diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..7c98241b67c06385974b44919f0f92fefb24f28c
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,97 @@
+image: maven:3.6-jdk-8
+
+#cache:
+#    paths:
+#    - $HOME/.m2/repository
+
+variables:
+  # This will supress any download for dependencies and plugins or upload messages which would clutter the console log.
+  # `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.
+  MAVEN_OPTS: "-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
+  # As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used
+  # when running from the command line.
+  # `installAtEnd` and `deployAtEnd`are only effective with recent version of the corresponding plugins.
+  MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true -Dmaven.repo.local=/tmp/.m2/repository"
+
+  SKIP_DEPENDENCIES: "false"
+  AUTO_DEPLOY_TO_PRODUCTION: "false"
+
+stages:
+- build_sde
+- build_est
+- test
+- deploy
+#- documentation
+#- release
+
+sde_build_test_job:
+    only:
+      refs:
+      - master
+      variables:
+      - $SKIP_DEPENDENCIES == "false"
+
+    
+    stage: build_sde
+    environment: staging
+    script:
+    - "curl -X POST -F token=d1ce830095dc9201851e948eb160f4 -F ref=master --form variables[SKIP_DEPENDENCIES]=true https://gitlab.fbk.eu/api/v4/projects/393/trigger/pipeline"
+
+est_build_test_job:
+    only:
+      refs:
+      - master
+      variables:
+      - $SKIP_DEPENDENCIES == "false"
+    
+    stage: build_est
+    environment: staging
+    script:
+    - "curl -X POST -F token=951497a03a4073902aa28ab8d9c2d3 -F ref=master --form variables[SKIP_DEPENDENCIES]=true https://gitlab.fbk.eu/api/v4/projects/1159/trigger/pipeline"
+
+maven_build_and_test:
+    only:
+      refs:
+      - master
+  
+    stage: test
+    environment: staging
+    script:
+    - "export DISPLAY=:0.0; cd org.polarsys.chess.parent; mvn $MAVEN_CLI_OPTS -P Neon-Java8,DevelopmentUpdateSite clean install"
+  
+.deploy_to_production_update_site: &deploy_to_production_update_site
+    dependencies:
+    - maven_build_and_test
+    variables:
+       GIT_STRATEGY: none
+       UPDATE_SITE_MOUNT_DIR: "/tmp/www_ci"
+       UPDATE_SITE_PROD_TARGET_DIR:  "html/tools/aida_chess"
+       REPOSITORY_TO_COPY: "org.polarsys.chess.parent/releng/eu.fbk.tools.aida.chess.repository/target/repository"
+       
+    stage: deploy
+    environment: staging
+    script:
+    - echo "Deploy to production update site"
+    - mkdir -p $UPDATE_SITE_MOUNT_DIR
+    - sshfs -o nonempty -o umask=0777 es@es-static.fbk.eu:/ $UPDATE_SITE_MOUNT_DIR
+    - mkdir -p $UPDATE_SITE_MOUNT_DIR/$UPDATE_SITE_PROD_TARGET_DIR
+    - cp -r ${REPOSITORY_TO_COPY}/* $UPDATE_SITE_MOUNT_DIR/$UPDATE_SITE_PROD_TARGET_DIR
+    - chmod -R 0777 $UPDATE_SITE_MOUNT_DIR/$UPDATE_SITE_PROD_TARGET_DIR
+    - fusermount -uz $UPDATE_SITE_MOUNT_DIR
+    only:
+      refs:
+      - master
+    
+automatic_deploy_to_production_update_site:
+    << : *deploy_to_production_update_site
+    only:
+      variables:
+      - $AUTO_DEPLOY_TO_PRODUCTION == "true"
+    
+manual_to_production_update_site:
+    << : *deploy_to_production_update_site
+    when: manual
+    only:
+      variables:
+      - $AUTO_DEPLOY_TO_PRODUCTION == "false"
+    
\ No newline at end of file
diff --git a/org.polarsys.chess.parent/.mvn/extensions.xml b/org.polarsys.chess.parent/.mvn/extensions.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5de0b592714f2a85481c43e94808dc8da412f95f
--- /dev/null
+++ b/org.polarsys.chess.parent/.mvn/extensions.xml
@@ -0,0 +1,7 @@
+<extensions>
+  <extension>
+    <groupId>org.eclipse.tycho.extras</groupId>
+    <artifactId>tycho-pomless</artifactId>
+    <version>1.3.0</version>
+  </extension>
+</extensions>
diff --git a/org.polarsys.chess.parent/.project b/org.polarsys.chess.parent/.project
new file mode 100644
index 0000000000000000000000000000000000000000..b61a0357cd67955f0a7a6baf208f1da301f105d1
--- /dev/null
+++ b/org.polarsys.chess.parent/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.polarsys.chess.parent</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.polarsys.chess.parent/.settings/.gitignore b/org.polarsys.chess.parent/.settings/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..0924da4b7805bc0c19e4f03b26ce07ef455393b3
--- /dev/null
+++ b/org.polarsys.chess.parent/.settings/.gitignore
@@ -0,0 +1 @@
+/org.eclipse.m2e.core.prefs
diff --git a/org.polarsys.chess.parent/.settings/org.eclipse.core.resources.prefs b/org.polarsys.chess.parent/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/org.polarsys.chess.parent/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.polarsys.chess.parent/bundles/pom.xml b/org.polarsys.chess.parent/bundles/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..96f2dd2dc63c0515fc2f4e420a7899682a9a3f06
--- /dev/null
+++ b/org.polarsys.chess.parent/bundles/pom.xml
@@ -0,0 +1,91 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.polarsys.chess.bundles</artifactId>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>org.polarsys.chess</groupId>
+        <artifactId>org.polarsys.chess.parent</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modules>
+       	<module>../../plugins/org.polarsys.chess.chessmlprofile</module>
+    	<module>../../plugins/org.polarsys.chess.core</module>
+    	<module>../../plugins/org.polarsys.chess.wizards</module>
+    	<module>../../plugins/contracts/org.polarsys.chess.contracts.profile</module>    	
+    	<module>../../plugins/org.polarsys.chess.service</module>    	
+    	<module>../../plugins/org.polarsys.chess.cleanCExporter</module>
+    	<module>../../plugins/org.polarsys.chess.OSSImporter</module>
+    	<module>../../plugins/org.polarsys.chess.cdo</module>
+    	<module>../../plugins/org.polarsys.chess.codegen.ada</module>
+    	<module>../../plugins/org.polarsys.chess.commands</module>
+    	<module>
+    		../../plugins/org.polarsys.chess.constraints.constraintEditor
+    	</module>
+    	<module>
+    		../../plugins/contracts/org.polarsys.chess.contracts.chessextension
+    	</module>
+    	<module>
+    		../../plugins/contracts/org.polarsys.chess.contracts.contractEditor
+    	</module>
+    	<module>
+    		../../plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager
+    	</module>
+    	<module>
+    		../../plugins/contracts/org.polarsys.chess.contracts.integration
+    	</module>
+    	<module>
+    		../../plugins/contracts/org.polarsys.chess.contracts.refinementView
+    	</module>
+    	<module>
+    		../../plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis
+    	</module>
+    	<module>
+    		../../plugins/contracts/org.polarsys.chess.contracts.transformations
+    	</module>
+    	<module>
+    		../../plugins/contracts/org.polarsys.chess.contracts.validation
+    	</module>
+    	<module>
+    		../../plugins/contracts/org.polarsys.chess.contracts.verificationService
+    	</module>
+    	<module>
+    		../../plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime
+    	</module>
+    	<module>../../plugins/org.polarsys.chess.diagram.ui</module>
+    	<module>../../plugins/org.polarsys.chess.diagramsCreator</module>
+    	<module>../../plugins/org.polarsys.chess.discovery</module>
+    	<module>../../plugins/fla/org.polarsys.chess.fla</module>
+    	<module>
+    		../../plugins/fla/org.polarsys.chess.fla.faultTreeGenerator
+    	</module>
+    	<module>../../plugins/fla/org.polarsys.chess.fla.flamm</module>
+    	<module>../../plugins/fla/org.polarsys.chess.fla.flaxml</module>
+    	<module>
+    		../../plugins/fla/org.polarsys.chess.fla.transformations
+    	</module>
+    	<module>../../plugins/org.polarsys.chess.functionBehaviors.functionBehaviorEditor</module>
+    	<module>../../plugins/org.polarsys.chess.m2m</module>
+    	<module>../../plugins/org.polarsys.chess.monitoring</module>
+    	<module>../../plugins/org.polarsys.chess.monitoring.edit</module>
+    	<module>../../plugins/org.polarsys.chess.monitoring.editor</module>
+    	<module>../../plugins/org.polarsys.chess.monitoring.tests</module>
+    	<module>../../plugins/org.polarsys.chess.multicore</module>
+    	<module>../../plugins/org.polarsys.chess.paramArchConfigurator</module>
+    	<module>../../plugins/org.polarsys.chess.patterns</module>
+    	<module>../../plugins/org.polarsys.chess.patterns.library</module>
+    	<module>../../plugins/org.polarsys.chess.patterns.profile</module>
+    	<module>../../plugins/org.polarsys.chess.properties.propertyEditor</module>
+    	<module>../../plugins/org.polarsys.chess.validator</module>
+    	<module>../../plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView</module>
+    	<module>../../plugins/org.polarsys.chess.smvExporter</module>
+    	<module>../../plugins/sba/org.polarsys.chess.statebased</module>
+    	<module>../../plugins/org.polarsys.chess.xtext.global</module>
+    	<module>../../plugins/org.polarsys.chess.tradeoffAnalysis</module>
+    	
+    	<!-- module>../../plugins/org.polarsys.chess.tabbedproperties</module>
+    	<module>../../plugins/fla/org.polarsys.chess.xtext.fladsl</module>
+    	<module>../../plugins/fla/org.polarsys.chess.xtext.fladsl.ui</module-->
+    </modules>
+</project>
diff --git a/org.polarsys.chess.parent/features/eu.fbk.tools.aida.chess.feature/.gitignore b/org.polarsys.chess.parent/features/eu.fbk.tools.aida.chess.feature/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..b83d22266ac8aa2f8df2edef68082c789727841d
--- /dev/null
+++ b/org.polarsys.chess.parent/features/eu.fbk.tools.aida.chess.feature/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/org.polarsys.chess.parent/features/eu.fbk.tools.aida.chess.feature/.project b/org.polarsys.chess.parent/features/eu.fbk.tools.aida.chess.feature/.project
new file mode 100644
index 0000000000000000000000000000000000000000..c24db5e02a0bf7a4acb8a6cd3fcf4d56b2c431c6
--- /dev/null
+++ b/org.polarsys.chess.parent/features/eu.fbk.tools.aida.chess.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>eu.fbk.tools.aida.chess.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.polarsys.chess.parent/features/eu.fbk.tools.aida.chess.feature/build.properties b/org.polarsys.chess.parent/features/eu.fbk.tools.aida.chess.feature/build.properties
new file mode 100644
index 0000000000000000000000000000000000000000..64f93a9f0b7328eb563aa5ad6cec7f828020e124
--- /dev/null
+++ b/org.polarsys.chess.parent/features/eu.fbk.tools.aida.chess.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/org.polarsys.chess.parent/features/eu.fbk.tools.aida.chess.feature/feature.xml b/org.polarsys.chess.parent/features/eu.fbk.tools.aida.chess.feature/feature.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5a13c248eeef9725203f8e9a2614c38c2b29ccf2
--- /dev/null
+++ b/org.polarsys.chess.parent/features/eu.fbk.tools.aida.chess.feature/feature.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="eu.fbk.tools.aida.chess.feature"
+      label="AIDA CHESS"
+      version="1.0.0.qualifier"
+      provider-name="Fondazione Bruno Kessler">
+
+   <description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+   <plugin
+         id="org.polarsys.chess.chessmlprofile"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.polarsys.chess.contracts.profile"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.polarsys.chess.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.polarsys.chess.diagram.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.polarsys.chess.diagramsCreator"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.polarsys.chess.functionBehaviors.functionBehaviorEditor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.polarsys.chess.service"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.polarsys.chess.validator"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.polarsys.chess.wizards"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/org.polarsys.chess.parent/features/eu.fbk.tools.aida.chess.feature/pom.xml b/org.polarsys.chess.parent/features/eu.fbk.tools.aida.chess.feature/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6332b69470fbec7379f56d5f0777e53e31673fb7
--- /dev/null
+++ b/org.polarsys.chess.parent/features/eu.fbk.tools.aida.chess.feature/pom.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.features</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>eu.fbk.tools.aida.chess.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/org.polarsys.chess.parent/features/pom.xml b/org.polarsys.chess.parent/features/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..891ccc51beeae27795faf8472ea9fd86dae4f00c
--- /dev/null
+++ b/org.polarsys.chess.parent/features/pom.xml
@@ -0,0 +1,18 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.polarsys.chess.features</artifactId>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>org.polarsys.chess</groupId>
+        <artifactId>org.polarsys.chess.parent</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <modules>
+    	<module>
+    		eu.fbk.tools.aida.chess.feature
+    	</module>
+    </modules>
+</project>
diff --git a/org.polarsys.chess.parent/pom.xml b/org.polarsys.chess.parent/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..aa6acc01ff4c538f6094481a13d2ed3566cd131f
--- /dev/null
+++ b/org.polarsys.chess.parent/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>org.polarsys.chess.parent</artifactId>
+  <packaging>pom</packaging>
+  <parent>
+ 	  	<groupId>org.polarsys.chess</groupId>
+ 	  	<artifactId>org.polarsys.chess.configuration</artifactId>
+  		 <version>1.0.0-SNAPSHOT</version>
+  		<relativePath>./releng/org.polarsys.chess.configuration</relativePath>
+ 	</parent>
+ 	
+	<modules>
+		<module>bundles</module>
+		<module>features</module>
+		<module>releng</module>
+	</modules>
+</project>
diff --git a/org.polarsys.chess.parent/releng/eu.fbk.tools.aida.chess.repository/.gitignore b/org.polarsys.chess.parent/releng/eu.fbk.tools.aida.chess.repository/.gitignore
new file mode 100755
index 0000000000000000000000000000000000000000..b83d22266ac8aa2f8df2edef68082c789727841d
--- /dev/null
+++ b/org.polarsys.chess.parent/releng/eu.fbk.tools.aida.chess.repository/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/org.polarsys.chess.parent/releng/eu.fbk.tools.aida.chess.repository/.project b/org.polarsys.chess.parent/releng/eu.fbk.tools.aida.chess.repository/.project
new file mode 100755
index 0000000000000000000000000000000000000000..2bb90f4a5e30e986970372e6d6fb9b06c242c3a3
--- /dev/null
+++ b/org.polarsys.chess.parent/releng/eu.fbk.tools.aida.chess.repository/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>eu.fbk.tools.aida.chess.repository</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.polarsys.chess.parent/releng/eu.fbk.tools.aida.chess.repository/.settings/org.eclipse.core.resources.prefs b/org.polarsys.chess.parent/releng/eu.fbk.tools.aida.chess.repository/.settings/org.eclipse.core.resources.prefs
new file mode 100755
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/org.polarsys.chess.parent/releng/eu.fbk.tools.aida.chess.repository/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.polarsys.chess.parent/releng/eu.fbk.tools.aida.chess.repository/.settings/org.eclipse.m2e.core.prefs b/org.polarsys.chess.parent/releng/eu.fbk.tools.aida.chess.repository/.settings/org.eclipse.m2e.core.prefs
new file mode 100755
index 0000000000000000000000000000000000000000..69a575b6f30efe4b1144b2adf543936d2d5b1e38
--- /dev/null
+++ b/org.polarsys.chess.parent/releng/eu.fbk.tools.aida.chess.repository/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=AIDADevelopmentUpdateSite
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.polarsys.chess.parent/releng/eu.fbk.tools.aida.chess.repository/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.polarsys.chess.parent/releng/eu.fbk.tools.aida.chess.repository/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100755
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/org.polarsys.chess.parent/releng/eu.fbk.tools.aida.chess.repository/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.polarsys.chess.parent/releng/eu.fbk.tools.aida.chess.repository/category.xml b/org.polarsys.chess.parent/releng/eu.fbk.tools.aida.chess.repository/category.xml
new file mode 100755
index 0000000000000000000000000000000000000000..f4fcc4b08a6a68eade43b5bbb5664dc8a1f0dd49
--- /dev/null
+++ b/org.polarsys.chess.parent/releng/eu.fbk.tools.aida.chess.repository/category.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <feature url="features/eu.fbk.tools.aida.chess.feature_1.0.0.qualifier.jar" id="eu.fbk.tools.aida.chess.feature" version="1.0.0.qualifier">
+      <category name="eu.fbk.tools.aida.chess"/>
+   </feature>
+   <category-def name="eu.fbk.tools.aida.chess" label="AIDA CHESS"/>
+</site>
diff --git a/org.polarsys.chess.parent/releng/eu.fbk.tools.aida.chess.repository/pom.xml b/org.polarsys.chess.parent/releng/eu.fbk.tools.aida.chess.repository/pom.xml
new file mode 100755
index 0000000000000000000000000000000000000000..c4abf2aaa530a9e9213ed318345d90ebbc1d5579
--- /dev/null
+++ b/org.polarsys.chess.parent/releng/eu.fbk.tools.aida.chess.repository/pom.xml
@@ -0,0 +1,181 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.polarsys.chess</groupId>
+		<artifactId>org.polarsys.chess.releng</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>eu.fbk.tools.aida.chess.repository</artifactId>
+	<packaging>eclipse-repository</packaging>
+	
+	<properties>
+		<updateSite.mount.dir.root>/tmp</updateSite.mount.dir.root>
+		<updateSite.mount.dir>www_ci</updateSite.mount.dir>
+		<updateSite.root>${updateSite.mount.dir.root}/${updateSite.mount.dir}/html/tools</updateSite.root>
+		<updateSite.url.root>es@es-static.fbk.eu:/</updateSite.url.root>
+		<updateSite.skip>true</updateSite.skip>
+	</properties>
+
+	<profiles>
+		<profile>
+			<id>DevelopmentUpdateSite</id>
+			<properties>
+				<updateSite.dir>${updateSite.root}/aida_chess_devel</updateSite.dir>
+				<updateSite.skip>false</updateSite.skip>								
+			</properties>
+		</profile>
+		<profile>
+			<id>ProductionUpdateSite</id>
+			<properties>
+				<updateSite.dir>${updateSite.root}/aida_chess</updateSite.dir>
+				<updateSite.skip>false</updateSite.skip>								
+			</properties>
+		</profile>
+	</profiles>
+
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>org.apache.maven.plugins</groupId>
+										<artifactId>maven-clean-plugin</artifactId>
+										<versionRange>[2.5,)</versionRange>
+										<goals>
+											<goal>clean</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>exec-maven-plugin</artifactId>
+				<version>1.6.0</version>
+				<executions>
+					<execution>
+						<id>create_mount_dir</id>
+						<goals>
+							<goal>exec</goal>
+						</goals>
+						<phase>install</phase>								
+						<configuration>
+							<skip>${updateSite.skip}</skip>
+							<executable>mkdir</executable>
+							<workingDirectory>${updateSite.mount.dir.root}</workingDirectory>
+							<longModulepath>false</longModulepath>
+							<arguments>
+								<argument>-p</argument>
+								<argument>${updateSite.mount.dir}</argument>
+							</arguments>
+						</configuration>
+					</execution>
+					<execution>
+						<id>change_dir_permissions</id>
+						<goals>
+							<goal>exec</goal>
+						</goals>
+						<phase>install</phase>
+						<configuration>
+							<skip>${updateSite.skip}</skip>
+							<executable>chmod</executable>
+							<workingDirectory>${updateSite.mount.dir.root}</workingDirectory>
+							<arguments>
+								<argument>0777</argument>
+								<argument>${updateSite.mount.dir}</argument>
+							</arguments>
+						</configuration>
+					</execution>
+					<execution>
+						<id>mount_sshfs</id>
+						<goals>
+							<goal>exec</goal>
+						</goals>
+						<phase>install</phase>
+						<configuration>
+							<skip>${updateSite.skip}</skip>
+							<executable>sshfs</executable>
+							<workingDirectory>${updateSite.mount.dir.root}</workingDirectory>
+							<arguments>
+								<argument>-o</argument>
+								<argument>nonempty</argument>
+								<argument>-o</argument>
+								<argument>umask=0777</argument>
+								<argument>${updateSite.url.root}</argument>
+								<argument>${updateSite.mount.dir}</argument>
+							</arguments>
+						</configuration>
+					</execution>
+					<execution>
+						<id>update_development_site</id>
+						<goals>
+							<goal>exec</goal>
+						</goals>
+						<phase>install</phase>
+						<configuration>
+							<skip>${updateSite.skip}</skip>
+							<executable>cp</executable>
+							<workingDirectory>${basedir}/target/repository</workingDirectory>
+							<arguments>
+								<argument>-r</argument>
+								<argument>.</argument>
+								<argument>${updateSite.dir}</argument>
+							</arguments>
+						</configuration>
+					</execution>
+					<execution>
+						<id>change_site_permissions</id>
+						<goals>
+							<goal>exec</goal>
+						</goals>
+						<phase>install</phase>
+						<configuration>
+							<executable>chmod</executable>
+							<workingDirectory>${updateSite.dir}</workingDirectory>
+							<arguments>
+								<argument>-R</argument>
+								<argument>0777</argument>
+								<argument>.</argument>
+							</arguments>
+						</configuration>
+					</execution>
+					<execution>
+						<id>umount_sshfs</id>
+						<goals>
+							<goal>exec</goal>
+						</goals>
+						<phase>install</phase>
+						<configuration>
+							<skip>${updateSite.skip}</skip>
+							<executable>fusermount</executable>
+							<workingDirectory>${updateSite.mount.dir.root}</workingDirectory>
+							<arguments>
+								<argument>-u</argument>
+								<argument>${updateSite.mount.dir}</argument>
+							</arguments>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/org.polarsys.chess.parent/releng/org.polarsys.chess.configuration/.classpath b/org.polarsys.chess.parent/releng/org.polarsys.chess.configuration/.classpath
new file mode 100644
index 0000000000000000000000000000000000000000..0a1daddd3e8b9c09545b11d60a0ecd9f63b431f4
--- /dev/null
+++ b/org.polarsys.chess.parent/releng/org.polarsys.chess.configuration/.classpath
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.polarsys.chess.parent/releng/org.polarsys.chess.configuration/.project b/org.polarsys.chess.parent/releng/org.polarsys.chess.configuration/.project
new file mode 100644
index 0000000000000000000000000000000000000000..7606bac8f4b0c66a9951939dd37dc6dd0448b883
--- /dev/null
+++ b/org.polarsys.chess.parent/releng/org.polarsys.chess.configuration/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.polarsys.chess.configuration</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.polarsys.chess.parent/releng/org.polarsys.chess.configuration/.settings/org.eclipse.core.resources.prefs b/org.polarsys.chess.parent/releng/org.polarsys.chess.configuration/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/org.polarsys.chess.parent/releng/org.polarsys.chess.configuration/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.polarsys.chess.parent/releng/org.polarsys.chess.configuration/.settings/org.eclipse.jdt.core.prefs b/org.polarsys.chess.parent/releng/org.polarsys.chess.configuration/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..abec6ca389ac6331e1f6466d9f67c8dd3406fb5a
--- /dev/null
+++ b/org.polarsys.chess.parent/releng/org.polarsys.chess.configuration/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/org.polarsys.chess.parent/releng/org.polarsys.chess.configuration/.settings/org.eclipse.m2e.core.prefs b/org.polarsys.chess.parent/releng/org.polarsys.chess.configuration/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/org.polarsys.chess.parent/releng/org.polarsys.chess.configuration/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.polarsys.chess.parent/releng/org.polarsys.chess.configuration/pom.xml b/org.polarsys.chess.parent/releng/org.polarsys.chess.configuration/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..93263ede6b81f41a7ffa4e3fe4352486d16ae096
--- /dev/null
+++ b/org.polarsys.chess.parent/releng/org.polarsys.chess.configuration/pom.xml
@@ -0,0 +1,321 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.polarsys.chess</groupId>	
+	<artifactId>org.polarsys.chess.configuration</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+
+	<prerequisites>
+		<maven>3.0.0</maven>
+	</prerequisites>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
+		
+		<!-- Define overridable properties for tycho-surefire-plugin -->
+		<platformSystemProperties></platformSystemProperties>
+		<moduleProperties></moduleProperties>
+		<systemProperties></systemProperties>
+		<tycho.testArgLine></tycho.testArgLine>
+		<tycho.test.platformArgs />
+		<tycho.test.jvmArgs>-Xmx512m ${tycho.test.platformArgs}</tycho.test.jvmArgs>
+		
+	</properties>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-maven-plugin</artifactId>
+				<version>${tycho.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<version>${tycho.version}</version>
+				<configuration>
+					<target>
+						<artifact>
+							<groupId>org.polarsys.chess.target</groupId>
+							<artifactId>org.polarsys.chess.target.neon</artifactId>
+							<version>1.0.0-SNAPSHOT</version>
+						</artifact>
+					</target>
+					<environments>
+						<environment>
+							<os>linux</os>
+							<ws>gtk</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>macosx</os>
+							<ws>cocoa</ws>
+							<arch>x86_64</arch>
+						</environment>
+					</environments>
+				</configuration>
+			</plugin>
+
+			<!--Enable the replacement of the SNAPSHOT version in the final product 
+				configuration -->
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho.version}</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<id>package-feature</id>
+						<configuration>
+							<finalName>${project.artifactId}_${unqualifiedVersion}.${buildQualifier}</finalName>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.eclipse.xtend</groupId>
+					<artifactId>xtend-maven-plugin</artifactId>
+					<version>${xtextVersion}</version>
+					<executions>
+						<execution>
+							<goals>
+								<goal>compile</goal>
+								<goal>xtend-install-debug-info</goal>
+								<goal>testCompile</goal>
+								<goal>xtend-test-install-debug-info</goal>
+							</goals>
+						</execution>
+					</executions>
+					<configuration>
+						<outputDirectory>${basedir}/xtend-gen</outputDirectory>
+						<testOutputDirectory>${basedir}/xtend-gen</testOutputDirectory>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-clean-plugin</artifactId>
+					<version>3.1.0</version>
+					<configuration>
+						<filesets>
+							<fileset>
+								<directory>${basedir}/xtend-gen</directory>
+								<includes>
+									<include>**/*</include>
+								</includes>
+							</fileset>
+						</filesets>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.apache.maven.plugins
+										</groupId>
+										<artifactId>
+											maven-resources-plugin
+										</artifactId>
+										<versionRange>
+											[2.4.3,)
+										</versionRange>
+										<goals>
+											<goal>resources</goal>
+											<goal>testResources</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore>org.polarsys.chess</ignore>
+									</action>
+								</pluginExecution>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.codehaus.mojo
+										</groupId>
+										<artifactId>
+											build-helper-maven-plugin
+										</artifactId>
+										<versionRange>
+											[1.9.1,)
+										</versionRange>
+										<goals>
+											<goal>add-resource</goal>
+											<goal>add-source</goal>
+											<goal>add-test-resource</goal>
+											<goal>add-test-source</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.eclipse.tycho
+										</groupId>
+										<artifactId>
+											tycho-compiler-plugin
+										</artifactId>
+										<versionRange>
+											[0.23.1,)
+										</versionRange>
+										<goals>
+											<goal>compile</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.eclipse.tycho
+										</groupId>
+										<artifactId>
+											tycho-packaging-plugin
+										</artifactId>
+										<versionRange>
+											[0.23.1,)
+										</versionRange>
+										<goals>
+											<goal>build-qualifier</goal>
+											<goal>build-qualifier-aggregator</goal>
+											<goal>validate-id</goal>
+											<goal>validate-version</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+				<plugin>
+					<!-- Can be removed after first generator execution https://bugs.eclipse.org/bugs/show_bug.cgi?id=480097 -->
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-compiler-plugin</artifactId>
+					<version>${tycho.version}</version>
+					<configuration>
+						<compilerArgument>-err:-forbidden</compilerArgument>
+						<useProjectSettings>false</useProjectSettings>
+					</configuration>
+				</plugin>
+				<!-- to skip running (and compiling) tests use commandline flag: -Dmaven.test.skip 
+					To skip tests, but still compile them, use: -DskipTests To allow all tests 
+					in a pom to pass/fail, use commandline flag: -fae (fail at end) -->
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-surefire-plugin</artifactId>
+					<version>${tycho.version}</version>
+					<configuration>
+						<!-- THE FOLLOWING LINE MUST NOT BE BROKEN BY AUTOFORMATTING -->
+						<argLine>${tycho.testArgLine} ${platformSystemProperties}
+							${systemProperties} ${moduleProperties}</argLine>
+						<failIfNoTests>false</failIfNoTests>
+						<useUIHarness>false</useUIHarness>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
+
+	<profiles>
+		<profile>
+			<id>Neon-Java8</id>
+			<activation>
+				<jdk>8</jdk>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<properties>
+				<!-- Tycho settings -->
+				<tycho.version>1.0.0</tycho.version>
+				<tycho.extras.version>1.0.0</tycho.extras.version>
+				<maven.compiler.source>1.8</maven.compiler.source>
+				<maven.compiler.target>1.8</maven.compiler.target>
+				<xtextVersion>2.12.0</xtextVersion>
+				<ecore-xcore-version>1.3.1</ecore-xcore-version>
+				<ecore-xcore-codegen-version>1.2.0</ecore-xcore-codegen-version>
+				<ecore-xcore-lib-version>1.1.100</ecore-xcore-lib-version>
+				<mwe2Version>[2.9.0,2.9.1)</mwe2Version>
+				<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+				<maven.compiler.source>1.8</maven.compiler.source>
+				<maven.compiler.target>1.8</maven.compiler.target>
+				<emfRuntimeVersion>2.12</emfRuntimeVersion>
+			</properties>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.eclipse.tycho</groupId>
+						<artifactId>target-platform-configuration</artifactId>
+						<version>${tycho.version}</version>
+						<configuration>
+							<target>
+								<artifact>
+									<groupId>org.polarsys.chess.target</groupId>
+									<artifactId>org.polarsys.chess.target.neon</artifactId>
+									<version>${project.version}</version>
+								</artifact>
+							</target>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>org.eclipse.xtend</groupId>
+						<artifactId>xtend-maven-plugin</artifactId>
+						<dependencies>
+							<dependency>
+								<groupId>org.eclipse.platform</groupId>
+								<artifactId>org.eclipse.equinox.common</artifactId>
+								<version>[3.8.0,4.0.0)</version>
+							</dependency>
+							<dependency>
+								<groupId>org.eclipse.jdt</groupId>
+								<artifactId>org.eclipse.jdt.core</artifactId>
+								<version>3.13.102</version>
+							</dependency>
+							<dependency>
+								<groupId>org.eclipse.jdt</groupId>
+								<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
+								<version>1.3.110</version>
+							</dependency>
+							<dependency>
+								<groupId>org.eclipse.jdt</groupId>
+								<artifactId>org.eclipse.jdt.compiler.tool</artifactId>
+								<version>1.2.101</version>
+							</dependency>
+							<dependency>
+								<groupId>org.eclipse.emf</groupId>
+								<artifactId>org.eclipse.emf.codegen</artifactId>
+								<version>2.11.0</version>
+							</dependency>
+						</dependencies>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+</project>
diff --git a/org.polarsys.chess.parent/releng/org.polarsys.chess.target.neon/.project b/org.polarsys.chess.parent/releng/org.polarsys.chess.target.neon/.project
new file mode 100644
index 0000000000000000000000000000000000000000..04f4169368eb8ba6e98dbd7907cb049420ff71c7
--- /dev/null
+++ b/org.polarsys.chess.parent/releng/org.polarsys.chess.target.neon/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.polarsys.chess.target.neon</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.polarsys.chess.parent/releng/org.polarsys.chess.target.neon/.settings/.gitignore b/org.polarsys.chess.parent/releng/org.polarsys.chess.target.neon/.settings/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..5f2445cd167d66ae124dacf9db50676f3cbc55b3
--- /dev/null
+++ b/org.polarsys.chess.parent/releng/org.polarsys.chess.target.neon/.settings/.gitignore
@@ -0,0 +1 @@
+/org.eclipse.xtend.core.Xtend.prefs
diff --git a/org.polarsys.chess.parent/releng/org.polarsys.chess.target.neon/.settings/org.eclipse.core.resources.prefs b/org.polarsys.chess.parent/releng/org.polarsys.chess.target.neon/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..4824b8026319a8fb303971008a7d59a816d58bd6
--- /dev/null
+++ b/org.polarsys.chess.parent/releng/org.polarsys.chess.target.neon/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.polarsys.chess.parent/releng/org.polarsys.chess.target.neon/.settings/org.eclipse.jdt.core.prefs b/org.polarsys.chess.parent/releng/org.polarsys.chess.target.neon/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..e029c71e0c9ba767548ced7db50d5dba63edc127
--- /dev/null
+++ b/org.polarsys.chess.parent/releng/org.polarsys.chess.target.neon/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/org.polarsys.chess.parent/releng/org.polarsys.chess.target.neon/.settings/org.eclipse.m2e.core.prefs b/org.polarsys.chess.parent/releng/org.polarsys.chess.target.neon/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..57a0e191ce11b783e2a9a08dbd0b67e32fcd8fc7
--- /dev/null
+++ b/org.polarsys.chess.parent/releng/org.polarsys.chess.target.neon/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=Photon
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.polarsys.chess.parent/releng/org.polarsys.chess.target.neon/org.polarsys.chess.target.neon.target b/org.polarsys.chess.parent/releng/org.polarsys.chess.target.neon/org.polarsys.chess.target.neon.target
new file mode 100644
index 0000000000000000000000000000000000000000..0d734b2595f8ce285532a6ca02ecab133ada7935
--- /dev/null
+++ b/org.polarsys.chess.parent/releng/org.polarsys.chess.target.neon/org.polarsys.chess.target.neon.target
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="org.polarsys.chess.target.neon.target" sequenceNumber="59">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.nebula.widgets.grid.feature.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/nebula/releases/2.2.0/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.xtext.sdk.feature.group" version="2.12.0.v20170519-1412"/>
+<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.12.0/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.0.v201605261103"/>
+<unit id="org.eclipse.emf.mwe.sdk.feature.group" version="1.3.20.v201605261103"/>
+<repository location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.9.0/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.elk.gmf.feature.feature.group" version="0.4.0"/>
+<unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.4.0"/>
+<unit id="org.eclipse.elk.algorithms.feature.feature.group" version="0.4.0"/>
+<unit id="org.eclipse.elk.graphiti.feature.feature.group" version="0.4.0"/>
+<unit id="org.eclipse.elk.feature.feature.group" version="0.4.0"/>
+<unit id="org.eclipse.elk.ui.feature.feature.group" version="0.4.0"/>
+<unit id="org.eclipse.elk.graphviz.feature.feature.group" version="0.4.0"/>
+<repository location="http://build.eclipse.org/modeling/elk/updates/0.4.0/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.papyrus.sysml.feature.feature.group" version="1.2.0.201703081153"/>
+<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="2.0.3.201703080851"/>
+<unit id="org.eclipse.papyrus.extra.cdo.feature.feature.group" version="1.2.0.201703081153"/>
+<unit id="org.eclipse.papyrus.sysml.diagram.feature.feature.group" version="2.0.0.201703081153"/>
+<unit id="org.eclipse.papyrus.extra.marte.feature.feature.group" version="1.2.0.201703081153"/>
+<repository location="https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/neon/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.epsilon.emf.feature.feature.group" version="1.5.1.201809302027"/>
+<unit id="org.eclipse.epsilon.core.feature.feature.group" version="1.5.1.201809302027"/>
+<repository location="http://download.eclipse.org/epsilon/updates/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.3.v20170227-0935"/>
+<unit id="org.eclipse.ocl.all.sdk.feature.group" version="5.2.0.v20160523-1914"/>
+<repository location="http://download.eclipse.org/releases/neon/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.sirius.specifier.ide.ui.aql.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.specifier.ide.ui.acceleo.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.aql.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.ide.eef.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.specifier.ide.ui.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.properties.feature.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.doc.feature.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.properties.feature.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.ide.ui.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.acceleo.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.tests.support.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.ocl.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.interpreter.feature.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.specifier.properties.feature.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.interpreter.feature.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.specifier.ide.ui.acceleo.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.aql.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.ide.xtext.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.ide.ui.acceleo.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.specifier.properties.feature.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.acceleo.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.ocl.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.ide.eef.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.samples.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.tests.support.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.doc.feature.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.aql.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.samples.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.ide.xtext.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.specifier.ide.ui.aql.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.specifier.ide.ui.feature.group" version="4.1.9.201802221507"/>
+<repository location="http://download.eclipse.org/sirius/updates/releases/4.1.9/neon/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.m2m.atl.feature.group" version="4.1.0.v201909021645"/>
+<repository location="https://download.eclipse.org/mmt/atl/updates/releases/4.1/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.8.0.v20180612-0940"/>
+<repository location="https://download.eclipse.org/mmt/qvto/updates/releases/3.8.0/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.viatra.query.sdk.feature.source.feature.group" version="1.7.2.201803211255"/>
+<unit id="org.eclipse.viatra.addon.viewers.runtime.feature.source.feature.group" version="0.17.2.201803211255"/>
+<repository location="https://download.eclipse.org/viatra/updates/release/1.7.2"/>
+</location>
+</locations>
+</target>
diff --git a/org.polarsys.chess.parent/releng/org.polarsys.chess.target.neon/pom.xml b/org.polarsys.chess.parent/releng/org.polarsys.chess.target.neon/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5850ca7293bd6748065f5fc7b21275bfa61e458e
--- /dev/null
+++ b/org.polarsys.chess.parent/releng/org.polarsys.chess.target.neon/pom.xml
@@ -0,0 +1,14 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.polarsys.chess</groupId>
+		<artifactId>org.polarsys.chess.releng</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+	<groupId>org.polarsys.chess.target</groupId>	
+	<artifactId>org.polarsys.chess.target.neon</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+	<dependencies>
+	</dependencies>
+</project>
diff --git a/org.polarsys.chess.parent/releng/pom.xml b/org.polarsys.chess.parent/releng/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dccc0e5ca727cee5274c6fd325c15d3d8de558cf
--- /dev/null
+++ b/org.polarsys.chess.parent/releng/pom.xml
@@ -0,0 +1,18 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.polarsys.chess.releng</artifactId>
+    <packaging>pom</packaging>
+    
+ <parent>
+        <groupId>org.polarsys.chess</groupId>
+        <artifactId>org.polarsys.chess.parent</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <modules>
+    	<module>org.polarsys.chess.configuration</module>
+    	<module>org.polarsys.chess.target.neon</module>
+    	<module>eu.fbk.tools.aida.chess.repository</module>
+    </modules>
+</project>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.chessextension/.gitignore b/plugins/contracts/org.polarsys.chess.contracts.chessextension/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.chessextension/.gitignore
+++ b/plugins/contracts/org.polarsys.chess.contracts.chessextension/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/contracts/org.polarsys.chess.contracts.chessextension/.project b/plugins/contracts/org.polarsys.chess.contracts.chessextension/.project
index a52a8e79c46f13ec97462cb8a2e95801086c7dff..db73c4c73ebf3bbb11c3b46f2c259c60ca3fca1b 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.chessextension/.project
+++ b/plugins/contracts/org.polarsys.chess.contracts.chessextension/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.chessextension/.settings/org.eclipse.core.resources.prefs b/plugins/contracts/org.polarsys.chess.contracts.chessextension/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.chessextension/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/contracts/org.polarsys.chess.contracts.chessextension/.settings/org.eclipse.m2e.core.prefs b/plugins/contracts/org.polarsys.chess.contracts.chessextension/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.chessextension/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/contracts/org.polarsys.chess.contracts.chessextension/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/contracts/org.polarsys.chess.contracts.chessextension/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.chessextension/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/contracts/org.polarsys.chess.contracts.chessextension/META-INF/MANIFEST.MF b/plugins/contracts/org.polarsys.chess.contracts.chessextension/META-INF/MANIFEST.MF
index 8dddc8520cc18d48ccfaf324b9db3fd1c3d6ccbe..37a0c95c965f71fce80af26c4b7e7fcad55e0bad 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.chessextension/META-INF/MANIFEST.MF
+++ b/plugins/contracts/org.polarsys.chess.contracts.chessextension/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CHESS Contracts Extension (Incubation)
 Bundle-SymbolicName: org.polarsys.chess.contracts.chessextension;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.polarsys.chess.contracts.chessextension.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
@@ -36,7 +36,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jface,
  eu.fbk.eclipse.standardtools.utils
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Intecs
 Import-Package: org.eclipse.emf.cdo.internal.explorer.checkouts;version="4.5.0",
  org.eclipse.emf.cdo.transfer,
diff --git a/plugins/contracts/org.polarsys.chess.contracts.chessextension/pom.xml b/plugins/contracts/org.polarsys.chess.contracts.chessextension/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4b9ba6086f9af118f9b0b49cf87f4b046b393249
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.chessextension/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.contracts.chessextension</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/listeners/PapyrusModelListener.java b/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/listeners/PapyrusModelListener.java
index 88d3069d40820ada49dda2939e3e5ef666a2c73d..0030ee5a9b153ae11c98b42c528d475bb2bdf28d 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/listeners/PapyrusModelListener.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.chessextension/src/org/polarsys/chess/contracts/chessextension/listeners/PapyrusModelListener.java
@@ -24,6 +24,7 @@ import org.eclipse.papyrus.uml.tools.listeners.StereotypeElementListener.Stereot
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.internal.Workbench;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Constraint;
@@ -49,7 +50,8 @@ public class PapyrusModelListener implements IPapyrusListener {
 	public void notifyChanged(Notification notification) {
 		Object notifier = notification.getNotifier();
 		
-		if((PlatformUI.getWorkbench().getActiveWorkbenchWindow()!=null)
+		if((Workbench.getInstance() != null) && (PlatformUI.getWorkbench()!=null)&&
+				(PlatformUI.getWorkbench().getActiveWorkbenchWindow()!=null)
 				&&(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()!=null)
 				&&(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().isEditorAreaVisible())
 				&&(notifier instanceof Class)){
diff --git a/plugins/contracts/org.polarsys.chess.contracts.contractEditor/.gitignore b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.contractEditor/.gitignore
+++ b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/contracts/org.polarsys.chess.contracts.contractEditor/.project b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/.project
index ec206a1740962991d3507a388198ff4369d356f0..1991e232207a74f4be721540eae5a55b0a220032 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.contractEditor/.project
+++ b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.contractEditor/.settings/org.eclipse.core.resources.prefs b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/contracts/org.polarsys.chess.contracts.contractEditor/.settings/org.eclipse.m2e.core.prefs b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/contracts/org.polarsys.chess.contracts.contractEditor/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/contracts/org.polarsys.chess.contracts.contractEditor/pom.xml b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0a25771c1344cb4b9bdca1118e0618ed2dad17dd
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.contracts.contractEditor</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager/.gitignore b/plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager/.gitignore
+++ b/plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager/.project b/plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager/.project
index 7bbe6d62f8bc54328a51578897b9a7084ee88d92..7aae73ebd29792cb4a5281c8689c9c273a4f4cf5 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager/.project
+++ b/plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager/.settings/org.eclipse.core.resources.prefs b/plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager/.settings/org.eclipse.m2e.core.prefs b/plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager/pom.xml b/plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4dbec3ef20c3d6e0e6fc182ce01f83ae0b7ff314
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.contracts.contractPropertyManager</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.feature/pom.xml b/plugins/contracts/org.polarsys.chess.contracts.feature/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f26c402799102a4ef2532074e2f9f6fc1268e341
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.feature/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>CHESS</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <groupId>org.polarsys.chess</groupId>
+  <artifactId>org.polarsys.chess.contracts.feature</artifactId>
+  <version>0.10.0-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/.gitignore b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/.gitignore
+++ b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/.project b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/.project
index 08b1f5bdec6e9b662298f9300c714a453fed3689..850ed541269630f2bb23bca6585f5d0c223bdca9 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/.project
+++ b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/.settings/org.eclipse.core.resources.prefs b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/.settings/org.eclipse.m2e.core.prefs b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/pom.xml b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4987d4ae556738d5b29139880a840a636f85b2f5
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.contracts.hierarchicalContractView</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/listener/PapyrusListener.java b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/listener/PapyrusListener.java
index 808a5068abbbbed9468a7b6c9927a8994310d2ce..c430054fb3b29d35d095ea4f1943cf6bc130e36d 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/listener/PapyrusListener.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/listener/PapyrusListener.java
@@ -23,6 +23,7 @@ import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.internal.Workbench;
 
 public class PapyrusListener implements IPapyrusListener {
 
@@ -37,7 +38,7 @@ public class PapyrusListener implements IPapyrusListener {
 		Object notifier = notification.getNotifier();
 
 		if (notifier instanceof Element) {
-
+			if (Workbench.getInstance() != null){
 			IWorkbench workbench = PlatformUI.getWorkbench();
 			IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();
 			IViewPart modelExplorerViewPart;
@@ -56,6 +57,7 @@ public class PapyrusListener implements IPapyrusListener {
 					}
 				}
 			}
+			}
 		}
 	}
 }
diff --git a/plugins/contracts/org.polarsys.chess.contracts.integration/.gitignore b/plugins/contracts/org.polarsys.chess.contracts.integration/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.integration/.gitignore
+++ b/plugins/contracts/org.polarsys.chess.contracts.integration/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/contracts/org.polarsys.chess.contracts.integration/.project b/plugins/contracts/org.polarsys.chess.contracts.integration/.project
index 2c69783db598b76854f5af02eb8bfa9bb55b4bfb..1cfe176172cd542f8a7f403b8eb1353c45e290ff 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.integration/.project
+++ b/plugins/contracts/org.polarsys.chess.contracts.integration/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.integration/.settings/org.eclipse.core.resources.prefs b/plugins/contracts/org.polarsys.chess.contracts.integration/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.integration/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/contracts/org.polarsys.chess.contracts.integration/.settings/org.eclipse.m2e.core.prefs b/plugins/contracts/org.polarsys.chess.contracts.integration/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.integration/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/contracts/org.polarsys.chess.contracts.integration/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/contracts/org.polarsys.chess.contracts.integration/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.integration/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/contracts/org.polarsys.chess.contracts.integration/META-INF/MANIFEST.MF b/plugins/contracts/org.polarsys.chess.contracts.integration/META-INF/MANIFEST.MF
index 8cefcdc637d49cde1df71bce1160610ed8106441..3f416ac1bfcee8fbeb8c2aa6ff498d594187db02 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.integration/META-INF/MANIFEST.MF
+++ b/plugins/contracts/org.polarsys.chess.contracts.integration/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CHESS Contracts Integration (Incubation)
 Bundle-SymbolicName: org.polarsys.chess.contracts.integration;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.polarsys.chess.contracts.integration.Activator
 Bundle-Vendor: Intecs
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.uml2.uml;bundle-version="3.2.100",
  org.eclipse.ui.ide;bundle-version="3.7.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.polarsys.chess.contracts.integration,
  org.polarsys.chess.contracts.integration.preferences
diff --git a/plugins/contracts/org.polarsys.chess.contracts.integration/pom.xml b/plugins/contracts/org.polarsys.chess.contracts.integration/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d0a36b43d90e50b27d951f9b2ab04ed58f09f6a8
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.integration/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.contracts.integration</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/.classpath b/plugins/contracts/org.polarsys.chess.contracts.profile/.classpath
index 121e527a9386dd66bdd0ec178fc2d28d734b82f8..eca7bdba8f03f22510b7980a94dbfe10c16c0901 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/.classpath
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/.gitignore b/plugins/contracts/org.polarsys.chess.contracts.profile/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/.gitignore
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/.project b/plugins/contracts/org.polarsys.chess.contracts.profile/.project
index c4234b340b20b77ac1e97133b8757fea374da40e..8bc96e88ae5d3215e3052a8dff32a75666d5af66 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/.project
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/.settings/org.eclipse.core.resources.prefs b/plugins/contracts/org.polarsys.chess.contracts.profile/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/.settings/org.eclipse.jdt.core.prefs b/plugins/contracts/org.polarsys.chess.contracts.profile/.settings/org.eclipse.jdt.core.prefs
index c537b63063ce6052bdc49c5fd0745b078f162c90..0c68a61dca867ceb49e79d2402935261ec3e3809 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/.settings/org.eclipse.m2e.core.prefs b/plugins/contracts/org.polarsys.chess.contracts.profile/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/contracts/org.polarsys.chess.contracts.profile/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/META-INF/MANIFEST.MF b/plugins/contracts/org.polarsys.chess.contracts.profile/META-INF/MANIFEST.MF
index ade9e60d593ed17d3349a38a37df0cdc7566cc63..e89f5ffbeecdaaa789e0fc5a8070140ddc330c12 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/META-INF/MANIFEST.MF
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CHESS Contracts Profile (Incubation)
 Bundle-SymbolicName: org.polarsys.chess.contracts.profile;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Intecs
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.polarsys.chess.contracts.profile.chesscontract,
  org.polarsys.chess.contracts.profile.chesscontract.DataTypes,
  org.polarsys.chess.contracts.profile.chesscontract.DataTypes.impl,
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/pom.xml b/plugins/contracts/org.polarsys.chess.contracts.profile/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..37184c8dc40af07403f07790e28105bf216d9cf9
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.contracts.profile</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/util/EntityUtil.java b/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/util/EntityUtil.java
index 40f355342794849fca2fdab7cf23efbdf2925a41..1f72d3090ac97a559d25291cdf67b4b362e4e1a5 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/util/EntityUtil.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/util/EntityUtil.java
@@ -12,6 +12,8 @@ package org.polarsys.chess.contracts.profile.chesscontract.util;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -95,11 +97,13 @@ import org.eclipse.uml2.uml.Profile;
 import org.eclipse.uml2.uml.Property;
 import org.eclipse.uml2.uml.Pseudostate;
 import org.eclipse.uml2.uml.PseudostateKind;
+import org.eclipse.uml2.uml.RedefinableTemplateSignature;
 import org.eclipse.uml2.uml.Region;
 import org.eclipse.uml2.uml.Signal;
 import org.eclipse.uml2.uml.SignalEvent;
 import org.eclipse.uml2.uml.StateMachine;
 import org.eclipse.uml2.uml.Stereotype;
+import org.eclipse.uml2.uml.TemplateParameter;
 import org.eclipse.uml2.uml.Transition;
 import org.eclipse.uml2.uml.Trigger;
 import org.eclipse.uml2.uml.Type;
@@ -187,6 +191,11 @@ public class EntityUtil {
 		logger.debug("wRoot: " + wRoot);
 
 		IProject proj = wRoot.getProject(projectName);
+
+		return loadModel(proj, fileName);
+	}
+
+	public Model loadModel(IProject proj, String fileName) {
 		IFile file = proj.getFile(fileName);
 		IPath loc = file.getLocation();
 		logger.debug("loc: " + loc);
@@ -636,6 +645,20 @@ public class EntityUtil {
 		return enumerations;
 	}
 
+	public EList<Enumeration> getEnumerationsInOrder(Package pkg) {
+		final EList<Enumeration> enumerations = getEnumerations(pkg);
+
+		Collections.sort(enumerations, new Comparator<Enumeration>() {
+
+			@Override
+			public int compare(Enumeration o1, Enumeration o2) {
+				return o1.getName().compareTo(o2.getName());
+			}
+		});
+
+		return enumerations;
+	}
+
 	/**
 	 * Creates a Signal type in the given package.
 	 * 
@@ -1558,30 +1581,27 @@ public class EntityUtil {
 			Class umlClass = (Class) umlElement;
 			for (Property umlProperty : umlClass.getOwnedAttributes()) {
 				if ((isStaticAttribute == null) || (umlProperty.isStatic() == isStaticAttribute)) {
-					if (isBooleanAttribute(umlProperty)) {
-						simpleAttributes.add(umlProperty);
-					}
-					if (isContinuousAttribute(umlProperty)) {
+					if (isBooleanAttribute(umlProperty) || isContinuousAttribute(umlProperty)
+							|| isDoubleAttribute(umlProperty) || isRangeAttribute(umlProperty)
+							|| isEnumerationAttribute(umlProperty) || isIntegerAttribute(umlProperty)
+							|| isRealAttribute(umlProperty) || isStringAttribute(umlProperty)) {
 						simpleAttributes.add(umlProperty);
-					}
-					if (isDoubleAttribute(umlProperty)) {
-						simpleAttributes.add(umlProperty);
-					}
-					if (isRangeAttribute(umlProperty)) {
-						simpleAttributes.add(umlProperty);
-					}
-					if (isEnumerationAttribute(umlProperty)) {
-						simpleAttributes.add(umlProperty);
-					}
-					if (isIntegerAttribute(umlProperty)) {
-						simpleAttributes.add(umlProperty);
-					}
-					if (isRealAttribute(umlProperty)) {
-						simpleAttributes.add(umlProperty);
-					}
-					if (isStringAttribute(umlProperty)) {
-						simpleAttributes.add(umlProperty);
-					}
+					} /*
+						 * else if (isContinuousAttribute(umlProperty)) {
+						 * simpleAttributes.add(umlProperty); }else if
+						 * (isDoubleAttribute(umlProperty)) {
+						 * simpleAttributes.add(umlProperty); }else if
+						 * (isRangeAttribute(umlProperty)) {
+						 * simpleAttributes.add(umlProperty); }else if
+						 * (isEnumerationAttribute(umlProperty)) {
+						 * simpleAttributes.add(umlProperty); }else if
+						 * (isIntegerAttribute(umlProperty)) {
+						 * simpleAttributes.add(umlProperty); }else if
+						 * (isRealAttribute(umlProperty)) {
+						 * simpleAttributes.add(umlProperty); }else if
+						 * (isStringAttribute(umlProperty)) {
+						 * simpleAttributes.add(umlProperty); }
+						 */
 				}
 			}
 		}
@@ -1800,7 +1820,7 @@ public class EntityUtil {
 		if (initialState != null) {
 			return initialState.getOutgoings();
 		} else {
-			throw new Exception(stateMachine.getName() + " does not have the initial state.");
+			throw new Exception("The state machine of "+((Class) (stateMachine.getOwner())).getName() + " does not have the initial state.");
 		}
 
 	}
@@ -1816,6 +1836,14 @@ public class EntityUtil {
 		return transitions;
 	}
 
+	public EList<Transition> getOutgoingTransitions(Vertex state) {
+		return state.getOutgoings();
+	}
+		
+	public EList<Transition> getIncomingTransitions(Vertex state) {
+		return state.getIncomings();
+	}
+	
 	public String getSignalEventName(Trigger trigger) {
 
 		if (trigger.getEvent() instanceof SignalEvent) {
@@ -1852,6 +1880,15 @@ public class EntityUtil {
 		return null;
 	}
 
+	public EList<String> getTransitionEffectParameters(Transition transition) {
+		OpaqueBehavior effect = getTransitionEffect(transition);
+		EList<String> paramsNames = new BasicEList<String>();
+		for(Parameter par: effect.getOwnedParameters()){
+			paramsNames.add(par.getName());
+		}
+		return paramsNames;
+	}
+	
 	public String getTransitionEffectText(Transition transition, String language) {
 		OpaqueBehavior effect = getTransitionEffect(transition);
 		if (effect != null) {
@@ -1871,7 +1908,7 @@ public class EntityUtil {
 		return null;
 	}
 
-	private void setTransitionEffectText(Transition transition, String effectText, String language) {
+	public void setTransitionEffectText(Transition transition, String effectText, String language) {
 		OpaqueBehavior effect = getTransitionEffect(transition);
 		if (effect != null) {
 			effect.getLanguages().add(0, language);
@@ -2471,6 +2508,14 @@ public class EntityUtil {
 		return parameter;
 	}
 
+	public Object clone(Object original) {
+		EObject context = (EObject) original;
+		EcoreUtil.Copier copier = new EcoreUtil.Copier();
+		EObject copy = copier.copy(context);
+		copier.copyReferences();
+		return copy;
+	}
+
 	public Constraint createFormalProperty(final Namespace formalPropertyOwner, String formalPropertyName) {
 
 		// Contract contract = getContract(umlContract);
@@ -2614,6 +2659,27 @@ public class EntityUtil {
 		return umlPort;
 	}
 
+	public RedefinableTemplateSignature createRedefinableTemplateSignature(Class owner, String parameterName) {
+		RedefinableTemplateSignature redefinableTemplateSignature = UMLFactory.eINSTANCE
+				.createRedefinableTemplateSignature();
+		redefinableTemplateSignature.setName("redefinableTemplateSignature");
+
+		TemplateParameter templateParameter = UMLFactory.eINSTANCE.createTemplateParameter();
+		redefinableTemplateSignature.getOwnedParameters().add(templateParameter);
+
+		LiteralString stringParameter = UMLFactory.eINSTANCE.createLiteralString();
+		stringParameter.setName(parameterName);
+		stringParameter.setOwningTemplateParameter(templateParameter);
+		stringParameter.setTemplateParameter(templateParameter);
+		stringParameter.setValue("0");
+		templateParameter.setDefault(stringParameter);
+		templateParameter.setParameteredElement(stringParameter);
+
+		owner.setOwnedTemplateSignature(redefinableTemplateSignature);
+
+		return redefinableTemplateSignature;
+	}
+
 	public String createDelegationConstraintText(String variableIdTextName, String constraintText,
 			String iterConditionText) {
 
@@ -2766,7 +2832,7 @@ public class EntityUtil {
 		 */
 	}
 
-	private void setOpaqueExpressionTextInUMLConstraint(final Constraint umlConstraint, final String formalPropertyText,
+	public void setOpaqueExpressionTextInUMLConstraint(final Constraint umlConstraint, final String formalPropertyText,
 			final String language) {
 		/*
 		 * TransactionalEditingDomain domain =
@@ -3856,7 +3922,7 @@ public class EntityUtil {
 	public boolean isOperation(String operationName, Class blockAsClass) {
 		if (blockAsClass != null) {
 			Operation umlOperation = blockAsClass.getOwnedOperation(operationName, null, null);
-			if (umlOperation!=null) {
+			if (umlOperation != null) {
 				return true;
 			}
 		}
@@ -3899,7 +3965,8 @@ public class EntityUtil {
 		// methodName + " , " + paramIndex);
 		Operation operation = getOperation(methodName, retrieveBlockType);
 		// logger.debug("getParameterType operation: " + operation);
-		if ((operation != null) && (operation.getMethods() != null) && (!operation.getMethods().isEmpty())) {
+		if ((operation != null) //&& (operation.getMethods() != null) && (!operation.getMethods().isEmpty())
+				) {
 
 			if (operation.inputParameters() != null) {
 				EList<Parameter> params = operation.inputParameters();
@@ -3943,7 +4010,7 @@ public class EntityUtil {
 
 	public EList<String> getOperationsNames(Class component) {
 		EList<String> operationsNames = new BasicEList<String>();
-		for(Operation operation : component.getOwnedOperations()){
+		for (Operation operation : component.getOwnedOperations()) {
 			String operationName = operation.getName();
 			operationsNames.add(operationName);
 		}
@@ -3952,13 +4019,36 @@ public class EntityUtil {
 
 	public EList<String> getAttributesNames(Class component) {
 		EList<String> attributesNames = new BasicEList<String>();
-		for(Property attribute : component.getOwnedAttributes()){
+		for (Property attribute : component.getOwnedAttributes()) {
 			String attributeName = attribute.getName();
-			if(!isPort(attribute)){
+			if (!isPort(attribute)) {
 				attributesNames.add(attributeName);
-			}			
+			}
 		}
 		return attributesNames;
 	}
 
+	public EList<Parameter> getOperationParameters(String operationName, Class parentClass) {
+		Operation op = parentClass.getOwnedOperation(operationName, null, null);
+		if(op!=null){
+			return op.getOwnedParameters();
+		}
+		return null;
+	}
+
+	public Operation getCallEventOperation(CallEvent callEvent) throws Exception {
+		if (callEvent.getOperation() != null) {
+			return callEvent.getOperation();
+		}
+		throw new Exception("The callEvent " + callEvent.getQualifiedName() + " has no associated operation");
+	}
+
+	public EList<String> getParametersNames(Operation operation) {
+		EList<String> parametersNames = new BasicEList<String>();
+		for(Parameter par: operation.getOwnedParameters()){
+			parametersNames.add(par.getName());
+		}
+		return parametersNames;
+	}
+
 }
\ No newline at end of file
diff --git a/plugins/contracts/org.polarsys.chess.contracts.refinementView/.gitignore b/plugins/contracts/org.polarsys.chess.contracts.refinementView/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.refinementView/.gitignore
+++ b/plugins/contracts/org.polarsys.chess.contracts.refinementView/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/contracts/org.polarsys.chess.contracts.refinementView/.project b/plugins/contracts/org.polarsys.chess.contracts.refinementView/.project
index 6f959d7f6552b64b8e790e6a6b659db2ffdf226b..55336b3161cdc22906499a2edf3336cdbe750b36 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.refinementView/.project
+++ b/plugins/contracts/org.polarsys.chess.contracts.refinementView/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.refinementView/.settings/org.eclipse.core.resources.prefs b/plugins/contracts/org.polarsys.chess.contracts.refinementView/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.refinementView/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/contracts/org.polarsys.chess.contracts.refinementView/.settings/org.eclipse.m2e.core.prefs b/plugins/contracts/org.polarsys.chess.contracts.refinementView/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.refinementView/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/contracts/org.polarsys.chess.contracts.refinementView/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/contracts/org.polarsys.chess.contracts.refinementView/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.refinementView/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/contracts/org.polarsys.chess.contracts.refinementView/pom.xml b/plugins/contracts/org.polarsys.chess.contracts.refinementView/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f3af5131940a49c1c3ad9391810c1e93f79c8558
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.refinementView/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.contracts.refinementView</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/listener/PapyrusListener.java b/plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/listener/PapyrusListener.java
index 62ffba0eed34ecf00ae57f68dcc50aa254230d8d..2a30bd85d89ad53ee8ddb3791170cce909c0b761 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/listener/PapyrusListener.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/listener/PapyrusListener.java
@@ -16,6 +16,7 @@ import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.internal.Workbench;
 import org.eclipse.uml2.uml.Element;
 import org.polarsys.chess.contracts.refinementView.view.CustomRefinementView;
 
@@ -30,7 +31,7 @@ public class PapyrusListener implements IPapyrusListener {
 		Object notifier = notification.getNotifier();
 
 		if (notifier instanceof Element) {
-
+if (Workbench.getInstance() != null){
 			IWorkbench workbench = PlatformUI.getWorkbench();
 			IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();
 			IViewPart modelExplorerViewPart;
@@ -43,7 +44,7 @@ public class PapyrusListener implements IPapyrusListener {
 					view.updateView();
 				}
 			}
-
+}
 		}
 
 	}
diff --git a/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/.gitignore b/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/.gitignore
+++ b/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/.project b/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/.project
index 16223c5dca59e5df8bf2f45e78336afabc26cd99..0b054bb80c79474e75a80220ebf5e357f0b2cbda 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/.project
+++ b/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/.settings/org.eclipse.core.resources.prefs b/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/.settings/org.eclipse.m2e.core.prefs b/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/pom.xml b/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3f4354ac10c277ccfb369beff6725ace3d39a6da
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.contracts.safetyAnalysis</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/.classpath b/plugins/contracts/org.polarsys.chess.contracts.transformations/.classpath
index 1512bf4e07dae055186fc929f44d9e45dd78b047..4b1aaf5c8cad3fdad47e6987eec0fd4b9b0ea88d 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/.classpath
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/.classpath
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="icons"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="icons"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/.gitignore b/plugins/contracts/org.polarsys.chess.contracts.transformations/.gitignore
index 6f3797035889c72aea3beb9983f6fa8fbb14896e..53641bd2aa2be50fb0fd7f75748f11b6e79f1cba 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/.gitignore
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/.gitignore
@@ -1,2 +1,3 @@
 /bin/
 /tasks/
+/target/
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/.project b/plugins/contracts/org.polarsys.chess.contracts.transformations/.project
index 452be6c4ce2dc3875d82772f7a60a86732f17f80..97404123469cba162bdf5c80de872fddad2d42f0 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/.project
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -25,8 +30,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.acceleo.ide.ui.acceleoNature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/.settings/org.eclipse.core.resources.prefs b/plugins/contracts/org.polarsys.chess.contracts.transformations/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/.settings/org.eclipse.jdt.core.prefs b/plugins/contracts/org.polarsys.chess.contracts.transformations/.settings/org.eclipse.jdt.core.prefs
index 6cbd2a772e896da0db77257707e1705c7f3488e1..0c68a61dca867ceb49e79d2402935261ec3e3809 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/.settings/org.eclipse.jdt.core.prefs
@@ -1,6 +1,7 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5    
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/.settings/org.eclipse.m2e.core.prefs b/plugins/contracts/org.polarsys.chess.contracts.transformations/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/contracts/org.polarsys.chess.contracts.transformations/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/META-INF/MANIFEST.MF b/plugins/contracts/org.polarsys.chess.contracts.transformations/META-INF/MANIFEST.MF
index 5cbbfc8c3fde2599f199036fedf1918608d43306..d8d72e314d3a9cb8e5a0fe4515d6f183144e8779 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/META-INF/MANIFEST.MF
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CHESS Contracts Transformations (Incubation)
 Bundle-SymbolicName: org.polarsys.chess.contracts.transformations;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.polarsys.chess.contracts.transformations.Activator
 Bundle-Vendor: Intecs
 Require-Bundle: org.eclipse.core.runtime,
@@ -47,7 +47,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.polarsys.chess.service,
  eu.fbk.eclipse.standardTools.XSapExecService,
  org.polarsys.chess.contracts.validation;bundle-version="0.9.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Eclipse-LazyStart: true
 Export-Package: org.polarsys.chess.contracts.transformations,
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/build.properties b/plugins/contracts/org.polarsys.chess.contracts.transformations/build.properties
index 9a9dbc9b522d40f95facf1a0742c7fe314b4b6fe..6cd763ba6f06cf6dc39d72329271572c515d8d41 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/build.properties
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/build.properties
@@ -12,7 +12,8 @@
 # Laura Baracchi  laura.baracchi@intecs.it  
 # Initial API and implementation and/or initial documentation
 ###############################################################################
-source.. = src/
+source.. = src/,\
+		   icons/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/pom.xml b/plugins/contracts/org.polarsys.chess.contracts.transformations/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5df744a1f2a7e23e460038b8d8e1b5f96bf74c95
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.contracts.transformations</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/tasks/generate.xml b/plugins/contracts/org.polarsys.chess.contracts.transformations/tasks/generate.xml
index d7d29f8146089e5fadf8ed8e7d7c5f822732d65d..f6c5314bf74268e7fead4a51aeacc57e19185015 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/tasks/generate.xml
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/tasks/generate.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project default="generate" name="org.polarsys.chess.contracts.transformations">
+<<<<<<< HEAD
     <property name="ECLIPSE_HOME" value="../../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515"/>
     <property name="ECLIPSE_WORKSPACE" value="../../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515/workspace"/>
+=======
+    <property name="ECLIPSE_HOME" value="../../../../../../Eclipse/eclipse"/>
+    <property name="ECLIPSE_WORKSPACE" value="../../../../../../Workspaces/FirstConfig/ws"/>
+>>>>>>> refs/remotes/origin/master
 
     <!-- The classpath with only the dependencies used by the project -->
     <path id="org.polarsys.chess.contracts.transformations.libraryclasspath">
@@ -27,7 +32,10 @@
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/javax.inject_1.0.0.v20091030.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi_3.11.3.v20170209-1843.jar"/>
+<<<<<<< HEAD
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.fx.osgi_2.4.0.201605100504.jar"/>
+=======
+>>>>>>> refs/remotes/origin/master
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar"/>
@@ -62,7 +70,11 @@
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.e4.ui.workbench3_0.13.100.v20160506-0759.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.resources_3.11.1.v20161107-2032.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.ide_3.12.3.v20170119-0935.jar"/>
+<<<<<<< HEAD
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.3.201810170111.jar"/>
+=======
+        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.3.201903050251.jar"/>
+>>>>>>> refs/remotes/origin/master
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.uml.profile.standard_1.0.100.v20170227-0935.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.sysml_1.2.0.201703081153.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.editor_1.3.0.201703080851.jar"/>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/tasks/generateErrorModel.xml b/plugins/contracts/org.polarsys.chess.contracts.transformations/tasks/generateErrorModel.xml
index 2da6c29980a5ffcf45dfe7b5be187378ffad1085..ccd1f83c9d9a26307d35ea9b3740b5f37a6c35bd 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/tasks/generateErrorModel.xml
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/tasks/generateErrorModel.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project default="generateErrorModel" name="org.polarsys.chess.contracts.transformations">
+<<<<<<< HEAD
     <property name="ECLIPSE_HOME" value="../../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515"/>
     <property name="ECLIPSE_WORKSPACE" value="../../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515/workspace"/>
+=======
+    <property name="ECLIPSE_HOME" value="../../../../../../Eclipse/eclipse"/>
+    <property name="ECLIPSE_WORKSPACE" value="../../../../../../Workspaces/FirstConfig/ws"/>
+>>>>>>> refs/remotes/origin/master
 
     <!-- The classpath with only the dependencies used by the project -->
     <path id="org.polarsys.chess.contracts.transformations.libraryclasspath">
@@ -27,7 +32,10 @@
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/javax.inject_1.0.0.v20091030.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi_3.11.3.v20170209-1843.jar"/>
+<<<<<<< HEAD
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.fx.osgi_2.4.0.201605100504.jar"/>
+=======
+>>>>>>> refs/remotes/origin/master
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar"/>
@@ -62,7 +70,11 @@
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.e4.ui.workbench3_0.13.100.v20160506-0759.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.resources_3.11.1.v20161107-2032.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.ide_3.12.3.v20170119-0935.jar"/>
+<<<<<<< HEAD
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.3.201810170111.jar"/>
+=======
+        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.3.201903050251.jar"/>
+>>>>>>> refs/remotes/origin/master
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.uml.profile.standard_1.0.100.v20170227-0935.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.sysml_1.2.0.201703081153.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.editor_1.3.0.201703080851.jar"/>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.transformations/tasks/generateFaultExtensions.xml b/plugins/contracts/org.polarsys.chess.contracts.transformations/tasks/generateFaultExtensions.xml
index f6a84328d86f25d0aa74ff4ec85172728a243b50..f5f3940445e785b911dbb696b7e41014ece0048f 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.transformations/tasks/generateFaultExtensions.xml
+++ b/plugins/contracts/org.polarsys.chess.contracts.transformations/tasks/generateFaultExtensions.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project default="generateFaultExtensions" name="org.polarsys.chess.contracts.transformations">
+<<<<<<< HEAD
     <property name="ECLIPSE_HOME" value="../../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515"/>
     <property name="ECLIPSE_WORKSPACE" value="../../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515/workspace"/>
+=======
+    <property name="ECLIPSE_HOME" value="../../../../../../Eclipse/eclipse"/>
+    <property name="ECLIPSE_WORKSPACE" value="../../../../../../Workspaces/FirstConfig/ws"/>
+>>>>>>> refs/remotes/origin/master
 
     <!-- The classpath with only the dependencies used by the project -->
     <path id="org.polarsys.chess.contracts.transformations.libraryclasspath">
@@ -27,7 +32,10 @@
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/javax.inject_1.0.0.v20091030.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi_3.11.3.v20170209-1843.jar"/>
+<<<<<<< HEAD
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.fx.osgi_2.4.0.201605100504.jar"/>
+=======
+>>>>>>> refs/remotes/origin/master
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar"/>
@@ -62,7 +70,11 @@
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.e4.ui.workbench3_0.13.100.v20160506-0759.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.resources_3.11.1.v20161107-2032.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.ide_3.12.3.v20170119-0935.jar"/>
+<<<<<<< HEAD
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.3.201810170111.jar"/>
+=======
+        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.3.201903050251.jar"/>
+>>>>>>> refs/remotes/origin/master
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.uml.profile.standard_1.0.100.v20170227-0935.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.sysml_1.2.0.201703081153.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.editor_1.3.0.201703080851.jar"/>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.validation/.classpath b/plugins/contracts/org.polarsys.chess.contracts.validation/.classpath
index ad32c83a7885b8953a938b41df3b4fd4fe1aae01..eca7bdba8f03f22510b7980a94dbfe10c16c0901 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.validation/.classpath
+++ b/plugins/contracts/org.polarsys.chess.contracts.validation/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.validation/.gitignore b/plugins/contracts/org.polarsys.chess.contracts.validation/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.validation/.gitignore
+++ b/plugins/contracts/org.polarsys.chess.contracts.validation/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/contracts/org.polarsys.chess.contracts.validation/.project b/plugins/contracts/org.polarsys.chess.contracts.validation/.project
index 401d04759475b62f44aa2286e6cc5264a8946ab0..559396386e66f57b2bfa19b9d20da11eb8b63956 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.validation/.project
+++ b/plugins/contracts/org.polarsys.chess.contracts.validation/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.validation/.settings/org.eclipse.core.resources.prefs b/plugins/contracts/org.polarsys.chess.contracts.validation/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.validation/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/contracts/org.polarsys.chess.contracts.validation/.settings/org.eclipse.jdt.core.prefs b/plugins/contracts/org.polarsys.chess.contracts.validation/.settings/org.eclipse.jdt.core.prefs
index c537b63063ce6052bdc49c5fd0745b078f162c90..0c68a61dca867ceb49e79d2402935261ec3e3809 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.validation/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/contracts/org.polarsys.chess.contracts.validation/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/contracts/org.polarsys.chess.contracts.validation/.settings/org.eclipse.m2e.core.prefs b/plugins/contracts/org.polarsys.chess.contracts.validation/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.validation/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/contracts/org.polarsys.chess.contracts.validation/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/contracts/org.polarsys.chess.contracts.validation/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.validation/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/contracts/org.polarsys.chess.contracts.validation/META-INF/MANIFEST.MF b/plugins/contracts/org.polarsys.chess.contracts.validation/META-INF/MANIFEST.MF
index c6093bd9ce4add2ea84a15b14ccb5aa623305340..d4c56705556e64ffe8815859ef836aacc132d62c 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.validation/META-INF/MANIFEST.MF
+++ b/plugins/contracts/org.polarsys.chess.contracts.validation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CHESS Contracts Validation (Incubation)
 Bundle-SymbolicName: org.polarsys.chess.contracts.validation;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.polarsys.chess.contracts.validation.Activator
 Bundle-Vendor: Intecs
 Require-Bundle: org.eclipse.ui,
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.swt,
  org.eclipse.papyrus.infra.gmfdiag.commands,
  org.polarsys.chess.contracts.profile
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.polarsys.chess.contracts.validation,
  org.polarsys.chess.contracts.validation.command,
diff --git a/plugins/contracts/org.polarsys.chess.contracts.validation/pom.xml b/plugins/contracts/org.polarsys.chess.contracts.validation/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9c91a871f69e4b0bba939cf0f91abcb4ed4124af
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.validation/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.contracts.validation</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/.gitignore b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/.gitignore
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/.project b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/.project
index 1a22b1842b4534fa0b82e6cbb3d887dc948ad178..0d37b64cbf8e96373258482e9a46257859a87146 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/.project
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/.settings/org.eclipse.core.resources.prefs b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/.settings/org.eclipse.m2e.core.prefs b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/pom.xml b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2d5aa479d3ed752a0fad2ad4109b0598aa543f9d
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.contracts.verificationService.test.runtime</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/.gitignore b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..2742e711020a36b686689e7d495d591f3816470a
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/src/org/polarsys/chess/contracts/verificationService/test/runtime/tests/.gitignore
@@ -0,0 +1 @@
+/TestCheckContractRefinementOfCHESSComponent.java
diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService/.gitignore b/plugins/contracts/org.polarsys.chess.contracts.verificationService/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService/.gitignore
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService/.project b/plugins/contracts/org.polarsys.chess.contracts.verificationService/.project
index 8bd3a0c18d062c13a98d7f27bf8e10fb0b2b3ce0..e6b91cb3f3775dd930d4781dae2d2ef74ec2d9a6 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.verificationService/.project
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService/.settings/org.eclipse.core.resources.prefs b/plugins/contracts/org.polarsys.chess.contracts.verificationService/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService/.settings/org.eclipse.m2e.core.prefs b/plugins/contracts/org.polarsys.chess.contracts.verificationService/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/contracts/org.polarsys.chess.contracts.verificationService/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/contracts/org.polarsys.chess.contracts.verificationService/pom.xml b/plugins/contracts/org.polarsys.chess.contracts.verificationService/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7198eca96fffd527539eeda4ce644f2815ebba98
--- /dev/null
+++ b/plugins/contracts/org.polarsys.chess.contracts.verificationService/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.contracts.verificationService</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/contracts/pom.xml b/plugins/contracts/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9cc2f2d9ebbd35608073cf346c52ed8c8417d566
--- /dev/null
+++ b/plugins/contracts/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.polarsys.chess</groupId>
+  <artifactId>org.polarsys.chess.contracts</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <modules>
+    <module>contracts/org.polarsys.chess.contracts.chessextension</module>
+    <module>contracts/org.polarsys.chess.contracts.contractEditor</module>
+    <module>contracts/org.polarsys.chess.contracts.contractPropertyManager</module>
+    <module>contracts/org.polarsys.chess.contracts.feature</module>
+    <module>contracts/org.polarsys.chess.contracts.hierarchicalContractView</module>
+    <module>contracts/org.polarsys.chess.contracts.integration</module>
+    <module>contracts/org.polarsys.chess.contracts.profile</module>
+    <module>contracts/org.polarsys.chess.contracts.refinementView</module>
+    <module>contracts/org.polarsys.chess.contracts.safetyAnalysis</module>
+    <module>contracts/org.polarsys.chess.contracts.transformations</module>
+    <module>contracts/org.polarsys.chess.contracts.validation</module>
+    <module>contracts/org.polarsys.chess.contracts.verificationService</module>
+    <module>contracts/org.polarsys.chess.contracts.verificationService.test.runtime</module>
+  </modules>
diff --git a/plugins/fla/org.polarsys.chess.fla.FPTC2FLABehavior/.settings/org.eclipse.m2e.core.prefs b/plugins/fla/org.polarsys.chess.fla.FPTC2FLABehavior/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.fla.FPTC2FLABehavior/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/fla/org.polarsys.chess.fla.faultTreeGenerator/.gitignore b/plugins/fla/org.polarsys.chess.fla.faultTreeGenerator/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/fla/org.polarsys.chess.fla.faultTreeGenerator/.gitignore
+++ b/plugins/fla/org.polarsys.chess.fla.faultTreeGenerator/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/fla/org.polarsys.chess.fla.faultTreeGenerator/.project b/plugins/fla/org.polarsys.chess.fla.faultTreeGenerator/.project
index fe5d737f0eee23904418a8a8fd69ce99e7d87317..1fe5cf05d6bec3e47d0acf485378a32a0eb9203d 100644
--- a/plugins/fla/org.polarsys.chess.fla.faultTreeGenerator/.project
+++ b/plugins/fla/org.polarsys.chess.fla.faultTreeGenerator/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/fla/org.polarsys.chess.fla.faultTreeGenerator/.settings/org.eclipse.core.resources.prefs b/plugins/fla/org.polarsys.chess.fla.faultTreeGenerator/.settings/org.eclipse.core.resources.prefs
index ed038c0a3395d034c6b3f4354fbe694cf7761d71..ac8331dbe744cd6bd74c3facfd781b4d0f34d289 100644
--- a/plugins/fla/org.polarsys.chess.fla.faultTreeGenerator/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/fla/org.polarsys.chess.fla.faultTreeGenerator/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,4 @@
 eclipse.preferences.version=1
 encoding//models/flamm.FailureTypes.xsd=UTF8
 encoding//models/flamm.xsd=UTF8
+encoding/<project>=UTF-8
diff --git a/plugins/fla/org.polarsys.chess.fla.faultTreeGenerator/.settings/org.eclipse.m2e.core.prefs b/plugins/fla/org.polarsys.chess.fla.faultTreeGenerator/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.fla.faultTreeGenerator/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/fla/org.polarsys.chess.fla.faultTreeGenerator/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/fla/org.polarsys.chess.fla.faultTreeGenerator/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.fla.faultTreeGenerator/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/fla/org.polarsys.chess.fla.faultTreeGenerator/pom.xml b/plugins/fla/org.polarsys.chess.fla.faultTreeGenerator/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c87dbaa2b9f57cb7533533f99420ad4375928220
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.fla.faultTreeGenerator/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.fla.faultTreeGenerator</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/fla/org.polarsys.chess.fla.feature/.project b/plugins/fla/org.polarsys.chess.fla.feature/.project
index 5a1bffd744d8f25301202f0e7178ab37f8e09948..864115f6261e62f306d3d7d518f93c51cefbbf0e 100644
--- a/plugins/fla/org.polarsys.chess.fla.feature/.project
+++ b/plugins/fla/org.polarsys.chess.fla.feature/.project
@@ -5,13 +5,25 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.pde.FeatureBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.FeatureNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/fla/org.polarsys.chess.fla.feature/.settings/org.eclipse.core.resources.prefs b/plugins/fla/org.polarsys.chess.fla.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.fla.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/fla/org.polarsys.chess.fla.feature/.settings/org.eclipse.m2e.core.prefs b/plugins/fla/org.polarsys.chess.fla.feature/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.fla.feature/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/fla/org.polarsys.chess.fla.feature/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/fla/org.polarsys.chess.fla.feature/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.fla.feature/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/fla/org.polarsys.chess.fla.feature/pom.xml b/plugins/fla/org.polarsys.chess.fla.feature/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fa6bbfe5158ea4885b3dde7d10c8eb987829fa1e
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.fla.feature/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.fla.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/.classpath b/plugins/fla/org.polarsys.chess.fla.flamm/.classpath
index ed2bc1287f0b42db3123c7a2df09baed211acea9..eca7bdba8f03f22510b7980a94dbfe10c16c0901 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/.classpath
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/.gitignore b/plugins/fla/org.polarsys.chess.fla.flamm/.gitignore
index 3e2fcc71712d1d9f84845f45b6eddd03e4e2fbfe..8f6683a380c8ac884680316711576c8619874b8c 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/.gitignore
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/.project b/plugins/fla/org.polarsys.chess.fla.flamm/.project
index a114a6ce6b67c9a87ec5c6e5da039bf4524b6abd..d0103a72a5340eee4266fb96dcf2086efc267b33 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/.project
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/.settings/org.eclipse.core.resources.prefs b/plugins/fla/org.polarsys.chess.fla.flamm/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/.settings/org.eclipse.jdt.core.prefs b/plugins/fla/org.polarsys.chess.fla.flamm/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..0c68a61dca867ceb49e79d2402935261ec3e3809
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/.settings/org.eclipse.m2e.core.prefs b/plugins/fla/org.polarsys.chess.fla.flamm/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/fla/org.polarsys.chess.fla.flamm/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/META-INF/MANIFEST.MF b/plugins/fla/org.polarsys.chess.fla.flamm/META-INF/MANIFEST.MF
index 4ffe83f9507a1654e8d3d44edea1a1c3e94e845b..1aa6afc264089cf4a3bfb3b1292e0f2770c86a74 100644
--- a/plugins/fla/org.polarsys.chess.fla.flamm/META-INF/MANIFEST.MF
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.chess.fla.flamm;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.polarsys.chess.fla.flamm,
  org.polarsys.chess.fla.flamm.FailureTypes,
  org.polarsys.chess.fla.flamm.analysis,
diff --git a/plugins/fla/org.polarsys.chess.fla.flamm/pom.xml b/plugins/fla/org.polarsys.chess.fla.flamm/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0849fb75bc25f7782cd1dc4fea47e9d1918b9c45
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.fla.flamm/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.fla.flamm</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/.classpath b/plugins/fla/org.polarsys.chess.fla.flaxml/.classpath
index ed2bc1287f0b42db3123c7a2df09baed211acea9..eca7bdba8f03f22510b7980a94dbfe10c16c0901 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/.classpath
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/.gitignore b/plugins/fla/org.polarsys.chess.fla.flaxml/.gitignore
index 3e2fcc71712d1d9f84845f45b6eddd03e4e2fbfe..8f6683a380c8ac884680316711576c8619874b8c 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/.gitignore
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/.project b/plugins/fla/org.polarsys.chess.fla.flaxml/.project
index 936710efa9dcf7afa8a0a13ef77d62783645e3b2..d1a00d360888bb09e25e3613abadac8ef93d0fd1 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/.project
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/.settings/org.eclipse.core.resources.prefs b/plugins/fla/org.polarsys.chess.fla.flaxml/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/.settings/org.eclipse.jdt.core.prefs b/plugins/fla/org.polarsys.chess.fla.flaxml/.settings/org.eclipse.jdt.core.prefs
index f287d53cf450c19c357775d06f02a07c00dcfea6..295926d964165896ea8aa7c1b1b3c9d3d3caa77e 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/.settings/org.eclipse.m2e.core.prefs b/plugins/fla/org.polarsys.chess.fla.flaxml/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/fla/org.polarsys.chess.fla.flaxml/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/META-INF/MANIFEST.MF b/plugins/fla/org.polarsys.chess.fla.flaxml/META-INF/MANIFEST.MF
index c78c08b8880d5a1ff0903cedb6f8e003334e9b8c..3a95599a25c81659a8ee3dd4d8de9bacae75caf2 100644
--- a/plugins/fla/org.polarsys.chess.fla.flaxml/META-INF/MANIFEST.MF
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.chess.fla.flaxml;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.polarsys.chess.fla.flaxml,
  org.polarsys.chess.fla.flaxml.impl,
  org.polarsys.chess.fla.flaxml.util
diff --git a/plugins/fla/org.polarsys.chess.fla.flaxml/pom.xml b/plugins/fla/org.polarsys.chess.fla.flaxml/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1badf95cad14f258fd3185c179f7930af695c577
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.fla.flaxml/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.fla.flaxml</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/fla/org.polarsys.chess.fla.transformations/.classpath b/plugins/fla/org.polarsys.chess.fla.transformations/.classpath
index 8a8f1668cdcc5c73a6921162616f01cb556ae7c1..eca7bdba8f03f22510b7980a94dbfe10c16c0901 100644
--- a/plugins/fla/org.polarsys.chess.fla.transformations/.classpath
+++ b/plugins/fla/org.polarsys.chess.fla.transformations/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/fla/org.polarsys.chess.fla.transformations/.gitignore b/plugins/fla/org.polarsys.chess.fla.transformations/.gitignore
index 3e2fcc71712d1d9f84845f45b6eddd03e4e2fbfe..8f6683a380c8ac884680316711576c8619874b8c 100644
--- a/plugins/fla/org.polarsys.chess.fla.transformations/.gitignore
+++ b/plugins/fla/org.polarsys.chess.fla.transformations/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/fla/org.polarsys.chess.fla.transformations/.project b/plugins/fla/org.polarsys.chess.fla.transformations/.project
index b5ba375083c45c0c84f7ab8c7691f1c289c22145..22a5869e67f43bd70b9e738dbd38047318cdcc63 100644
--- a/plugins/fla/org.polarsys.chess.fla.transformations/.project
+++ b/plugins/fla/org.polarsys.chess.fla.transformations/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -29,8 +34,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.m2m.qvt.oml.project.QVTONature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
diff --git a/plugins/fla/org.polarsys.chess.fla.transformations/.settings/org.eclipse.core.resources.prefs b/plugins/fla/org.polarsys.chess.fla.transformations/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.fla.transformations/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/fla/org.polarsys.chess.fla.transformations/.settings/org.eclipse.jdt.core.prefs b/plugins/fla/org.polarsys.chess.fla.transformations/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..0c68a61dca867ceb49e79d2402935261ec3e3809
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.fla.transformations/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/fla/org.polarsys.chess.fla.transformations/.settings/org.eclipse.m2e.core.prefs b/plugins/fla/org.polarsys.chess.fla.transformations/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.fla.transformations/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/fla/org.polarsys.chess.fla.transformations/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/fla/org.polarsys.chess.fla.transformations/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.fla.transformations/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/fla/org.polarsys.chess.fla.transformations/META-INF/MANIFEST.MF b/plugins/fla/org.polarsys.chess.fla.transformations/META-INF/MANIFEST.MF
index e586a257b7a995795a9128ac5eeb840f5d05b31d..f03686ecba8c2902bd78989370702a9c240f4818 100644
--- a/plugins/fla/org.polarsys.chess.fla.transformations/META-INF/MANIFEST.MF
+++ b/plugins/fla/org.polarsys.chess.fla.transformations/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Concerto-FLA Transformations Plug-in
 Bundle-SymbolicName: org.polarsys.chess.fla.transformations;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: 
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.m2m.qvt.oml,
@@ -13,3 +13,4 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.m2m.qvt.oml.runtime,
  org.polarsys.chess.fla.flamm
 Export-Package: org.polarsys.chess.fla.transformations.utilities
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/fla/org.polarsys.chess.fla.transformations/pom.xml b/plugins/fla/org.polarsys.chess.fla.transformations/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3a9bb7b79c15bcb116c94e5606986d3037f3614b
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.fla.transformations/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.fla.transformations</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/fla/org.polarsys.chess.fla/.classpath b/plugins/fla/org.polarsys.chess.fla/.classpath
index 8a8f1668cdcc5c73a6921162616f01cb556ae7c1..eca7bdba8f03f22510b7980a94dbfe10c16c0901 100644
--- a/plugins/fla/org.polarsys.chess.fla/.classpath
+++ b/plugins/fla/org.polarsys.chess.fla/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/fla/org.polarsys.chess.fla/.gitignore b/plugins/fla/org.polarsys.chess.fla/.gitignore
index 3e2fcc71712d1d9f84845f45b6eddd03e4e2fbfe..8f6683a380c8ac884680316711576c8619874b8c 100644
--- a/plugins/fla/org.polarsys.chess.fla/.gitignore
+++ b/plugins/fla/org.polarsys.chess.fla/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/fla/org.polarsys.chess.fla/.project b/plugins/fla/org.polarsys.chess.fla/.project
index 4838667ac925638a0ca71946652c9d20822bfa58..85475402558bfa2df0a3f58c1fc9a98c6aaaeaee 100644
--- a/plugins/fla/org.polarsys.chess.fla/.project
+++ b/plugins/fla/org.polarsys.chess.fla/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/fla/org.polarsys.chess.fla/.settings/org.eclipse.core.resources.prefs b/plugins/fla/org.polarsys.chess.fla/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.fla/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/fla/org.polarsys.chess.fla/.settings/org.eclipse.jdt.core.prefs b/plugins/fla/org.polarsys.chess.fla/.settings/org.eclipse.jdt.core.prefs
index f287d53cf450c19c357775d06f02a07c00dcfea6..295926d964165896ea8aa7c1b1b3c9d3d3caa77e 100644
--- a/plugins/fla/org.polarsys.chess.fla/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/fla/org.polarsys.chess.fla/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/fla/org.polarsys.chess.fla/.settings/org.eclipse.m2e.core.prefs b/plugins/fla/org.polarsys.chess.fla/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.fla/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/fla/org.polarsys.chess.fla/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/fla/org.polarsys.chess.fla/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.fla/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/fla/org.polarsys.chess.fla/META-INF/MANIFEST.MF b/plugins/fla/org.polarsys.chess.fla/META-INF/MANIFEST.MF
index af469862056b3e40e679a49a8a297c9ac328806e..46e37d68b65a17d1c37f7c15fcd0c17bef6fdc9f 100644
--- a/plugins/fla/org.polarsys.chess.fla/META-INF/MANIFEST.MF
+++ b/plugins/fla/org.polarsys.chess.fla/META-INF/MANIFEST.MF
@@ -24,5 +24,5 @@ Require-Bundle: org.eclipse.ui,
  org.polarsys.chess.fla.flaxml,
  org.polarsys.chess.m2m,
  org.eclipse.uml2.uml
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/fla/org.polarsys.chess.fla/pom.xml b/plugins/fla/org.polarsys.chess.fla/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6c0ea6dafcfaf15c0fb7eac8c4fb203f445f848c
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.fla/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.fla</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.classpath b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.classpath
index f5ffadb8d73c75658b6f9b94ca3b01286ed10d79..bc001b4a78c0b5010a989e262b982d3992129788 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.classpath
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.classpath
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="src" path="xtend-gen"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src-gen"/>
+	<classpathentry kind="src" path="xtend-gen"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.gitignore b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.gitignore
index 3e2fcc71712d1d9f84845f45b6eddd03e4e2fbfe..67e5e0f2f26002d121562fade9781fa531b3f20e 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.gitignore
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.gitignore
@@ -1 +1,4 @@
 /bin/
+/src-gen/
+/xtend-gen/
+/target/
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.project b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.project
index d17e3dd63722335fca25f93c27e6634d94c5d15a..13bf8bc4fac244704e2fe7cbd976f236716abbf6 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.project
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.project
@@ -25,8 +25,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.settings/org.eclipse.jdt.core.prefs
index 11f6e462df7b697da0744bef232871f1aa1b0cb3..295926d964165896ea8aa7c1b1b3c9d3d3caa77e 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.settings/org.eclipse.m2e.core.prefs b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/META-INF/MANIFEST.MF b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/META-INF/MANIFEST.MF
index c6486c64572d162fc017a33ac941ddd07a622d27..6252526b8a3e4455cc89f7c4813c8a31febcb6c2 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/META-INF/MANIFEST.MF
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/META-INF/MANIFEST.MF
@@ -1,29 +1,30 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: org.polarsys.chess.xtext.fladsl.ui
-Bundle-Vendor: Intecs
-Bundle-Version: 1.0.0.qualifier
-Bundle-SymbolicName: org.polarsys.chess.xtext.fladsl.ui;singleton:=true
-Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.xtext.ui,
- org.eclipse.ui.editors;bundle-version="3.8.200",
- org.eclipse.ui.ide;bundle-version="3.10.0",
- org.eclipse.xtext.ui.shared,
- org.eclipse.ui,
- org.eclipse.xtext.builder,
- org.eclipse.xtext.common.types.ui,
- org.eclipse.xtext.ui.codetemplates.ui,
- org.eclipse.compare,
- org.eclipse.xtext.xbase.lib,
- org.eclipse.uml2.uml.editor;bundle-version="5.0.1",
- org.polarsys.chess.xtext.fladsl,
- org.antlr.runtime
-Import-Package: org.apache.log4j,
- org.eclipse.xtext.xbase.lib
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Export-Package: org.polarsys.chess.xtext.ui.contentassist.antlr,
- org.polarsys.chess.xtext.ui.internal,
- org.polarsys.chess.xtext.ui,
- org.polarsys.chess.xtext.ui.contentassist,
- org.polarsys.chess.xtext.ui.quickfix
-Bundle-Activator: org.polarsys.chess.xtext.ui.internal.FlaDslActivator
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: org.polarsys.chess.xtext.fladsl.ui
+Bundle-Vendor: Intecs
+Bundle-Version: 1.0.0.qualifier
+Bundle-SymbolicName: org.polarsys.chess.xtext.fladsl.ui;singleton:=true
+Bundle-ActivationPolicy: lazy
+Require-Bundle: org.eclipse.xtext.ui,
+ org.eclipse.ui.editors;bundle-version="3.8.200",
+ org.eclipse.ui.ide;bundle-version="3.10.0",
+ org.eclipse.xtext.ui.shared,
+ org.eclipse.ui,
+ org.eclipse.xtext.builder,
+ org.eclipse.xtext.common.types.ui,
+ org.eclipse.xtext.ui.codetemplates.ui,
+ org.eclipse.compare,
+ org.eclipse.xtext.xbase.lib,
+ org.eclipse.uml2.uml.editor;bundle-version="5.0.1",
+ org.polarsys.chess.xtext.fladsl,
+ org.antlr.runtime
+Import-Package: org.apache.log4j,
+ org.eclipse.xtext.xbase.lib
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.polarsys.chess.xtext.ui.contentassist.antlr,
+ org.polarsys.chess.xtext.ui.internal,
+ org.polarsys.chess.xtext.ui,
+ org.polarsys.chess.xtext.ui.contentassist,
+ org.polarsys.chess.xtext.ui.quickfix,
+ org.polarsys.chess.xtext.ui.contentassist.antlr.internal
+Bundle-Activator: org.polarsys.chess.xtext.ui.internal.FlaDslActivator
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/plugin.xml_gen b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/plugin.xml_gen
index 254f4e7898cdd8777f501b55eff30281071df4b0..d1799119d936938d5f9f1763c52dae851eca4b4a 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/plugin.xml_gen
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/plugin.xml_gen
@@ -1,398 +1,425 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-    <extension
-            point="org.eclipse.ui.editors">
-        <editor
-            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.XtextEditor"
-            contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
-            default="true"
-            extensions="fladsl"
-            id="org.polarsys.chess.xtext.FlaDsl"
-            name="FlaDsl Editor">
-        </editor>
-    </extension>
-    <extension
-        point="org.eclipse.ui.handlers">
-        <handler
-            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclarationHandler"
-            commandId="org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclaration">
-            <activeWhen>
-                <reference
-                    definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
-                </reference>
-            </activeWhen>
-        </handler>
-        <handler
-            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.handler.ValidateActionHandler"
-            commandId="org.polarsys.chess.xtext.FlaDsl.validate">
-         <activeWhen>
-            <reference
-                    definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
-            </reference>
-         </activeWhen>
-      	</handler>
-      	<!-- copy qualified name -->
-        <handler
-            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedNameHandler"
-            commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName">
-            <activeWhen>
-				<reference definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened" />
-            </activeWhen>
-        </handler>
-        <handler
-            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedNameHandler"
-            commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName">
-            <activeWhen>
-            	<and>
-            		<reference definitionId="org.polarsys.chess.xtext.FlaDsl.XtextEditor.opened" />
-	                <iterate>
-						<adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
-					</iterate>
-				</and>
-            </activeWhen>
-        </handler>
-    </extension>
-    <extension point="org.eclipse.core.expressions.definitions">
-        <definition id="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
-            <and>
-                <reference definitionId="isActiveEditorAnInstanceOfXtextEditor"/>
-                <with variable="activeEditor">
-                    <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName" 
-                        value="org.polarsys.chess.xtext.FlaDsl" 
-                        forcePluginActivation="true"/>
-                </with>        
-            </and>
-        </definition>
-        <definition id="org.polarsys.chess.xtext.FlaDsl.XtextEditor.opened">
-            <and>
-                <reference definitionId="isXtextEditorActive"/>
-                <with variable="activeEditor">
-                    <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName" 
-                        value="org.polarsys.chess.xtext.FlaDsl" 
-                        forcePluginActivation="true"/>
-                </with>        
-            </and>
-        </definition>
-    </extension>
-    <extension
-            point="org.eclipse.ui.preferencePages">
-        <page
-            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
-            id="org.polarsys.chess.xtext.FlaDsl"
-            name="FlaDsl">
-            <keywordReference id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"/>
-        </page>
-        <page
-            category="org.polarsys.chess.xtext.FlaDsl"
-            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.syntaxcoloring.SyntaxColoringPreferencePage"
-            id="org.polarsys.chess.xtext.FlaDsl.coloring"
-            name="Syntax Coloring">
-            <keywordReference id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"/>
-        </page>
-        <page
-            category="org.polarsys.chess.xtext.FlaDsl"
-            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.templates.XtextTemplatePreferencePage"
-            id="org.polarsys.chess.xtext.FlaDsl.templates"
-            name="Templates">
-            <keywordReference id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"/>
-        </page>
-    </extension>
-    <extension
-            point="org.eclipse.ui.propertyPages">
-        <page
-            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
-            id="org.polarsys.chess.xtext.FlaDsl"
-            name="FlaDsl">
-            <keywordReference id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"/>
-            <enabledWhen>
-	            <adapt type="org.eclipse.core.resources.IProject"/>
-			</enabledWhen>
-	        <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
-        </page>
-    </extension>
-    <extension
-        point="org.eclipse.ui.keywords">
-        <keyword
-            id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"
-            label="FlaDsl"/>
-    </extension>
-    <extension
-         point="org.eclipse.ui.commands">
-      <command
-            description="Trigger expensive validation"
-            id="org.polarsys.chess.xtext.FlaDsl.validate"
-            name="Validate">
-      </command>
-      <!-- copy qualified name -->
-      <command
-            id="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
-            categoryId="org.eclipse.ui.category.edit"
-            description="Copy the qualified name for the selected element"
-            name="Copy Qualified Name">
-      </command>
-      <command
-            id="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
-            categoryId="org.eclipse.ui.category.edit"
-            description="Copy the qualified name for the selected element"
-            name="Copy Qualified Name">
-      </command>
-    </extension>
-    <extension point="org.eclipse.ui.menus">
-        <menuContribution
-            locationURI="popup:#TextEditorContext?after=group.edit">
-             <command
-                 commandId="org.polarsys.chess.xtext.FlaDsl.validate"
-                 style="push"
-                 tooltip="Trigger expensive validation">
-            <visibleWhen checkEnabled="false">
-                <reference
-                    definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
-                </reference>
-            </visibleWhen>
-         </command>  
-         </menuContribution>
-         <!-- copy qualified name -->
-         <menuContribution locationURI="popup:#TextEditorContext?after=copy">
-         	<command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName" 
-         		style="push" tooltip="Copy Qualified Name">
-            	<visibleWhen checkEnabled="false">
-                	<reference definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened" />
-            	</visibleWhen>
-         	</command>  
-         </menuContribution>
-         <menuContribution locationURI="menu:edit?after=copy">
-         	<command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
-            	style="push" tooltip="Copy Qualified Name">
-            	<visibleWhen checkEnabled="false">
-                	<reference definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened" />
-            	</visibleWhen>
-         	</command>  
-         </menuContribution>
-         <menuContribution locationURI="popup:org.eclipse.xtext.ui.outline?after=additions">
-			<command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName" 
-				style="push" tooltip="Copy Qualified Name">
-         		<visibleWhen checkEnabled="false">
-	            	<and>
-	            		<reference definitionId="org.polarsys.chess.xtext.FlaDsl.XtextEditor.opened" />
-						<iterate>
-							<adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
-						</iterate>
-					</and>
-				</visibleWhen>
-			</command>
-         </menuContribution>
-    </extension>
-    <extension point="org.eclipse.ui.menus">
-		<menuContribution locationURI="popup:#TextEditorContext?endof=group.find">
-			<command commandId="org.eclipse.xtext.ui.editor.FindReferences">
-				<visibleWhen checkEnabled="false">
-                	<reference definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
-                	</reference>
-            	</visibleWhen>
-			</command>
-		</menuContribution>
-	</extension>
-	<extension point="org.eclipse.ui.handlers">
-	    <handler
-            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.findrefs.FindReferencesHandler"
-            commandId="org.eclipse.xtext.ui.editor.FindReferences">
-            <activeWhen>
-                <reference
-                    definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
-                </reference>
-            </activeWhen>
-        </handler>
-    </extension>   
-
-<!-- adding resource factories -->
-
-	<extension
-		point="org.eclipse.emf.ecore.extension_parser">
-		<parser
-			class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.resource.IResourceFactory"
-			type="fladsl">
-		</parser>
-	</extension>
-	<extension point="org.eclipse.xtext.extension_resourceServiceProvider">
-        <resourceServiceProvider
-            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.resource.IResourceUIServiceProvider"
-            uriExtension="fladsl">
-        </resourceServiceProvider>
-    </extension>
-
-
-	<!-- marker definitions for org.polarsys.chess.xtext.FlaDsl -->
-	<extension
-	        id="fladsl.check.fast"
-	        name="FlaDsl Problem"
-	        point="org.eclipse.core.resources.markers">
-	    <super type="org.eclipse.xtext.ui.check.fast"/>
-	    <persistent value="true"/>
-	</extension>
-	<extension
-	        id="fladsl.check.normal"
-	        name="FlaDsl Problem"
-	        point="org.eclipse.core.resources.markers">
-	    <super type="org.eclipse.xtext.ui.check.normal"/>
-	    <persistent value="true"/>
-	</extension>
-	<extension
-	        id="fladsl.check.expensive"
-	        name="FlaDsl Problem"
-	        point="org.eclipse.core.resources.markers">
-	    <super type="org.eclipse.xtext.ui.check.expensive"/>
-	    <persistent value="true"/>
-	</extension>
-
-   <extension
-         point="org.eclipse.xtext.builder.participant">
-      <participant
-            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant"
-            fileExtensions="fladsl"
-            >
-      </participant>
-   </extension>
-   <extension
-            point="org.eclipse.ui.preferencePages">
-        <page
-            category="org.polarsys.chess.xtext.FlaDsl"
-            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage"
-            id="org.polarsys.chess.xtext.FlaDsl.compiler.preferencePage"
-            name="Compiler">
-            <keywordReference id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"/>
-        </page>
-    </extension>
-    <extension
-            point="org.eclipse.ui.propertyPages">
-        <page
-            category="org.polarsys.chess.xtext.FlaDsl"
-            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage"
-            id="org.polarsys.chess.xtext.FlaDsl.compiler.propertyPage"
-            name="Compiler">
-            <keywordReference id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"/>
-            <enabledWhen>
-	            <adapt type="org.eclipse.core.resources.IProject"/>
-			</enabledWhen>
-	        <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
-        </page>
-    </extension>
-
-	<!-- Quick Outline -->
-	<extension
-		point="org.eclipse.ui.handlers">
-		<handler 
-			class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.outline.quickoutline.ShowQuickOutlineActionHandler"
-			commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline">
-			<activeWhen>
-				<reference
-					definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
-				</reference>
-			</activeWhen>
-		</handler>
-	</extension>
-	<extension
-		point="org.eclipse.ui.commands">
-		<command
-			description="Open the quick outline."
-			id="org.eclipse.xtext.ui.editor.outline.QuickOutline"
-			name="Quick Outline">
-		</command>
-	</extension>
-	<extension point="org.eclipse.ui.menus">
-		<menuContribution
-			locationURI="popup:#TextEditorContext?after=group.open">
-			<command commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline"
-				style="push"
-				tooltip="Open Quick Outline">
-				<visibleWhen checkEnabled="false">
-					<reference definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened"/>
-				</visibleWhen>
-			</command>
-		</menuContribution>
-	</extension>
-    <!-- quickfix marker resolution generator for org.polarsys.chess.xtext.FlaDsl -->
-    <extension
-            point="org.eclipse.ui.ide.markerResolution">
-        <markerResolutionGenerator
-            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
-            markerType="org.polarsys.chess.xtext.ui.fladsl.check.fast">
-            <attribute
-                name="FIXABLE_KEY"
-                value="true">
-            </attribute>
-        </markerResolutionGenerator>
-        <markerResolutionGenerator
-            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
-            markerType="org.polarsys.chess.xtext.ui.fladsl.check.normal">
-            <attribute
-                name="FIXABLE_KEY"
-                value="true">
-            </attribute>
-        </markerResolutionGenerator>
-        <markerResolutionGenerator
-            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
-            markerType="org.polarsys.chess.xtext.ui.fladsl.check.expensive">
-            <attribute
-                name="FIXABLE_KEY"
-                value="true">
-            </attribute>
-        </markerResolutionGenerator>
-    </extension>
-   	<!-- Rename Refactoring -->
-	<extension point="org.eclipse.ui.handlers">
-		<handler 
-			class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.DefaultRenameElementHandler"
-			commandId="org.eclipse.xtext.ui.refactoring.RenameElement">
-			<activeWhen>
-				<reference
-					definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
-				</reference>
-			</activeWhen>
-		</handler>
-	</extension>
-    <extension point="org.eclipse.ui.menus">
-         <menuContribution
-            locationURI="popup:#TextEditorContext?after=group.edit">
-         <command commandId="org.eclipse.xtext.ui.refactoring.RenameElement"
-               style="push">
-            <visibleWhen checkEnabled="false">
-               <reference
-                     definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
-               </reference>
-            </visibleWhen>
-         </command>
-      </menuContribution>
-   </extension>
-   <extension point="org.eclipse.ui.preferencePages">
-	    <page
-	        category="org.polarsys.chess.xtext.FlaDsl"
-	        class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.RefactoringPreferencePage"
-	        id="org.polarsys.chess.xtext.FlaDsl.refactoring"
-	        name="Refactoring">
-	        <keywordReference id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"/>
-	    </page>
-	</extension>
-
-  <extension point="org.eclipse.compare.contentViewers">
-    <viewer id="org.polarsys.chess.xtext.FlaDsl.compare.contentViewers"
-            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"
-            extensions="fladsl">
-    </viewer>
-  </extension>
-  <extension point="org.eclipse.compare.contentMergeViewers">
-    <viewer id="org.polarsys.chess.xtext.FlaDsl.compare.contentMergeViewers"
-            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"
-            extensions="fladsl" label="FlaDsl Compare">
-     </viewer>
-  </extension>
-  <extension point="org.eclipse.ui.editors.documentProviders">
-    <provider id="org.polarsys.chess.xtext.FlaDsl.editors.documentProviders"
-            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.model.XtextDocumentProvider"
-            extensions="fladsl">
-    </provider>
-  </extension>
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<plugin>
+
+    <extension
+            point="org.eclipse.ui.editors">
+        <editor
+            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.XtextEditor"
+            contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
+            default="true"
+            extensions="fladsl"
+            id="org.polarsys.chess.xtext.FlaDsl"
+            name="FlaDsl Editor">
+        </editor>
+    </extension>
+    <extension
+        point="org.eclipse.ui.handlers">
+        <handler
+            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclarationHandler"
+            commandId="org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclaration">
+            <activeWhen>
+                <reference
+                    definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
+                </reference>
+            </activeWhen>
+        </handler>
+        <handler
+            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.handler.ValidateActionHandler"
+            commandId="org.polarsys.chess.xtext.FlaDsl.validate">
+         <activeWhen>
+            <reference
+                    definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
+            </reference>
+         </activeWhen>
+      	</handler>
+      	<!-- copy qualified name -->
+        <handler
+            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedNameHandler"
+            commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName">
+            <activeWhen>
+				<reference definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened" />
+            </activeWhen>
+        </handler>
+        <handler
+            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedNameHandler"
+            commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName">
+            <activeWhen>
+            	<and>
+            		<reference definitionId="org.polarsys.chess.xtext.FlaDsl.XtextEditor.opened" />
+	                <iterate>
+						<adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
+					</iterate>
+				</and>
+            </activeWhen>
+        </handler>
+    </extension>
+    <extension point="org.eclipse.core.expressions.definitions">
+        <definition id="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
+            <and>
+                <reference definitionId="isActiveEditorAnInstanceOfXtextEditor"/>
+                <with variable="activeEditor">
+                    <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName" 
+                        value="org.polarsys.chess.xtext.FlaDsl" 
+                        forcePluginActivation="true"/>
+                </with>        
+            </and>
+        </definition>
+        <definition id="org.polarsys.chess.xtext.FlaDsl.XtextEditor.opened">
+            <and>
+                <reference definitionId="isXtextEditorActive"/>
+                <with variable="activeEditor">
+                    <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName" 
+                        value="org.polarsys.chess.xtext.FlaDsl" 
+                        forcePluginActivation="true"/>
+                </with>        
+            </and>
+        </definition>
+    </extension>
+    <extension
+            point="org.eclipse.ui.preferencePages">
+        <page
+            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
+            id="org.polarsys.chess.xtext.FlaDsl"
+            name="FlaDsl">
+            <keywordReference id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"/>
+        </page>
+        <page
+            category="org.polarsys.chess.xtext.FlaDsl"
+            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.syntaxcoloring.SyntaxColoringPreferencePage"
+            id="org.polarsys.chess.xtext.FlaDsl.coloring"
+            name="Syntax Coloring">
+            <keywordReference id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"/>
+        </page>
+        <page
+            category="org.polarsys.chess.xtext.FlaDsl"
+            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.templates.XtextTemplatePreferencePage"
+            id="org.polarsys.chess.xtext.FlaDsl.templates"
+            name="Templates">
+            <keywordReference id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"/>
+        </page>
+    </extension>
+    <extension
+            point="org.eclipse.ui.propertyPages">
+        <page
+            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
+            id="org.polarsys.chess.xtext.FlaDsl"
+            name="FlaDsl">
+            <keywordReference id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"/>
+            <enabledWhen>
+	            <adapt type="org.eclipse.core.resources.IProject"/>
+			</enabledWhen>
+	        <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
+        </page>
+    </extension>
+    <extension
+        point="org.eclipse.ui.keywords">
+        <keyword
+            id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"
+            label="FlaDsl"/>
+    </extension>
+    <extension
+         point="org.eclipse.ui.commands">
+      <command
+            description="Trigger expensive validation"
+            id="org.polarsys.chess.xtext.FlaDsl.validate"
+            name="Validate">
+      </command>
+      <!-- copy qualified name -->
+      <command
+            id="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+            categoryId="org.eclipse.ui.category.edit"
+            description="Copy the qualified name for the selected element"
+            name="Copy Qualified Name">
+      </command>
+      <command
+            id="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
+            categoryId="org.eclipse.ui.category.edit"
+            description="Copy the qualified name for the selected element"
+            name="Copy Qualified Name">
+      </command>
+    </extension>
+    <extension point="org.eclipse.ui.menus">
+        <menuContribution
+            locationURI="popup:#TextEditorContext?after=group.edit">
+             <command
+                 commandId="org.polarsys.chess.xtext.FlaDsl.validate"
+                 style="push"
+                 tooltip="Trigger expensive validation">
+            <visibleWhen checkEnabled="false">
+                <reference
+                    definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
+                </reference>
+            </visibleWhen>
+         </command>  
+         </menuContribution>
+         <!-- copy qualified name -->
+         <menuContribution locationURI="popup:#TextEditorContext?after=copy">
+         	<command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName" 
+         		style="push" tooltip="Copy Qualified Name">
+            	<visibleWhen checkEnabled="false">
+                	<reference definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened" />
+            	</visibleWhen>
+         	</command>  
+         </menuContribution>
+         <menuContribution locationURI="menu:edit?after=copy">
+         	<command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+            	style="push" tooltip="Copy Qualified Name">
+            	<visibleWhen checkEnabled="false">
+                	<reference definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened" />
+            	</visibleWhen>
+         	</command>  
+         </menuContribution>
+         <menuContribution locationURI="popup:org.eclipse.xtext.ui.outline?after=additions">
+			<command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName" 
+				style="push" tooltip="Copy Qualified Name">
+         		<visibleWhen checkEnabled="false">
+	            	<and>
+	            		<reference definitionId="org.polarsys.chess.xtext.FlaDsl.XtextEditor.opened" />
+						<iterate>
+							<adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
+						</iterate>
+					</and>
+				</visibleWhen>
+			</command>
+         </menuContribution>
+    </extension>
+    <extension point="org.eclipse.ui.menus">
+		<menuContribution locationURI="popup:#TextEditorContext?endof=group.find">
+			<command commandId="org.eclipse.xtext.ui.editor.FindReferences">
+				<visibleWhen checkEnabled="false">
+                	<reference definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
+                	</reference>
+            	</visibleWhen>
+			</command>
+		</menuContribution>
+	</extension>
+	<extension point="org.eclipse.ui.handlers">
+	    <handler
+            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.findrefs.FindReferencesHandler"
+            commandId="org.eclipse.xtext.ui.editor.FindReferences">
+            <activeWhen>
+                <reference
+                    definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
+                </reference>
+            </activeWhen>
+        </handler>
+    </extension>   
+
+<!-- adding resource factories -->
+
+	<extension
+		point="org.eclipse.emf.ecore.extension_parser">
+		<parser
+			class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.resource.IResourceFactory"
+			type="fladsl">
+		</parser>
+	</extension>
+	<extension point="org.eclipse.xtext.extension_resourceServiceProvider">
+        <resourceServiceProvider
+            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.resource.IResourceUIServiceProvider"
+            uriExtension="fladsl">
+        </resourceServiceProvider>
+    </extension>
+
+
+	<!-- marker definitions for org.polarsys.chess.xtext.FlaDsl -->
+	<extension
+	        id="fladsl.check.fast"
+	        name="FlaDsl Problem"
+	        point="org.eclipse.core.resources.markers">
+	    <super type="org.eclipse.xtext.ui.check.fast"/>
+	    <persistent value="true"/>
+	</extension>
+	<extension
+	        id="fladsl.check.normal"
+	        name="FlaDsl Problem"
+	        point="org.eclipse.core.resources.markers">
+	    <super type="org.eclipse.xtext.ui.check.normal"/>
+	    <persistent value="true"/>
+	</extension>
+	<extension
+	        id="fladsl.check.expensive"
+	        name="FlaDsl Problem"
+	        point="org.eclipse.core.resources.markers">
+	    <super type="org.eclipse.xtext.ui.check.expensive"/>
+	    <persistent value="true"/>
+	</extension>
+
+   <extension
+         point="org.eclipse.xtext.builder.participant">
+      <participant
+            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant"
+            fileExtensions="fladsl"
+            >
+      </participant>
+   </extension>
+   <extension
+            point="org.eclipse.ui.preferencePages">
+        <page
+            category="org.polarsys.chess.xtext.FlaDsl"
+            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage"
+            id="org.polarsys.chess.xtext.FlaDsl.compiler.preferencePage"
+            name="Compiler">
+            <keywordReference id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"/>
+        </page>
+    </extension>
+    <extension
+            point="org.eclipse.ui.propertyPages">
+        <page
+            category="org.polarsys.chess.xtext.FlaDsl"
+            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage"
+            id="org.polarsys.chess.xtext.FlaDsl.compiler.propertyPage"
+            name="Compiler">
+            <keywordReference id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"/>
+            <enabledWhen>
+	            <adapt type="org.eclipse.core.resources.IProject"/>
+			</enabledWhen>
+	        <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
+        </page>
+    </extension>
+    <extension point="org.eclipse.ui.menus">
+		<menuContribution locationURI="popup:#TextEditorContext?after=xtext.ui.openDeclaration">
+			<command
+				commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand"
+				id="org.polarsys.chess.xtext.FlaDsl.OpenGeneratedCode"
+				style="push">
+					<visibleWhen checkEnabled="false">
+						<reference definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened" />
+					</visibleWhen>
+			</command>
+		</menuContribution>
+	</extension>
+	<extension point="org.eclipse.ui.handlers">
+		<handler
+			class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.generator.trace.OpenGeneratedFileHandler"
+			commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand">
+				<activeWhen>
+					<reference definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened" />
+				</activeWhen>
+		</handler>
+	</extension>
+
+	<!-- Quick Outline -->
+	<extension
+		point="org.eclipse.ui.handlers">
+		<handler 
+			class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.outline.quickoutline.ShowQuickOutlineActionHandler"
+			commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline">
+			<activeWhen>
+				<reference
+					definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
+				</reference>
+			</activeWhen>
+		</handler>
+	</extension>
+	<extension
+		point="org.eclipse.ui.commands">
+		<command
+			description="Open the quick outline."
+			id="org.eclipse.xtext.ui.editor.outline.QuickOutline"
+			name="Quick Outline">
+		</command>
+	</extension>
+	<extension point="org.eclipse.ui.menus">
+		<menuContribution
+			locationURI="popup:#TextEditorContext?after=group.open">
+			<command commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline"
+				style="push"
+				tooltip="Open Quick Outline">
+				<visibleWhen checkEnabled="false">
+					<reference definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened"/>
+				</visibleWhen>
+			</command>
+		</menuContribution>
+	</extension>
+    <!-- quickfix marker resolution generator for org.polarsys.chess.xtext.FlaDsl -->
+    <extension
+            point="org.eclipse.ui.ide.markerResolution">
+        <markerResolutionGenerator
+            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
+            markerType="org.polarsys.chess.xtext.ui.fladsl.check.fast">
+            <attribute
+                name="FIXABLE_KEY"
+                value="true">
+            </attribute>
+        </markerResolutionGenerator>
+        <markerResolutionGenerator
+            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
+            markerType="org.polarsys.chess.xtext.ui.fladsl.check.normal">
+            <attribute
+                name="FIXABLE_KEY"
+                value="true">
+            </attribute>
+        </markerResolutionGenerator>
+        <markerResolutionGenerator
+            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
+            markerType="org.polarsys.chess.xtext.ui.fladsl.check.expensive">
+            <attribute
+                name="FIXABLE_KEY"
+                value="true">
+            </attribute>
+        </markerResolutionGenerator>
+    </extension>
+   	<!-- Rename Refactoring -->
+	<extension point="org.eclipse.ui.handlers">
+		<handler 
+			class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.DefaultRenameElementHandler"
+			commandId="org.eclipse.xtext.ui.refactoring.RenameElement">
+			<activeWhen>
+				<reference
+					definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
+				</reference>
+			</activeWhen>
+		</handler>
+	</extension>
+    <extension point="org.eclipse.ui.menus">
+         <menuContribution
+            locationURI="popup:#TextEditorContext?after=group.edit">
+         <command commandId="org.eclipse.xtext.ui.refactoring.RenameElement"
+               style="push">
+            <visibleWhen checkEnabled="false">
+               <reference
+                     definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
+               </reference>
+            </visibleWhen>
+         </command>
+      </menuContribution>
+   </extension>
+   <extension point="org.eclipse.ui.preferencePages">
+	    <page
+	        category="org.polarsys.chess.xtext.FlaDsl"
+	        class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.RefactoringPreferencePage"
+	        id="org.polarsys.chess.xtext.FlaDsl.refactoring"
+	        name="Refactoring">
+	        <keywordReference id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"/>
+	    </page>
+	</extension>
+
+  <extension point="org.eclipse.compare.contentViewers">
+    <viewer id="org.polarsys.chess.xtext.FlaDsl.compare.contentViewers"
+            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"
+            extensions="fladsl">
+    </viewer>
+  </extension>
+  <extension point="org.eclipse.compare.contentMergeViewers">
+    <viewer id="org.polarsys.chess.xtext.FlaDsl.compare.contentMergeViewers"
+            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"
+            extensions="fladsl" label="FlaDsl Compare">
+     </viewer>
+  </extension>
+  <extension point="org.eclipse.ui.editors.documentProviders">
+    <provider id="org.polarsys.chess.xtext.FlaDsl.editors.documentProviders"
+            class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.model.XtextDocumentProvider"
+            extensions="fladsl">
+    </provider>
+  </extension>
+  <extension point="org.eclipse.team.core.fileTypes">
+    <fileTypes
+            extension="fladsl"
+            type="text">
+    </fileTypes>
+  </extension>
+
+</plugin>
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/pom.xml b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..028b70c1b89c90d53115e15b3685eb5dca338c61
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.xtext.fladsl.ui</artifactId>
+  <packaging>eclipse-plugin</packaging>
+  
+  <build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.xtend</groupId>
+				<artifactId>xtend-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/AbstractFlaDslUiModule.java b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/AbstractFlaDslUiModule.java
deleted file mode 100644
index b96f4ebf4723c511ac1869daba610d8fcf1df2ea..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/AbstractFlaDslUiModule.java
+++ /dev/null
@@ -1,242 +0,0 @@
-
-/*
- * generated by Xtext
- */
-package org.polarsys.chess.xtext.ui;
-
-import org.eclipse.xtext.ui.DefaultUiModule;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * Manual modifications go to {org.polarsys.chess.xtext.ui.FlaDslUiModule}
- */
-@SuppressWarnings("all")
-public abstract class AbstractFlaDslUiModule extends DefaultUiModule {
-	
-	public AbstractFlaDslUiModule(AbstractUIPlugin plugin) {
-		super(plugin);
-	}
-	
-	
-	// contributed by org.eclipse.xtext.ui.generator.ImplicitUiFragment
-	public com.google.inject.Provider<org.eclipse.xtext.resource.containers.IAllContainersState> provideIAllContainersState() {
-		return org.eclipse.xtext.ui.shared.Access.getJavaProjectsState();
-	}
-
-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.IProposalConflictHelper> bindIProposalConflictHelper() {
-		return org.eclipse.xtext.ui.editor.contentassist.antlr.AntlrProposalConflictHelper.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
-	public void configureHighlightingLexer(com.google.inject.Binder binder) {
-		binder.bind(org.eclipse.xtext.parser.antlr.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.HIGHLIGHTING)).to(org.polarsys.chess.xtext.parser.antlr.internal.InternalFlaDslLexer.class);
-	}
-
-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
-	public void configureHighlightingTokenDefProvider(com.google.inject.Binder binder) {
-		binder.bind(org.eclipse.xtext.parser.antlr.ITokenDefProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.HIGHLIGHTING)).to(org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class);
-	}
-
-	// contributed by org.eclipse.xtext.generator.exporting.QualifiedNamesFragment
-	public Class<? extends org.eclipse.xtext.ui.refactoring.IDependentElementsCalculator> bindIDependentElementsCalculator() {
-		return org.eclipse.xtext.ui.refactoring.impl.DefaultDependentElementsCalculator.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
-	public void configureIResourceDescriptionsBuilderScope(com.google.inject.Binder binder) {
-		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.NAMED_BUILDER_SCOPE)).to(org.eclipse.xtext.builder.clustering.CurrentDescriptions.ResourceSetAware.class);
-	}
-
-	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.IXtextEditorCallback> bindIXtextEditorCallback() {
-		return org.eclipse.xtext.builder.nature.NatureAddingEditorCallback.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
-	public void configureIResourceDescriptionsPersisted(com.google.inject.Binder binder) {
-		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.PERSISTED_DESCRIPTIONS)).to(org.eclipse.xtext.builder.builderState.IBuilderState.class);
-	}
-
-	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.DocumentBasedDirtyResource> bindDocumentBasedDirtyResource() {
-		return org.eclipse.xtext.builder.impl.PersistentDataAwareDirtyResource.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.generator.GeneratorFragment
-	public Class<? extends org.eclipse.xtext.builder.IXtextBuilderParticipant> bindIXtextBuilderParticipant() {
-		return org.eclipse.xtext.builder.BuilderParticipant.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.generator.GeneratorFragment
-	public org.eclipse.core.resources.IWorkspaceRoot bindIWorkspaceRootToInstance() {
-		return org.eclipse.core.resources.ResourcesPlugin.getWorkspace().getRoot();
-	}
-
-	// contributed by org.eclipse.xtext.generator.generator.GeneratorFragment
-	public void configureBuilderPreferenceStoreInitializer(com.google.inject.Binder binder) {
-		binder.bind(org.eclipse.xtext.ui.editor.preferences.IPreferenceStoreInitializer.class).annotatedWith(com.google.inject.name.Names.named("builderPreferenceInitializer")).to(org.eclipse.xtext.builder.preferences.BuilderPreferenceAccess.Initializer.class);
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.labeling.LabelProviderFragment
-	public Class<? extends org.eclipse.jface.viewers.ILabelProvider> bindILabelProvider() {
-		return org.polarsys.chess.xtext.ui.labeling.FlaDslLabelProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.labeling.LabelProviderFragment
-	public void configureResourceUIServiceLabelProvider(com.google.inject.Binder binder) {
-		binder.bind(org.eclipse.jface.viewers.ILabelProvider.class).annotatedWith(org.eclipse.xtext.ui.resource.ResourceServiceDescriptionLabelProvider.class).to(org.polarsys.chess.xtext.ui.labeling.FlaDslDescriptionLabelProvider.class);
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineTreeProviderFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.outline.IOutlineTreeProvider> bindIOutlineTreeProvider() {
-		return org.polarsys.chess.xtext.ui.outline.FlaDslOutlineTreeProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.outline.OutlineTreeProviderFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.outline.impl.IOutlineTreeStructureProvider> bindIOutlineTreeStructureProvider() {
-		return org.polarsys.chess.xtext.ui.outline.FlaDslOutlineTreeProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.quickfix.QuickfixProviderFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.quickfix.IssueResolutionProvider> bindIssueResolutionProvider() {
-		return org.polarsys.chess.xtext.ui.quickfix.FlaDslQuickfixProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.contentAssist.ContentAssistFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.IContentProposalProvider> bindIContentProposalProvider() {
-		return org.polarsys.chess.xtext.ui.contentassist.FlaDslProposalProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext.Factory> bindContentAssistContext$Factory() {
-		return org.eclipse.xtext.ui.editor.contentassist.antlr.ParserBasedContentAssistContextFactory.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.antlr.IContentAssistParser> bindIContentAssistParser() {
-		return org.polarsys.chess.xtext.ui.contentassist.antlr.FlaDslParser.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment
-	public void configureContentAssistLexerProvider(com.google.inject.Binder binder) {
-		binder.bind(org.polarsys.chess.xtext.ui.contentassist.antlr.internal.InternalFlaDslLexer.class).toProvider(org.eclipse.xtext.parser.antlr.LexerProvider.create(org.polarsys.chess.xtext.ui.contentassist.antlr.internal.InternalFlaDslLexer.class));
-	}
-
-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrUiGeneratorFragment
-	public void configureContentAssistLexer(com.google.inject.Binder binder) {
-		binder.bind(org.eclipse.xtext.ui.editor.contentassist.antlr.internal.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.CONTENT_ASSIST)).to(org.polarsys.chess.xtext.ui.contentassist.antlr.internal.InternalFlaDslLexer.class);
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment
-	public Class<? extends org.eclipse.xtext.ui.refactoring.IRenameStrategy> bindIRenameStrategy() {
-		return org.eclipse.xtext.ui.refactoring.impl.DefaultRenameStrategy.class;
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment
-	public Class<? extends org.eclipse.xtext.ui.refactoring.IReferenceUpdater> bindIReferenceUpdater() {
-		return org.eclipse.xtext.ui.refactoring.impl.DefaultReferenceUpdater.class;
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment
-	public void configureIPreferenceStoreInitializer(com.google.inject.Binder binder) {
-		binder.bind(org.eclipse.xtext.ui.editor.preferences.IPreferenceStoreInitializer.class).annotatedWith(com.google.inject.name.Names.named("RefactoringPreferences")).to(org.eclipse.xtext.ui.refactoring.ui.RefactoringPreferences.Initializer.class);
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment
-	public Class<? extends org.eclipse.xtext.ui.refactoring.IRenameRefactoringProvider> bindIRenameRefactoringProvider() {
-		return org.eclipse.xtext.ui.refactoring.impl.DefaultRenameRefactoringProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.refactoring.RefactorElementNameFragment
-	public Class<? extends org.eclipse.xtext.ui.refactoring.ui.IRenameSupport.Factory> bindIRenameSupport$Factory() {
-		return org.eclipse.xtext.ui.refactoring.ui.DefaultRenameSupport.Factory.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public java.lang.ClassLoader bindClassLoaderToInstance() {
-		return getClass().getClassLoader();
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.access.IJvmTypeProvider.Factory> bindIJvmTypeProvider$Factory() {
-		return org.eclipse.xtext.common.types.access.jdt.JdtTypeProviderFactory.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.xtext.AbstractTypeScopeProvider> bindAbstractTypeScopeProvider() {
-		return org.eclipse.xtext.common.types.xtext.ui.JdtBasedSimpleTypeScopeProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.xtext.ui.ITypesProposalProvider> bindITypesProposalProvider() {
-		return org.eclipse.xtext.common.types.xtext.ui.JdtTypesProposalProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.access.jdt.IJavaProjectProvider> bindIJavaProjectProvider() {
-		return org.eclipse.xtext.common.types.xtext.ui.XtextResourceSetBasedProjectProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.hyperlinking.IHyperlinkHelper> bindIHyperlinkHelper() {
-		return org.eclipse.xtext.common.types.xtext.ui.TypeAwareHyperlinkHelper.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.PrefixMatcher> bindPrefixMatcher() {
-		return org.eclipse.xtext.ui.editor.contentassist.FQNPrefixMatcher.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.contentassist.AbstractJavaBasedContentProposalProvider.ReferenceProposalCreator> bindAbstractJavaBasedContentProposalProvider$ReferenceProposalCreator() {
-		return org.eclipse.xtext.common.types.xtext.ui.TypeAwareReferenceProposalCreator.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.IValidationJobScheduler> bindIValidationJobScheduler() {
-		return org.eclipse.xtext.common.types.xtext.ui.JdtValidationJobScheduler.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.refactoring.impl.RefactoringResourceSetProvider> bindRefactoringResourceSetProvider() {
-		return org.eclipse.xtext.common.types.ui.refactoring.JvmRefactoringResourceSetProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.ui.query.IJavaSearchParticipation> bindIJavaSearchParticipation() {
-		return org.eclipse.xtext.common.types.ui.query.IJavaSearchParticipation.Yes.class;
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment
-	public com.google.inject.Provider<org.eclipse.xtext.ui.codetemplates.ui.preferences.TemplatesLanguageConfiguration> provideTemplatesLanguageConfiguration() {
-		return org.eclipse.xtext.ui.codetemplates.ui.AccessibleCodetemplatesActivator.getTemplatesLanguageConfigurationProvider();
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment
-	public com.google.inject.Provider<org.eclipse.xtext.ui.codetemplates.ui.registry.LanguageRegistry> provideLanguageRegistry() {
-		return org.eclipse.xtext.ui.codetemplates.ui.AccessibleCodetemplatesActivator.getLanguageRegistry();
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment
-	@org.eclipse.xtext.service.SingletonBinding(eager=true)	public Class<? extends org.eclipse.xtext.ui.codetemplates.ui.registry.LanguageRegistrar> bindLanguageRegistrar() {
-		return org.eclipse.xtext.ui.codetemplates.ui.registry.LanguageRegistrar.class;
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.editor.templates.XtextTemplatePreferencePage> bindXtextTemplatePreferencePage() {
-		return org.eclipse.xtext.ui.codetemplates.ui.preferences.AdvancedTemplatesPreferencePage.class;
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.ui.codetemplates.ui.partialEditing.IPartialContentAssistParser> bindIPartialContentAssistParser() {
-		return org.polarsys.chess.xtext.ui.contentassist.antlr.PartialFlaDslContentAssistParser.class;
-	}
-
-	// contributed by org.eclipse.xtext.ui.generator.compare.CompareFragment
-	public Class<? extends org.eclipse.compare.IViewerCreator> bindIViewerCreator() {
-		return org.eclipse.xtext.ui.compare.DefaultViewerCreator.class;
-	}
-
-
-}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/FlaDslExecutableExtensionFactory.java b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/FlaDslExecutableExtensionFactory.java
deleted file mode 100644
index 4dcc0df95e50d50d68b2bbde715a98f0290b8546..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/FlaDslExecutableExtensionFactory.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * generated by Xtext
- */
-package org.polarsys.chess.xtext.ui;
-
-import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory;
-import org.osgi.framework.Bundle;
-
-import com.google.inject.Injector;
-
-import org.polarsys.chess.xtext.ui.internal.FlaDslActivator;
-
-/**
- * This class was generated. Customizations should only happen in a newly
- * introduced subclass. 
- */
-public class FlaDslExecutableExtensionFactory extends AbstractGuiceAwareExecutableExtensionFactory {
-
-	@Override
-	protected Bundle getBundle() {
-		return FlaDslActivator.getInstance().getBundle();
-	}
-	
-	@Override
-	protected Injector getInjector() {
-		return FlaDslActivator.getInstance().getInjector(FlaDslActivator.ORG_POLARSYS_CHESS_XTEXT_FLADSL);
-	}
-	
-}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/AbstractFlaDslProposalProvider.java b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/AbstractFlaDslProposalProvider.java
deleted file mode 100644
index 53ff79ef0b3b600534653ba3da1219c9bc1f8096..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/AbstractFlaDslProposalProvider.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
-* generated by Xtext
-*/
-package org.polarsys.chess.xtext.ui.contentassist;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.xtext.*;
-import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor;
-import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
-
-/**
- * Represents a generated, default implementation of superclass {@link org.eclipse.xtext.common.ui.contentassist.TerminalsProposalProvider}.
- * Methods are dynamically dispatched on the first parameter, i.e., you can override them 
- * with a more concrete subtype. 
- */
-@SuppressWarnings("all")
-public class AbstractFlaDslProposalProvider extends org.eclipse.xtext.common.ui.contentassist.TerminalsProposalProvider {
-		
-	public void completeBehaviour_Rules(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeExpression_Lhs(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeExpression_Rhs(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeLhs_Failures(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeRhs_Failures(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeInputExpression_Ref(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeInputExpression_FailureExpr(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeOutputExpression_Ref(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeOutputExpression_FailureExpr(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeInFailureExpr_Failures(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeOutFailureExpr_Failures(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeFailureDefinition_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeFailureDefinition_AcidAvoidable(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeComplexNofailureDefinition_AcidMitigation(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeVariableDefinition_VariableName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeACIDavoidable_A(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeACIDavoidable_C(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeACIDavoidable_I(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeACIDavoidable_D(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeACIDMitigation_A(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeACIDMitigation_C(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeACIDMitigation_I(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-	public void completeACIDMitigation_D(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
-	}
-    
-	public void complete_Behaviour(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_Expression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_Lhs(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_Rhs(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_InputExpression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_OutputExpression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_InFailureExpr(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_OutFailureExpr(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_Definitions(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_FailureDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_NoFailureDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_ComplexNofailureDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_WildcardDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_VariableDefinition(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_FailureType(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_ActualFailureType(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_NoFailureType(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_Wildcard(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_ACIDavoidable(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_Aavoidable(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_Cavoidable(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_Iavoidable(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_Davoidable(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_ACIDMitigation(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_Amitigation(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_Cmitigation(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_Imitigation(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_Dmitigation(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-	public void complete_FQN(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		// subclasses may override
-	}
-}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/FlaDslParser.java b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/FlaDslParser.java
deleted file mode 100644
index 90dff708cfee77f9f6ca44da50cc8cd19be9b64c..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/FlaDslParser.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
-* generated by Xtext
-*/
-package org.polarsys.chess.xtext.ui.contentassist.antlr;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.HashMap;
-
-import org.antlr.runtime.RecognitionException;
-import org.eclipse.xtext.AbstractElement;
-import org.eclipse.xtext.ui.editor.contentassist.antlr.AbstractContentAssistParser;
-import org.eclipse.xtext.ui.editor.contentassist.antlr.FollowElement;
-import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
-
-import com.google.inject.Inject;
-
-import org.polarsys.chess.xtext.services.FlaDslGrammarAccess;
-
-public class FlaDslParser extends AbstractContentAssistParser {
-	
-	@Inject
-	private FlaDslGrammarAccess grammarAccess;
-	
-	private Map<AbstractElement, String> nameMappings;
-	
-	@Override
-	protected org.polarsys.chess.xtext.ui.contentassist.antlr.internal.InternalFlaDslParser createParser() {
-		org.polarsys.chess.xtext.ui.contentassist.antlr.internal.InternalFlaDslParser result = new org.polarsys.chess.xtext.ui.contentassist.antlr.internal.InternalFlaDslParser(null);
-		result.setGrammarAccess(grammarAccess);
-		return result;
-	}
-	
-	@Override
-	protected String getRuleName(AbstractElement element) {
-		if (nameMappings == null) {
-			nameMappings = new HashMap<AbstractElement, String>() {
-				private static final long serialVersionUID = 1L;
-				{
-					put(grammarAccess.getInputExpressionAccess().getAlternatives_0(), "rule__InputExpression__Alternatives_0");
-					put(grammarAccess.getOutputExpressionAccess().getAlternatives_0(), "rule__OutputExpression__Alternatives_0");
-					put(grammarAccess.getInFailureExprAccess().getAlternatives(), "rule__InFailureExpr__Alternatives");
-					put(grammarAccess.getOutFailureExprAccess().getAlternatives(), "rule__OutFailureExpr__Alternatives");
-					put(grammarAccess.getDefinitionsAccess().getAlternatives(), "rule__Definitions__Alternatives");
-					put(grammarAccess.getFailureTypeAccess().getAlternatives(), "rule__FailureType__Alternatives");
-					put(grammarAccess.getActualFailureTypeAccess().getAlternatives(), "rule__ActualFailureType__Alternatives");
-					put(grammarAccess.getAavoidableAccess().getAlternatives(), "rule__Aavoidable__Alternatives");
-					put(grammarAccess.getCavoidableAccess().getAlternatives(), "rule__Cavoidable__Alternatives");
-					put(grammarAccess.getIavoidableAccess().getAlternatives(), "rule__Iavoidable__Alternatives");
-					put(grammarAccess.getDavoidableAccess().getAlternatives(), "rule__Davoidable__Alternatives");
-					put(grammarAccess.getAmitigationAccess().getAlternatives(), "rule__Amitigation__Alternatives");
-					put(grammarAccess.getCmitigationAccess().getAlternatives(), "rule__Cmitigation__Alternatives");
-					put(grammarAccess.getImitigationAccess().getAlternatives(), "rule__Imitigation__Alternatives");
-					put(grammarAccess.getDmitigationAccess().getAlternatives(), "rule__Dmitigation__Alternatives");
-					put(grammarAccess.getExpressionAccess().getGroup(), "rule__Expression__Group__0");
-					put(grammarAccess.getLhsAccess().getGroup(), "rule__Lhs__Group__0");
-					put(grammarAccess.getLhsAccess().getGroup_1(), "rule__Lhs__Group_1__0");
-					put(grammarAccess.getRhsAccess().getGroup(), "rule__Rhs__Group__0");
-					put(grammarAccess.getRhsAccess().getGroup_1(), "rule__Rhs__Group_1__0");
-					put(grammarAccess.getInputExpressionAccess().getGroup(), "rule__InputExpression__Group__0");
-					put(grammarAccess.getOutputExpressionAccess().getGroup(), "rule__OutputExpression__Group__0");
-					put(grammarAccess.getInFailureExprAccess().getGroup_3(), "rule__InFailureExpr__Group_3__0");
-					put(grammarAccess.getInFailureExprAccess().getGroup_3_2(), "rule__InFailureExpr__Group_3_2__0");
-					put(grammarAccess.getOutFailureExprAccess().getGroup_3(), "rule__OutFailureExpr__Group_3__0");
-					put(grammarAccess.getOutFailureExprAccess().getGroup_3_2(), "rule__OutFailureExpr__Group_3_2__0");
-					put(grammarAccess.getFailureDefinitionAccess().getGroup(), "rule__FailureDefinition__Group__0");
-					put(grammarAccess.getFailureDefinitionAccess().getGroup_2(), "rule__FailureDefinition__Group_2__0");
-					put(grammarAccess.getNoFailureDefinitionAccess().getGroup(), "rule__NoFailureDefinition__Group__0");
-					put(grammarAccess.getComplexNofailureDefinitionAccess().getGroup(), "rule__ComplexNofailureDefinition__Group__0");
-					put(grammarAccess.getWildcardDefinitionAccess().getGroup(), "rule__WildcardDefinition__Group__0");
-					put(grammarAccess.getVariableDefinitionAccess().getGroup(), "rule__VariableDefinition__Group__0");
-					put(grammarAccess.getACIDavoidableAccess().getGroup(), "rule__ACIDavoidable__Group__0");
-					put(grammarAccess.getACIDMitigationAccess().getGroup(), "rule__ACIDMitigation__Group__0");
-					put(grammarAccess.getFQNAccess().getGroup(), "rule__FQN__Group__0");
-					put(grammarAccess.getFQNAccess().getGroup_1(), "rule__FQN__Group_1__0");
-					put(grammarAccess.getBehaviourAccess().getRulesAssignment(), "rule__Behaviour__RulesAssignment");
-					put(grammarAccess.getExpressionAccess().getLhsAssignment_1(), "rule__Expression__LhsAssignment_1");
-					put(grammarAccess.getExpressionAccess().getRhsAssignment_3(), "rule__Expression__RhsAssignment_3");
-					put(grammarAccess.getLhsAccess().getFailuresAssignment_0(), "rule__Lhs__FailuresAssignment_0");
-					put(grammarAccess.getLhsAccess().getFailuresAssignment_1_1(), "rule__Lhs__FailuresAssignment_1_1");
-					put(grammarAccess.getRhsAccess().getFailuresAssignment_0(), "rule__Rhs__FailuresAssignment_0");
-					put(grammarAccess.getRhsAccess().getFailuresAssignment_1_1(), "rule__Rhs__FailuresAssignment_1_1");
-					put(grammarAccess.getInputExpressionAccess().getRefAssignment_0_0(), "rule__InputExpression__RefAssignment_0_0");
-					put(grammarAccess.getInputExpressionAccess().getFailureExprAssignment_2(), "rule__InputExpression__FailureExprAssignment_2");
-					put(grammarAccess.getOutputExpressionAccess().getRefAssignment_0_0(), "rule__OutputExpression__RefAssignment_0_0");
-					put(grammarAccess.getOutputExpressionAccess().getFailureExprAssignment_2(), "rule__OutputExpression__FailureExprAssignment_2");
-					put(grammarAccess.getInFailureExprAccess().getFailuresAssignment_0(), "rule__InFailureExpr__FailuresAssignment_0");
-					put(grammarAccess.getInFailureExprAccess().getFailuresAssignment_1(), "rule__InFailureExpr__FailuresAssignment_1");
-					put(grammarAccess.getInFailureExprAccess().getFailuresAssignment_2(), "rule__InFailureExpr__FailuresAssignment_2");
-					put(grammarAccess.getInFailureExprAccess().getFailuresAssignment_3_1(), "rule__InFailureExpr__FailuresAssignment_3_1");
-					put(grammarAccess.getInFailureExprAccess().getFailuresAssignment_3_2_1(), "rule__InFailureExpr__FailuresAssignment_3_2_1");
-					put(grammarAccess.getInFailureExprAccess().getFailuresAssignment_4(), "rule__InFailureExpr__FailuresAssignment_4");
-					put(grammarAccess.getOutFailureExprAccess().getFailuresAssignment_0(), "rule__OutFailureExpr__FailuresAssignment_0");
-					put(grammarAccess.getOutFailureExprAccess().getFailuresAssignment_1(), "rule__OutFailureExpr__FailuresAssignment_1");
-					put(grammarAccess.getOutFailureExprAccess().getFailuresAssignment_2(), "rule__OutFailureExpr__FailuresAssignment_2");
-					put(grammarAccess.getOutFailureExprAccess().getFailuresAssignment_3_1(), "rule__OutFailureExpr__FailuresAssignment_3_1");
-					put(grammarAccess.getOutFailureExprAccess().getFailuresAssignment_3_2_1(), "rule__OutFailureExpr__FailuresAssignment_3_2_1");
-					put(grammarAccess.getOutFailureExprAccess().getFailuresAssignment_4(), "rule__OutFailureExpr__FailuresAssignment_4");
-					put(grammarAccess.getFailureDefinitionAccess().getTypeAssignment_1(), "rule__FailureDefinition__TypeAssignment_1");
-					put(grammarAccess.getFailureDefinitionAccess().getAcidAvoidableAssignment_2_1(), "rule__FailureDefinition__AcidAvoidableAssignment_2_1");
-					put(grammarAccess.getComplexNofailureDefinitionAccess().getAcidMitigationAssignment_3(), "rule__ComplexNofailureDefinition__AcidMitigationAssignment_3");
-					put(grammarAccess.getVariableDefinitionAccess().getVariableNameAssignment_1(), "rule__VariableDefinition__VariableNameAssignment_1");
-					put(grammarAccess.getACIDavoidableAccess().getAAssignment_0(), "rule__ACIDavoidable__AAssignment_0");
-					put(grammarAccess.getACIDavoidableAccess().getCAssignment_2(), "rule__ACIDavoidable__CAssignment_2");
-					put(grammarAccess.getACIDavoidableAccess().getIAssignment_4(), "rule__ACIDavoidable__IAssignment_4");
-					put(grammarAccess.getACIDavoidableAccess().getDAssignment_6(), "rule__ACIDavoidable__DAssignment_6");
-					put(grammarAccess.getACIDMitigationAccess().getAAssignment_0(), "rule__ACIDMitigation__AAssignment_0");
-					put(grammarAccess.getACIDMitigationAccess().getCAssignment_2(), "rule__ACIDMitigation__CAssignment_2");
-					put(grammarAccess.getACIDMitigationAccess().getIAssignment_4(), "rule__ACIDMitigation__IAssignment_4");
-					put(grammarAccess.getACIDMitigationAccess().getDAssignment_6(), "rule__ACIDMitigation__DAssignment_6");
-				}
-			};
-		}
-		return nameMappings.get(element);
-	}
-	
-	@Override
-	protected Collection<FollowElement> getFollowElements(AbstractInternalContentAssistParser parser) {
-		try {
-			org.polarsys.chess.xtext.ui.contentassist.antlr.internal.InternalFlaDslParser typedParser = (org.polarsys.chess.xtext.ui.contentassist.antlr.internal.InternalFlaDslParser) parser;
-			typedParser.entryRuleBehaviour();
-			return typedParser.getFollowElements();
-		} catch(RecognitionException ex) {
-			throw new RuntimeException(ex);
-		}		
-	}
-	
-	@Override
-	protected String[] getInitialHiddenTokens() {
-		return new String[] { "RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT" };
-	}
-	
-	public FlaDslGrammarAccess getGrammarAccess() {
-		return this.grammarAccess;
-	}
-	
-	public void setGrammarAccess(FlaDslGrammarAccess grammarAccess) {
-		this.grammarAccess = grammarAccess;
-	}
-}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/PartialFlaDslContentAssistParser.java b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/PartialFlaDslContentAssistParser.java
deleted file mode 100644
index 2daa0898c9a471985108ef3681cf564235d17e01..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/PartialFlaDslContentAssistParser.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * generated by Xtext
- */
-package org.polarsys.chess.xtext.ui.contentassist.antlr;
-
-import java.util.Collection;
-import java.util.Collections;
-
-import org.eclipse.xtext.AbstractRule;
-import org.eclipse.xtext.ui.codetemplates.ui.partialEditing.IPartialContentAssistParser;
-import org.eclipse.xtext.ui.editor.contentassist.antlr.FollowElement;
-import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
-import org.eclipse.xtext.util.PolymorphicDispatcher;
-
-/**
- * @author Sebastian Zarnekow - Initial contribution and API
- */
-@SuppressWarnings("restriction")
-public class PartialFlaDslContentAssistParser extends FlaDslParser implements IPartialContentAssistParser {
-
-	private AbstractRule rule;
-
-	public void initializeFor(AbstractRule rule) {
-		this.rule = rule;
-	}
-	
-	@Override
-	protected Collection<FollowElement> getFollowElements(AbstractInternalContentAssistParser parser) {
-		if (rule == null || rule.eIsProxy())
-			return Collections.emptyList();
-		String methodName = "entryRule" + rule.getName();
-		PolymorphicDispatcher<Collection<FollowElement>> dispatcher = 
-			new PolymorphicDispatcher<Collection<FollowElement>>(methodName, 0, 0, Collections.singletonList(parser));
-		dispatcher.invoke();
-		return parser.getFollowElements();
-	}
-
-}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g
deleted file mode 100644
index d239d63aa3a1ac024f4249045667b0eaa25cff41..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g
+++ /dev/null
@@ -1,3592 +0,0 @@
-/*
-* generated by Xtext
-*/
-grammar InternalFlaDsl;
-
-options {
-	superClass=AbstractInternalContentAssistParser;
-	
-}
-
-@lexer::header {
-package org.polarsys.chess.xtext.ui.contentassist.antlr.internal;
-
-// Hack: Use our own Lexer superclass by means of import. 
-// Currently there is no other way to specify the superclass for the lexer.
-import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.Lexer;
-}
-
-@parser::header {
-package org.polarsys.chess.xtext.ui.contentassist.antlr.internal; 
-
-import java.io.InputStream;
-import org.eclipse.xtext.*;
-import org.eclipse.xtext.parser.*;
-import org.eclipse.xtext.parser.impl.*;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.xtext.parser.antlr.XtextTokenStream;
-import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
-import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
-import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.DFA;
-import org.polarsys.chess.xtext.services.FlaDslGrammarAccess;
-
-}
-
-@parser::members {
- 
- 	private FlaDslGrammarAccess grammarAccess;
- 	
-    public void setGrammarAccess(FlaDslGrammarAccess grammarAccess) {
-    	this.grammarAccess = grammarAccess;
-    }
-    
-    @Override
-    protected Grammar getGrammar() {
-    	return grammarAccess.getGrammar();
-    }
-    
-    @Override
-    protected String getValueForTokenName(String tokenName) {
-    	return tokenName;
-    }
-
-}
-
-
-
-
-// Entry rule entryRuleBehaviour
-entryRuleBehaviour 
-:
-{ before(grammarAccess.getBehaviourRule()); }
-	 ruleBehaviour
-{ after(grammarAccess.getBehaviourRule()); } 
-	 EOF 
-;
-
-// Rule Behaviour
-ruleBehaviour
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-(
-{ before(grammarAccess.getBehaviourAccess().getRulesAssignment()); }
-(rule__Behaviour__RulesAssignment)
-{ after(grammarAccess.getBehaviourAccess().getRulesAssignment()); }
-)
-(
-{ before(grammarAccess.getBehaviourAccess().getRulesAssignment()); }
-(rule__Behaviour__RulesAssignment)*
-{ after(grammarAccess.getBehaviourAccess().getRulesAssignment()); }
-)
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleExpression
-entryRuleExpression 
-:
-{ before(grammarAccess.getExpressionRule()); }
-	 ruleExpression
-{ after(grammarAccess.getExpressionRule()); } 
-	 EOF 
-;
-
-// Rule Expression
-ruleExpression
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getExpressionAccess().getGroup()); }
-(rule__Expression__Group__0)
-{ after(grammarAccess.getExpressionAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleLhs
-entryRuleLhs 
-:
-{ before(grammarAccess.getLhsRule()); }
-	 ruleLhs
-{ after(grammarAccess.getLhsRule()); } 
-	 EOF 
-;
-
-// Rule Lhs
-ruleLhs
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getLhsAccess().getGroup()); }
-(rule__Lhs__Group__0)
-{ after(grammarAccess.getLhsAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleRhs
-entryRuleRhs 
-:
-{ before(grammarAccess.getRhsRule()); }
-	 ruleRhs
-{ after(grammarAccess.getRhsRule()); } 
-	 EOF 
-;
-
-// Rule Rhs
-ruleRhs
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getRhsAccess().getGroup()); }
-(rule__Rhs__Group__0)
-{ after(grammarAccess.getRhsAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleInputExpression
-entryRuleInputExpression 
-:
-{ before(grammarAccess.getInputExpressionRule()); }
-	 ruleInputExpression
-{ after(grammarAccess.getInputExpressionRule()); } 
-	 EOF 
-;
-
-// Rule InputExpression
-ruleInputExpression
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getInputExpressionAccess().getGroup()); }
-(rule__InputExpression__Group__0)
-{ after(grammarAccess.getInputExpressionAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleOutputExpression
-entryRuleOutputExpression 
-:
-{ before(grammarAccess.getOutputExpressionRule()); }
-	 ruleOutputExpression
-{ after(grammarAccess.getOutputExpressionRule()); } 
-	 EOF 
-;
-
-// Rule OutputExpression
-ruleOutputExpression
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getOutputExpressionAccess().getGroup()); }
-(rule__OutputExpression__Group__0)
-{ after(grammarAccess.getOutputExpressionAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleInFailureExpr
-entryRuleInFailureExpr 
-:
-{ before(grammarAccess.getInFailureExprRule()); }
-	 ruleInFailureExpr
-{ after(grammarAccess.getInFailureExprRule()); } 
-	 EOF 
-;
-
-// Rule InFailureExpr
-ruleInFailureExpr
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getInFailureExprAccess().getAlternatives()); }
-(rule__InFailureExpr__Alternatives)
-{ after(grammarAccess.getInFailureExprAccess().getAlternatives()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleOutFailureExpr
-entryRuleOutFailureExpr 
-:
-{ before(grammarAccess.getOutFailureExprRule()); }
-	 ruleOutFailureExpr
-{ after(grammarAccess.getOutFailureExprRule()); } 
-	 EOF 
-;
-
-// Rule OutFailureExpr
-ruleOutFailureExpr
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getOutFailureExprAccess().getAlternatives()); }
-(rule__OutFailureExpr__Alternatives)
-{ after(grammarAccess.getOutFailureExprAccess().getAlternatives()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-// Entry rule entryRuleFailureDefinition
-entryRuleFailureDefinition 
-:
-{ before(grammarAccess.getFailureDefinitionRule()); }
-	 ruleFailureDefinition
-{ after(grammarAccess.getFailureDefinitionRule()); } 
-	 EOF 
-;
-
-// Rule FailureDefinition
-ruleFailureDefinition
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getFailureDefinitionAccess().getGroup()); }
-(rule__FailureDefinition__Group__0)
-{ after(grammarAccess.getFailureDefinitionAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleNoFailureDefinition
-entryRuleNoFailureDefinition 
-:
-{ before(grammarAccess.getNoFailureDefinitionRule()); }
-	 ruleNoFailureDefinition
-{ after(grammarAccess.getNoFailureDefinitionRule()); } 
-	 EOF 
-;
-
-// Rule NoFailureDefinition
-ruleNoFailureDefinition
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getNoFailureDefinitionAccess().getGroup()); }
-(rule__NoFailureDefinition__Group__0)
-{ after(grammarAccess.getNoFailureDefinitionAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleComplexNofailureDefinition
-entryRuleComplexNofailureDefinition 
-:
-{ before(grammarAccess.getComplexNofailureDefinitionRule()); }
-	 ruleComplexNofailureDefinition
-{ after(grammarAccess.getComplexNofailureDefinitionRule()); } 
-	 EOF 
-;
-
-// Rule ComplexNofailureDefinition
-ruleComplexNofailureDefinition
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getComplexNofailureDefinitionAccess().getGroup()); }
-(rule__ComplexNofailureDefinition__Group__0)
-{ after(grammarAccess.getComplexNofailureDefinitionAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleWildcardDefinition
-entryRuleWildcardDefinition 
-:
-{ before(grammarAccess.getWildcardDefinitionRule()); }
-	 ruleWildcardDefinition
-{ after(grammarAccess.getWildcardDefinitionRule()); } 
-	 EOF 
-;
-
-// Rule WildcardDefinition
-ruleWildcardDefinition
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getWildcardDefinitionAccess().getGroup()); }
-(rule__WildcardDefinition__Group__0)
-{ after(grammarAccess.getWildcardDefinitionAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleVariableDefinition
-entryRuleVariableDefinition 
-:
-{ before(grammarAccess.getVariableDefinitionRule()); }
-	 ruleVariableDefinition
-{ after(grammarAccess.getVariableDefinitionRule()); } 
-	 EOF 
-;
-
-// Rule VariableDefinition
-ruleVariableDefinition
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getVariableDefinitionAccess().getGroup()); }
-(rule__VariableDefinition__Group__0)
-{ after(grammarAccess.getVariableDefinitionAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleACIDavoidable
-entryRuleACIDavoidable 
-:
-{ before(grammarAccess.getACIDavoidableRule()); }
-	 ruleACIDavoidable
-{ after(grammarAccess.getACIDavoidableRule()); } 
-	 EOF 
-;
-
-// Rule ACIDavoidable
-ruleACIDavoidable
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getACIDavoidableAccess().getGroup()); }
-(rule__ACIDavoidable__Group__0)
-{ after(grammarAccess.getACIDavoidableAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Entry rule entryRuleACIDMitigation
-entryRuleACIDMitigation 
-:
-{ before(grammarAccess.getACIDMitigationRule()); }
-	 ruleACIDMitigation
-{ after(grammarAccess.getACIDMitigationRule()); } 
-	 EOF 
-;
-
-// Rule ACIDMitigation
-ruleACIDMitigation
-    @init {
-		int stackSize = keepStackSize();
-    }
-	:
-(
-{ before(grammarAccess.getACIDMitigationAccess().getGroup()); }
-(rule__ACIDMitigation__Group__0)
-{ after(grammarAccess.getACIDMitigationAccess().getGroup()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-// Rule ActualFailureType
-ruleActualFailureType
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getActualFailureTypeAccess().getAlternatives()); }
-(rule__ActualFailureType__Alternatives)
-{ after(grammarAccess.getActualFailureTypeAccess().getAlternatives()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-// Rule Aavoidable
-ruleAavoidable
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getAavoidableAccess().getAlternatives()); }
-(rule__Aavoidable__Alternatives)
-{ after(grammarAccess.getAavoidableAccess().getAlternatives()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Rule Cavoidable
-ruleCavoidable
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getCavoidableAccess().getAlternatives()); }
-(rule__Cavoidable__Alternatives)
-{ after(grammarAccess.getCavoidableAccess().getAlternatives()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Rule Iavoidable
-ruleIavoidable
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getIavoidableAccess().getAlternatives()); }
-(rule__Iavoidable__Alternatives)
-{ after(grammarAccess.getIavoidableAccess().getAlternatives()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Rule Davoidable
-ruleDavoidable
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getDavoidableAccess().getAlternatives()); }
-(rule__Davoidable__Alternatives)
-{ after(grammarAccess.getDavoidableAccess().getAlternatives()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Rule Amitigation
-ruleAmitigation
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getAmitigationAccess().getAlternatives()); }
-(rule__Amitigation__Alternatives)
-{ after(grammarAccess.getAmitigationAccess().getAlternatives()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Rule Cmitigation
-ruleCmitigation
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getCmitigationAccess().getAlternatives()); }
-(rule__Cmitigation__Alternatives)
-{ after(grammarAccess.getCmitigationAccess().getAlternatives()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Rule Imitigation
-ruleImitigation
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getImitigationAccess().getAlternatives()); }
-(rule__Imitigation__Alternatives)
-{ after(grammarAccess.getImitigationAccess().getAlternatives()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-// Rule Dmitigation
-ruleDmitigation
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getDmitigationAccess().getAlternatives()); }
-(rule__Dmitigation__Alternatives)
-{ after(grammarAccess.getDmitigationAccess().getAlternatives()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-rule__InputExpression__Alternatives_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getInputExpressionAccess().getRefAssignment_0_0()); }
-(rule__InputExpression__RefAssignment_0_0)
-{ after(grammarAccess.getInputExpressionAccess().getRefAssignment_0_0()); }
-)
-
-    |(
-{ before(grammarAccess.getInputExpressionAccess().getUndefinedKeyword_0_1()); }
-
-	'undefined' 
-
-{ after(grammarAccess.getInputExpressionAccess().getUndefinedKeyword_0_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__OutputExpression__Alternatives_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOutputExpressionAccess().getRefAssignment_0_0()); }
-(rule__OutputExpression__RefAssignment_0_0)
-{ after(grammarAccess.getOutputExpressionAccess().getRefAssignment_0_0()); }
-)
-
-    |(
-{ before(grammarAccess.getOutputExpressionAccess().getUndefinedKeyword_0_1()); }
-
-	'undefined' 
-
-{ after(grammarAccess.getOutputExpressionAccess().getUndefinedKeyword_0_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__InFailureExpr__Alternatives
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getInFailureExprAccess().getFailuresAssignment_0()); }
-(rule__InFailureExpr__FailuresAssignment_0)
-{ after(grammarAccess.getInFailureExprAccess().getFailuresAssignment_0()); }
-)
-
-    |(
-{ before(grammarAccess.getInFailureExprAccess().getFailuresAssignment_1()); }
-(rule__InFailureExpr__FailuresAssignment_1)
-{ after(grammarAccess.getInFailureExprAccess().getFailuresAssignment_1()); }
-)
-
-    |(
-{ before(grammarAccess.getInFailureExprAccess().getFailuresAssignment_2()); }
-(rule__InFailureExpr__FailuresAssignment_2)
-{ after(grammarAccess.getInFailureExprAccess().getFailuresAssignment_2()); }
-)
-
-    |(
-{ before(grammarAccess.getInFailureExprAccess().getGroup_3()); }
-(rule__InFailureExpr__Group_3__0)
-{ after(grammarAccess.getInFailureExprAccess().getGroup_3()); }
-)
-
-    |(
-{ before(grammarAccess.getInFailureExprAccess().getFailuresAssignment_4()); }
-(rule__InFailureExpr__FailuresAssignment_4)
-{ after(grammarAccess.getInFailureExprAccess().getFailuresAssignment_4()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__OutFailureExpr__Alternatives
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOutFailureExprAccess().getFailuresAssignment_0()); }
-(rule__OutFailureExpr__FailuresAssignment_0)
-{ after(grammarAccess.getOutFailureExprAccess().getFailuresAssignment_0()); }
-)
-
-    |(
-{ before(grammarAccess.getOutFailureExprAccess().getFailuresAssignment_1()); }
-(rule__OutFailureExpr__FailuresAssignment_1)
-{ after(grammarAccess.getOutFailureExprAccess().getFailuresAssignment_1()); }
-)
-
-    |(
-{ before(grammarAccess.getOutFailureExprAccess().getFailuresAssignment_2()); }
-(rule__OutFailureExpr__FailuresAssignment_2)
-{ after(grammarAccess.getOutFailureExprAccess().getFailuresAssignment_2()); }
-)
-
-    |(
-{ before(grammarAccess.getOutFailureExprAccess().getGroup_3()); }
-(rule__OutFailureExpr__Group_3__0)
-{ after(grammarAccess.getOutFailureExprAccess().getGroup_3()); }
-)
-
-    |(
-{ before(grammarAccess.getOutFailureExprAccess().getFailuresAssignment_4()); }
-(rule__OutFailureExpr__FailuresAssignment_4)
-{ after(grammarAccess.getOutFailureExprAccess().getFailuresAssignment_4()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-rule__ActualFailureType__Alternatives
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getActualFailureTypeAccess().getEARLYEnumLiteralDeclaration_0()); }
-(	'early' 
-)
-{ after(grammarAccess.getActualFailureTypeAccess().getEARLYEnumLiteralDeclaration_0()); }
-)
-
-    |(
-{ before(grammarAccess.getActualFailureTypeAccess().getLATEEnumLiteralDeclaration_1()); }
-(	'late' 
-)
-{ after(grammarAccess.getActualFailureTypeAccess().getLATEEnumLiteralDeclaration_1()); }
-)
-
-    |(
-{ before(grammarAccess.getActualFailureTypeAccess().getCOMMISSIONEnumLiteralDeclaration_2()); }
-(	'commission' 
-)
-{ after(grammarAccess.getActualFailureTypeAccess().getCOMMISSIONEnumLiteralDeclaration_2()); }
-)
-
-    |(
-{ before(grammarAccess.getActualFailureTypeAccess().getOMISSIONEnumLiteralDeclaration_3()); }
-(	'omission' 
-)
-{ after(grammarAccess.getActualFailureTypeAccess().getOMISSIONEnumLiteralDeclaration_3()); }
-)
-
-    |(
-{ before(grammarAccess.getActualFailureTypeAccess().getVALUE_SUBTLEEnumLiteralDeclaration_4()); }
-(	'valueSubtle' 
-)
-{ after(grammarAccess.getActualFailureTypeAccess().getVALUE_SUBTLEEnumLiteralDeclaration_4()); }
-)
-
-    |(
-{ before(grammarAccess.getActualFailureTypeAccess().getVALUE_COARSEEnumLiteralDeclaration_5()); }
-(	'valueCoarse' 
-)
-{ after(grammarAccess.getActualFailureTypeAccess().getVALUE_COARSEEnumLiteralDeclaration_5()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Aavoidable__Alternatives
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getAavoidableAccess().getINCOMPLETIONEnumLiteralDeclaration_0()); }
-(	'incompletion' 
-)
-{ after(grammarAccess.getAavoidableAccess().getINCOMPLETIONEnumLiteralDeclaration_0()); }
-)
-
-    |(
-{ before(grammarAccess.getAavoidableAccess().getNONEEnumLiteralDeclaration_1()); }
-(	'none' 
-)
-{ after(grammarAccess.getAavoidableAccess().getNONEEnumLiteralDeclaration_1()); }
-)
-
-    |(
-{ before(grammarAccess.getAavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2()); }
-(	'unspecified' 
-)
-{ after(grammarAccess.getAavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Cavoidable__Alternatives
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getCavoidableAccess().getINCONSISTENCYEnumLiteralDeclaration_0()); }
-(	'inconsistency' 
-)
-{ after(grammarAccess.getCavoidableAccess().getINCONSISTENCYEnumLiteralDeclaration_0()); }
-)
-
-    |(
-{ before(grammarAccess.getCavoidableAccess().getNONEEnumLiteralDeclaration_1()); }
-(	'none' 
-)
-{ after(grammarAccess.getCavoidableAccess().getNONEEnumLiteralDeclaration_1()); }
-)
-
-    |(
-{ before(grammarAccess.getCavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2()); }
-(	'unspecified' 
-)
-{ after(grammarAccess.getCavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Iavoidable__Alternatives
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getIavoidableAccess().getINTERFERENCEEnumLiteralDeclaration_0()); }
-(	'interference' 
-)
-{ after(grammarAccess.getIavoidableAccess().getINTERFERENCEEnumLiteralDeclaration_0()); }
-)
-
-    |(
-{ before(grammarAccess.getIavoidableAccess().getNONEEnumLiteralDeclaration_1()); }
-(	'none' 
-)
-{ after(grammarAccess.getIavoidableAccess().getNONEEnumLiteralDeclaration_1()); }
-)
-
-    |(
-{ before(grammarAccess.getIavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2()); }
-(	'unspecified' 
-)
-{ after(grammarAccess.getIavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Davoidable__Alternatives
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getDavoidableAccess().getIMPERMANENCEEnumLiteralDeclaration_0()); }
-(	'impermanence' 
-)
-{ after(grammarAccess.getDavoidableAccess().getIMPERMANENCEEnumLiteralDeclaration_0()); }
-)
-
-    |(
-{ before(grammarAccess.getDavoidableAccess().getNONEEnumLiteralDeclaration_1()); }
-(	'none' 
-)
-{ after(grammarAccess.getDavoidableAccess().getNONEEnumLiteralDeclaration_1()); }
-)
-
-    |(
-{ before(grammarAccess.getDavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2()); }
-(	'unspecified' 
-)
-{ after(grammarAccess.getDavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Amitigation__Alternatives
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getAmitigationAccess().getALL_OR_NOTHINGEnumLiteralDeclaration_0()); }
-(	'all_or_nothing' 
-)
-{ after(grammarAccess.getAmitigationAccess().getALL_OR_NOTHINGEnumLiteralDeclaration_0()); }
-)
-
-    |(
-{ before(grammarAccess.getAmitigationAccess().getALL_OR_COMPENSATIONEnumLiteralDeclaration_1()); }
-(	'all_or_compensation' 
-)
-{ after(grammarAccess.getAmitigationAccess().getALL_OR_COMPENSATIONEnumLiteralDeclaration_1()); }
-)
-
-    |(
-{ before(grammarAccess.getAmitigationAccess().getNONEEnumLiteralDeclaration_2()); }
-(	'none' 
-)
-{ after(grammarAccess.getAmitigationAccess().getNONEEnumLiteralDeclaration_2()); }
-)
-
-    |(
-{ before(grammarAccess.getAmitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3()); }
-(	'unspecified' 
-)
-{ after(grammarAccess.getAmitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Cmitigation__Alternatives
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getCmitigationAccess().getFULL_CONSISTENCYEnumLiteralDeclaration_0()); }
-(	'full_consistency' 
-)
-{ after(grammarAccess.getCmitigationAccess().getFULL_CONSISTENCYEnumLiteralDeclaration_0()); }
-)
-
-    |(
-{ before(grammarAccess.getCmitigationAccess().getRANGE_VIOLATION_ALLOWEDEnumLiteralDeclaration_1()); }
-(	'range_violation_allowed' 
-)
-{ after(grammarAccess.getCmitigationAccess().getRANGE_VIOLATION_ALLOWEDEnumLiteralDeclaration_1()); }
-)
-
-    |(
-{ before(grammarAccess.getCmitigationAccess().getNONEEnumLiteralDeclaration_2()); }
-(	'none' 
-)
-{ after(grammarAccess.getCmitigationAccess().getNONEEnumLiteralDeclaration_2()); }
-)
-
-    |(
-{ before(grammarAccess.getCmitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3()); }
-(	'unspecified' 
-)
-{ after(grammarAccess.getCmitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Imitigation__Alternatives
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getImitigationAccess().getSERIALIZABLEEnumLiteralDeclaration_0()); }
-(	'serializable' 
-)
-{ after(grammarAccess.getImitigationAccess().getSERIALIZABLEEnumLiteralDeclaration_0()); }
-)
-
-    |(
-{ before(grammarAccess.getImitigationAccess().getPORTABLE_LEVELEnumLiteralDeclaration_1()); }
-(	'portable_level' 
-)
-{ after(grammarAccess.getImitigationAccess().getPORTABLE_LEVELEnumLiteralDeclaration_1()); }
-)
-
-    |(
-{ before(grammarAccess.getImitigationAccess().getNONEEnumLiteralDeclaration_2()); }
-(	'none' 
-)
-{ after(grammarAccess.getImitigationAccess().getNONEEnumLiteralDeclaration_2()); }
-)
-
-    |(
-{ before(grammarAccess.getImitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3()); }
-(	'unspecified' 
-)
-{ after(grammarAccess.getImitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Dmitigation__Alternatives
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getDmitigationAccess().getNO_LOSSEnumLiteralDeclaration_0()); }
-(	'no_loss' 
-)
-{ after(grammarAccess.getDmitigationAccess().getNO_LOSSEnumLiteralDeclaration_0()); }
-)
-
-    |(
-{ before(grammarAccess.getDmitigationAccess().getPARTIAL_LOSS_ALLOWEDEnumLiteralDeclaration_1()); }
-(	'partial_loss_allowed' 
-)
-{ after(grammarAccess.getDmitigationAccess().getPARTIAL_LOSS_ALLOWEDEnumLiteralDeclaration_1()); }
-)
-
-    |(
-{ before(grammarAccess.getDmitigationAccess().getNONEEnumLiteralDeclaration_2()); }
-(	'none' 
-)
-{ after(grammarAccess.getDmitigationAccess().getNONEEnumLiteralDeclaration_2()); }
-)
-
-    |(
-{ before(grammarAccess.getDmitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3()); }
-(	'unspecified' 
-)
-{ after(grammarAccess.getDmitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-rule__Expression__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Expression__Group__0__Impl
-	rule__Expression__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Expression__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getExpressionAccess().getFLAKeyword_0()); }
-
-	'FLA:' 
-
-{ after(grammarAccess.getExpressionAccess().getFLAKeyword_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Expression__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Expression__Group__1__Impl
-	rule__Expression__Group__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Expression__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getExpressionAccess().getLhsAssignment_1()); }
-(rule__Expression__LhsAssignment_1)
-{ after(grammarAccess.getExpressionAccess().getLhsAssignment_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Expression__Group__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Expression__Group__2__Impl
-	rule__Expression__Group__3
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Expression__Group__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getExpressionAccess().getHyphenMinusGreaterThanSignKeyword_2()); }
-
-	'->' 
-
-{ after(grammarAccess.getExpressionAccess().getHyphenMinusGreaterThanSignKeyword_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Expression__Group__3
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Expression__Group__3__Impl
-	rule__Expression__Group__4
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Expression__Group__3__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getExpressionAccess().getRhsAssignment_3()); }
-(rule__Expression__RhsAssignment_3)
-{ after(grammarAccess.getExpressionAccess().getRhsAssignment_3()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Expression__Group__4
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Expression__Group__4__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Expression__Group__4__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getExpressionAccess().getSemicolonKeyword_4()); }
-
-	';' 
-
-{ after(grammarAccess.getExpressionAccess().getSemicolonKeyword_4()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-rule__Lhs__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Lhs__Group__0__Impl
-	rule__Lhs__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Lhs__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getLhsAccess().getFailuresAssignment_0()); }
-(rule__Lhs__FailuresAssignment_0)
-{ after(grammarAccess.getLhsAccess().getFailuresAssignment_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Lhs__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Lhs__Group__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Lhs__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getLhsAccess().getGroup_1()); }
-(rule__Lhs__Group_1__0)*
-{ after(grammarAccess.getLhsAccess().getGroup_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-rule__Lhs__Group_1__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Lhs__Group_1__0__Impl
-	rule__Lhs__Group_1__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Lhs__Group_1__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getLhsAccess().getCommaKeyword_1_0()); }
-
-	',' 
-
-{ after(grammarAccess.getLhsAccess().getCommaKeyword_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Lhs__Group_1__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Lhs__Group_1__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Lhs__Group_1__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getLhsAccess().getFailuresAssignment_1_1()); }
-(rule__Lhs__FailuresAssignment_1_1)
-{ after(grammarAccess.getLhsAccess().getFailuresAssignment_1_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-rule__Rhs__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Rhs__Group__0__Impl
-	rule__Rhs__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Rhs__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getRhsAccess().getFailuresAssignment_0()); }
-(rule__Rhs__FailuresAssignment_0)
-{ after(grammarAccess.getRhsAccess().getFailuresAssignment_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Rhs__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Rhs__Group__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Rhs__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getRhsAccess().getGroup_1()); }
-(rule__Rhs__Group_1__0)*
-{ after(grammarAccess.getRhsAccess().getGroup_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-rule__Rhs__Group_1__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Rhs__Group_1__0__Impl
-	rule__Rhs__Group_1__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Rhs__Group_1__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getRhsAccess().getCommaKeyword_1_0()); }
-
-	',' 
-
-{ after(grammarAccess.getRhsAccess().getCommaKeyword_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__Rhs__Group_1__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__Rhs__Group_1__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Rhs__Group_1__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getRhsAccess().getFailuresAssignment_1_1()); }
-(rule__Rhs__FailuresAssignment_1_1)
-{ after(grammarAccess.getRhsAccess().getFailuresAssignment_1_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-rule__InputExpression__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__InputExpression__Group__0__Impl
-	rule__InputExpression__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__InputExpression__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getInputExpressionAccess().getAlternatives_0()); }
-(rule__InputExpression__Alternatives_0)
-{ after(grammarAccess.getInputExpressionAccess().getAlternatives_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__InputExpression__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__InputExpression__Group__1__Impl
-	rule__InputExpression__Group__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__InputExpression__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getInputExpressionAccess().getFullStopKeyword_1()); }
-
-	'.' 
-
-{ after(grammarAccess.getInputExpressionAccess().getFullStopKeyword_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__InputExpression__Group__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__InputExpression__Group__2__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__InputExpression__Group__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getInputExpressionAccess().getFailureExprAssignment_2()); }
-(rule__InputExpression__FailureExprAssignment_2)
-{ after(grammarAccess.getInputExpressionAccess().getFailureExprAssignment_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-rule__OutputExpression__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__OutputExpression__Group__0__Impl
-	rule__OutputExpression__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__OutputExpression__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOutputExpressionAccess().getAlternatives_0()); }
-(rule__OutputExpression__Alternatives_0)
-{ after(grammarAccess.getOutputExpressionAccess().getAlternatives_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__OutputExpression__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__OutputExpression__Group__1__Impl
-	rule__OutputExpression__Group__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__OutputExpression__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOutputExpressionAccess().getFullStopKeyword_1()); }
-
-	'.' 
-
-{ after(grammarAccess.getOutputExpressionAccess().getFullStopKeyword_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__OutputExpression__Group__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__OutputExpression__Group__2__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__OutputExpression__Group__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOutputExpressionAccess().getFailureExprAssignment_2()); }
-(rule__OutputExpression__FailureExprAssignment_2)
-{ after(grammarAccess.getOutputExpressionAccess().getFailureExprAssignment_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-rule__InFailureExpr__Group_3__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__InFailureExpr__Group_3__0__Impl
-	rule__InFailureExpr__Group_3__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__InFailureExpr__Group_3__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getInFailureExprAccess().getLeftCurlyBracketKeyword_3_0()); }
-
-	'{' 
-
-{ after(grammarAccess.getInFailureExprAccess().getLeftCurlyBracketKeyword_3_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__InFailureExpr__Group_3__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__InFailureExpr__Group_3__1__Impl
-	rule__InFailureExpr__Group_3__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__InFailureExpr__Group_3__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getInFailureExprAccess().getFailuresAssignment_3_1()); }
-(rule__InFailureExpr__FailuresAssignment_3_1)
-{ after(grammarAccess.getInFailureExprAccess().getFailuresAssignment_3_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__InFailureExpr__Group_3__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__InFailureExpr__Group_3__2__Impl
-	rule__InFailureExpr__Group_3__3
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__InFailureExpr__Group_3__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-(
-{ before(grammarAccess.getInFailureExprAccess().getGroup_3_2()); }
-(rule__InFailureExpr__Group_3_2__0)
-{ after(grammarAccess.getInFailureExprAccess().getGroup_3_2()); }
-)
-(
-{ before(grammarAccess.getInFailureExprAccess().getGroup_3_2()); }
-(rule__InFailureExpr__Group_3_2__0)*
-{ after(grammarAccess.getInFailureExprAccess().getGroup_3_2()); }
-)
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__InFailureExpr__Group_3__3
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__InFailureExpr__Group_3__3__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__InFailureExpr__Group_3__3__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getInFailureExprAccess().getRightCurlyBracketKeyword_3_3()); }
-
-	'}' 
-
-{ after(grammarAccess.getInFailureExprAccess().getRightCurlyBracketKeyword_3_3()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-
-
-rule__InFailureExpr__Group_3_2__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__InFailureExpr__Group_3_2__0__Impl
-	rule__InFailureExpr__Group_3_2__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__InFailureExpr__Group_3_2__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getInFailureExprAccess().getCommaKeyword_3_2_0()); }
-
-	',' 
-
-{ after(grammarAccess.getInFailureExprAccess().getCommaKeyword_3_2_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__InFailureExpr__Group_3_2__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__InFailureExpr__Group_3_2__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__InFailureExpr__Group_3_2__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getInFailureExprAccess().getFailuresAssignment_3_2_1()); }
-(rule__InFailureExpr__FailuresAssignment_3_2_1)
-{ after(grammarAccess.getInFailureExprAccess().getFailuresAssignment_3_2_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-rule__OutFailureExpr__Group_3__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__OutFailureExpr__Group_3__0__Impl
-	rule__OutFailureExpr__Group_3__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__OutFailureExpr__Group_3__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOutFailureExprAccess().getLeftCurlyBracketKeyword_3_0()); }
-
-	'{' 
-
-{ after(grammarAccess.getOutFailureExprAccess().getLeftCurlyBracketKeyword_3_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__OutFailureExpr__Group_3__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__OutFailureExpr__Group_3__1__Impl
-	rule__OutFailureExpr__Group_3__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__OutFailureExpr__Group_3__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOutFailureExprAccess().getFailuresAssignment_3_1()); }
-(rule__OutFailureExpr__FailuresAssignment_3_1)
-{ after(grammarAccess.getOutFailureExprAccess().getFailuresAssignment_3_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__OutFailureExpr__Group_3__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__OutFailureExpr__Group_3__2__Impl
-	rule__OutFailureExpr__Group_3__3
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__OutFailureExpr__Group_3__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-(
-{ before(grammarAccess.getOutFailureExprAccess().getGroup_3_2()); }
-(rule__OutFailureExpr__Group_3_2__0)
-{ after(grammarAccess.getOutFailureExprAccess().getGroup_3_2()); }
-)
-(
-{ before(grammarAccess.getOutFailureExprAccess().getGroup_3_2()); }
-(rule__OutFailureExpr__Group_3_2__0)*
-{ after(grammarAccess.getOutFailureExprAccess().getGroup_3_2()); }
-)
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__OutFailureExpr__Group_3__3
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__OutFailureExpr__Group_3__3__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__OutFailureExpr__Group_3__3__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOutFailureExprAccess().getRightCurlyBracketKeyword_3_3()); }
-
-	'}' 
-
-{ after(grammarAccess.getOutFailureExprAccess().getRightCurlyBracketKeyword_3_3()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-
-
-rule__OutFailureExpr__Group_3_2__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__OutFailureExpr__Group_3_2__0__Impl
-	rule__OutFailureExpr__Group_3_2__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__OutFailureExpr__Group_3_2__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOutFailureExprAccess().getCommaKeyword_3_2_0()); }
-
-	',' 
-
-{ after(grammarAccess.getOutFailureExprAccess().getCommaKeyword_3_2_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__OutFailureExpr__Group_3_2__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__OutFailureExpr__Group_3_2__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__OutFailureExpr__Group_3_2__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOutFailureExprAccess().getFailuresAssignment_3_2_1()); }
-(rule__OutFailureExpr__FailuresAssignment_3_2_1)
-{ after(grammarAccess.getOutFailureExprAccess().getFailuresAssignment_3_2_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-rule__FailureDefinition__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__FailureDefinition__Group__0__Impl
-	rule__FailureDefinition__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__FailureDefinition__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getFailureDefinitionAccess().getFailureDefinitionAction_0()); }
-(
-
-)
-{ after(grammarAccess.getFailureDefinitionAccess().getFailureDefinitionAction_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__FailureDefinition__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__FailureDefinition__Group__1__Impl
-	rule__FailureDefinition__Group__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__FailureDefinition__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getFailureDefinitionAccess().getTypeAssignment_1()); }
-(rule__FailureDefinition__TypeAssignment_1)
-{ after(grammarAccess.getFailureDefinitionAccess().getTypeAssignment_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__FailureDefinition__Group__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__FailureDefinition__Group__2__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__FailureDefinition__Group__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getFailureDefinitionAccess().getGroup_2()); }
-(rule__FailureDefinition__Group_2__0)?
-{ after(grammarAccess.getFailureDefinitionAccess().getGroup_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-rule__FailureDefinition__Group_2__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__FailureDefinition__Group_2__0__Impl
-	rule__FailureDefinition__Group_2__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__FailureDefinition__Group_2__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getFailureDefinitionAccess().getFullStopKeyword_2_0()); }
-
-	'.' 
-
-{ after(grammarAccess.getFailureDefinitionAccess().getFullStopKeyword_2_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__FailureDefinition__Group_2__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__FailureDefinition__Group_2__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__FailureDefinition__Group_2__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getFailureDefinitionAccess().getAcidAvoidableAssignment_2_1()); }
-(rule__FailureDefinition__AcidAvoidableAssignment_2_1)
-{ after(grammarAccess.getFailureDefinitionAccess().getAcidAvoidableAssignment_2_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-rule__NoFailureDefinition__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__NoFailureDefinition__Group__0__Impl
-	rule__NoFailureDefinition__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__NoFailureDefinition__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getNoFailureDefinitionAccess().getNoFailureDefinitionAction_0()); }
-(
-
-)
-{ after(grammarAccess.getNoFailureDefinitionAccess().getNoFailureDefinitionAction_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__NoFailureDefinition__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__NoFailureDefinition__Group__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__NoFailureDefinition__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getNoFailureDefinitionAccess().getNoFailureKeyword_1()); }
-
-	'noFailure' 
-
-{ after(grammarAccess.getNoFailureDefinitionAccess().getNoFailureKeyword_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-rule__ComplexNofailureDefinition__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__ComplexNofailureDefinition__Group__0__Impl
-	rule__ComplexNofailureDefinition__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__ComplexNofailureDefinition__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getComplexNofailureDefinitionAccess().getNoFailureDefinitionAction_0()); }
-(
-
-)
-{ after(grammarAccess.getComplexNofailureDefinitionAccess().getNoFailureDefinitionAction_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__ComplexNofailureDefinition__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__ComplexNofailureDefinition__Group__1__Impl
-	rule__ComplexNofailureDefinition__Group__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__ComplexNofailureDefinition__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getComplexNofailureDefinitionAccess().getNoFailureKeyword_1()); }
-
-	'noFailure' 
-
-{ after(grammarAccess.getComplexNofailureDefinitionAccess().getNoFailureKeyword_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__ComplexNofailureDefinition__Group__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__ComplexNofailureDefinition__Group__2__Impl
-	rule__ComplexNofailureDefinition__Group__3
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__ComplexNofailureDefinition__Group__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getComplexNofailureDefinitionAccess().getFullStopKeyword_2()); }
-
-	'.' 
-
-{ after(grammarAccess.getComplexNofailureDefinitionAccess().getFullStopKeyword_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__ComplexNofailureDefinition__Group__3
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__ComplexNofailureDefinition__Group__3__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__ComplexNofailureDefinition__Group__3__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getComplexNofailureDefinitionAccess().getAcidMitigationAssignment_3()); }
-(rule__ComplexNofailureDefinition__AcidMitigationAssignment_3)
-{ after(grammarAccess.getComplexNofailureDefinitionAccess().getAcidMitigationAssignment_3()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-
-
-rule__WildcardDefinition__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__WildcardDefinition__Group__0__Impl
-	rule__WildcardDefinition__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__WildcardDefinition__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getWildcardDefinitionAccess().getWildcardDefinitionAction_0()); }
-(
-
-)
-{ after(grammarAccess.getWildcardDefinitionAccess().getWildcardDefinitionAction_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__WildcardDefinition__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__WildcardDefinition__Group__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__WildcardDefinition__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getWildcardDefinitionAccess().getWildcardKeyword_1()); }
-
-	'wildcard' 
-
-{ after(grammarAccess.getWildcardDefinitionAccess().getWildcardKeyword_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-rule__VariableDefinition__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__VariableDefinition__Group__0__Impl
-	rule__VariableDefinition__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__VariableDefinition__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getVariableDefinitionAccess().getVariableDefinitionAction_0()); }
-(
-
-)
-{ after(grammarAccess.getVariableDefinitionAccess().getVariableDefinitionAction_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__VariableDefinition__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__VariableDefinition__Group__1__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__VariableDefinition__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getVariableDefinitionAccess().getVariableNameAssignment_1()); }
-(rule__VariableDefinition__VariableNameAssignment_1)
-{ after(grammarAccess.getVariableDefinitionAccess().getVariableNameAssignment_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-rule__ACIDavoidable__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__ACIDavoidable__Group__0__Impl
-	rule__ACIDavoidable__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__ACIDavoidable__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getACIDavoidableAccess().getAAssignment_0()); }
-(rule__ACIDavoidable__AAssignment_0)
-{ after(grammarAccess.getACIDavoidableAccess().getAAssignment_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__ACIDavoidable__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__ACIDavoidable__Group__1__Impl
-	rule__ACIDavoidable__Group__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__ACIDavoidable__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getACIDavoidableAccess().getFullStopKeyword_1()); }
-
-	'.' 
-
-{ after(grammarAccess.getACIDavoidableAccess().getFullStopKeyword_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__ACIDavoidable__Group__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__ACIDavoidable__Group__2__Impl
-	rule__ACIDavoidable__Group__3
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__ACIDavoidable__Group__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getACIDavoidableAccess().getCAssignment_2()); }
-(rule__ACIDavoidable__CAssignment_2)
-{ after(grammarAccess.getACIDavoidableAccess().getCAssignment_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__ACIDavoidable__Group__3
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__ACIDavoidable__Group__3__Impl
-	rule__ACIDavoidable__Group__4
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__ACIDavoidable__Group__3__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getACIDavoidableAccess().getFullStopKeyword_3()); }
-
-	'.' 
-
-{ after(grammarAccess.getACIDavoidableAccess().getFullStopKeyword_3()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__ACIDavoidable__Group__4
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__ACIDavoidable__Group__4__Impl
-	rule__ACIDavoidable__Group__5
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__ACIDavoidable__Group__4__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getACIDavoidableAccess().getIAssignment_4()); }
-(rule__ACIDavoidable__IAssignment_4)
-{ after(grammarAccess.getACIDavoidableAccess().getIAssignment_4()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__ACIDavoidable__Group__5
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__ACIDavoidable__Group__5__Impl
-	rule__ACIDavoidable__Group__6
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__ACIDavoidable__Group__5__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getACIDavoidableAccess().getFullStopKeyword_5()); }
-
-	'.' 
-
-{ after(grammarAccess.getACIDavoidableAccess().getFullStopKeyword_5()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__ACIDavoidable__Group__6
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__ACIDavoidable__Group__6__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__ACIDavoidable__Group__6__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getACIDavoidableAccess().getDAssignment_6()); }
-(rule__ACIDavoidable__DAssignment_6)
-{ after(grammarAccess.getACIDavoidableAccess().getDAssignment_6()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-rule__ACIDMitigation__Group__0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__ACIDMitigation__Group__0__Impl
-	rule__ACIDMitigation__Group__1
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__ACIDMitigation__Group__0__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getACIDMitigationAccess().getAAssignment_0()); }
-(rule__ACIDMitigation__AAssignment_0)
-{ after(grammarAccess.getACIDMitigationAccess().getAAssignment_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__ACIDMitigation__Group__1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__ACIDMitigation__Group__1__Impl
-	rule__ACIDMitigation__Group__2
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__ACIDMitigation__Group__1__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getACIDMitigationAccess().getFullStopKeyword_1()); }
-
-	'.' 
-
-{ after(grammarAccess.getACIDMitigationAccess().getFullStopKeyword_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__ACIDMitigation__Group__2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__ACIDMitigation__Group__2__Impl
-	rule__ACIDMitigation__Group__3
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__ACIDMitigation__Group__2__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getACIDMitigationAccess().getCAssignment_2()); }
-(rule__ACIDMitigation__CAssignment_2)
-{ after(grammarAccess.getACIDMitigationAccess().getCAssignment_2()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__ACIDMitigation__Group__3
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__ACIDMitigation__Group__3__Impl
-	rule__ACIDMitigation__Group__4
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__ACIDMitigation__Group__3__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getACIDMitigationAccess().getFullStopKeyword_3()); }
-
-	'.' 
-
-{ after(grammarAccess.getACIDMitigationAccess().getFullStopKeyword_3()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__ACIDMitigation__Group__4
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__ACIDMitigation__Group__4__Impl
-	rule__ACIDMitigation__Group__5
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__ACIDMitigation__Group__4__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getACIDMitigationAccess().getIAssignment_4()); }
-(rule__ACIDMitigation__IAssignment_4)
-{ after(grammarAccess.getACIDMitigationAccess().getIAssignment_4()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__ACIDMitigation__Group__5
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__ACIDMitigation__Group__5__Impl
-	rule__ACIDMitigation__Group__6
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__ACIDMitigation__Group__5__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getACIDMitigationAccess().getFullStopKeyword_5()); }
-
-	'.' 
-
-{ after(grammarAccess.getACIDMitigationAccess().getFullStopKeyword_5()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-rule__ACIDMitigation__Group__6
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__ACIDMitigation__Group__6__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__ACIDMitigation__Group__6__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getACIDMitigationAccess().getDAssignment_6()); }
-(rule__ACIDMitigation__DAssignment_6)
-{ after(grammarAccess.getACIDMitigationAccess().getDAssignment_6()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-rule__Behaviour__RulesAssignment
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getBehaviourAccess().getRulesExpressionParserRuleCall_0()); }
-	ruleExpression{ after(grammarAccess.getBehaviourAccess().getRulesExpressionParserRuleCall_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Expression__LhsAssignment_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getExpressionAccess().getLhsLhsParserRuleCall_1_0()); }
-	ruleLhs{ after(grammarAccess.getExpressionAccess().getLhsLhsParserRuleCall_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Expression__RhsAssignment_3
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getExpressionAccess().getRhsRhsParserRuleCall_3_0()); }
-	ruleRhs{ after(grammarAccess.getExpressionAccess().getRhsRhsParserRuleCall_3_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Lhs__FailuresAssignment_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getLhsAccess().getFailuresInputExpressionParserRuleCall_0_0()); }
-	ruleInputExpression{ after(grammarAccess.getLhsAccess().getFailuresInputExpressionParserRuleCall_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Lhs__FailuresAssignment_1_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getLhsAccess().getFailuresInputExpressionParserRuleCall_1_1_0()); }
-	ruleInputExpression{ after(grammarAccess.getLhsAccess().getFailuresInputExpressionParserRuleCall_1_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Rhs__FailuresAssignment_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getRhsAccess().getFailuresOutputExpressionParserRuleCall_0_0()); }
-	ruleOutputExpression{ after(grammarAccess.getRhsAccess().getFailuresOutputExpressionParserRuleCall_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__Rhs__FailuresAssignment_1_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getRhsAccess().getFailuresOutputExpressionParserRuleCall_1_1_0()); }
-	ruleOutputExpression{ after(grammarAccess.getRhsAccess().getFailuresOutputExpressionParserRuleCall_1_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__InputExpression__RefAssignment_0_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getInputExpressionAccess().getRefPortCrossReference_0_0_0()); }
-(
-{ before(grammarAccess.getInputExpressionAccess().getRefPortIDTerminalRuleCall_0_0_0_1()); }
-	RULE_ID{ after(grammarAccess.getInputExpressionAccess().getRefPortIDTerminalRuleCall_0_0_0_1()); }
-)
-{ after(grammarAccess.getInputExpressionAccess().getRefPortCrossReference_0_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__InputExpression__FailureExprAssignment_2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getInputExpressionAccess().getFailureExprInFailureExprParserRuleCall_2_0()); }
-	ruleInFailureExpr{ after(grammarAccess.getInputExpressionAccess().getFailureExprInFailureExprParserRuleCall_2_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__OutputExpression__RefAssignment_0_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOutputExpressionAccess().getRefPortCrossReference_0_0_0()); }
-(
-{ before(grammarAccess.getOutputExpressionAccess().getRefPortIDTerminalRuleCall_0_0_0_1()); }
-	RULE_ID{ after(grammarAccess.getOutputExpressionAccess().getRefPortIDTerminalRuleCall_0_0_0_1()); }
-)
-{ after(grammarAccess.getOutputExpressionAccess().getRefPortCrossReference_0_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__OutputExpression__FailureExprAssignment_2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOutputExpressionAccess().getFailureExprOutFailureExprParserRuleCall_2_0()); }
-	ruleOutFailureExpr{ after(grammarAccess.getOutputExpressionAccess().getFailureExprOutFailureExprParserRuleCall_2_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__InFailureExpr__FailuresAssignment_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getInFailureExprAccess().getFailuresWildcardDefinitionParserRuleCall_0_0()); }
-	ruleWildcardDefinition{ after(grammarAccess.getInFailureExprAccess().getFailuresWildcardDefinitionParserRuleCall_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__InFailureExpr__FailuresAssignment_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getInFailureExprAccess().getFailuresNoFailureDefinitionParserRuleCall_1_0()); }
-	ruleNoFailureDefinition{ after(grammarAccess.getInFailureExprAccess().getFailuresNoFailureDefinitionParserRuleCall_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__InFailureExpr__FailuresAssignment_2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getInFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_2_0()); }
-	ruleFailureDefinition{ after(grammarAccess.getInFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_2_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__InFailureExpr__FailuresAssignment_3_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getInFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_3_1_0()); }
-	ruleFailureDefinition{ after(grammarAccess.getInFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_3_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__InFailureExpr__FailuresAssignment_3_2_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getInFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_3_2_1_0()); }
-	ruleFailureDefinition{ after(grammarAccess.getInFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_3_2_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__InFailureExpr__FailuresAssignment_4
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getInFailureExprAccess().getFailuresVariableDefinitionParserRuleCall_4_0()); }
-	ruleVariableDefinition{ after(grammarAccess.getInFailureExprAccess().getFailuresVariableDefinitionParserRuleCall_4_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__OutFailureExpr__FailuresAssignment_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOutFailureExprAccess().getFailuresNoFailureDefinitionParserRuleCall_0_0()); }
-	ruleNoFailureDefinition{ after(grammarAccess.getOutFailureExprAccess().getFailuresNoFailureDefinitionParserRuleCall_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__OutFailureExpr__FailuresAssignment_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOutFailureExprAccess().getFailuresComplexNofailureDefinitionParserRuleCall_1_0()); }
-	ruleComplexNofailureDefinition{ after(grammarAccess.getOutFailureExprAccess().getFailuresComplexNofailureDefinitionParserRuleCall_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__OutFailureExpr__FailuresAssignment_2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOutFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_2_0()); }
-	ruleFailureDefinition{ after(grammarAccess.getOutFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_2_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__OutFailureExpr__FailuresAssignment_3_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOutFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_3_1_0()); }
-	ruleFailureDefinition{ after(grammarAccess.getOutFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_3_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__OutFailureExpr__FailuresAssignment_3_2_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOutFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_3_2_1_0()); }
-	ruleFailureDefinition{ after(grammarAccess.getOutFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_3_2_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__OutFailureExpr__FailuresAssignment_4
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getOutFailureExprAccess().getFailuresVariableDefinitionParserRuleCall_4_0()); }
-	ruleVariableDefinition{ after(grammarAccess.getOutFailureExprAccess().getFailuresVariableDefinitionParserRuleCall_4_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__FailureDefinition__TypeAssignment_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getFailureDefinitionAccess().getTypeActualFailureTypeEnumRuleCall_1_0()); }
-	ruleActualFailureType{ after(grammarAccess.getFailureDefinitionAccess().getTypeActualFailureTypeEnumRuleCall_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__FailureDefinition__AcidAvoidableAssignment_2_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getFailureDefinitionAccess().getAcidAvoidableACIDavoidableParserRuleCall_2_1_0()); }
-	ruleACIDavoidable{ after(grammarAccess.getFailureDefinitionAccess().getAcidAvoidableACIDavoidableParserRuleCall_2_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__ComplexNofailureDefinition__AcidMitigationAssignment_3
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getComplexNofailureDefinitionAccess().getAcidMitigationACIDMitigationParserRuleCall_3_0()); }
-	ruleACIDMitigation{ after(grammarAccess.getComplexNofailureDefinitionAccess().getAcidMitigationACIDMitigationParserRuleCall_3_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__VariableDefinition__VariableNameAssignment_1
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getVariableDefinitionAccess().getVariableNameIDTerminalRuleCall_1_0()); }
-	RULE_ID{ after(grammarAccess.getVariableDefinitionAccess().getVariableNameIDTerminalRuleCall_1_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__ACIDavoidable__AAssignment_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getACIDavoidableAccess().getAAavoidableEnumRuleCall_0_0()); }
-	ruleAavoidable{ after(grammarAccess.getACIDavoidableAccess().getAAavoidableEnumRuleCall_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__ACIDavoidable__CAssignment_2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getACIDavoidableAccess().getCCavoidableEnumRuleCall_2_0()); }
-	ruleCavoidable{ after(grammarAccess.getACIDavoidableAccess().getCCavoidableEnumRuleCall_2_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__ACIDavoidable__IAssignment_4
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getACIDavoidableAccess().getIIavoidableEnumRuleCall_4_0()); }
-	ruleIavoidable{ after(grammarAccess.getACIDavoidableAccess().getIIavoidableEnumRuleCall_4_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__ACIDavoidable__DAssignment_6
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getACIDavoidableAccess().getDDavoidableEnumRuleCall_6_0()); }
-	ruleDavoidable{ after(grammarAccess.getACIDavoidableAccess().getDDavoidableEnumRuleCall_6_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__ACIDMitigation__AAssignment_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getACIDMitigationAccess().getAAmitigationEnumRuleCall_0_0()); }
-	ruleAmitigation{ after(grammarAccess.getACIDMitigationAccess().getAAmitigationEnumRuleCall_0_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__ACIDMitigation__CAssignment_2
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getACIDMitigationAccess().getCCmitigationEnumRuleCall_2_0()); }
-	ruleCmitigation{ after(grammarAccess.getACIDMitigationAccess().getCCmitigationEnumRuleCall_2_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__ACIDMitigation__IAssignment_4
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getACIDMitigationAccess().getIImitigationEnumRuleCall_4_0()); }
-	ruleImitigation{ after(grammarAccess.getACIDMitigationAccess().getIImitigationEnumRuleCall_4_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__ACIDMitigation__DAssignment_6
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getACIDMitigationAccess().getDDmitigationEnumRuleCall_6_0()); }
-	ruleDmitigation{ after(grammarAccess.getACIDMitigationAccess().getDDmitigationEnumRuleCall_6_0()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
-
-RULE_INT : ('0'..'9')+;
-
-RULE_STRING : ('"' ('\\' .|~(('\\'|'"')))* '"'|'\'' ('\\' .|~(('\\'|'\'')))* '\'');
-
-RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
-
-RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?;
-
-RULE_WS : (' '|'\t'|'\r'|'\n')+;
-
-RULE_ANY_OTHER : .;
-
-
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.tokens b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.tokens
deleted file mode 100644
index f8b08e20468b763af2d5463f751bc7b3fff868c9..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.tokens
+++ /dev/null
@@ -1,67 +0,0 @@
-','=35
-'->'=33
-'.'=36
-';'=34
-'FLA:'=32
-'all_or_compensation'=25
-'all_or_nothing'=24
-'commission'=14
-'early'=12
-'full_consistency'=26
-'impermanence'=23
-'incompletion'=18
-'inconsistency'=21
-'interference'=22
-'late'=13
-'noFailure'=39
-'no_loss'=30
-'none'=19
-'omission'=15
-'partial_loss_allowed'=31
-'portable_level'=29
-'range_violation_allowed'=27
-'serializable'=28
-'undefined'=11
-'unspecified'=20
-'valueCoarse'=17
-'valueSubtle'=16
-'wildcard'=40
-'{'=37
-'}'=38
-RULE_ANY_OTHER=10
-RULE_ID=4
-RULE_INT=5
-RULE_ML_COMMENT=7
-RULE_SL_COMMENT=8
-RULE_STRING=6
-RULE_WS=9
-T__11=11
-T__12=12
-T__13=13
-T__14=14
-T__15=15
-T__16=16
-T__17=17
-T__18=18
-T__19=19
-T__20=20
-T__21=21
-T__22=22
-T__23=23
-T__24=24
-T__25=25
-T__26=26
-T__27=27
-T__28=28
-T__29=29
-T__30=30
-T__31=31
-T__32=32
-T__33=33
-T__34=34
-T__35=35
-T__36=36
-T__37=37
-T__38=38
-T__39=39
-T__40=40
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDslLexer.java b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDslLexer.java
deleted file mode 100644
index 4eb9b0b2247ecf12fe473843bbdc088eb2ab1e85..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDslLexer.java
+++ /dev/null
@@ -1,1962 +0,0 @@
-package org.polarsys.chess.xtext.ui.contentassist.antlr.internal;
-
-// Hack: Use our own Lexer superclass by means of import. 
-// Currently there is no other way to specify the superclass for the lexer.
-import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.Lexer;
-
-
-import org.antlr.runtime.*;
-import java.util.Stack;
-import java.util.List;
-import java.util.ArrayList;
-
-@SuppressWarnings("all")
-public class InternalFlaDslLexer extends Lexer {
-    public static final int T__40=40;
-    public static final int RULE_ID=4;
-    public static final int T__29=29;
-    public static final int T__28=28;
-    public static final int T__27=27;
-    public static final int T__26=26;
-    public static final int T__25=25;
-    public static final int T__24=24;
-    public static final int T__23=23;
-    public static final int T__22=22;
-    public static final int RULE_ANY_OTHER=10;
-    public static final int T__21=21;
-    public static final int T__20=20;
-    public static final int EOF=-1;
-    public static final int RULE_SL_COMMENT=8;
-    public static final int RULE_ML_COMMENT=7;
-    public static final int T__19=19;
-    public static final int T__30=30;
-    public static final int T__31=31;
-    public static final int T__32=32;
-    public static final int RULE_STRING=6;
-    public static final int T__16=16;
-    public static final int T__33=33;
-    public static final int T__15=15;
-    public static final int T__34=34;
-    public static final int T__18=18;
-    public static final int T__35=35;
-    public static final int T__17=17;
-    public static final int T__36=36;
-    public static final int T__12=12;
-    public static final int T__37=37;
-    public static final int T__11=11;
-    public static final int T__38=38;
-    public static final int T__14=14;
-    public static final int T__39=39;
-    public static final int T__13=13;
-    public static final int RULE_INT=5;
-    public static final int RULE_WS=9;
-
-    // delegates
-    // delegators
-
-    public InternalFlaDslLexer() {;} 
-    public InternalFlaDslLexer(CharStream input) {
-        this(input, new RecognizerSharedState());
-    }
-    public InternalFlaDslLexer(CharStream input, RecognizerSharedState state) {
-        super(input,state);
-
-    }
-    public String getGrammarFileName() { return "../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g"; }
-
-    // $ANTLR start "T__11"
-    public final void mT__11() throws RecognitionException {
-        try {
-            int _type = T__11;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:11:7: ( 'undefined' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:11:9: 'undefined'
-            {
-            match("undefined"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__11"
-
-    // $ANTLR start "T__12"
-    public final void mT__12() throws RecognitionException {
-        try {
-            int _type = T__12;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:12:7: ( 'early' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:12:9: 'early'
-            {
-            match("early"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__12"
-
-    // $ANTLR start "T__13"
-    public final void mT__13() throws RecognitionException {
-        try {
-            int _type = T__13;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:13:7: ( 'late' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:13:9: 'late'
-            {
-            match("late"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__13"
-
-    // $ANTLR start "T__14"
-    public final void mT__14() throws RecognitionException {
-        try {
-            int _type = T__14;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:14:7: ( 'commission' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:14:9: 'commission'
-            {
-            match("commission"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__14"
-
-    // $ANTLR start "T__15"
-    public final void mT__15() throws RecognitionException {
-        try {
-            int _type = T__15;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:15:7: ( 'omission' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:15:9: 'omission'
-            {
-            match("omission"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__15"
-
-    // $ANTLR start "T__16"
-    public final void mT__16() throws RecognitionException {
-        try {
-            int _type = T__16;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:16:7: ( 'valueSubtle' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:16:9: 'valueSubtle'
-            {
-            match("valueSubtle"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__16"
-
-    // $ANTLR start "T__17"
-    public final void mT__17() throws RecognitionException {
-        try {
-            int _type = T__17;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:17:7: ( 'valueCoarse' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:17:9: 'valueCoarse'
-            {
-            match("valueCoarse"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__17"
-
-    // $ANTLR start "T__18"
-    public final void mT__18() throws RecognitionException {
-        try {
-            int _type = T__18;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:18:7: ( 'incompletion' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:18:9: 'incompletion'
-            {
-            match("incompletion"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__18"
-
-    // $ANTLR start "T__19"
-    public final void mT__19() throws RecognitionException {
-        try {
-            int _type = T__19;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:19:7: ( 'none' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:19:9: 'none'
-            {
-            match("none"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__19"
-
-    // $ANTLR start "T__20"
-    public final void mT__20() throws RecognitionException {
-        try {
-            int _type = T__20;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:20:7: ( 'unspecified' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:20:9: 'unspecified'
-            {
-            match("unspecified"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__20"
-
-    // $ANTLR start "T__21"
-    public final void mT__21() throws RecognitionException {
-        try {
-            int _type = T__21;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:21:7: ( 'inconsistency' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:21:9: 'inconsistency'
-            {
-            match("inconsistency"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__21"
-
-    // $ANTLR start "T__22"
-    public final void mT__22() throws RecognitionException {
-        try {
-            int _type = T__22;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:22:7: ( 'interference' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:22:9: 'interference'
-            {
-            match("interference"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__22"
-
-    // $ANTLR start "T__23"
-    public final void mT__23() throws RecognitionException {
-        try {
-            int _type = T__23;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:23:7: ( 'impermanence' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:23:9: 'impermanence'
-            {
-            match("impermanence"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__23"
-
-    // $ANTLR start "T__24"
-    public final void mT__24() throws RecognitionException {
-        try {
-            int _type = T__24;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:24:7: ( 'all_or_nothing' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:24:9: 'all_or_nothing'
-            {
-            match("all_or_nothing"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__24"
-
-    // $ANTLR start "T__25"
-    public final void mT__25() throws RecognitionException {
-        try {
-            int _type = T__25;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:25:7: ( 'all_or_compensation' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:25:9: 'all_or_compensation'
-            {
-            match("all_or_compensation"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__25"
-
-    // $ANTLR start "T__26"
-    public final void mT__26() throws RecognitionException {
-        try {
-            int _type = T__26;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:26:7: ( 'full_consistency' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:26:9: 'full_consistency'
-            {
-            match("full_consistency"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__26"
-
-    // $ANTLR start "T__27"
-    public final void mT__27() throws RecognitionException {
-        try {
-            int _type = T__27;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:27:7: ( 'range_violation_allowed' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:27:9: 'range_violation_allowed'
-            {
-            match("range_violation_allowed"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__27"
-
-    // $ANTLR start "T__28"
-    public final void mT__28() throws RecognitionException {
-        try {
-            int _type = T__28;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:28:7: ( 'serializable' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:28:9: 'serializable'
-            {
-            match("serializable"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__28"
-
-    // $ANTLR start "T__29"
-    public final void mT__29() throws RecognitionException {
-        try {
-            int _type = T__29;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:29:7: ( 'portable_level' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:29:9: 'portable_level'
-            {
-            match("portable_level"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__29"
-
-    // $ANTLR start "T__30"
-    public final void mT__30() throws RecognitionException {
-        try {
-            int _type = T__30;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:30:7: ( 'no_loss' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:30:9: 'no_loss'
-            {
-            match("no_loss"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__30"
-
-    // $ANTLR start "T__31"
-    public final void mT__31() throws RecognitionException {
-        try {
-            int _type = T__31;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:31:7: ( 'partial_loss_allowed' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:31:9: 'partial_loss_allowed'
-            {
-            match("partial_loss_allowed"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__31"
-
-    // $ANTLR start "T__32"
-    public final void mT__32() throws RecognitionException {
-        try {
-            int _type = T__32;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:32:7: ( 'FLA:' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:32:9: 'FLA:'
-            {
-            match("FLA:"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__32"
-
-    // $ANTLR start "T__33"
-    public final void mT__33() throws RecognitionException {
-        try {
-            int _type = T__33;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:33:7: ( '->' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:33:9: '->'
-            {
-            match("->"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__33"
-
-    // $ANTLR start "T__34"
-    public final void mT__34() throws RecognitionException {
-        try {
-            int _type = T__34;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:34:7: ( ';' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:34:9: ';'
-            {
-            match(';'); 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__34"
-
-    // $ANTLR start "T__35"
-    public final void mT__35() throws RecognitionException {
-        try {
-            int _type = T__35;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:35:7: ( ',' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:35:9: ','
-            {
-            match(','); 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__35"
-
-    // $ANTLR start "T__36"
-    public final void mT__36() throws RecognitionException {
-        try {
-            int _type = T__36;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:36:7: ( '.' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:36:9: '.'
-            {
-            match('.'); 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__36"
-
-    // $ANTLR start "T__37"
-    public final void mT__37() throws RecognitionException {
-        try {
-            int _type = T__37;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:37:7: ( '{' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:37:9: '{'
-            {
-            match('{'); 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__37"
-
-    // $ANTLR start "T__38"
-    public final void mT__38() throws RecognitionException {
-        try {
-            int _type = T__38;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:38:7: ( '}' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:38:9: '}'
-            {
-            match('}'); 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__38"
-
-    // $ANTLR start "T__39"
-    public final void mT__39() throws RecognitionException {
-        try {
-            int _type = T__39;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:39:7: ( 'noFailure' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:39:9: 'noFailure'
-            {
-            match("noFailure"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__39"
-
-    // $ANTLR start "T__40"
-    public final void mT__40() throws RecognitionException {
-        try {
-            int _type = T__40;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:40:7: ( 'wildcard' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:40:9: 'wildcard'
-            {
-            match("wildcard"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__40"
-
-    // $ANTLR start "RULE_ID"
-    public final void mRULE_ID() throws RecognitionException {
-        try {
-            int _type = RULE_ID;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3578:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3578:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3578:11: ( '^' )?
-            int alt1=2;
-            int LA1_0 = input.LA(1);
-
-            if ( (LA1_0=='^') ) {
-                alt1=1;
-            }
-            switch (alt1) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3578:11: '^'
-                    {
-                    match('^'); 
-
-                    }
-                    break;
-
-            }
-
-            if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3578:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
-            loop2:
-            do {
-                int alt2=2;
-                int LA2_0 = input.LA(1);
-
-                if ( ((LA2_0>='0' && LA2_0<='9')||(LA2_0>='A' && LA2_0<='Z')||LA2_0=='_'||(LA2_0>='a' && LA2_0<='z')) ) {
-                    alt2=1;
-                }
-
-
-                switch (alt2) {
-            	case 1 :
-            	    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:
-            	    {
-            	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
-            	        input.consume();
-
-            	    }
-            	    else {
-            	        MismatchedSetException mse = new MismatchedSetException(null,input);
-            	        recover(mse);
-            	        throw mse;}
-
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop2;
-                }
-            } while (true);
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "RULE_ID"
-
-    // $ANTLR start "RULE_INT"
-    public final void mRULE_INT() throws RecognitionException {
-        try {
-            int _type = RULE_INT;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3580:10: ( ( '0' .. '9' )+ )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3580:12: ( '0' .. '9' )+
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3580:12: ( '0' .. '9' )+
-            int cnt3=0;
-            loop3:
-            do {
-                int alt3=2;
-                int LA3_0 = input.LA(1);
-
-                if ( ((LA3_0>='0' && LA3_0<='9')) ) {
-                    alt3=1;
-                }
-
-
-                switch (alt3) {
-            	case 1 :
-            	    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3580:13: '0' .. '9'
-            	    {
-            	    matchRange('0','9'); 
-
-            	    }
-            	    break;
-
-            	default :
-            	    if ( cnt3 >= 1 ) break loop3;
-                        EarlyExitException eee =
-                            new EarlyExitException(3, input);
-                        throw eee;
-                }
-                cnt3++;
-            } while (true);
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "RULE_INT"
-
-    // $ANTLR start "RULE_STRING"
-    public final void mRULE_STRING() throws RecognitionException {
-        try {
-            int _type = RULE_STRING;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3582:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3582:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3582:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
-            int alt6=2;
-            int LA6_0 = input.LA(1);
-
-            if ( (LA6_0=='\"') ) {
-                alt6=1;
-            }
-            else if ( (LA6_0=='\'') ) {
-                alt6=2;
-            }
-            else {
-                NoViableAltException nvae =
-                    new NoViableAltException("", 6, 0, input);
-
-                throw nvae;
-            }
-            switch (alt6) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3582:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
-                    {
-                    match('\"'); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3582:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
-                    loop4:
-                    do {
-                        int alt4=3;
-                        int LA4_0 = input.LA(1);
-
-                        if ( (LA4_0=='\\') ) {
-                            alt4=1;
-                        }
-                        else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=']' && LA4_0<='\uFFFF')) ) {
-                            alt4=2;
-                        }
-
-
-                        switch (alt4) {
-                    	case 1 :
-                    	    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3582:21: '\\\\' .
-                    	    {
-                    	    match('\\'); 
-                    	    matchAny(); 
-
-                    	    }
-                    	    break;
-                    	case 2 :
-                    	    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3582:28: ~ ( ( '\\\\' | '\"' ) )
-                    	    {
-                    	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
-                    	        input.consume();
-
-                    	    }
-                    	    else {
-                    	        MismatchedSetException mse = new MismatchedSetException(null,input);
-                    	        recover(mse);
-                    	        throw mse;}
-
-
-                    	    }
-                    	    break;
-
-                    	default :
-                    	    break loop4;
-                        }
-                    } while (true);
-
-                    match('\"'); 
-
-                    }
-                    break;
-                case 2 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3582:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
-                    {
-                    match('\''); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3582:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
-                    loop5:
-                    do {
-                        int alt5=3;
-                        int LA5_0 = input.LA(1);
-
-                        if ( (LA5_0=='\\') ) {
-                            alt5=1;
-                        }
-                        else if ( ((LA5_0>='\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=']' && LA5_0<='\uFFFF')) ) {
-                            alt5=2;
-                        }
-
-
-                        switch (alt5) {
-                    	case 1 :
-                    	    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3582:54: '\\\\' .
-                    	    {
-                    	    match('\\'); 
-                    	    matchAny(); 
-
-                    	    }
-                    	    break;
-                    	case 2 :
-                    	    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3582:61: ~ ( ( '\\\\' | '\\'' ) )
-                    	    {
-                    	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
-                    	        input.consume();
-
-                    	    }
-                    	    else {
-                    	        MismatchedSetException mse = new MismatchedSetException(null,input);
-                    	        recover(mse);
-                    	        throw mse;}
-
-
-                    	    }
-                    	    break;
-
-                    	default :
-                    	    break loop5;
-                        }
-                    } while (true);
-
-                    match('\''); 
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "RULE_STRING"
-
-    // $ANTLR start "RULE_ML_COMMENT"
-    public final void mRULE_ML_COMMENT() throws RecognitionException {
-        try {
-            int _type = RULE_ML_COMMENT;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3584:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3584:19: '/*' ( options {greedy=false; } : . )* '*/'
-            {
-            match("/*"); 
-
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3584:24: ( options {greedy=false; } : . )*
-            loop7:
-            do {
-                int alt7=2;
-                int LA7_0 = input.LA(1);
-
-                if ( (LA7_0=='*') ) {
-                    int LA7_1 = input.LA(2);
-
-                    if ( (LA7_1=='/') ) {
-                        alt7=2;
-                    }
-                    else if ( ((LA7_1>='\u0000' && LA7_1<='.')||(LA7_1>='0' && LA7_1<='\uFFFF')) ) {
-                        alt7=1;
-                    }
-
-
-                }
-                else if ( ((LA7_0>='\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\uFFFF')) ) {
-                    alt7=1;
-                }
-
-
-                switch (alt7) {
-            	case 1 :
-            	    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3584:52: .
-            	    {
-            	    matchAny(); 
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop7;
-                }
-            } while (true);
-
-            match("*/"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "RULE_ML_COMMENT"
-
-    // $ANTLR start "RULE_SL_COMMENT"
-    public final void mRULE_SL_COMMENT() throws RecognitionException {
-        try {
-            int _type = RULE_SL_COMMENT;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3586:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3586:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
-            {
-            match("//"); 
-
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3586:24: (~ ( ( '\\n' | '\\r' ) ) )*
-            loop8:
-            do {
-                int alt8=2;
-                int LA8_0 = input.LA(1);
-
-                if ( ((LA8_0>='\u0000' && LA8_0<='\t')||(LA8_0>='\u000B' && LA8_0<='\f')||(LA8_0>='\u000E' && LA8_0<='\uFFFF')) ) {
-                    alt8=1;
-                }
-
-
-                switch (alt8) {
-            	case 1 :
-            	    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3586:24: ~ ( ( '\\n' | '\\r' ) )
-            	    {
-            	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
-            	        input.consume();
-
-            	    }
-            	    else {
-            	        MismatchedSetException mse = new MismatchedSetException(null,input);
-            	        recover(mse);
-            	        throw mse;}
-
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop8;
-                }
-            } while (true);
-
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3586:40: ( ( '\\r' )? '\\n' )?
-            int alt10=2;
-            int LA10_0 = input.LA(1);
-
-            if ( (LA10_0=='\n'||LA10_0=='\r') ) {
-                alt10=1;
-            }
-            switch (alt10) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3586:41: ( '\\r' )? '\\n'
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3586:41: ( '\\r' )?
-                    int alt9=2;
-                    int LA9_0 = input.LA(1);
-
-                    if ( (LA9_0=='\r') ) {
-                        alt9=1;
-                    }
-                    switch (alt9) {
-                        case 1 :
-                            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3586:41: '\\r'
-                            {
-                            match('\r'); 
-
-                            }
-                            break;
-
-                    }
-
-                    match('\n'); 
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "RULE_SL_COMMENT"
-
-    // $ANTLR start "RULE_WS"
-    public final void mRULE_WS() throws RecognitionException {
-        try {
-            int _type = RULE_WS;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3588:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3588:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3588:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
-            int cnt11=0;
-            loop11:
-            do {
-                int alt11=2;
-                int LA11_0 = input.LA(1);
-
-                if ( ((LA11_0>='\t' && LA11_0<='\n')||LA11_0=='\r'||LA11_0==' ') ) {
-                    alt11=1;
-                }
-
-
-                switch (alt11) {
-            	case 1 :
-            	    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:
-            	    {
-            	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
-            	        input.consume();
-
-            	    }
-            	    else {
-            	        MismatchedSetException mse = new MismatchedSetException(null,input);
-            	        recover(mse);
-            	        throw mse;}
-
-
-            	    }
-            	    break;
-
-            	default :
-            	    if ( cnt11 >= 1 ) break loop11;
-                        EarlyExitException eee =
-                            new EarlyExitException(11, input);
-                        throw eee;
-                }
-                cnt11++;
-            } while (true);
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "RULE_WS"
-
-    // $ANTLR start "RULE_ANY_OTHER"
-    public final void mRULE_ANY_OTHER() throws RecognitionException {
-        try {
-            int _type = RULE_ANY_OTHER;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3590:16: ( . )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3590:18: .
-            {
-            matchAny(); 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "RULE_ANY_OTHER"
-
-    public void mTokens() throws RecognitionException {
-        // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
-        int alt12=37;
-        alt12 = dfa12.predict(input);
-        switch (alt12) {
-            case 1 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:10: T__11
-                {
-                mT__11(); 
-
-                }
-                break;
-            case 2 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:16: T__12
-                {
-                mT__12(); 
-
-                }
-                break;
-            case 3 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:22: T__13
-                {
-                mT__13(); 
-
-                }
-                break;
-            case 4 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:28: T__14
-                {
-                mT__14(); 
-
-                }
-                break;
-            case 5 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:34: T__15
-                {
-                mT__15(); 
-
-                }
-                break;
-            case 6 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:40: T__16
-                {
-                mT__16(); 
-
-                }
-                break;
-            case 7 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:46: T__17
-                {
-                mT__17(); 
-
-                }
-                break;
-            case 8 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:52: T__18
-                {
-                mT__18(); 
-
-                }
-                break;
-            case 9 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:58: T__19
-                {
-                mT__19(); 
-
-                }
-                break;
-            case 10 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:64: T__20
-                {
-                mT__20(); 
-
-                }
-                break;
-            case 11 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:70: T__21
-                {
-                mT__21(); 
-
-                }
-                break;
-            case 12 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:76: T__22
-                {
-                mT__22(); 
-
-                }
-                break;
-            case 13 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:82: T__23
-                {
-                mT__23(); 
-
-                }
-                break;
-            case 14 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:88: T__24
-                {
-                mT__24(); 
-
-                }
-                break;
-            case 15 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:94: T__25
-                {
-                mT__25(); 
-
-                }
-                break;
-            case 16 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:100: T__26
-                {
-                mT__26(); 
-
-                }
-                break;
-            case 17 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:106: T__27
-                {
-                mT__27(); 
-
-                }
-                break;
-            case 18 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:112: T__28
-                {
-                mT__28(); 
-
-                }
-                break;
-            case 19 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:118: T__29
-                {
-                mT__29(); 
-
-                }
-                break;
-            case 20 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:124: T__30
-                {
-                mT__30(); 
-
-                }
-                break;
-            case 21 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:130: T__31
-                {
-                mT__31(); 
-
-                }
-                break;
-            case 22 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:136: T__32
-                {
-                mT__32(); 
-
-                }
-                break;
-            case 23 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:142: T__33
-                {
-                mT__33(); 
-
-                }
-                break;
-            case 24 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:148: T__34
-                {
-                mT__34(); 
-
-                }
-                break;
-            case 25 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:154: T__35
-                {
-                mT__35(); 
-
-                }
-                break;
-            case 26 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:160: T__36
-                {
-                mT__36(); 
-
-                }
-                break;
-            case 27 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:166: T__37
-                {
-                mT__37(); 
-
-                }
-                break;
-            case 28 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:172: T__38
-                {
-                mT__38(); 
-
-                }
-                break;
-            case 29 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:178: T__39
-                {
-                mT__39(); 
-
-                }
-                break;
-            case 30 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:184: T__40
-                {
-                mT__40(); 
-
-                }
-                break;
-            case 31 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:190: RULE_ID
-                {
-                mRULE_ID(); 
-
-                }
-                break;
-            case 32 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:198: RULE_INT
-                {
-                mRULE_INT(); 
-
-                }
-                break;
-            case 33 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:207: RULE_STRING
-                {
-                mRULE_STRING(); 
-
-                }
-                break;
-            case 34 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:219: RULE_ML_COMMENT
-                {
-                mRULE_ML_COMMENT(); 
-
-                }
-                break;
-            case 35 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:235: RULE_SL_COMMENT
-                {
-                mRULE_SL_COMMENT(); 
-
-                }
-                break;
-            case 36 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:251: RULE_WS
-                {
-                mRULE_WS(); 
-
-                }
-                break;
-            case 37 :
-                // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1:259: RULE_ANY_OTHER
-                {
-                mRULE_ANY_OTHER(); 
-
-                }
-                break;
-
-        }
-
-    }
-
-
-    protected DFA12 dfa12 = new DFA12(this);
-    static final String DFA12_eotS =
-        "\1\uffff\16\37\1\35\5\uffff\1\37\1\35\2\uffff\3\35\2\uffff\1\37"+
-        "\1\uffff\17\37\6\uffff\1\37\5\uffff\30\37\1\150\6\37\1\160\10\37"+
-        "\1\uffff\3\37\1\174\1\uffff\7\37\1\uffff\13\37\1\uffff\33\37\1\u00ab"+
-        "\13\37\1\u00b8\6\37\1\uffff\10\37\1\u00c7\1\u00c8\2\37\1\uffff\6"+
-        "\37\1\u00d1\7\37\2\uffff\1\37\1\u00da\6\37\1\uffff\7\37\1\u00e8"+
-        "\1\uffff\1\u00e9\1\u00ea\13\37\3\uffff\1\u00f6\1\37\1\u00f8\1\u00f9"+
-        "\4\37\1\u00fe\2\37\1\uffff\1\u0101\2\uffff\4\37\1\uffff\2\37\1\uffff"+
-        "\1\u0108\3\37\1\u010c\1\37\1\uffff\3\37\1\uffff\2\37\1\u0113\3\37"+
-        "\1\uffff\5\37\1\u011c\2\37\1\uffff\1\37\1\u0120\1\37\1\uffff\1\37"+
-        "\1\u0123\1\uffff";
-    static final String DFA12_eofS =
-        "\u0124\uffff";
-    static final String DFA12_minS =
-        "\1\0\1\156\2\141\1\157\1\155\1\141\1\155\1\157\1\154\1\165\1\141"+
-        "\1\145\1\141\1\114\1\76\5\uffff\1\151\1\101\2\uffff\2\0\1\52\2\uffff"+
-        "\1\144\1\uffff\1\162\1\164\1\155\1\151\1\154\1\143\1\160\1\106\2"+
-        "\154\1\156\3\162\1\101\6\uffff\1\154\5\uffff\1\145\1\160\1\154\1"+
-        "\145\1\155\1\163\1\165\1\157\3\145\1\154\1\141\1\137\1\154\1\147"+
-        "\1\151\2\164\1\72\1\144\1\146\1\145\1\171\1\60\1\151\1\163\1\145"+
-        "\1\155\2\162\1\60\1\157\1\151\1\157\1\137\1\145\2\141\1\151\1\uffff"+
-        "\1\143\1\151\1\143\1\60\1\uffff\1\163\1\151\1\103\1\160\1\163\1"+
-        "\146\1\155\1\uffff\1\163\1\154\1\162\1\143\1\137\1\154\1\142\2\141"+
-        "\1\156\1\151\1\uffff\1\163\1\157\1\165\1\157\1\154\1\151\1\145\1"+
-        "\141\1\163\1\165\1\137\1\157\1\166\1\151\2\154\1\162\1\145\1\146"+
-        "\1\151\1\156\1\142\1\141\1\145\1\163\1\162\1\156\1\60\1\162\1\143"+
-        "\1\156\1\151\1\172\1\145\1\137\2\144\1\151\1\157\1\60\1\164\1\162"+
-        "\2\164\2\145\1\uffff\1\145\2\157\1\163\1\157\1\141\1\137\1\154\2"+
-        "\60\1\145\1\156\1\uffff\1\154\1\163\1\151\1\145\2\156\1\60\1\164"+
-        "\1\155\1\151\1\154\1\142\1\154\1\157\2\uffff\1\144\1\60\2\145\1"+
-        "\157\1\156\2\143\1\uffff\1\150\1\160\1\163\1\141\1\154\1\145\1\163"+
-        "\1\60\1\uffff\2\60\1\156\1\143\2\145\1\151\1\145\2\164\1\145\1\166"+
-        "\1\163\3\uffff\1\60\1\171\2\60\2\156\1\145\1\151\1\60\1\145\1\137"+
-        "\1\uffff\1\60\2\uffff\1\147\1\163\1\156\1\157\1\uffff\1\154\1\141"+
-        "\1\uffff\1\60\1\141\1\143\1\156\1\60\1\154\1\uffff\1\164\1\171\1"+
-        "\137\1\uffff\1\154\1\151\1\60\1\141\2\157\1\uffff\1\154\1\167\1"+
-        "\156\1\154\1\145\1\60\1\157\1\144\1\uffff\1\167\1\60\1\145\1\uffff"+
-        "\1\144\1\60\1\uffff";
-    static final String DFA12_maxS =
-        "\1\uffff\1\156\2\141\1\157\1\155\1\141\1\156\1\157\1\154\1\165"+
-        "\1\141\1\145\1\157\1\114\1\76\5\uffff\1\151\1\172\2\uffff\2\uffff"+
-        "\1\57\2\uffff\1\163\1\uffff\1\162\1\164\1\155\1\151\1\154\1\164"+
-        "\1\160\1\156\2\154\1\156\3\162\1\101\6\uffff\1\154\5\uffff\1\145"+
-        "\1\160\1\154\1\145\1\155\1\163\1\165\1\157\3\145\1\154\1\141\1\137"+
-        "\1\154\1\147\1\151\2\164\1\72\1\144\1\146\1\145\1\171\1\172\1\151"+
-        "\1\163\1\145\1\156\2\162\1\172\1\157\1\151\1\157\1\137\1\145\2\141"+
-        "\1\151\1\uffff\1\143\1\151\1\143\1\172\1\uffff\1\163\1\151\1\123"+
-        "\1\160\1\163\1\146\1\155\1\uffff\1\163\1\154\1\162\1\143\1\137\1"+
-        "\154\1\142\2\141\1\156\1\151\1\uffff\1\163\1\157\1\165\1\157\1\154"+
-        "\1\151\1\145\1\141\1\163\1\165\1\137\1\157\1\166\1\151\2\154\1\162"+
-        "\1\145\1\146\1\151\1\156\1\142\1\141\1\145\1\163\1\162\1\156\1\172"+
-        "\1\162\2\156\1\151\1\172\1\145\1\137\2\144\1\151\1\157\1\172\1\164"+
-        "\1\162\2\164\2\145\1\uffff\1\145\2\157\1\163\1\157\1\141\1\137\1"+
-        "\154\2\172\1\145\1\156\1\uffff\1\154\1\163\1\151\1\145\2\156\1\172"+
-        "\1\164\1\155\1\151\1\154\1\142\1\154\1\157\2\uffff\1\144\1\172\2"+
-        "\145\1\157\1\156\2\143\1\uffff\1\150\1\160\1\163\1\141\1\154\1\145"+
-        "\1\163\1\172\1\uffff\2\172\1\156\1\143\2\145\1\151\1\145\2\164\1"+
-        "\145\1\166\1\163\3\uffff\1\172\1\171\2\172\2\156\1\145\1\151\1\172"+
-        "\1\145\1\137\1\uffff\1\172\2\uffff\1\147\1\163\1\156\1\157\1\uffff"+
-        "\1\154\1\141\1\uffff\1\172\1\141\1\143\1\156\1\172\1\154\1\uffff"+
-        "\1\164\1\171\1\137\1\uffff\1\154\1\151\1\172\1\141\2\157\1\uffff"+
-        "\1\154\1\167\1\156\1\154\1\145\1\172\1\157\1\144\1\uffff\1\167\1"+
-        "\172\1\145\1\uffff\1\144\1\172\1\uffff";
-    static final String DFA12_acceptS =
-        "\20\uffff\1\30\1\31\1\32\1\33\1\34\2\uffff\1\37\1\40\3\uffff\1"+
-        "\44\1\45\1\uffff\1\37\17\uffff\1\27\1\30\1\31\1\32\1\33\1\34\1\uffff"+
-        "\1\40\1\41\1\42\1\43\1\44\50\uffff\1\26\4\uffff\1\3\7\uffff\1\11"+
-        "\13\uffff\1\2\56\uffff\1\24\14\uffff\1\5\16\uffff\1\36\1\1\10\uffff"+
-        "\1\35\10\uffff\1\4\15\uffff\1\12\1\6\1\7\13\uffff\1\10\1\uffff\1"+
-        "\14\1\15\4\uffff\1\22\2\uffff\1\13\6\uffff\1\16\3\uffff\1\23\6\uffff"+
-        "\1\20\10\uffff\1\17\3\uffff\1\25\2\uffff\1\21";
-    static final String DFA12_specialS =
-        "\1\1\30\uffff\1\2\1\0\u0109\uffff}>";
-    static final String[] DFA12_transitionS = {
-            "\11\35\2\34\2\35\1\34\22\35\1\34\1\35\1\31\4\35\1\32\4\35\1"+
-            "\21\1\17\1\22\1\33\12\30\1\35\1\20\5\35\5\27\1\16\24\27\3\35"+
-            "\1\26\1\27\1\35\1\11\1\27\1\4\1\27\1\2\1\12\2\27\1\7\2\27\1"+
-            "\3\1\27\1\10\1\5\1\15\1\27\1\13\1\14\1\27\1\1\1\6\1\25\3\27"+
-            "\1\23\1\35\1\24\uff82\35",
-            "\1\36",
-            "\1\40",
-            "\1\41",
-            "\1\42",
-            "\1\43",
-            "\1\44",
-            "\1\46\1\45",
-            "\1\47",
-            "\1\50",
-            "\1\51",
-            "\1\52",
-            "\1\53",
-            "\1\55\15\uffff\1\54",
-            "\1\56",
-            "\1\57",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "\1\65",
-            "\32\37\4\uffff\1\37\1\uffff\32\37",
-            "",
-            "",
-            "\0\67",
-            "\0\67",
-            "\1\70\4\uffff\1\71",
-            "",
-            "",
-            "\1\73\16\uffff\1\74",
-            "",
-            "\1\75",
-            "\1\76",
-            "\1\77",
-            "\1\100",
-            "\1\101",
-            "\1\102\20\uffff\1\103",
-            "\1\104",
-            "\1\107\30\uffff\1\106\16\uffff\1\105",
-            "\1\110",
-            "\1\111",
-            "\1\112",
-            "\1\113",
-            "\1\114",
-            "\1\115",
-            "\1\116",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "\1\117",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "\1\120",
-            "\1\121",
-            "\1\122",
-            "\1\123",
-            "\1\124",
-            "\1\125",
-            "\1\126",
-            "\1\127",
-            "\1\130",
-            "\1\131",
-            "\1\132",
-            "\1\133",
-            "\1\134",
-            "\1\135",
-            "\1\136",
-            "\1\137",
-            "\1\140",
-            "\1\141",
-            "\1\142",
-            "\1\143",
-            "\1\144",
-            "\1\145",
-            "\1\146",
-            "\1\147",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\151",
-            "\1\152",
-            "\1\153",
-            "\1\154\1\155",
-            "\1\156",
-            "\1\157",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\161",
-            "\1\162",
-            "\1\163",
-            "\1\164",
-            "\1\165",
-            "\1\166",
-            "\1\167",
-            "\1\170",
-            "",
-            "\1\171",
-            "\1\172",
-            "\1\173",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "",
-            "\1\175",
-            "\1\176",
-            "\1\u0080\17\uffff\1\177",
-            "\1\u0081",
-            "\1\u0082",
-            "\1\u0083",
-            "\1\u0084",
-            "",
-            "\1\u0085",
-            "\1\u0086",
-            "\1\u0087",
-            "\1\u0088",
-            "\1\u0089",
-            "\1\u008a",
-            "\1\u008b",
-            "\1\u008c",
-            "\1\u008d",
-            "\1\u008e",
-            "\1\u008f",
-            "",
-            "\1\u0090",
-            "\1\u0091",
-            "\1\u0092",
-            "\1\u0093",
-            "\1\u0094",
-            "\1\u0095",
-            "\1\u0096",
-            "\1\u0097",
-            "\1\u0098",
-            "\1\u0099",
-            "\1\u009a",
-            "\1\u009b",
-            "\1\u009c",
-            "\1\u009d",
-            "\1\u009e",
-            "\1\u009f",
-            "\1\u00a0",
-            "\1\u00a1",
-            "\1\u00a2",
-            "\1\u00a3",
-            "\1\u00a4",
-            "\1\u00a5",
-            "\1\u00a6",
-            "\1\u00a7",
-            "\1\u00a8",
-            "\1\u00a9",
-            "\1\u00aa",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\u00ac",
-            "\1\u00ae\12\uffff\1\u00ad",
-            "\1\u00af",
-            "\1\u00b0",
-            "\1\u00b1",
-            "\1\u00b2",
-            "\1\u00b3",
-            "\1\u00b4",
-            "\1\u00b5",
-            "\1\u00b6",
-            "\1\u00b7",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\u00b9",
-            "\1\u00ba",
-            "\1\u00bb",
-            "\1\u00bc",
-            "\1\u00bd",
-            "\1\u00be",
-            "",
-            "\1\u00bf",
-            "\1\u00c0",
-            "\1\u00c1",
-            "\1\u00c2",
-            "\1\u00c3",
-            "\1\u00c4",
-            "\1\u00c5",
-            "\1\u00c6",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\u00c9",
-            "\1\u00ca",
-            "",
-            "\1\u00cb",
-            "\1\u00cc",
-            "\1\u00cd",
-            "\1\u00ce",
-            "\1\u00cf",
-            "\1\u00d0",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\u00d2",
-            "\1\u00d3",
-            "\1\u00d4",
-            "\1\u00d5",
-            "\1\u00d6",
-            "\1\u00d7",
-            "\1\u00d8",
-            "",
-            "",
-            "\1\u00d9",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\u00db",
-            "\1\u00dc",
-            "\1\u00dd",
-            "\1\u00de",
-            "\1\u00df",
-            "\1\u00e0",
-            "",
-            "\1\u00e1",
-            "\1\u00e2",
-            "\1\u00e3",
-            "\1\u00e4",
-            "\1\u00e5",
-            "\1\u00e6",
-            "\1\u00e7",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\u00eb",
-            "\1\u00ec",
-            "\1\u00ed",
-            "\1\u00ee",
-            "\1\u00ef",
-            "\1\u00f0",
-            "\1\u00f1",
-            "\1\u00f2",
-            "\1\u00f3",
-            "\1\u00f4",
-            "\1\u00f5",
-            "",
-            "",
-            "",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\u00f7",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\u00fa",
-            "\1\u00fb",
-            "\1\u00fc",
-            "\1\u00fd",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\u00ff",
-            "\1\u0100",
-            "",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "",
-            "",
-            "\1\u0102",
-            "\1\u0103",
-            "\1\u0104",
-            "\1\u0105",
-            "",
-            "\1\u0106",
-            "\1\u0107",
-            "",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\u0109",
-            "\1\u010a",
-            "\1\u010b",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\u010d",
-            "",
-            "\1\u010e",
-            "\1\u010f",
-            "\1\u0110",
-            "",
-            "\1\u0111",
-            "\1\u0112",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\u0114",
-            "\1\u0115",
-            "\1\u0116",
-            "",
-            "\1\u0117",
-            "\1\u0118",
-            "\1\u0119",
-            "\1\u011a",
-            "\1\u011b",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\u011d",
-            "\1\u011e",
-            "",
-            "\1\u011f",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\u0121",
-            "",
-            "\1\u0122",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            ""
-    };
-
-    static final short[] DFA12_eot = DFA.unpackEncodedString(DFA12_eotS);
-    static final short[] DFA12_eof = DFA.unpackEncodedString(DFA12_eofS);
-    static final char[] DFA12_min = DFA.unpackEncodedStringToUnsignedChars(DFA12_minS);
-    static final char[] DFA12_max = DFA.unpackEncodedStringToUnsignedChars(DFA12_maxS);
-    static final short[] DFA12_accept = DFA.unpackEncodedString(DFA12_acceptS);
-    static final short[] DFA12_special = DFA.unpackEncodedString(DFA12_specialS);
-    static final short[][] DFA12_transition;
-
-    static {
-        int numStates = DFA12_transitionS.length;
-        DFA12_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA12_transition[i] = DFA.unpackEncodedString(DFA12_transitionS[i]);
-        }
-    }
-
-    class DFA12 extends DFA {
-
-        public DFA12(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 12;
-            this.eot = DFA12_eot;
-            this.eof = DFA12_eof;
-            this.min = DFA12_min;
-            this.max = DFA12_max;
-            this.accept = DFA12_accept;
-            this.special = DFA12_special;
-            this.transition = DFA12_transition;
-        }
-        public String getDescription() {
-            return "1:1: Tokens : ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
-        }
-        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
-            IntStream input = _input;
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA12_26 = input.LA(1);
-
-                        s = -1;
-                        if ( ((LA12_26>='\u0000' && LA12_26<='\uFFFF')) ) {s = 55;}
-
-                        else s = 29;
-
-                        if ( s>=0 ) return s;
-                        break;
-                    case 1 : 
-                        int LA12_0 = input.LA(1);
-
-                        s = -1;
-                        if ( (LA12_0=='u') ) {s = 1;}
-
-                        else if ( (LA12_0=='e') ) {s = 2;}
-
-                        else if ( (LA12_0=='l') ) {s = 3;}
-
-                        else if ( (LA12_0=='c') ) {s = 4;}
-
-                        else if ( (LA12_0=='o') ) {s = 5;}
-
-                        else if ( (LA12_0=='v') ) {s = 6;}
-
-                        else if ( (LA12_0=='i') ) {s = 7;}
-
-                        else if ( (LA12_0=='n') ) {s = 8;}
-
-                        else if ( (LA12_0=='a') ) {s = 9;}
-
-                        else if ( (LA12_0=='f') ) {s = 10;}
-
-                        else if ( (LA12_0=='r') ) {s = 11;}
-
-                        else if ( (LA12_0=='s') ) {s = 12;}
-
-                        else if ( (LA12_0=='p') ) {s = 13;}
-
-                        else if ( (LA12_0=='F') ) {s = 14;}
-
-                        else if ( (LA12_0=='-') ) {s = 15;}
-
-                        else if ( (LA12_0==';') ) {s = 16;}
-
-                        else if ( (LA12_0==',') ) {s = 17;}
-
-                        else if ( (LA12_0=='.') ) {s = 18;}
-
-                        else if ( (LA12_0=='{') ) {s = 19;}
-
-                        else if ( (LA12_0=='}') ) {s = 20;}
-
-                        else if ( (LA12_0=='w') ) {s = 21;}
-
-                        else if ( (LA12_0=='^') ) {s = 22;}
-
-                        else if ( ((LA12_0>='A' && LA12_0<='E')||(LA12_0>='G' && LA12_0<='Z')||LA12_0=='_'||LA12_0=='b'||LA12_0=='d'||(LA12_0>='g' && LA12_0<='h')||(LA12_0>='j' && LA12_0<='k')||LA12_0=='m'||LA12_0=='q'||LA12_0=='t'||(LA12_0>='x' && LA12_0<='z')) ) {s = 23;}
-
-                        else if ( ((LA12_0>='0' && LA12_0<='9')) ) {s = 24;}
-
-                        else if ( (LA12_0=='\"') ) {s = 25;}
-
-                        else if ( (LA12_0=='\'') ) {s = 26;}
-
-                        else if ( (LA12_0=='/') ) {s = 27;}
-
-                        else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {s = 28;}
-
-                        else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||LA12_0=='!'||(LA12_0>='#' && LA12_0<='&')||(LA12_0>='(' && LA12_0<='+')||LA12_0==':'||(LA12_0>='<' && LA12_0<='@')||(LA12_0>='[' && LA12_0<=']')||LA12_0=='`'||LA12_0=='|'||(LA12_0>='~' && LA12_0<='\uFFFF')) ) {s = 29;}
-
-                        if ( s>=0 ) return s;
-                        break;
-                    case 2 : 
-                        int LA12_25 = input.LA(1);
-
-                        s = -1;
-                        if ( ((LA12_25>='\u0000' && LA12_25<='\uFFFF')) ) {s = 55;}
-
-                        else s = 29;
-
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 12, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
- 
-
-}
\ No newline at end of file
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDslParser.java b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDslParser.java
deleted file mode 100644
index 59d8474eb0e83019bb67ef11dfbf2a680b73e301..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDslParser.java
+++ /dev/null
@@ -1,10061 +0,0 @@
-package org.polarsys.chess.xtext.ui.contentassist.antlr.internal; 
-
-import java.io.InputStream;
-import org.eclipse.xtext.*;
-import org.eclipse.xtext.parser.*;
-import org.eclipse.xtext.parser.impl.*;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.xtext.parser.antlr.XtextTokenStream;
-import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
-import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
-import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.DFA;
-import org.polarsys.chess.xtext.services.FlaDslGrammarAccess;
-
-
-
-import org.antlr.runtime.*;
-import java.util.Stack;
-import java.util.List;
-import java.util.ArrayList;
-
-@SuppressWarnings("all")
-public class InternalFlaDslParser extends AbstractInternalContentAssistParser {
-    public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'undefined'", "'early'", "'late'", "'commission'", "'omission'", "'valueSubtle'", "'valueCoarse'", "'incompletion'", "'none'", "'unspecified'", "'inconsistency'", "'interference'", "'impermanence'", "'all_or_nothing'", "'all_or_compensation'", "'full_consistency'", "'range_violation_allowed'", "'serializable'", "'portable_level'", "'no_loss'", "'partial_loss_allowed'", "'FLA:'", "'->'", "';'", "','", "'.'", "'{'", "'}'", "'noFailure'", "'wildcard'"
-    };
-    public static final int RULE_ID=4;
-    public static final int T__40=40;
-    public static final int T__29=29;
-    public static final int T__28=28;
-    public static final int T__27=27;
-    public static final int T__26=26;
-    public static final int T__25=25;
-    public static final int T__24=24;
-    public static final int T__23=23;
-    public static final int T__22=22;
-    public static final int RULE_ANY_OTHER=10;
-    public static final int T__21=21;
-    public static final int T__20=20;
-    public static final int RULE_SL_COMMENT=8;
-    public static final int EOF=-1;
-    public static final int RULE_ML_COMMENT=7;
-    public static final int T__30=30;
-    public static final int T__19=19;
-    public static final int T__31=31;
-    public static final int RULE_STRING=6;
-    public static final int T__32=32;
-    public static final int T__33=33;
-    public static final int T__16=16;
-    public static final int T__34=34;
-    public static final int T__15=15;
-    public static final int T__35=35;
-    public static final int T__18=18;
-    public static final int T__36=36;
-    public static final int T__17=17;
-    public static final int T__37=37;
-    public static final int T__12=12;
-    public static final int T__38=38;
-    public static final int T__11=11;
-    public static final int T__39=39;
-    public static final int T__14=14;
-    public static final int T__13=13;
-    public static final int RULE_INT=5;
-    public static final int RULE_WS=9;
-
-    // delegates
-    // delegators
-
-
-        public InternalFlaDslParser(TokenStream input) {
-            this(input, new RecognizerSharedState());
-        }
-        public InternalFlaDslParser(TokenStream input, RecognizerSharedState state) {
-            super(input, state);
-             
-        }
-        
-
-    public String[] getTokenNames() { return InternalFlaDslParser.tokenNames; }
-    public String getGrammarFileName() { return "../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g"; }
-
-
-     
-     	private FlaDslGrammarAccess grammarAccess;
-     	
-        public void setGrammarAccess(FlaDslGrammarAccess grammarAccess) {
-        	this.grammarAccess = grammarAccess;
-        }
-        
-        @Override
-        protected Grammar getGrammar() {
-        	return grammarAccess.getGrammar();
-        }
-        
-        @Override
-        protected String getValueForTokenName(String tokenName) {
-        	return tokenName;
-        }
-
-
-
-
-    // $ANTLR start "entryRuleBehaviour"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:60:1: entryRuleBehaviour : ruleBehaviour EOF ;
-    public final void entryRuleBehaviour() throws RecognitionException {
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:61:1: ( ruleBehaviour EOF )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:62:1: ruleBehaviour EOF
-            {
-             before(grammarAccess.getBehaviourRule()); 
-            pushFollow(FOLLOW_ruleBehaviour_in_entryRuleBehaviour61);
-            ruleBehaviour();
-
-            state._fsp--;
-
-             after(grammarAccess.getBehaviourRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleBehaviour68); 
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
-        return ;
-    }
-    // $ANTLR end "entryRuleBehaviour"
-
-
-    // $ANTLR start "ruleBehaviour"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:69:1: ruleBehaviour : ( ( ( rule__Behaviour__RulesAssignment ) ) ( ( rule__Behaviour__RulesAssignment )* ) ) ;
-    public final void ruleBehaviour() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:73:2: ( ( ( ( rule__Behaviour__RulesAssignment ) ) ( ( rule__Behaviour__RulesAssignment )* ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:74:1: ( ( ( rule__Behaviour__RulesAssignment ) ) ( ( rule__Behaviour__RulesAssignment )* ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:74:1: ( ( ( rule__Behaviour__RulesAssignment ) ) ( ( rule__Behaviour__RulesAssignment )* ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:75:1: ( ( rule__Behaviour__RulesAssignment ) ) ( ( rule__Behaviour__RulesAssignment )* )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:75:1: ( ( rule__Behaviour__RulesAssignment ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:76:1: ( rule__Behaviour__RulesAssignment )
-            {
-             before(grammarAccess.getBehaviourAccess().getRulesAssignment()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:77:1: ( rule__Behaviour__RulesAssignment )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:77:2: rule__Behaviour__RulesAssignment
-            {
-            pushFollow(FOLLOW_rule__Behaviour__RulesAssignment_in_ruleBehaviour96);
-            rule__Behaviour__RulesAssignment();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getBehaviourAccess().getRulesAssignment()); 
-
-            }
-
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:80:1: ( ( rule__Behaviour__RulesAssignment )* )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:81:1: ( rule__Behaviour__RulesAssignment )*
-            {
-             before(grammarAccess.getBehaviourAccess().getRulesAssignment()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:82:1: ( rule__Behaviour__RulesAssignment )*
-            loop1:
-            do {
-                int alt1=2;
-                int LA1_0 = input.LA(1);
-
-                if ( (LA1_0==32) ) {
-                    alt1=1;
-                }
-
-
-                switch (alt1) {
-            	case 1 :
-            	    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:82:2: rule__Behaviour__RulesAssignment
-            	    {
-            	    pushFollow(FOLLOW_rule__Behaviour__RulesAssignment_in_ruleBehaviour108);
-            	    rule__Behaviour__RulesAssignment();
-
-            	    state._fsp--;
-
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop1;
-                }
-            } while (true);
-
-             after(grammarAccess.getBehaviourAccess().getRulesAssignment()); 
-
-            }
-
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "ruleBehaviour"
-
-
-    // $ANTLR start "entryRuleExpression"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:95:1: entryRuleExpression : ruleExpression EOF ;
-    public final void entryRuleExpression() throws RecognitionException {
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:96:1: ( ruleExpression EOF )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:97:1: ruleExpression EOF
-            {
-             before(grammarAccess.getExpressionRule()); 
-            pushFollow(FOLLOW_ruleExpression_in_entryRuleExpression138);
-            ruleExpression();
-
-            state._fsp--;
-
-             after(grammarAccess.getExpressionRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleExpression145); 
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
-        return ;
-    }
-    // $ANTLR end "entryRuleExpression"
-
-
-    // $ANTLR start "ruleExpression"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:104:1: ruleExpression : ( ( rule__Expression__Group__0 ) ) ;
-    public final void ruleExpression() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:108:2: ( ( ( rule__Expression__Group__0 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:109:1: ( ( rule__Expression__Group__0 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:109:1: ( ( rule__Expression__Group__0 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:110:1: ( rule__Expression__Group__0 )
-            {
-             before(grammarAccess.getExpressionAccess().getGroup()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:111:1: ( rule__Expression__Group__0 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:111:2: rule__Expression__Group__0
-            {
-            pushFollow(FOLLOW_rule__Expression__Group__0_in_ruleExpression171);
-            rule__Expression__Group__0();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getExpressionAccess().getGroup()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "ruleExpression"
-
-
-    // $ANTLR start "entryRuleLhs"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:123:1: entryRuleLhs : ruleLhs EOF ;
-    public final void entryRuleLhs() throws RecognitionException {
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:124:1: ( ruleLhs EOF )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:125:1: ruleLhs EOF
-            {
-             before(grammarAccess.getLhsRule()); 
-            pushFollow(FOLLOW_ruleLhs_in_entryRuleLhs198);
-            ruleLhs();
-
-            state._fsp--;
-
-             after(grammarAccess.getLhsRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLhs205); 
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
-        return ;
-    }
-    // $ANTLR end "entryRuleLhs"
-
-
-    // $ANTLR start "ruleLhs"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:132:1: ruleLhs : ( ( rule__Lhs__Group__0 ) ) ;
-    public final void ruleLhs() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:136:2: ( ( ( rule__Lhs__Group__0 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:137:1: ( ( rule__Lhs__Group__0 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:137:1: ( ( rule__Lhs__Group__0 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:138:1: ( rule__Lhs__Group__0 )
-            {
-             before(grammarAccess.getLhsAccess().getGroup()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:139:1: ( rule__Lhs__Group__0 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:139:2: rule__Lhs__Group__0
-            {
-            pushFollow(FOLLOW_rule__Lhs__Group__0_in_ruleLhs231);
-            rule__Lhs__Group__0();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getLhsAccess().getGroup()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "ruleLhs"
-
-
-    // $ANTLR start "entryRuleRhs"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:151:1: entryRuleRhs : ruleRhs EOF ;
-    public final void entryRuleRhs() throws RecognitionException {
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:152:1: ( ruleRhs EOF )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:153:1: ruleRhs EOF
-            {
-             before(grammarAccess.getRhsRule()); 
-            pushFollow(FOLLOW_ruleRhs_in_entryRuleRhs258);
-            ruleRhs();
-
-            state._fsp--;
-
-             after(grammarAccess.getRhsRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRhs265); 
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
-        return ;
-    }
-    // $ANTLR end "entryRuleRhs"
-
-
-    // $ANTLR start "ruleRhs"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:160:1: ruleRhs : ( ( rule__Rhs__Group__0 ) ) ;
-    public final void ruleRhs() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:164:2: ( ( ( rule__Rhs__Group__0 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:165:1: ( ( rule__Rhs__Group__0 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:165:1: ( ( rule__Rhs__Group__0 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:166:1: ( rule__Rhs__Group__0 )
-            {
-             before(grammarAccess.getRhsAccess().getGroup()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:167:1: ( rule__Rhs__Group__0 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:167:2: rule__Rhs__Group__0
-            {
-            pushFollow(FOLLOW_rule__Rhs__Group__0_in_ruleRhs291);
-            rule__Rhs__Group__0();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getRhsAccess().getGroup()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "ruleRhs"
-
-
-    // $ANTLR start "entryRuleInputExpression"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:179:1: entryRuleInputExpression : ruleInputExpression EOF ;
-    public final void entryRuleInputExpression() throws RecognitionException {
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:180:1: ( ruleInputExpression EOF )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:181:1: ruleInputExpression EOF
-            {
-             before(grammarAccess.getInputExpressionRule()); 
-            pushFollow(FOLLOW_ruleInputExpression_in_entryRuleInputExpression318);
-            ruleInputExpression();
-
-            state._fsp--;
-
-             after(grammarAccess.getInputExpressionRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInputExpression325); 
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
-        return ;
-    }
-    // $ANTLR end "entryRuleInputExpression"
-
-
-    // $ANTLR start "ruleInputExpression"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:188:1: ruleInputExpression : ( ( rule__InputExpression__Group__0 ) ) ;
-    public final void ruleInputExpression() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:192:2: ( ( ( rule__InputExpression__Group__0 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:193:1: ( ( rule__InputExpression__Group__0 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:193:1: ( ( rule__InputExpression__Group__0 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:194:1: ( rule__InputExpression__Group__0 )
-            {
-             before(grammarAccess.getInputExpressionAccess().getGroup()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:195:1: ( rule__InputExpression__Group__0 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:195:2: rule__InputExpression__Group__0
-            {
-            pushFollow(FOLLOW_rule__InputExpression__Group__0_in_ruleInputExpression351);
-            rule__InputExpression__Group__0();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getInputExpressionAccess().getGroup()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "ruleInputExpression"
-
-
-    // $ANTLR start "entryRuleOutputExpression"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:207:1: entryRuleOutputExpression : ruleOutputExpression EOF ;
-    public final void entryRuleOutputExpression() throws RecognitionException {
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:208:1: ( ruleOutputExpression EOF )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:209:1: ruleOutputExpression EOF
-            {
-             before(grammarAccess.getOutputExpressionRule()); 
-            pushFollow(FOLLOW_ruleOutputExpression_in_entryRuleOutputExpression378);
-            ruleOutputExpression();
-
-            state._fsp--;
-
-             after(grammarAccess.getOutputExpressionRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOutputExpression385); 
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
-        return ;
-    }
-    // $ANTLR end "entryRuleOutputExpression"
-
-
-    // $ANTLR start "ruleOutputExpression"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:216:1: ruleOutputExpression : ( ( rule__OutputExpression__Group__0 ) ) ;
-    public final void ruleOutputExpression() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:220:2: ( ( ( rule__OutputExpression__Group__0 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:221:1: ( ( rule__OutputExpression__Group__0 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:221:1: ( ( rule__OutputExpression__Group__0 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:222:1: ( rule__OutputExpression__Group__0 )
-            {
-             before(grammarAccess.getOutputExpressionAccess().getGroup()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:223:1: ( rule__OutputExpression__Group__0 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:223:2: rule__OutputExpression__Group__0
-            {
-            pushFollow(FOLLOW_rule__OutputExpression__Group__0_in_ruleOutputExpression411);
-            rule__OutputExpression__Group__0();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getOutputExpressionAccess().getGroup()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "ruleOutputExpression"
-
-
-    // $ANTLR start "entryRuleInFailureExpr"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:235:1: entryRuleInFailureExpr : ruleInFailureExpr EOF ;
-    public final void entryRuleInFailureExpr() throws RecognitionException {
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:236:1: ( ruleInFailureExpr EOF )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:237:1: ruleInFailureExpr EOF
-            {
-             before(grammarAccess.getInFailureExprRule()); 
-            pushFollow(FOLLOW_ruleInFailureExpr_in_entryRuleInFailureExpr438);
-            ruleInFailureExpr();
-
-            state._fsp--;
-
-             after(grammarAccess.getInFailureExprRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInFailureExpr445); 
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
-        return ;
-    }
-    // $ANTLR end "entryRuleInFailureExpr"
-
-
-    // $ANTLR start "ruleInFailureExpr"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:244:1: ruleInFailureExpr : ( ( rule__InFailureExpr__Alternatives ) ) ;
-    public final void ruleInFailureExpr() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:248:2: ( ( ( rule__InFailureExpr__Alternatives ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:249:1: ( ( rule__InFailureExpr__Alternatives ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:249:1: ( ( rule__InFailureExpr__Alternatives ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:250:1: ( rule__InFailureExpr__Alternatives )
-            {
-             before(grammarAccess.getInFailureExprAccess().getAlternatives()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:251:1: ( rule__InFailureExpr__Alternatives )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:251:2: rule__InFailureExpr__Alternatives
-            {
-            pushFollow(FOLLOW_rule__InFailureExpr__Alternatives_in_ruleInFailureExpr471);
-            rule__InFailureExpr__Alternatives();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getInFailureExprAccess().getAlternatives()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "ruleInFailureExpr"
-
-
-    // $ANTLR start "entryRuleOutFailureExpr"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:263:1: entryRuleOutFailureExpr : ruleOutFailureExpr EOF ;
-    public final void entryRuleOutFailureExpr() throws RecognitionException {
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:264:1: ( ruleOutFailureExpr EOF )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:265:1: ruleOutFailureExpr EOF
-            {
-             before(grammarAccess.getOutFailureExprRule()); 
-            pushFollow(FOLLOW_ruleOutFailureExpr_in_entryRuleOutFailureExpr498);
-            ruleOutFailureExpr();
-
-            state._fsp--;
-
-             after(grammarAccess.getOutFailureExprRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOutFailureExpr505); 
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
-        return ;
-    }
-    // $ANTLR end "entryRuleOutFailureExpr"
-
-
-    // $ANTLR start "ruleOutFailureExpr"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:272:1: ruleOutFailureExpr : ( ( rule__OutFailureExpr__Alternatives ) ) ;
-    public final void ruleOutFailureExpr() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:276:2: ( ( ( rule__OutFailureExpr__Alternatives ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:277:1: ( ( rule__OutFailureExpr__Alternatives ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:277:1: ( ( rule__OutFailureExpr__Alternatives ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:278:1: ( rule__OutFailureExpr__Alternatives )
-            {
-             before(grammarAccess.getOutFailureExprAccess().getAlternatives()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:279:1: ( rule__OutFailureExpr__Alternatives )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:279:2: rule__OutFailureExpr__Alternatives
-            {
-            pushFollow(FOLLOW_rule__OutFailureExpr__Alternatives_in_ruleOutFailureExpr531);
-            rule__OutFailureExpr__Alternatives();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getOutFailureExprAccess().getAlternatives()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "ruleOutFailureExpr"
-
-
-    // $ANTLR start "entryRuleFailureDefinition"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:293:1: entryRuleFailureDefinition : ruleFailureDefinition EOF ;
-    public final void entryRuleFailureDefinition() throws RecognitionException {
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:294:1: ( ruleFailureDefinition EOF )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:295:1: ruleFailureDefinition EOF
-            {
-             before(grammarAccess.getFailureDefinitionRule()); 
-            pushFollow(FOLLOW_ruleFailureDefinition_in_entryRuleFailureDefinition560);
-            ruleFailureDefinition();
-
-            state._fsp--;
-
-             after(grammarAccess.getFailureDefinitionRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFailureDefinition567); 
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
-        return ;
-    }
-    // $ANTLR end "entryRuleFailureDefinition"
-
-
-    // $ANTLR start "ruleFailureDefinition"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:302:1: ruleFailureDefinition : ( ( rule__FailureDefinition__Group__0 ) ) ;
-    public final void ruleFailureDefinition() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:306:2: ( ( ( rule__FailureDefinition__Group__0 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:307:1: ( ( rule__FailureDefinition__Group__0 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:307:1: ( ( rule__FailureDefinition__Group__0 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:308:1: ( rule__FailureDefinition__Group__0 )
-            {
-             before(grammarAccess.getFailureDefinitionAccess().getGroup()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:309:1: ( rule__FailureDefinition__Group__0 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:309:2: rule__FailureDefinition__Group__0
-            {
-            pushFollow(FOLLOW_rule__FailureDefinition__Group__0_in_ruleFailureDefinition593);
-            rule__FailureDefinition__Group__0();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getFailureDefinitionAccess().getGroup()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "ruleFailureDefinition"
-
-
-    // $ANTLR start "entryRuleNoFailureDefinition"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:321:1: entryRuleNoFailureDefinition : ruleNoFailureDefinition EOF ;
-    public final void entryRuleNoFailureDefinition() throws RecognitionException {
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:322:1: ( ruleNoFailureDefinition EOF )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:323:1: ruleNoFailureDefinition EOF
-            {
-             before(grammarAccess.getNoFailureDefinitionRule()); 
-            pushFollow(FOLLOW_ruleNoFailureDefinition_in_entryRuleNoFailureDefinition620);
-            ruleNoFailureDefinition();
-
-            state._fsp--;
-
-             after(grammarAccess.getNoFailureDefinitionRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNoFailureDefinition627); 
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
-        return ;
-    }
-    // $ANTLR end "entryRuleNoFailureDefinition"
-
-
-    // $ANTLR start "ruleNoFailureDefinition"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:330:1: ruleNoFailureDefinition : ( ( rule__NoFailureDefinition__Group__0 ) ) ;
-    public final void ruleNoFailureDefinition() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:334:2: ( ( ( rule__NoFailureDefinition__Group__0 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:335:1: ( ( rule__NoFailureDefinition__Group__0 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:335:1: ( ( rule__NoFailureDefinition__Group__0 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:336:1: ( rule__NoFailureDefinition__Group__0 )
-            {
-             before(grammarAccess.getNoFailureDefinitionAccess().getGroup()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:337:1: ( rule__NoFailureDefinition__Group__0 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:337:2: rule__NoFailureDefinition__Group__0
-            {
-            pushFollow(FOLLOW_rule__NoFailureDefinition__Group__0_in_ruleNoFailureDefinition653);
-            rule__NoFailureDefinition__Group__0();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getNoFailureDefinitionAccess().getGroup()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "ruleNoFailureDefinition"
-
-
-    // $ANTLR start "entryRuleComplexNofailureDefinition"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:349:1: entryRuleComplexNofailureDefinition : ruleComplexNofailureDefinition EOF ;
-    public final void entryRuleComplexNofailureDefinition() throws RecognitionException {
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:350:1: ( ruleComplexNofailureDefinition EOF )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:351:1: ruleComplexNofailureDefinition EOF
-            {
-             before(grammarAccess.getComplexNofailureDefinitionRule()); 
-            pushFollow(FOLLOW_ruleComplexNofailureDefinition_in_entryRuleComplexNofailureDefinition680);
-            ruleComplexNofailureDefinition();
-
-            state._fsp--;
-
-             after(grammarAccess.getComplexNofailureDefinitionRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleComplexNofailureDefinition687); 
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
-        return ;
-    }
-    // $ANTLR end "entryRuleComplexNofailureDefinition"
-
-
-    // $ANTLR start "ruleComplexNofailureDefinition"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:358:1: ruleComplexNofailureDefinition : ( ( rule__ComplexNofailureDefinition__Group__0 ) ) ;
-    public final void ruleComplexNofailureDefinition() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:362:2: ( ( ( rule__ComplexNofailureDefinition__Group__0 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:363:1: ( ( rule__ComplexNofailureDefinition__Group__0 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:363:1: ( ( rule__ComplexNofailureDefinition__Group__0 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:364:1: ( rule__ComplexNofailureDefinition__Group__0 )
-            {
-             before(grammarAccess.getComplexNofailureDefinitionAccess().getGroup()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:365:1: ( rule__ComplexNofailureDefinition__Group__0 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:365:2: rule__ComplexNofailureDefinition__Group__0
-            {
-            pushFollow(FOLLOW_rule__ComplexNofailureDefinition__Group__0_in_ruleComplexNofailureDefinition713);
-            rule__ComplexNofailureDefinition__Group__0();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getComplexNofailureDefinitionAccess().getGroup()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "ruleComplexNofailureDefinition"
-
-
-    // $ANTLR start "entryRuleWildcardDefinition"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:377:1: entryRuleWildcardDefinition : ruleWildcardDefinition EOF ;
-    public final void entryRuleWildcardDefinition() throws RecognitionException {
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:378:1: ( ruleWildcardDefinition EOF )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:379:1: ruleWildcardDefinition EOF
-            {
-             before(grammarAccess.getWildcardDefinitionRule()); 
-            pushFollow(FOLLOW_ruleWildcardDefinition_in_entryRuleWildcardDefinition740);
-            ruleWildcardDefinition();
-
-            state._fsp--;
-
-             after(grammarAccess.getWildcardDefinitionRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleWildcardDefinition747); 
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
-        return ;
-    }
-    // $ANTLR end "entryRuleWildcardDefinition"
-
-
-    // $ANTLR start "ruleWildcardDefinition"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:386:1: ruleWildcardDefinition : ( ( rule__WildcardDefinition__Group__0 ) ) ;
-    public final void ruleWildcardDefinition() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:390:2: ( ( ( rule__WildcardDefinition__Group__0 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:391:1: ( ( rule__WildcardDefinition__Group__0 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:391:1: ( ( rule__WildcardDefinition__Group__0 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:392:1: ( rule__WildcardDefinition__Group__0 )
-            {
-             before(grammarAccess.getWildcardDefinitionAccess().getGroup()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:393:1: ( rule__WildcardDefinition__Group__0 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:393:2: rule__WildcardDefinition__Group__0
-            {
-            pushFollow(FOLLOW_rule__WildcardDefinition__Group__0_in_ruleWildcardDefinition773);
-            rule__WildcardDefinition__Group__0();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getWildcardDefinitionAccess().getGroup()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "ruleWildcardDefinition"
-
-
-    // $ANTLR start "entryRuleVariableDefinition"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:405:1: entryRuleVariableDefinition : ruleVariableDefinition EOF ;
-    public final void entryRuleVariableDefinition() throws RecognitionException {
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:406:1: ( ruleVariableDefinition EOF )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:407:1: ruleVariableDefinition EOF
-            {
-             before(grammarAccess.getVariableDefinitionRule()); 
-            pushFollow(FOLLOW_ruleVariableDefinition_in_entryRuleVariableDefinition800);
-            ruleVariableDefinition();
-
-            state._fsp--;
-
-             after(grammarAccess.getVariableDefinitionRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleVariableDefinition807); 
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
-        return ;
-    }
-    // $ANTLR end "entryRuleVariableDefinition"
-
-
-    // $ANTLR start "ruleVariableDefinition"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:414:1: ruleVariableDefinition : ( ( rule__VariableDefinition__Group__0 ) ) ;
-    public final void ruleVariableDefinition() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:418:2: ( ( ( rule__VariableDefinition__Group__0 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:419:1: ( ( rule__VariableDefinition__Group__0 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:419:1: ( ( rule__VariableDefinition__Group__0 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:420:1: ( rule__VariableDefinition__Group__0 )
-            {
-             before(grammarAccess.getVariableDefinitionAccess().getGroup()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:421:1: ( rule__VariableDefinition__Group__0 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:421:2: rule__VariableDefinition__Group__0
-            {
-            pushFollow(FOLLOW_rule__VariableDefinition__Group__0_in_ruleVariableDefinition833);
-            rule__VariableDefinition__Group__0();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getVariableDefinitionAccess().getGroup()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "ruleVariableDefinition"
-
-
-    // $ANTLR start "entryRuleACIDavoidable"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:433:1: entryRuleACIDavoidable : ruleACIDavoidable EOF ;
-    public final void entryRuleACIDavoidable() throws RecognitionException {
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:434:1: ( ruleACIDavoidable EOF )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:435:1: ruleACIDavoidable EOF
-            {
-             before(grammarAccess.getACIDavoidableRule()); 
-            pushFollow(FOLLOW_ruleACIDavoidable_in_entryRuleACIDavoidable860);
-            ruleACIDavoidable();
-
-            state._fsp--;
-
-             after(grammarAccess.getACIDavoidableRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleACIDavoidable867); 
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
-        return ;
-    }
-    // $ANTLR end "entryRuleACIDavoidable"
-
-
-    // $ANTLR start "ruleACIDavoidable"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:442:1: ruleACIDavoidable : ( ( rule__ACIDavoidable__Group__0 ) ) ;
-    public final void ruleACIDavoidable() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:446:2: ( ( ( rule__ACIDavoidable__Group__0 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:447:1: ( ( rule__ACIDavoidable__Group__0 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:447:1: ( ( rule__ACIDavoidable__Group__0 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:448:1: ( rule__ACIDavoidable__Group__0 )
-            {
-             before(grammarAccess.getACIDavoidableAccess().getGroup()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:449:1: ( rule__ACIDavoidable__Group__0 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:449:2: rule__ACIDavoidable__Group__0
-            {
-            pushFollow(FOLLOW_rule__ACIDavoidable__Group__0_in_ruleACIDavoidable893);
-            rule__ACIDavoidable__Group__0();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getACIDavoidableAccess().getGroup()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "ruleACIDavoidable"
-
-
-    // $ANTLR start "entryRuleACIDMitigation"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:461:1: entryRuleACIDMitigation : ruleACIDMitigation EOF ;
-    public final void entryRuleACIDMitigation() throws RecognitionException {
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:462:1: ( ruleACIDMitigation EOF )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:463:1: ruleACIDMitigation EOF
-            {
-             before(grammarAccess.getACIDMitigationRule()); 
-            pushFollow(FOLLOW_ruleACIDMitigation_in_entryRuleACIDMitigation920);
-            ruleACIDMitigation();
-
-            state._fsp--;
-
-             after(grammarAccess.getACIDMitigationRule()); 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleACIDMitigation927); 
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
-        return ;
-    }
-    // $ANTLR end "entryRuleACIDMitigation"
-
-
-    // $ANTLR start "ruleACIDMitigation"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:470:1: ruleACIDMitigation : ( ( rule__ACIDMitigation__Group__0 ) ) ;
-    public final void ruleACIDMitigation() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:474:2: ( ( ( rule__ACIDMitigation__Group__0 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:475:1: ( ( rule__ACIDMitigation__Group__0 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:475:1: ( ( rule__ACIDMitigation__Group__0 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:476:1: ( rule__ACIDMitigation__Group__0 )
-            {
-             before(grammarAccess.getACIDMitigationAccess().getGroup()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:477:1: ( rule__ACIDMitigation__Group__0 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:477:2: rule__ACIDMitigation__Group__0
-            {
-            pushFollow(FOLLOW_rule__ACIDMitigation__Group__0_in_ruleACIDMitigation953);
-            rule__ACIDMitigation__Group__0();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getACIDMitigationAccess().getGroup()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "ruleACIDMitigation"
-
-
-    // $ANTLR start "ruleActualFailureType"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:494:1: ruleActualFailureType : ( ( rule__ActualFailureType__Alternatives ) ) ;
-    public final void ruleActualFailureType() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:498:1: ( ( ( rule__ActualFailureType__Alternatives ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:499:1: ( ( rule__ActualFailureType__Alternatives ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:499:1: ( ( rule__ActualFailureType__Alternatives ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:500:1: ( rule__ActualFailureType__Alternatives )
-            {
-             before(grammarAccess.getActualFailureTypeAccess().getAlternatives()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:501:1: ( rule__ActualFailureType__Alternatives )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:501:2: rule__ActualFailureType__Alternatives
-            {
-            pushFollow(FOLLOW_rule__ActualFailureType__Alternatives_in_ruleActualFailureType994);
-            rule__ActualFailureType__Alternatives();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getActualFailureTypeAccess().getAlternatives()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "ruleActualFailureType"
-
-
-    // $ANTLR start "ruleAavoidable"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:517:1: ruleAavoidable : ( ( rule__Aavoidable__Alternatives ) ) ;
-    public final void ruleAavoidable() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:521:1: ( ( ( rule__Aavoidable__Alternatives ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:522:1: ( ( rule__Aavoidable__Alternatives ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:522:1: ( ( rule__Aavoidable__Alternatives ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:523:1: ( rule__Aavoidable__Alternatives )
-            {
-             before(grammarAccess.getAavoidableAccess().getAlternatives()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:524:1: ( rule__Aavoidable__Alternatives )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:524:2: rule__Aavoidable__Alternatives
-            {
-            pushFollow(FOLLOW_rule__Aavoidable__Alternatives_in_ruleAavoidable1034);
-            rule__Aavoidable__Alternatives();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getAavoidableAccess().getAlternatives()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "ruleAavoidable"
-
-
-    // $ANTLR start "ruleCavoidable"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:536:1: ruleCavoidable : ( ( rule__Cavoidable__Alternatives ) ) ;
-    public final void ruleCavoidable() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:540:1: ( ( ( rule__Cavoidable__Alternatives ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:541:1: ( ( rule__Cavoidable__Alternatives ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:541:1: ( ( rule__Cavoidable__Alternatives ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:542:1: ( rule__Cavoidable__Alternatives )
-            {
-             before(grammarAccess.getCavoidableAccess().getAlternatives()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:543:1: ( rule__Cavoidable__Alternatives )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:543:2: rule__Cavoidable__Alternatives
-            {
-            pushFollow(FOLLOW_rule__Cavoidable__Alternatives_in_ruleCavoidable1070);
-            rule__Cavoidable__Alternatives();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getCavoidableAccess().getAlternatives()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "ruleCavoidable"
-
-
-    // $ANTLR start "ruleIavoidable"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:555:1: ruleIavoidable : ( ( rule__Iavoidable__Alternatives ) ) ;
-    public final void ruleIavoidable() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:559:1: ( ( ( rule__Iavoidable__Alternatives ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:560:1: ( ( rule__Iavoidable__Alternatives ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:560:1: ( ( rule__Iavoidable__Alternatives ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:561:1: ( rule__Iavoidable__Alternatives )
-            {
-             before(grammarAccess.getIavoidableAccess().getAlternatives()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:562:1: ( rule__Iavoidable__Alternatives )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:562:2: rule__Iavoidable__Alternatives
-            {
-            pushFollow(FOLLOW_rule__Iavoidable__Alternatives_in_ruleIavoidable1106);
-            rule__Iavoidable__Alternatives();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getIavoidableAccess().getAlternatives()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "ruleIavoidable"
-
-
-    // $ANTLR start "ruleDavoidable"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:574:1: ruleDavoidable : ( ( rule__Davoidable__Alternatives ) ) ;
-    public final void ruleDavoidable() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:578:1: ( ( ( rule__Davoidable__Alternatives ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:579:1: ( ( rule__Davoidable__Alternatives ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:579:1: ( ( rule__Davoidable__Alternatives ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:580:1: ( rule__Davoidable__Alternatives )
-            {
-             before(grammarAccess.getDavoidableAccess().getAlternatives()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:581:1: ( rule__Davoidable__Alternatives )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:581:2: rule__Davoidable__Alternatives
-            {
-            pushFollow(FOLLOW_rule__Davoidable__Alternatives_in_ruleDavoidable1142);
-            rule__Davoidable__Alternatives();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getDavoidableAccess().getAlternatives()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "ruleDavoidable"
-
-
-    // $ANTLR start "ruleAmitigation"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:593:1: ruleAmitigation : ( ( rule__Amitigation__Alternatives ) ) ;
-    public final void ruleAmitigation() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:597:1: ( ( ( rule__Amitigation__Alternatives ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:598:1: ( ( rule__Amitigation__Alternatives ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:598:1: ( ( rule__Amitigation__Alternatives ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:599:1: ( rule__Amitigation__Alternatives )
-            {
-             before(grammarAccess.getAmitigationAccess().getAlternatives()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:600:1: ( rule__Amitigation__Alternatives )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:600:2: rule__Amitigation__Alternatives
-            {
-            pushFollow(FOLLOW_rule__Amitigation__Alternatives_in_ruleAmitigation1178);
-            rule__Amitigation__Alternatives();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getAmitigationAccess().getAlternatives()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "ruleAmitigation"
-
-
-    // $ANTLR start "ruleCmitigation"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:612:1: ruleCmitigation : ( ( rule__Cmitigation__Alternatives ) ) ;
-    public final void ruleCmitigation() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:616:1: ( ( ( rule__Cmitigation__Alternatives ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:617:1: ( ( rule__Cmitigation__Alternatives ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:617:1: ( ( rule__Cmitigation__Alternatives ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:618:1: ( rule__Cmitigation__Alternatives )
-            {
-             before(grammarAccess.getCmitigationAccess().getAlternatives()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:619:1: ( rule__Cmitigation__Alternatives )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:619:2: rule__Cmitigation__Alternatives
-            {
-            pushFollow(FOLLOW_rule__Cmitigation__Alternatives_in_ruleCmitigation1214);
-            rule__Cmitigation__Alternatives();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getCmitigationAccess().getAlternatives()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "ruleCmitigation"
-
-
-    // $ANTLR start "ruleImitigation"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:631:1: ruleImitigation : ( ( rule__Imitigation__Alternatives ) ) ;
-    public final void ruleImitigation() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:635:1: ( ( ( rule__Imitigation__Alternatives ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:636:1: ( ( rule__Imitigation__Alternatives ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:636:1: ( ( rule__Imitigation__Alternatives ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:637:1: ( rule__Imitigation__Alternatives )
-            {
-             before(grammarAccess.getImitigationAccess().getAlternatives()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:638:1: ( rule__Imitigation__Alternatives )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:638:2: rule__Imitigation__Alternatives
-            {
-            pushFollow(FOLLOW_rule__Imitigation__Alternatives_in_ruleImitigation1250);
-            rule__Imitigation__Alternatives();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getImitigationAccess().getAlternatives()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "ruleImitigation"
-
-
-    // $ANTLR start "ruleDmitigation"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:650:1: ruleDmitigation : ( ( rule__Dmitigation__Alternatives ) ) ;
-    public final void ruleDmitigation() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:654:1: ( ( ( rule__Dmitigation__Alternatives ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:655:1: ( ( rule__Dmitigation__Alternatives ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:655:1: ( ( rule__Dmitigation__Alternatives ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:656:1: ( rule__Dmitigation__Alternatives )
-            {
-             before(grammarAccess.getDmitigationAccess().getAlternatives()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:657:1: ( rule__Dmitigation__Alternatives )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:657:2: rule__Dmitigation__Alternatives
-            {
-            pushFollow(FOLLOW_rule__Dmitigation__Alternatives_in_ruleDmitigation1286);
-            rule__Dmitigation__Alternatives();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getDmitigationAccess().getAlternatives()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "ruleDmitigation"
-
-
-    // $ANTLR start "rule__InputExpression__Alternatives_0"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:668:1: rule__InputExpression__Alternatives_0 : ( ( ( rule__InputExpression__RefAssignment_0_0 ) ) | ( 'undefined' ) );
-    public final void rule__InputExpression__Alternatives_0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:672:1: ( ( ( rule__InputExpression__RefAssignment_0_0 ) ) | ( 'undefined' ) )
-            int alt2=2;
-            int LA2_0 = input.LA(1);
-
-            if ( (LA2_0==RULE_ID) ) {
-                alt2=1;
-            }
-            else if ( (LA2_0==11) ) {
-                alt2=2;
-            }
-            else {
-                NoViableAltException nvae =
-                    new NoViableAltException("", 2, 0, input);
-
-                throw nvae;
-            }
-            switch (alt2) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:673:1: ( ( rule__InputExpression__RefAssignment_0_0 ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:673:1: ( ( rule__InputExpression__RefAssignment_0_0 ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:674:1: ( rule__InputExpression__RefAssignment_0_0 )
-                    {
-                     before(grammarAccess.getInputExpressionAccess().getRefAssignment_0_0()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:675:1: ( rule__InputExpression__RefAssignment_0_0 )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:675:2: rule__InputExpression__RefAssignment_0_0
-                    {
-                    pushFollow(FOLLOW_rule__InputExpression__RefAssignment_0_0_in_rule__InputExpression__Alternatives_01321);
-                    rule__InputExpression__RefAssignment_0_0();
-
-                    state._fsp--;
-
-
-                    }
-
-                     after(grammarAccess.getInputExpressionAccess().getRefAssignment_0_0()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:679:6: ( 'undefined' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:679:6: ( 'undefined' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:680:1: 'undefined'
-                    {
-                     before(grammarAccess.getInputExpressionAccess().getUndefinedKeyword_0_1()); 
-                    match(input,11,FOLLOW_11_in_rule__InputExpression__Alternatives_01340); 
-                     after(grammarAccess.getInputExpressionAccess().getUndefinedKeyword_0_1()); 
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__InputExpression__Alternatives_0"
-
-
-    // $ANTLR start "rule__OutputExpression__Alternatives_0"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:692:1: rule__OutputExpression__Alternatives_0 : ( ( ( rule__OutputExpression__RefAssignment_0_0 ) ) | ( 'undefined' ) );
-    public final void rule__OutputExpression__Alternatives_0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:696:1: ( ( ( rule__OutputExpression__RefAssignment_0_0 ) ) | ( 'undefined' ) )
-            int alt3=2;
-            int LA3_0 = input.LA(1);
-
-            if ( (LA3_0==RULE_ID) ) {
-                alt3=1;
-            }
-            else if ( (LA3_0==11) ) {
-                alt3=2;
-            }
-            else {
-                NoViableAltException nvae =
-                    new NoViableAltException("", 3, 0, input);
-
-                throw nvae;
-            }
-            switch (alt3) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:697:1: ( ( rule__OutputExpression__RefAssignment_0_0 ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:697:1: ( ( rule__OutputExpression__RefAssignment_0_0 ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:698:1: ( rule__OutputExpression__RefAssignment_0_0 )
-                    {
-                     before(grammarAccess.getOutputExpressionAccess().getRefAssignment_0_0()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:699:1: ( rule__OutputExpression__RefAssignment_0_0 )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:699:2: rule__OutputExpression__RefAssignment_0_0
-                    {
-                    pushFollow(FOLLOW_rule__OutputExpression__RefAssignment_0_0_in_rule__OutputExpression__Alternatives_01374);
-                    rule__OutputExpression__RefAssignment_0_0();
-
-                    state._fsp--;
-
-
-                    }
-
-                     after(grammarAccess.getOutputExpressionAccess().getRefAssignment_0_0()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:703:6: ( 'undefined' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:703:6: ( 'undefined' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:704:1: 'undefined'
-                    {
-                     before(grammarAccess.getOutputExpressionAccess().getUndefinedKeyword_0_1()); 
-                    match(input,11,FOLLOW_11_in_rule__OutputExpression__Alternatives_01393); 
-                     after(grammarAccess.getOutputExpressionAccess().getUndefinedKeyword_0_1()); 
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__OutputExpression__Alternatives_0"
-
-
-    // $ANTLR start "rule__InFailureExpr__Alternatives"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:716:1: rule__InFailureExpr__Alternatives : ( ( ( rule__InFailureExpr__FailuresAssignment_0 ) ) | ( ( rule__InFailureExpr__FailuresAssignment_1 ) ) | ( ( rule__InFailureExpr__FailuresAssignment_2 ) ) | ( ( rule__InFailureExpr__Group_3__0 ) ) | ( ( rule__InFailureExpr__FailuresAssignment_4 ) ) );
-    public final void rule__InFailureExpr__Alternatives() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:720:1: ( ( ( rule__InFailureExpr__FailuresAssignment_0 ) ) | ( ( rule__InFailureExpr__FailuresAssignment_1 ) ) | ( ( rule__InFailureExpr__FailuresAssignment_2 ) ) | ( ( rule__InFailureExpr__Group_3__0 ) ) | ( ( rule__InFailureExpr__FailuresAssignment_4 ) ) )
-            int alt4=5;
-            switch ( input.LA(1) ) {
-            case 40:
-                {
-                alt4=1;
-                }
-                break;
-            case 39:
-                {
-                alt4=2;
-                }
-                break;
-            case 12:
-            case 13:
-            case 14:
-            case 15:
-            case 16:
-            case 17:
-                {
-                alt4=3;
-                }
-                break;
-            case 37:
-                {
-                alt4=4;
-                }
-                break;
-            case RULE_ID:
-                {
-                alt4=5;
-                }
-                break;
-            default:
-                NoViableAltException nvae =
-                    new NoViableAltException("", 4, 0, input);
-
-                throw nvae;
-            }
-
-            switch (alt4) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:721:1: ( ( rule__InFailureExpr__FailuresAssignment_0 ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:721:1: ( ( rule__InFailureExpr__FailuresAssignment_0 ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:722:1: ( rule__InFailureExpr__FailuresAssignment_0 )
-                    {
-                     before(grammarAccess.getInFailureExprAccess().getFailuresAssignment_0()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:723:1: ( rule__InFailureExpr__FailuresAssignment_0 )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:723:2: rule__InFailureExpr__FailuresAssignment_0
-                    {
-                    pushFollow(FOLLOW_rule__InFailureExpr__FailuresAssignment_0_in_rule__InFailureExpr__Alternatives1427);
-                    rule__InFailureExpr__FailuresAssignment_0();
-
-                    state._fsp--;
-
-
-                    }
-
-                     after(grammarAccess.getInFailureExprAccess().getFailuresAssignment_0()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:727:6: ( ( rule__InFailureExpr__FailuresAssignment_1 ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:727:6: ( ( rule__InFailureExpr__FailuresAssignment_1 ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:728:1: ( rule__InFailureExpr__FailuresAssignment_1 )
-                    {
-                     before(grammarAccess.getInFailureExprAccess().getFailuresAssignment_1()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:729:1: ( rule__InFailureExpr__FailuresAssignment_1 )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:729:2: rule__InFailureExpr__FailuresAssignment_1
-                    {
-                    pushFollow(FOLLOW_rule__InFailureExpr__FailuresAssignment_1_in_rule__InFailureExpr__Alternatives1445);
-                    rule__InFailureExpr__FailuresAssignment_1();
-
-                    state._fsp--;
-
-
-                    }
-
-                     after(grammarAccess.getInFailureExprAccess().getFailuresAssignment_1()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 3 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:733:6: ( ( rule__InFailureExpr__FailuresAssignment_2 ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:733:6: ( ( rule__InFailureExpr__FailuresAssignment_2 ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:734:1: ( rule__InFailureExpr__FailuresAssignment_2 )
-                    {
-                     before(grammarAccess.getInFailureExprAccess().getFailuresAssignment_2()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:735:1: ( rule__InFailureExpr__FailuresAssignment_2 )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:735:2: rule__InFailureExpr__FailuresAssignment_2
-                    {
-                    pushFollow(FOLLOW_rule__InFailureExpr__FailuresAssignment_2_in_rule__InFailureExpr__Alternatives1463);
-                    rule__InFailureExpr__FailuresAssignment_2();
-
-                    state._fsp--;
-
-
-                    }
-
-                     after(grammarAccess.getInFailureExprAccess().getFailuresAssignment_2()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 4 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:739:6: ( ( rule__InFailureExpr__Group_3__0 ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:739:6: ( ( rule__InFailureExpr__Group_3__0 ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:740:1: ( rule__InFailureExpr__Group_3__0 )
-                    {
-                     before(grammarAccess.getInFailureExprAccess().getGroup_3()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:741:1: ( rule__InFailureExpr__Group_3__0 )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:741:2: rule__InFailureExpr__Group_3__0
-                    {
-                    pushFollow(FOLLOW_rule__InFailureExpr__Group_3__0_in_rule__InFailureExpr__Alternatives1481);
-                    rule__InFailureExpr__Group_3__0();
-
-                    state._fsp--;
-
-
-                    }
-
-                     after(grammarAccess.getInFailureExprAccess().getGroup_3()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 5 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:745:6: ( ( rule__InFailureExpr__FailuresAssignment_4 ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:745:6: ( ( rule__InFailureExpr__FailuresAssignment_4 ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:746:1: ( rule__InFailureExpr__FailuresAssignment_4 )
-                    {
-                     before(grammarAccess.getInFailureExprAccess().getFailuresAssignment_4()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:747:1: ( rule__InFailureExpr__FailuresAssignment_4 )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:747:2: rule__InFailureExpr__FailuresAssignment_4
-                    {
-                    pushFollow(FOLLOW_rule__InFailureExpr__FailuresAssignment_4_in_rule__InFailureExpr__Alternatives1499);
-                    rule__InFailureExpr__FailuresAssignment_4();
-
-                    state._fsp--;
-
-
-                    }
-
-                     after(grammarAccess.getInFailureExprAccess().getFailuresAssignment_4()); 
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__InFailureExpr__Alternatives"
-
-
-    // $ANTLR start "rule__OutFailureExpr__Alternatives"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:756:1: rule__OutFailureExpr__Alternatives : ( ( ( rule__OutFailureExpr__FailuresAssignment_0 ) ) | ( ( rule__OutFailureExpr__FailuresAssignment_1 ) ) | ( ( rule__OutFailureExpr__FailuresAssignment_2 ) ) | ( ( rule__OutFailureExpr__Group_3__0 ) ) | ( ( rule__OutFailureExpr__FailuresAssignment_4 ) ) );
-    public final void rule__OutFailureExpr__Alternatives() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:760:1: ( ( ( rule__OutFailureExpr__FailuresAssignment_0 ) ) | ( ( rule__OutFailureExpr__FailuresAssignment_1 ) ) | ( ( rule__OutFailureExpr__FailuresAssignment_2 ) ) | ( ( rule__OutFailureExpr__Group_3__0 ) ) | ( ( rule__OutFailureExpr__FailuresAssignment_4 ) ) )
-            int alt5=5;
-            switch ( input.LA(1) ) {
-            case 39:
-                {
-                int LA5_1 = input.LA(2);
-
-                if ( (LA5_1==36) ) {
-                    alt5=2;
-                }
-                else if ( (LA5_1==EOF||(LA5_1>=34 && LA5_1<=35)) ) {
-                    alt5=1;
-                }
-                else {
-                    NoViableAltException nvae =
-                        new NoViableAltException("", 5, 1, input);
-
-                    throw nvae;
-                }
-                }
-                break;
-            case 12:
-            case 13:
-            case 14:
-            case 15:
-            case 16:
-            case 17:
-                {
-                alt5=3;
-                }
-                break;
-            case 37:
-                {
-                alt5=4;
-                }
-                break;
-            case RULE_ID:
-                {
-                alt5=5;
-                }
-                break;
-            default:
-                NoViableAltException nvae =
-                    new NoViableAltException("", 5, 0, input);
-
-                throw nvae;
-            }
-
-            switch (alt5) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:761:1: ( ( rule__OutFailureExpr__FailuresAssignment_0 ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:761:1: ( ( rule__OutFailureExpr__FailuresAssignment_0 ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:762:1: ( rule__OutFailureExpr__FailuresAssignment_0 )
-                    {
-                     before(grammarAccess.getOutFailureExprAccess().getFailuresAssignment_0()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:763:1: ( rule__OutFailureExpr__FailuresAssignment_0 )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:763:2: rule__OutFailureExpr__FailuresAssignment_0
-                    {
-                    pushFollow(FOLLOW_rule__OutFailureExpr__FailuresAssignment_0_in_rule__OutFailureExpr__Alternatives1532);
-                    rule__OutFailureExpr__FailuresAssignment_0();
-
-                    state._fsp--;
-
-
-                    }
-
-                     after(grammarAccess.getOutFailureExprAccess().getFailuresAssignment_0()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:767:6: ( ( rule__OutFailureExpr__FailuresAssignment_1 ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:767:6: ( ( rule__OutFailureExpr__FailuresAssignment_1 ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:768:1: ( rule__OutFailureExpr__FailuresAssignment_1 )
-                    {
-                     before(grammarAccess.getOutFailureExprAccess().getFailuresAssignment_1()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:769:1: ( rule__OutFailureExpr__FailuresAssignment_1 )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:769:2: rule__OutFailureExpr__FailuresAssignment_1
-                    {
-                    pushFollow(FOLLOW_rule__OutFailureExpr__FailuresAssignment_1_in_rule__OutFailureExpr__Alternatives1550);
-                    rule__OutFailureExpr__FailuresAssignment_1();
-
-                    state._fsp--;
-
-
-                    }
-
-                     after(grammarAccess.getOutFailureExprAccess().getFailuresAssignment_1()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 3 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:773:6: ( ( rule__OutFailureExpr__FailuresAssignment_2 ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:773:6: ( ( rule__OutFailureExpr__FailuresAssignment_2 ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:774:1: ( rule__OutFailureExpr__FailuresAssignment_2 )
-                    {
-                     before(grammarAccess.getOutFailureExprAccess().getFailuresAssignment_2()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:775:1: ( rule__OutFailureExpr__FailuresAssignment_2 )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:775:2: rule__OutFailureExpr__FailuresAssignment_2
-                    {
-                    pushFollow(FOLLOW_rule__OutFailureExpr__FailuresAssignment_2_in_rule__OutFailureExpr__Alternatives1568);
-                    rule__OutFailureExpr__FailuresAssignment_2();
-
-                    state._fsp--;
-
-
-                    }
-
-                     after(grammarAccess.getOutFailureExprAccess().getFailuresAssignment_2()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 4 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:779:6: ( ( rule__OutFailureExpr__Group_3__0 ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:779:6: ( ( rule__OutFailureExpr__Group_3__0 ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:780:1: ( rule__OutFailureExpr__Group_3__0 )
-                    {
-                     before(grammarAccess.getOutFailureExprAccess().getGroup_3()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:781:1: ( rule__OutFailureExpr__Group_3__0 )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:781:2: rule__OutFailureExpr__Group_3__0
-                    {
-                    pushFollow(FOLLOW_rule__OutFailureExpr__Group_3__0_in_rule__OutFailureExpr__Alternatives1586);
-                    rule__OutFailureExpr__Group_3__0();
-
-                    state._fsp--;
-
-
-                    }
-
-                     after(grammarAccess.getOutFailureExprAccess().getGroup_3()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 5 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:785:6: ( ( rule__OutFailureExpr__FailuresAssignment_4 ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:785:6: ( ( rule__OutFailureExpr__FailuresAssignment_4 ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:786:1: ( rule__OutFailureExpr__FailuresAssignment_4 )
-                    {
-                     before(grammarAccess.getOutFailureExprAccess().getFailuresAssignment_4()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:787:1: ( rule__OutFailureExpr__FailuresAssignment_4 )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:787:2: rule__OutFailureExpr__FailuresAssignment_4
-                    {
-                    pushFollow(FOLLOW_rule__OutFailureExpr__FailuresAssignment_4_in_rule__OutFailureExpr__Alternatives1604);
-                    rule__OutFailureExpr__FailuresAssignment_4();
-
-                    state._fsp--;
-
-
-                    }
-
-                     after(grammarAccess.getOutFailureExprAccess().getFailuresAssignment_4()); 
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__OutFailureExpr__Alternatives"
-
-
-    // $ANTLR start "rule__ActualFailureType__Alternatives"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:798:1: rule__ActualFailureType__Alternatives : ( ( ( 'early' ) ) | ( ( 'late' ) ) | ( ( 'commission' ) ) | ( ( 'omission' ) ) | ( ( 'valueSubtle' ) ) | ( ( 'valueCoarse' ) ) );
-    public final void rule__ActualFailureType__Alternatives() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:802:1: ( ( ( 'early' ) ) | ( ( 'late' ) ) | ( ( 'commission' ) ) | ( ( 'omission' ) ) | ( ( 'valueSubtle' ) ) | ( ( 'valueCoarse' ) ) )
-            int alt6=6;
-            switch ( input.LA(1) ) {
-            case 12:
-                {
-                alt6=1;
-                }
-                break;
-            case 13:
-                {
-                alt6=2;
-                }
-                break;
-            case 14:
-                {
-                alt6=3;
-                }
-                break;
-            case 15:
-                {
-                alt6=4;
-                }
-                break;
-            case 16:
-                {
-                alt6=5;
-                }
-                break;
-            case 17:
-                {
-                alt6=6;
-                }
-                break;
-            default:
-                NoViableAltException nvae =
-                    new NoViableAltException("", 6, 0, input);
-
-                throw nvae;
-            }
-
-            switch (alt6) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:803:1: ( ( 'early' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:803:1: ( ( 'early' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:804:1: ( 'early' )
-                    {
-                     before(grammarAccess.getActualFailureTypeAccess().getEARLYEnumLiteralDeclaration_0()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:805:1: ( 'early' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:805:3: 'early'
-                    {
-                    match(input,12,FOLLOW_12_in_rule__ActualFailureType__Alternatives1640); 
-
-                    }
-
-                     after(grammarAccess.getActualFailureTypeAccess().getEARLYEnumLiteralDeclaration_0()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:810:6: ( ( 'late' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:810:6: ( ( 'late' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:811:1: ( 'late' )
-                    {
-                     before(grammarAccess.getActualFailureTypeAccess().getLATEEnumLiteralDeclaration_1()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:812:1: ( 'late' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:812:3: 'late'
-                    {
-                    match(input,13,FOLLOW_13_in_rule__ActualFailureType__Alternatives1661); 
-
-                    }
-
-                     after(grammarAccess.getActualFailureTypeAccess().getLATEEnumLiteralDeclaration_1()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 3 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:817:6: ( ( 'commission' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:817:6: ( ( 'commission' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:818:1: ( 'commission' )
-                    {
-                     before(grammarAccess.getActualFailureTypeAccess().getCOMMISSIONEnumLiteralDeclaration_2()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:819:1: ( 'commission' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:819:3: 'commission'
-                    {
-                    match(input,14,FOLLOW_14_in_rule__ActualFailureType__Alternatives1682); 
-
-                    }
-
-                     after(grammarAccess.getActualFailureTypeAccess().getCOMMISSIONEnumLiteralDeclaration_2()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 4 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:824:6: ( ( 'omission' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:824:6: ( ( 'omission' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:825:1: ( 'omission' )
-                    {
-                     before(grammarAccess.getActualFailureTypeAccess().getOMISSIONEnumLiteralDeclaration_3()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:826:1: ( 'omission' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:826:3: 'omission'
-                    {
-                    match(input,15,FOLLOW_15_in_rule__ActualFailureType__Alternatives1703); 
-
-                    }
-
-                     after(grammarAccess.getActualFailureTypeAccess().getOMISSIONEnumLiteralDeclaration_3()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 5 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:831:6: ( ( 'valueSubtle' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:831:6: ( ( 'valueSubtle' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:832:1: ( 'valueSubtle' )
-                    {
-                     before(grammarAccess.getActualFailureTypeAccess().getVALUE_SUBTLEEnumLiteralDeclaration_4()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:833:1: ( 'valueSubtle' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:833:3: 'valueSubtle'
-                    {
-                    match(input,16,FOLLOW_16_in_rule__ActualFailureType__Alternatives1724); 
-
-                    }
-
-                     after(grammarAccess.getActualFailureTypeAccess().getVALUE_SUBTLEEnumLiteralDeclaration_4()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 6 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:838:6: ( ( 'valueCoarse' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:838:6: ( ( 'valueCoarse' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:839:1: ( 'valueCoarse' )
-                    {
-                     before(grammarAccess.getActualFailureTypeAccess().getVALUE_COARSEEnumLiteralDeclaration_5()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:840:1: ( 'valueCoarse' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:840:3: 'valueCoarse'
-                    {
-                    match(input,17,FOLLOW_17_in_rule__ActualFailureType__Alternatives1745); 
-
-                    }
-
-                     after(grammarAccess.getActualFailureTypeAccess().getVALUE_COARSEEnumLiteralDeclaration_5()); 
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ActualFailureType__Alternatives"
-
-
-    // $ANTLR start "rule__Aavoidable__Alternatives"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:850:1: rule__Aavoidable__Alternatives : ( ( ( 'incompletion' ) ) | ( ( 'none' ) ) | ( ( 'unspecified' ) ) );
-    public final void rule__Aavoidable__Alternatives() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:854:1: ( ( ( 'incompletion' ) ) | ( ( 'none' ) ) | ( ( 'unspecified' ) ) )
-            int alt7=3;
-            switch ( input.LA(1) ) {
-            case 18:
-                {
-                alt7=1;
-                }
-                break;
-            case 19:
-                {
-                alt7=2;
-                }
-                break;
-            case 20:
-                {
-                alt7=3;
-                }
-                break;
-            default:
-                NoViableAltException nvae =
-                    new NoViableAltException("", 7, 0, input);
-
-                throw nvae;
-            }
-
-            switch (alt7) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:855:1: ( ( 'incompletion' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:855:1: ( ( 'incompletion' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:856:1: ( 'incompletion' )
-                    {
-                     before(grammarAccess.getAavoidableAccess().getINCOMPLETIONEnumLiteralDeclaration_0()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:857:1: ( 'incompletion' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:857:3: 'incompletion'
-                    {
-                    match(input,18,FOLLOW_18_in_rule__Aavoidable__Alternatives1781); 
-
-                    }
-
-                     after(grammarAccess.getAavoidableAccess().getINCOMPLETIONEnumLiteralDeclaration_0()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:862:6: ( ( 'none' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:862:6: ( ( 'none' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:863:1: ( 'none' )
-                    {
-                     before(grammarAccess.getAavoidableAccess().getNONEEnumLiteralDeclaration_1()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:864:1: ( 'none' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:864:3: 'none'
-                    {
-                    match(input,19,FOLLOW_19_in_rule__Aavoidable__Alternatives1802); 
-
-                    }
-
-                     after(grammarAccess.getAavoidableAccess().getNONEEnumLiteralDeclaration_1()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 3 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:869:6: ( ( 'unspecified' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:869:6: ( ( 'unspecified' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:870:1: ( 'unspecified' )
-                    {
-                     before(grammarAccess.getAavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:871:1: ( 'unspecified' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:871:3: 'unspecified'
-                    {
-                    match(input,20,FOLLOW_20_in_rule__Aavoidable__Alternatives1823); 
-
-                    }
-
-                     after(grammarAccess.getAavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2()); 
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Aavoidable__Alternatives"
-
-
-    // $ANTLR start "rule__Cavoidable__Alternatives"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:881:1: rule__Cavoidable__Alternatives : ( ( ( 'inconsistency' ) ) | ( ( 'none' ) ) | ( ( 'unspecified' ) ) );
-    public final void rule__Cavoidable__Alternatives() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:885:1: ( ( ( 'inconsistency' ) ) | ( ( 'none' ) ) | ( ( 'unspecified' ) ) )
-            int alt8=3;
-            switch ( input.LA(1) ) {
-            case 21:
-                {
-                alt8=1;
-                }
-                break;
-            case 19:
-                {
-                alt8=2;
-                }
-                break;
-            case 20:
-                {
-                alt8=3;
-                }
-                break;
-            default:
-                NoViableAltException nvae =
-                    new NoViableAltException("", 8, 0, input);
-
-                throw nvae;
-            }
-
-            switch (alt8) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:886:1: ( ( 'inconsistency' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:886:1: ( ( 'inconsistency' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:887:1: ( 'inconsistency' )
-                    {
-                     before(grammarAccess.getCavoidableAccess().getINCONSISTENCYEnumLiteralDeclaration_0()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:888:1: ( 'inconsistency' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:888:3: 'inconsistency'
-                    {
-                    match(input,21,FOLLOW_21_in_rule__Cavoidable__Alternatives1859); 
-
-                    }
-
-                     after(grammarAccess.getCavoidableAccess().getINCONSISTENCYEnumLiteralDeclaration_0()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:893:6: ( ( 'none' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:893:6: ( ( 'none' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:894:1: ( 'none' )
-                    {
-                     before(grammarAccess.getCavoidableAccess().getNONEEnumLiteralDeclaration_1()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:895:1: ( 'none' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:895:3: 'none'
-                    {
-                    match(input,19,FOLLOW_19_in_rule__Cavoidable__Alternatives1880); 
-
-                    }
-
-                     after(grammarAccess.getCavoidableAccess().getNONEEnumLiteralDeclaration_1()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 3 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:900:6: ( ( 'unspecified' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:900:6: ( ( 'unspecified' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:901:1: ( 'unspecified' )
-                    {
-                     before(grammarAccess.getCavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:902:1: ( 'unspecified' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:902:3: 'unspecified'
-                    {
-                    match(input,20,FOLLOW_20_in_rule__Cavoidable__Alternatives1901); 
-
-                    }
-
-                     after(grammarAccess.getCavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2()); 
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Cavoidable__Alternatives"
-
-
-    // $ANTLR start "rule__Iavoidable__Alternatives"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:912:1: rule__Iavoidable__Alternatives : ( ( ( 'interference' ) ) | ( ( 'none' ) ) | ( ( 'unspecified' ) ) );
-    public final void rule__Iavoidable__Alternatives() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:916:1: ( ( ( 'interference' ) ) | ( ( 'none' ) ) | ( ( 'unspecified' ) ) )
-            int alt9=3;
-            switch ( input.LA(1) ) {
-            case 22:
-                {
-                alt9=1;
-                }
-                break;
-            case 19:
-                {
-                alt9=2;
-                }
-                break;
-            case 20:
-                {
-                alt9=3;
-                }
-                break;
-            default:
-                NoViableAltException nvae =
-                    new NoViableAltException("", 9, 0, input);
-
-                throw nvae;
-            }
-
-            switch (alt9) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:917:1: ( ( 'interference' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:917:1: ( ( 'interference' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:918:1: ( 'interference' )
-                    {
-                     before(grammarAccess.getIavoidableAccess().getINTERFERENCEEnumLiteralDeclaration_0()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:919:1: ( 'interference' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:919:3: 'interference'
-                    {
-                    match(input,22,FOLLOW_22_in_rule__Iavoidable__Alternatives1937); 
-
-                    }
-
-                     after(grammarAccess.getIavoidableAccess().getINTERFERENCEEnumLiteralDeclaration_0()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:924:6: ( ( 'none' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:924:6: ( ( 'none' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:925:1: ( 'none' )
-                    {
-                     before(grammarAccess.getIavoidableAccess().getNONEEnumLiteralDeclaration_1()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:926:1: ( 'none' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:926:3: 'none'
-                    {
-                    match(input,19,FOLLOW_19_in_rule__Iavoidable__Alternatives1958); 
-
-                    }
-
-                     after(grammarAccess.getIavoidableAccess().getNONEEnumLiteralDeclaration_1()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 3 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:931:6: ( ( 'unspecified' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:931:6: ( ( 'unspecified' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:932:1: ( 'unspecified' )
-                    {
-                     before(grammarAccess.getIavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:933:1: ( 'unspecified' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:933:3: 'unspecified'
-                    {
-                    match(input,20,FOLLOW_20_in_rule__Iavoidable__Alternatives1979); 
-
-                    }
-
-                     after(grammarAccess.getIavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2()); 
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Iavoidable__Alternatives"
-
-
-    // $ANTLR start "rule__Davoidable__Alternatives"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:943:1: rule__Davoidable__Alternatives : ( ( ( 'impermanence' ) ) | ( ( 'none' ) ) | ( ( 'unspecified' ) ) );
-    public final void rule__Davoidable__Alternatives() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:947:1: ( ( ( 'impermanence' ) ) | ( ( 'none' ) ) | ( ( 'unspecified' ) ) )
-            int alt10=3;
-            switch ( input.LA(1) ) {
-            case 23:
-                {
-                alt10=1;
-                }
-                break;
-            case 19:
-                {
-                alt10=2;
-                }
-                break;
-            case 20:
-                {
-                alt10=3;
-                }
-                break;
-            default:
-                NoViableAltException nvae =
-                    new NoViableAltException("", 10, 0, input);
-
-                throw nvae;
-            }
-
-            switch (alt10) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:948:1: ( ( 'impermanence' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:948:1: ( ( 'impermanence' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:949:1: ( 'impermanence' )
-                    {
-                     before(grammarAccess.getDavoidableAccess().getIMPERMANENCEEnumLiteralDeclaration_0()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:950:1: ( 'impermanence' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:950:3: 'impermanence'
-                    {
-                    match(input,23,FOLLOW_23_in_rule__Davoidable__Alternatives2015); 
-
-                    }
-
-                     after(grammarAccess.getDavoidableAccess().getIMPERMANENCEEnumLiteralDeclaration_0()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:955:6: ( ( 'none' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:955:6: ( ( 'none' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:956:1: ( 'none' )
-                    {
-                     before(grammarAccess.getDavoidableAccess().getNONEEnumLiteralDeclaration_1()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:957:1: ( 'none' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:957:3: 'none'
-                    {
-                    match(input,19,FOLLOW_19_in_rule__Davoidable__Alternatives2036); 
-
-                    }
-
-                     after(grammarAccess.getDavoidableAccess().getNONEEnumLiteralDeclaration_1()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 3 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:962:6: ( ( 'unspecified' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:962:6: ( ( 'unspecified' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:963:1: ( 'unspecified' )
-                    {
-                     before(grammarAccess.getDavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:964:1: ( 'unspecified' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:964:3: 'unspecified'
-                    {
-                    match(input,20,FOLLOW_20_in_rule__Davoidable__Alternatives2057); 
-
-                    }
-
-                     after(grammarAccess.getDavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2()); 
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Davoidable__Alternatives"
-
-
-    // $ANTLR start "rule__Amitigation__Alternatives"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:974:1: rule__Amitigation__Alternatives : ( ( ( 'all_or_nothing' ) ) | ( ( 'all_or_compensation' ) ) | ( ( 'none' ) ) | ( ( 'unspecified' ) ) );
-    public final void rule__Amitigation__Alternatives() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:978:1: ( ( ( 'all_or_nothing' ) ) | ( ( 'all_or_compensation' ) ) | ( ( 'none' ) ) | ( ( 'unspecified' ) ) )
-            int alt11=4;
-            switch ( input.LA(1) ) {
-            case 24:
-                {
-                alt11=1;
-                }
-                break;
-            case 25:
-                {
-                alt11=2;
-                }
-                break;
-            case 19:
-                {
-                alt11=3;
-                }
-                break;
-            case 20:
-                {
-                alt11=4;
-                }
-                break;
-            default:
-                NoViableAltException nvae =
-                    new NoViableAltException("", 11, 0, input);
-
-                throw nvae;
-            }
-
-            switch (alt11) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:979:1: ( ( 'all_or_nothing' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:979:1: ( ( 'all_or_nothing' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:980:1: ( 'all_or_nothing' )
-                    {
-                     before(grammarAccess.getAmitigationAccess().getALL_OR_NOTHINGEnumLiteralDeclaration_0()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:981:1: ( 'all_or_nothing' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:981:3: 'all_or_nothing'
-                    {
-                    match(input,24,FOLLOW_24_in_rule__Amitigation__Alternatives2093); 
-
-                    }
-
-                     after(grammarAccess.getAmitigationAccess().getALL_OR_NOTHINGEnumLiteralDeclaration_0()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:986:6: ( ( 'all_or_compensation' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:986:6: ( ( 'all_or_compensation' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:987:1: ( 'all_or_compensation' )
-                    {
-                     before(grammarAccess.getAmitigationAccess().getALL_OR_COMPENSATIONEnumLiteralDeclaration_1()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:988:1: ( 'all_or_compensation' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:988:3: 'all_or_compensation'
-                    {
-                    match(input,25,FOLLOW_25_in_rule__Amitigation__Alternatives2114); 
-
-                    }
-
-                     after(grammarAccess.getAmitigationAccess().getALL_OR_COMPENSATIONEnumLiteralDeclaration_1()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 3 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:993:6: ( ( 'none' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:993:6: ( ( 'none' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:994:1: ( 'none' )
-                    {
-                     before(grammarAccess.getAmitigationAccess().getNONEEnumLiteralDeclaration_2()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:995:1: ( 'none' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:995:3: 'none'
-                    {
-                    match(input,19,FOLLOW_19_in_rule__Amitigation__Alternatives2135); 
-
-                    }
-
-                     after(grammarAccess.getAmitigationAccess().getNONEEnumLiteralDeclaration_2()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 4 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1000:6: ( ( 'unspecified' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1000:6: ( ( 'unspecified' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1001:1: ( 'unspecified' )
-                    {
-                     before(grammarAccess.getAmitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1002:1: ( 'unspecified' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1002:3: 'unspecified'
-                    {
-                    match(input,20,FOLLOW_20_in_rule__Amitigation__Alternatives2156); 
-
-                    }
-
-                     after(grammarAccess.getAmitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3()); 
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Amitigation__Alternatives"
-
-
-    // $ANTLR start "rule__Cmitigation__Alternatives"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1012:1: rule__Cmitigation__Alternatives : ( ( ( 'full_consistency' ) ) | ( ( 'range_violation_allowed' ) ) | ( ( 'none' ) ) | ( ( 'unspecified' ) ) );
-    public final void rule__Cmitigation__Alternatives() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1016:1: ( ( ( 'full_consistency' ) ) | ( ( 'range_violation_allowed' ) ) | ( ( 'none' ) ) | ( ( 'unspecified' ) ) )
-            int alt12=4;
-            switch ( input.LA(1) ) {
-            case 26:
-                {
-                alt12=1;
-                }
-                break;
-            case 27:
-                {
-                alt12=2;
-                }
-                break;
-            case 19:
-                {
-                alt12=3;
-                }
-                break;
-            case 20:
-                {
-                alt12=4;
-                }
-                break;
-            default:
-                NoViableAltException nvae =
-                    new NoViableAltException("", 12, 0, input);
-
-                throw nvae;
-            }
-
-            switch (alt12) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1017:1: ( ( 'full_consistency' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1017:1: ( ( 'full_consistency' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1018:1: ( 'full_consistency' )
-                    {
-                     before(grammarAccess.getCmitigationAccess().getFULL_CONSISTENCYEnumLiteralDeclaration_0()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1019:1: ( 'full_consistency' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1019:3: 'full_consistency'
-                    {
-                    match(input,26,FOLLOW_26_in_rule__Cmitigation__Alternatives2192); 
-
-                    }
-
-                     after(grammarAccess.getCmitigationAccess().getFULL_CONSISTENCYEnumLiteralDeclaration_0()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1024:6: ( ( 'range_violation_allowed' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1024:6: ( ( 'range_violation_allowed' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1025:1: ( 'range_violation_allowed' )
-                    {
-                     before(grammarAccess.getCmitigationAccess().getRANGE_VIOLATION_ALLOWEDEnumLiteralDeclaration_1()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1026:1: ( 'range_violation_allowed' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1026:3: 'range_violation_allowed'
-                    {
-                    match(input,27,FOLLOW_27_in_rule__Cmitigation__Alternatives2213); 
-
-                    }
-
-                     after(grammarAccess.getCmitigationAccess().getRANGE_VIOLATION_ALLOWEDEnumLiteralDeclaration_1()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 3 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1031:6: ( ( 'none' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1031:6: ( ( 'none' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1032:1: ( 'none' )
-                    {
-                     before(grammarAccess.getCmitigationAccess().getNONEEnumLiteralDeclaration_2()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1033:1: ( 'none' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1033:3: 'none'
-                    {
-                    match(input,19,FOLLOW_19_in_rule__Cmitigation__Alternatives2234); 
-
-                    }
-
-                     after(grammarAccess.getCmitigationAccess().getNONEEnumLiteralDeclaration_2()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 4 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1038:6: ( ( 'unspecified' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1038:6: ( ( 'unspecified' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1039:1: ( 'unspecified' )
-                    {
-                     before(grammarAccess.getCmitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1040:1: ( 'unspecified' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1040:3: 'unspecified'
-                    {
-                    match(input,20,FOLLOW_20_in_rule__Cmitigation__Alternatives2255); 
-
-                    }
-
-                     after(grammarAccess.getCmitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3()); 
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Cmitigation__Alternatives"
-
-
-    // $ANTLR start "rule__Imitigation__Alternatives"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1050:1: rule__Imitigation__Alternatives : ( ( ( 'serializable' ) ) | ( ( 'portable_level' ) ) | ( ( 'none' ) ) | ( ( 'unspecified' ) ) );
-    public final void rule__Imitigation__Alternatives() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1054:1: ( ( ( 'serializable' ) ) | ( ( 'portable_level' ) ) | ( ( 'none' ) ) | ( ( 'unspecified' ) ) )
-            int alt13=4;
-            switch ( input.LA(1) ) {
-            case 28:
-                {
-                alt13=1;
-                }
-                break;
-            case 29:
-                {
-                alt13=2;
-                }
-                break;
-            case 19:
-                {
-                alt13=3;
-                }
-                break;
-            case 20:
-                {
-                alt13=4;
-                }
-                break;
-            default:
-                NoViableAltException nvae =
-                    new NoViableAltException("", 13, 0, input);
-
-                throw nvae;
-            }
-
-            switch (alt13) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1055:1: ( ( 'serializable' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1055:1: ( ( 'serializable' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1056:1: ( 'serializable' )
-                    {
-                     before(grammarAccess.getImitigationAccess().getSERIALIZABLEEnumLiteralDeclaration_0()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1057:1: ( 'serializable' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1057:3: 'serializable'
-                    {
-                    match(input,28,FOLLOW_28_in_rule__Imitigation__Alternatives2291); 
-
-                    }
-
-                     after(grammarAccess.getImitigationAccess().getSERIALIZABLEEnumLiteralDeclaration_0()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1062:6: ( ( 'portable_level' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1062:6: ( ( 'portable_level' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1063:1: ( 'portable_level' )
-                    {
-                     before(grammarAccess.getImitigationAccess().getPORTABLE_LEVELEnumLiteralDeclaration_1()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1064:1: ( 'portable_level' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1064:3: 'portable_level'
-                    {
-                    match(input,29,FOLLOW_29_in_rule__Imitigation__Alternatives2312); 
-
-                    }
-
-                     after(grammarAccess.getImitigationAccess().getPORTABLE_LEVELEnumLiteralDeclaration_1()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 3 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1069:6: ( ( 'none' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1069:6: ( ( 'none' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1070:1: ( 'none' )
-                    {
-                     before(grammarAccess.getImitigationAccess().getNONEEnumLiteralDeclaration_2()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1071:1: ( 'none' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1071:3: 'none'
-                    {
-                    match(input,19,FOLLOW_19_in_rule__Imitigation__Alternatives2333); 
-
-                    }
-
-                     after(grammarAccess.getImitigationAccess().getNONEEnumLiteralDeclaration_2()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 4 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1076:6: ( ( 'unspecified' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1076:6: ( ( 'unspecified' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1077:1: ( 'unspecified' )
-                    {
-                     before(grammarAccess.getImitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1078:1: ( 'unspecified' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1078:3: 'unspecified'
-                    {
-                    match(input,20,FOLLOW_20_in_rule__Imitigation__Alternatives2354); 
-
-                    }
-
-                     after(grammarAccess.getImitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3()); 
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Imitigation__Alternatives"
-
-
-    // $ANTLR start "rule__Dmitigation__Alternatives"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1088:1: rule__Dmitigation__Alternatives : ( ( ( 'no_loss' ) ) | ( ( 'partial_loss_allowed' ) ) | ( ( 'none' ) ) | ( ( 'unspecified' ) ) );
-    public final void rule__Dmitigation__Alternatives() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1092:1: ( ( ( 'no_loss' ) ) | ( ( 'partial_loss_allowed' ) ) | ( ( 'none' ) ) | ( ( 'unspecified' ) ) )
-            int alt14=4;
-            switch ( input.LA(1) ) {
-            case 30:
-                {
-                alt14=1;
-                }
-                break;
-            case 31:
-                {
-                alt14=2;
-                }
-                break;
-            case 19:
-                {
-                alt14=3;
-                }
-                break;
-            case 20:
-                {
-                alt14=4;
-                }
-                break;
-            default:
-                NoViableAltException nvae =
-                    new NoViableAltException("", 14, 0, input);
-
-                throw nvae;
-            }
-
-            switch (alt14) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1093:1: ( ( 'no_loss' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1093:1: ( ( 'no_loss' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1094:1: ( 'no_loss' )
-                    {
-                     before(grammarAccess.getDmitigationAccess().getNO_LOSSEnumLiteralDeclaration_0()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1095:1: ( 'no_loss' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1095:3: 'no_loss'
-                    {
-                    match(input,30,FOLLOW_30_in_rule__Dmitigation__Alternatives2390); 
-
-                    }
-
-                     after(grammarAccess.getDmitigationAccess().getNO_LOSSEnumLiteralDeclaration_0()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1100:6: ( ( 'partial_loss_allowed' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1100:6: ( ( 'partial_loss_allowed' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1101:1: ( 'partial_loss_allowed' )
-                    {
-                     before(grammarAccess.getDmitigationAccess().getPARTIAL_LOSS_ALLOWEDEnumLiteralDeclaration_1()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1102:1: ( 'partial_loss_allowed' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1102:3: 'partial_loss_allowed'
-                    {
-                    match(input,31,FOLLOW_31_in_rule__Dmitigation__Alternatives2411); 
-
-                    }
-
-                     after(grammarAccess.getDmitigationAccess().getPARTIAL_LOSS_ALLOWEDEnumLiteralDeclaration_1()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 3 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1107:6: ( ( 'none' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1107:6: ( ( 'none' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1108:1: ( 'none' )
-                    {
-                     before(grammarAccess.getDmitigationAccess().getNONEEnumLiteralDeclaration_2()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1109:1: ( 'none' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1109:3: 'none'
-                    {
-                    match(input,19,FOLLOW_19_in_rule__Dmitigation__Alternatives2432); 
-
-                    }
-
-                     after(grammarAccess.getDmitigationAccess().getNONEEnumLiteralDeclaration_2()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 4 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1114:6: ( ( 'unspecified' ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1114:6: ( ( 'unspecified' ) )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1115:1: ( 'unspecified' )
-                    {
-                     before(grammarAccess.getDmitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3()); 
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1116:1: ( 'unspecified' )
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1116:3: 'unspecified'
-                    {
-                    match(input,20,FOLLOW_20_in_rule__Dmitigation__Alternatives2453); 
-
-                    }
-
-                     after(grammarAccess.getDmitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3()); 
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Dmitigation__Alternatives"
-
-
-    // $ANTLR start "rule__Expression__Group__0"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1128:1: rule__Expression__Group__0 : rule__Expression__Group__0__Impl rule__Expression__Group__1 ;
-    public final void rule__Expression__Group__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1132:1: ( rule__Expression__Group__0__Impl rule__Expression__Group__1 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1133:2: rule__Expression__Group__0__Impl rule__Expression__Group__1
-            {
-            pushFollow(FOLLOW_rule__Expression__Group__0__Impl_in_rule__Expression__Group__02486);
-            rule__Expression__Group__0__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__Expression__Group__1_in_rule__Expression__Group__02489);
-            rule__Expression__Group__1();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Expression__Group__0"
-
-
-    // $ANTLR start "rule__Expression__Group__0__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1140:1: rule__Expression__Group__0__Impl : ( 'FLA:' ) ;
-    public final void rule__Expression__Group__0__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1144:1: ( ( 'FLA:' ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1145:1: ( 'FLA:' )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1145:1: ( 'FLA:' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1146:1: 'FLA:'
-            {
-             before(grammarAccess.getExpressionAccess().getFLAKeyword_0()); 
-            match(input,32,FOLLOW_32_in_rule__Expression__Group__0__Impl2517); 
-             after(grammarAccess.getExpressionAccess().getFLAKeyword_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Expression__Group__0__Impl"
-
-
-    // $ANTLR start "rule__Expression__Group__1"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1159:1: rule__Expression__Group__1 : rule__Expression__Group__1__Impl rule__Expression__Group__2 ;
-    public final void rule__Expression__Group__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1163:1: ( rule__Expression__Group__1__Impl rule__Expression__Group__2 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1164:2: rule__Expression__Group__1__Impl rule__Expression__Group__2
-            {
-            pushFollow(FOLLOW_rule__Expression__Group__1__Impl_in_rule__Expression__Group__12548);
-            rule__Expression__Group__1__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__Expression__Group__2_in_rule__Expression__Group__12551);
-            rule__Expression__Group__2();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Expression__Group__1"
-
-
-    // $ANTLR start "rule__Expression__Group__1__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1171:1: rule__Expression__Group__1__Impl : ( ( rule__Expression__LhsAssignment_1 ) ) ;
-    public final void rule__Expression__Group__1__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1175:1: ( ( ( rule__Expression__LhsAssignment_1 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1176:1: ( ( rule__Expression__LhsAssignment_1 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1176:1: ( ( rule__Expression__LhsAssignment_1 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1177:1: ( rule__Expression__LhsAssignment_1 )
-            {
-             before(grammarAccess.getExpressionAccess().getLhsAssignment_1()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1178:1: ( rule__Expression__LhsAssignment_1 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1178:2: rule__Expression__LhsAssignment_1
-            {
-            pushFollow(FOLLOW_rule__Expression__LhsAssignment_1_in_rule__Expression__Group__1__Impl2578);
-            rule__Expression__LhsAssignment_1();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getExpressionAccess().getLhsAssignment_1()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Expression__Group__1__Impl"
-
-
-    // $ANTLR start "rule__Expression__Group__2"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1188:1: rule__Expression__Group__2 : rule__Expression__Group__2__Impl rule__Expression__Group__3 ;
-    public final void rule__Expression__Group__2() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1192:1: ( rule__Expression__Group__2__Impl rule__Expression__Group__3 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1193:2: rule__Expression__Group__2__Impl rule__Expression__Group__3
-            {
-            pushFollow(FOLLOW_rule__Expression__Group__2__Impl_in_rule__Expression__Group__22608);
-            rule__Expression__Group__2__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__Expression__Group__3_in_rule__Expression__Group__22611);
-            rule__Expression__Group__3();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Expression__Group__2"
-
-
-    // $ANTLR start "rule__Expression__Group__2__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1200:1: rule__Expression__Group__2__Impl : ( '->' ) ;
-    public final void rule__Expression__Group__2__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1204:1: ( ( '->' ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1205:1: ( '->' )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1205:1: ( '->' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1206:1: '->'
-            {
-             before(grammarAccess.getExpressionAccess().getHyphenMinusGreaterThanSignKeyword_2()); 
-            match(input,33,FOLLOW_33_in_rule__Expression__Group__2__Impl2639); 
-             after(grammarAccess.getExpressionAccess().getHyphenMinusGreaterThanSignKeyword_2()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Expression__Group__2__Impl"
-
-
-    // $ANTLR start "rule__Expression__Group__3"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1219:1: rule__Expression__Group__3 : rule__Expression__Group__3__Impl rule__Expression__Group__4 ;
-    public final void rule__Expression__Group__3() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1223:1: ( rule__Expression__Group__3__Impl rule__Expression__Group__4 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1224:2: rule__Expression__Group__3__Impl rule__Expression__Group__4
-            {
-            pushFollow(FOLLOW_rule__Expression__Group__3__Impl_in_rule__Expression__Group__32670);
-            rule__Expression__Group__3__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__Expression__Group__4_in_rule__Expression__Group__32673);
-            rule__Expression__Group__4();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Expression__Group__3"
-
-
-    // $ANTLR start "rule__Expression__Group__3__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1231:1: rule__Expression__Group__3__Impl : ( ( rule__Expression__RhsAssignment_3 ) ) ;
-    public final void rule__Expression__Group__3__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1235:1: ( ( ( rule__Expression__RhsAssignment_3 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1236:1: ( ( rule__Expression__RhsAssignment_3 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1236:1: ( ( rule__Expression__RhsAssignment_3 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1237:1: ( rule__Expression__RhsAssignment_3 )
-            {
-             before(grammarAccess.getExpressionAccess().getRhsAssignment_3()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1238:1: ( rule__Expression__RhsAssignment_3 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1238:2: rule__Expression__RhsAssignment_3
-            {
-            pushFollow(FOLLOW_rule__Expression__RhsAssignment_3_in_rule__Expression__Group__3__Impl2700);
-            rule__Expression__RhsAssignment_3();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getExpressionAccess().getRhsAssignment_3()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Expression__Group__3__Impl"
-
-
-    // $ANTLR start "rule__Expression__Group__4"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1248:1: rule__Expression__Group__4 : rule__Expression__Group__4__Impl ;
-    public final void rule__Expression__Group__4() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1252:1: ( rule__Expression__Group__4__Impl )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1253:2: rule__Expression__Group__4__Impl
-            {
-            pushFollow(FOLLOW_rule__Expression__Group__4__Impl_in_rule__Expression__Group__42730);
-            rule__Expression__Group__4__Impl();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Expression__Group__4"
-
-
-    // $ANTLR start "rule__Expression__Group__4__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1259:1: rule__Expression__Group__4__Impl : ( ';' ) ;
-    public final void rule__Expression__Group__4__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1263:1: ( ( ';' ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1264:1: ( ';' )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1264:1: ( ';' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1265:1: ';'
-            {
-             before(grammarAccess.getExpressionAccess().getSemicolonKeyword_4()); 
-            match(input,34,FOLLOW_34_in_rule__Expression__Group__4__Impl2758); 
-             after(grammarAccess.getExpressionAccess().getSemicolonKeyword_4()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Expression__Group__4__Impl"
-
-
-    // $ANTLR start "rule__Lhs__Group__0"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1288:1: rule__Lhs__Group__0 : rule__Lhs__Group__0__Impl rule__Lhs__Group__1 ;
-    public final void rule__Lhs__Group__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1292:1: ( rule__Lhs__Group__0__Impl rule__Lhs__Group__1 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1293:2: rule__Lhs__Group__0__Impl rule__Lhs__Group__1
-            {
-            pushFollow(FOLLOW_rule__Lhs__Group__0__Impl_in_rule__Lhs__Group__02799);
-            rule__Lhs__Group__0__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__Lhs__Group__1_in_rule__Lhs__Group__02802);
-            rule__Lhs__Group__1();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Lhs__Group__0"
-
-
-    // $ANTLR start "rule__Lhs__Group__0__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1300:1: rule__Lhs__Group__0__Impl : ( ( rule__Lhs__FailuresAssignment_0 ) ) ;
-    public final void rule__Lhs__Group__0__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1304:1: ( ( ( rule__Lhs__FailuresAssignment_0 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1305:1: ( ( rule__Lhs__FailuresAssignment_0 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1305:1: ( ( rule__Lhs__FailuresAssignment_0 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1306:1: ( rule__Lhs__FailuresAssignment_0 )
-            {
-             before(grammarAccess.getLhsAccess().getFailuresAssignment_0()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1307:1: ( rule__Lhs__FailuresAssignment_0 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1307:2: rule__Lhs__FailuresAssignment_0
-            {
-            pushFollow(FOLLOW_rule__Lhs__FailuresAssignment_0_in_rule__Lhs__Group__0__Impl2829);
-            rule__Lhs__FailuresAssignment_0();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getLhsAccess().getFailuresAssignment_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Lhs__Group__0__Impl"
-
-
-    // $ANTLR start "rule__Lhs__Group__1"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1317:1: rule__Lhs__Group__1 : rule__Lhs__Group__1__Impl ;
-    public final void rule__Lhs__Group__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1321:1: ( rule__Lhs__Group__1__Impl )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1322:2: rule__Lhs__Group__1__Impl
-            {
-            pushFollow(FOLLOW_rule__Lhs__Group__1__Impl_in_rule__Lhs__Group__12859);
-            rule__Lhs__Group__1__Impl();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Lhs__Group__1"
-
-
-    // $ANTLR start "rule__Lhs__Group__1__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1328:1: rule__Lhs__Group__1__Impl : ( ( rule__Lhs__Group_1__0 )* ) ;
-    public final void rule__Lhs__Group__1__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1332:1: ( ( ( rule__Lhs__Group_1__0 )* ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1333:1: ( ( rule__Lhs__Group_1__0 )* )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1333:1: ( ( rule__Lhs__Group_1__0 )* )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1334:1: ( rule__Lhs__Group_1__0 )*
-            {
-             before(grammarAccess.getLhsAccess().getGroup_1()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1335:1: ( rule__Lhs__Group_1__0 )*
-            loop15:
-            do {
-                int alt15=2;
-                int LA15_0 = input.LA(1);
-
-                if ( (LA15_0==35) ) {
-                    alt15=1;
-                }
-
-
-                switch (alt15) {
-            	case 1 :
-            	    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1335:2: rule__Lhs__Group_1__0
-            	    {
-            	    pushFollow(FOLLOW_rule__Lhs__Group_1__0_in_rule__Lhs__Group__1__Impl2886);
-            	    rule__Lhs__Group_1__0();
-
-            	    state._fsp--;
-
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop15;
-                }
-            } while (true);
-
-             after(grammarAccess.getLhsAccess().getGroup_1()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Lhs__Group__1__Impl"
-
-
-    // $ANTLR start "rule__Lhs__Group_1__0"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1349:1: rule__Lhs__Group_1__0 : rule__Lhs__Group_1__0__Impl rule__Lhs__Group_1__1 ;
-    public final void rule__Lhs__Group_1__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1353:1: ( rule__Lhs__Group_1__0__Impl rule__Lhs__Group_1__1 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1354:2: rule__Lhs__Group_1__0__Impl rule__Lhs__Group_1__1
-            {
-            pushFollow(FOLLOW_rule__Lhs__Group_1__0__Impl_in_rule__Lhs__Group_1__02921);
-            rule__Lhs__Group_1__0__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__Lhs__Group_1__1_in_rule__Lhs__Group_1__02924);
-            rule__Lhs__Group_1__1();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Lhs__Group_1__0"
-
-
-    // $ANTLR start "rule__Lhs__Group_1__0__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1361:1: rule__Lhs__Group_1__0__Impl : ( ',' ) ;
-    public final void rule__Lhs__Group_1__0__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1365:1: ( ( ',' ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1366:1: ( ',' )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1366:1: ( ',' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1367:1: ','
-            {
-             before(grammarAccess.getLhsAccess().getCommaKeyword_1_0()); 
-            match(input,35,FOLLOW_35_in_rule__Lhs__Group_1__0__Impl2952); 
-             after(grammarAccess.getLhsAccess().getCommaKeyword_1_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Lhs__Group_1__0__Impl"
-
-
-    // $ANTLR start "rule__Lhs__Group_1__1"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1380:1: rule__Lhs__Group_1__1 : rule__Lhs__Group_1__1__Impl ;
-    public final void rule__Lhs__Group_1__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1384:1: ( rule__Lhs__Group_1__1__Impl )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1385:2: rule__Lhs__Group_1__1__Impl
-            {
-            pushFollow(FOLLOW_rule__Lhs__Group_1__1__Impl_in_rule__Lhs__Group_1__12983);
-            rule__Lhs__Group_1__1__Impl();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Lhs__Group_1__1"
-
-
-    // $ANTLR start "rule__Lhs__Group_1__1__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1391:1: rule__Lhs__Group_1__1__Impl : ( ( rule__Lhs__FailuresAssignment_1_1 ) ) ;
-    public final void rule__Lhs__Group_1__1__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1395:1: ( ( ( rule__Lhs__FailuresAssignment_1_1 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1396:1: ( ( rule__Lhs__FailuresAssignment_1_1 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1396:1: ( ( rule__Lhs__FailuresAssignment_1_1 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1397:1: ( rule__Lhs__FailuresAssignment_1_1 )
-            {
-             before(grammarAccess.getLhsAccess().getFailuresAssignment_1_1()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1398:1: ( rule__Lhs__FailuresAssignment_1_1 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1398:2: rule__Lhs__FailuresAssignment_1_1
-            {
-            pushFollow(FOLLOW_rule__Lhs__FailuresAssignment_1_1_in_rule__Lhs__Group_1__1__Impl3010);
-            rule__Lhs__FailuresAssignment_1_1();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getLhsAccess().getFailuresAssignment_1_1()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Lhs__Group_1__1__Impl"
-
-
-    // $ANTLR start "rule__Rhs__Group__0"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1412:1: rule__Rhs__Group__0 : rule__Rhs__Group__0__Impl rule__Rhs__Group__1 ;
-    public final void rule__Rhs__Group__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1416:1: ( rule__Rhs__Group__0__Impl rule__Rhs__Group__1 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1417:2: rule__Rhs__Group__0__Impl rule__Rhs__Group__1
-            {
-            pushFollow(FOLLOW_rule__Rhs__Group__0__Impl_in_rule__Rhs__Group__03044);
-            rule__Rhs__Group__0__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__Rhs__Group__1_in_rule__Rhs__Group__03047);
-            rule__Rhs__Group__1();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Rhs__Group__0"
-
-
-    // $ANTLR start "rule__Rhs__Group__0__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1424:1: rule__Rhs__Group__0__Impl : ( ( rule__Rhs__FailuresAssignment_0 ) ) ;
-    public final void rule__Rhs__Group__0__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1428:1: ( ( ( rule__Rhs__FailuresAssignment_0 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1429:1: ( ( rule__Rhs__FailuresAssignment_0 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1429:1: ( ( rule__Rhs__FailuresAssignment_0 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1430:1: ( rule__Rhs__FailuresAssignment_0 )
-            {
-             before(grammarAccess.getRhsAccess().getFailuresAssignment_0()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1431:1: ( rule__Rhs__FailuresAssignment_0 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1431:2: rule__Rhs__FailuresAssignment_0
-            {
-            pushFollow(FOLLOW_rule__Rhs__FailuresAssignment_0_in_rule__Rhs__Group__0__Impl3074);
-            rule__Rhs__FailuresAssignment_0();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getRhsAccess().getFailuresAssignment_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Rhs__Group__0__Impl"
-
-
-    // $ANTLR start "rule__Rhs__Group__1"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1441:1: rule__Rhs__Group__1 : rule__Rhs__Group__1__Impl ;
-    public final void rule__Rhs__Group__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1445:1: ( rule__Rhs__Group__1__Impl )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1446:2: rule__Rhs__Group__1__Impl
-            {
-            pushFollow(FOLLOW_rule__Rhs__Group__1__Impl_in_rule__Rhs__Group__13104);
-            rule__Rhs__Group__1__Impl();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Rhs__Group__1"
-
-
-    // $ANTLR start "rule__Rhs__Group__1__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1452:1: rule__Rhs__Group__1__Impl : ( ( rule__Rhs__Group_1__0 )* ) ;
-    public final void rule__Rhs__Group__1__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1456:1: ( ( ( rule__Rhs__Group_1__0 )* ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1457:1: ( ( rule__Rhs__Group_1__0 )* )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1457:1: ( ( rule__Rhs__Group_1__0 )* )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1458:1: ( rule__Rhs__Group_1__0 )*
-            {
-             before(grammarAccess.getRhsAccess().getGroup_1()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1459:1: ( rule__Rhs__Group_1__0 )*
-            loop16:
-            do {
-                int alt16=2;
-                int LA16_0 = input.LA(1);
-
-                if ( (LA16_0==35) ) {
-                    alt16=1;
-                }
-
-
-                switch (alt16) {
-            	case 1 :
-            	    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1459:2: rule__Rhs__Group_1__0
-            	    {
-            	    pushFollow(FOLLOW_rule__Rhs__Group_1__0_in_rule__Rhs__Group__1__Impl3131);
-            	    rule__Rhs__Group_1__0();
-
-            	    state._fsp--;
-
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop16;
-                }
-            } while (true);
-
-             after(grammarAccess.getRhsAccess().getGroup_1()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Rhs__Group__1__Impl"
-
-
-    // $ANTLR start "rule__Rhs__Group_1__0"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1473:1: rule__Rhs__Group_1__0 : rule__Rhs__Group_1__0__Impl rule__Rhs__Group_1__1 ;
-    public final void rule__Rhs__Group_1__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1477:1: ( rule__Rhs__Group_1__0__Impl rule__Rhs__Group_1__1 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1478:2: rule__Rhs__Group_1__0__Impl rule__Rhs__Group_1__1
-            {
-            pushFollow(FOLLOW_rule__Rhs__Group_1__0__Impl_in_rule__Rhs__Group_1__03166);
-            rule__Rhs__Group_1__0__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__Rhs__Group_1__1_in_rule__Rhs__Group_1__03169);
-            rule__Rhs__Group_1__1();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Rhs__Group_1__0"
-
-
-    // $ANTLR start "rule__Rhs__Group_1__0__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1485:1: rule__Rhs__Group_1__0__Impl : ( ',' ) ;
-    public final void rule__Rhs__Group_1__0__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1489:1: ( ( ',' ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1490:1: ( ',' )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1490:1: ( ',' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1491:1: ','
-            {
-             before(grammarAccess.getRhsAccess().getCommaKeyword_1_0()); 
-            match(input,35,FOLLOW_35_in_rule__Rhs__Group_1__0__Impl3197); 
-             after(grammarAccess.getRhsAccess().getCommaKeyword_1_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Rhs__Group_1__0__Impl"
-
-
-    // $ANTLR start "rule__Rhs__Group_1__1"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1504:1: rule__Rhs__Group_1__1 : rule__Rhs__Group_1__1__Impl ;
-    public final void rule__Rhs__Group_1__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1508:1: ( rule__Rhs__Group_1__1__Impl )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1509:2: rule__Rhs__Group_1__1__Impl
-            {
-            pushFollow(FOLLOW_rule__Rhs__Group_1__1__Impl_in_rule__Rhs__Group_1__13228);
-            rule__Rhs__Group_1__1__Impl();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Rhs__Group_1__1"
-
-
-    // $ANTLR start "rule__Rhs__Group_1__1__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1515:1: rule__Rhs__Group_1__1__Impl : ( ( rule__Rhs__FailuresAssignment_1_1 ) ) ;
-    public final void rule__Rhs__Group_1__1__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1519:1: ( ( ( rule__Rhs__FailuresAssignment_1_1 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1520:1: ( ( rule__Rhs__FailuresAssignment_1_1 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1520:1: ( ( rule__Rhs__FailuresAssignment_1_1 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1521:1: ( rule__Rhs__FailuresAssignment_1_1 )
-            {
-             before(grammarAccess.getRhsAccess().getFailuresAssignment_1_1()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1522:1: ( rule__Rhs__FailuresAssignment_1_1 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1522:2: rule__Rhs__FailuresAssignment_1_1
-            {
-            pushFollow(FOLLOW_rule__Rhs__FailuresAssignment_1_1_in_rule__Rhs__Group_1__1__Impl3255);
-            rule__Rhs__FailuresAssignment_1_1();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getRhsAccess().getFailuresAssignment_1_1()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Rhs__Group_1__1__Impl"
-
-
-    // $ANTLR start "rule__InputExpression__Group__0"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1536:1: rule__InputExpression__Group__0 : rule__InputExpression__Group__0__Impl rule__InputExpression__Group__1 ;
-    public final void rule__InputExpression__Group__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1540:1: ( rule__InputExpression__Group__0__Impl rule__InputExpression__Group__1 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1541:2: rule__InputExpression__Group__0__Impl rule__InputExpression__Group__1
-            {
-            pushFollow(FOLLOW_rule__InputExpression__Group__0__Impl_in_rule__InputExpression__Group__03289);
-            rule__InputExpression__Group__0__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__InputExpression__Group__1_in_rule__InputExpression__Group__03292);
-            rule__InputExpression__Group__1();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__InputExpression__Group__0"
-
-
-    // $ANTLR start "rule__InputExpression__Group__0__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1548:1: rule__InputExpression__Group__0__Impl : ( ( rule__InputExpression__Alternatives_0 ) ) ;
-    public final void rule__InputExpression__Group__0__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1552:1: ( ( ( rule__InputExpression__Alternatives_0 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1553:1: ( ( rule__InputExpression__Alternatives_0 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1553:1: ( ( rule__InputExpression__Alternatives_0 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1554:1: ( rule__InputExpression__Alternatives_0 )
-            {
-             before(grammarAccess.getInputExpressionAccess().getAlternatives_0()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1555:1: ( rule__InputExpression__Alternatives_0 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1555:2: rule__InputExpression__Alternatives_0
-            {
-            pushFollow(FOLLOW_rule__InputExpression__Alternatives_0_in_rule__InputExpression__Group__0__Impl3319);
-            rule__InputExpression__Alternatives_0();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getInputExpressionAccess().getAlternatives_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__InputExpression__Group__0__Impl"
-
-
-    // $ANTLR start "rule__InputExpression__Group__1"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1565:1: rule__InputExpression__Group__1 : rule__InputExpression__Group__1__Impl rule__InputExpression__Group__2 ;
-    public final void rule__InputExpression__Group__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1569:1: ( rule__InputExpression__Group__1__Impl rule__InputExpression__Group__2 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1570:2: rule__InputExpression__Group__1__Impl rule__InputExpression__Group__2
-            {
-            pushFollow(FOLLOW_rule__InputExpression__Group__1__Impl_in_rule__InputExpression__Group__13349);
-            rule__InputExpression__Group__1__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__InputExpression__Group__2_in_rule__InputExpression__Group__13352);
-            rule__InputExpression__Group__2();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__InputExpression__Group__1"
-
-
-    // $ANTLR start "rule__InputExpression__Group__1__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1577:1: rule__InputExpression__Group__1__Impl : ( '.' ) ;
-    public final void rule__InputExpression__Group__1__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1581:1: ( ( '.' ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1582:1: ( '.' )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1582:1: ( '.' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1583:1: '.'
-            {
-             before(grammarAccess.getInputExpressionAccess().getFullStopKeyword_1()); 
-            match(input,36,FOLLOW_36_in_rule__InputExpression__Group__1__Impl3380); 
-             after(grammarAccess.getInputExpressionAccess().getFullStopKeyword_1()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__InputExpression__Group__1__Impl"
-
-
-    // $ANTLR start "rule__InputExpression__Group__2"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1596:1: rule__InputExpression__Group__2 : rule__InputExpression__Group__2__Impl ;
-    public final void rule__InputExpression__Group__2() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1600:1: ( rule__InputExpression__Group__2__Impl )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1601:2: rule__InputExpression__Group__2__Impl
-            {
-            pushFollow(FOLLOW_rule__InputExpression__Group__2__Impl_in_rule__InputExpression__Group__23411);
-            rule__InputExpression__Group__2__Impl();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__InputExpression__Group__2"
-
-
-    // $ANTLR start "rule__InputExpression__Group__2__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1607:1: rule__InputExpression__Group__2__Impl : ( ( rule__InputExpression__FailureExprAssignment_2 ) ) ;
-    public final void rule__InputExpression__Group__2__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1611:1: ( ( ( rule__InputExpression__FailureExprAssignment_2 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1612:1: ( ( rule__InputExpression__FailureExprAssignment_2 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1612:1: ( ( rule__InputExpression__FailureExprAssignment_2 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1613:1: ( rule__InputExpression__FailureExprAssignment_2 )
-            {
-             before(grammarAccess.getInputExpressionAccess().getFailureExprAssignment_2()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1614:1: ( rule__InputExpression__FailureExprAssignment_2 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1614:2: rule__InputExpression__FailureExprAssignment_2
-            {
-            pushFollow(FOLLOW_rule__InputExpression__FailureExprAssignment_2_in_rule__InputExpression__Group__2__Impl3438);
-            rule__InputExpression__FailureExprAssignment_2();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getInputExpressionAccess().getFailureExprAssignment_2()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__InputExpression__Group__2__Impl"
-
-
-    // $ANTLR start "rule__OutputExpression__Group__0"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1630:1: rule__OutputExpression__Group__0 : rule__OutputExpression__Group__0__Impl rule__OutputExpression__Group__1 ;
-    public final void rule__OutputExpression__Group__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1634:1: ( rule__OutputExpression__Group__0__Impl rule__OutputExpression__Group__1 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1635:2: rule__OutputExpression__Group__0__Impl rule__OutputExpression__Group__1
-            {
-            pushFollow(FOLLOW_rule__OutputExpression__Group__0__Impl_in_rule__OutputExpression__Group__03474);
-            rule__OutputExpression__Group__0__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__OutputExpression__Group__1_in_rule__OutputExpression__Group__03477);
-            rule__OutputExpression__Group__1();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__OutputExpression__Group__0"
-
-
-    // $ANTLR start "rule__OutputExpression__Group__0__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1642:1: rule__OutputExpression__Group__0__Impl : ( ( rule__OutputExpression__Alternatives_0 ) ) ;
-    public final void rule__OutputExpression__Group__0__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1646:1: ( ( ( rule__OutputExpression__Alternatives_0 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1647:1: ( ( rule__OutputExpression__Alternatives_0 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1647:1: ( ( rule__OutputExpression__Alternatives_0 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1648:1: ( rule__OutputExpression__Alternatives_0 )
-            {
-             before(grammarAccess.getOutputExpressionAccess().getAlternatives_0()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1649:1: ( rule__OutputExpression__Alternatives_0 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1649:2: rule__OutputExpression__Alternatives_0
-            {
-            pushFollow(FOLLOW_rule__OutputExpression__Alternatives_0_in_rule__OutputExpression__Group__0__Impl3504);
-            rule__OutputExpression__Alternatives_0();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getOutputExpressionAccess().getAlternatives_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__OutputExpression__Group__0__Impl"
-
-
-    // $ANTLR start "rule__OutputExpression__Group__1"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1659:1: rule__OutputExpression__Group__1 : rule__OutputExpression__Group__1__Impl rule__OutputExpression__Group__2 ;
-    public final void rule__OutputExpression__Group__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1663:1: ( rule__OutputExpression__Group__1__Impl rule__OutputExpression__Group__2 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1664:2: rule__OutputExpression__Group__1__Impl rule__OutputExpression__Group__2
-            {
-            pushFollow(FOLLOW_rule__OutputExpression__Group__1__Impl_in_rule__OutputExpression__Group__13534);
-            rule__OutputExpression__Group__1__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__OutputExpression__Group__2_in_rule__OutputExpression__Group__13537);
-            rule__OutputExpression__Group__2();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__OutputExpression__Group__1"
-
-
-    // $ANTLR start "rule__OutputExpression__Group__1__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1671:1: rule__OutputExpression__Group__1__Impl : ( '.' ) ;
-    public final void rule__OutputExpression__Group__1__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1675:1: ( ( '.' ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1676:1: ( '.' )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1676:1: ( '.' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1677:1: '.'
-            {
-             before(grammarAccess.getOutputExpressionAccess().getFullStopKeyword_1()); 
-            match(input,36,FOLLOW_36_in_rule__OutputExpression__Group__1__Impl3565); 
-             after(grammarAccess.getOutputExpressionAccess().getFullStopKeyword_1()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__OutputExpression__Group__1__Impl"
-
-
-    // $ANTLR start "rule__OutputExpression__Group__2"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1690:1: rule__OutputExpression__Group__2 : rule__OutputExpression__Group__2__Impl ;
-    public final void rule__OutputExpression__Group__2() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1694:1: ( rule__OutputExpression__Group__2__Impl )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1695:2: rule__OutputExpression__Group__2__Impl
-            {
-            pushFollow(FOLLOW_rule__OutputExpression__Group__2__Impl_in_rule__OutputExpression__Group__23596);
-            rule__OutputExpression__Group__2__Impl();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__OutputExpression__Group__2"
-
-
-    // $ANTLR start "rule__OutputExpression__Group__2__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1701:1: rule__OutputExpression__Group__2__Impl : ( ( rule__OutputExpression__FailureExprAssignment_2 ) ) ;
-    public final void rule__OutputExpression__Group__2__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1705:1: ( ( ( rule__OutputExpression__FailureExprAssignment_2 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1706:1: ( ( rule__OutputExpression__FailureExprAssignment_2 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1706:1: ( ( rule__OutputExpression__FailureExprAssignment_2 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1707:1: ( rule__OutputExpression__FailureExprAssignment_2 )
-            {
-             before(grammarAccess.getOutputExpressionAccess().getFailureExprAssignment_2()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1708:1: ( rule__OutputExpression__FailureExprAssignment_2 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1708:2: rule__OutputExpression__FailureExprAssignment_2
-            {
-            pushFollow(FOLLOW_rule__OutputExpression__FailureExprAssignment_2_in_rule__OutputExpression__Group__2__Impl3623);
-            rule__OutputExpression__FailureExprAssignment_2();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getOutputExpressionAccess().getFailureExprAssignment_2()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__OutputExpression__Group__2__Impl"
-
-
-    // $ANTLR start "rule__InFailureExpr__Group_3__0"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1724:1: rule__InFailureExpr__Group_3__0 : rule__InFailureExpr__Group_3__0__Impl rule__InFailureExpr__Group_3__1 ;
-    public final void rule__InFailureExpr__Group_3__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1728:1: ( rule__InFailureExpr__Group_3__0__Impl rule__InFailureExpr__Group_3__1 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1729:2: rule__InFailureExpr__Group_3__0__Impl rule__InFailureExpr__Group_3__1
-            {
-            pushFollow(FOLLOW_rule__InFailureExpr__Group_3__0__Impl_in_rule__InFailureExpr__Group_3__03659);
-            rule__InFailureExpr__Group_3__0__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__InFailureExpr__Group_3__1_in_rule__InFailureExpr__Group_3__03662);
-            rule__InFailureExpr__Group_3__1();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__InFailureExpr__Group_3__0"
-
-
-    // $ANTLR start "rule__InFailureExpr__Group_3__0__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1736:1: rule__InFailureExpr__Group_3__0__Impl : ( '{' ) ;
-    public final void rule__InFailureExpr__Group_3__0__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1740:1: ( ( '{' ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1741:1: ( '{' )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1741:1: ( '{' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1742:1: '{'
-            {
-             before(grammarAccess.getInFailureExprAccess().getLeftCurlyBracketKeyword_3_0()); 
-            match(input,37,FOLLOW_37_in_rule__InFailureExpr__Group_3__0__Impl3690); 
-             after(grammarAccess.getInFailureExprAccess().getLeftCurlyBracketKeyword_3_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__InFailureExpr__Group_3__0__Impl"
-
-
-    // $ANTLR start "rule__InFailureExpr__Group_3__1"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1755:1: rule__InFailureExpr__Group_3__1 : rule__InFailureExpr__Group_3__1__Impl rule__InFailureExpr__Group_3__2 ;
-    public final void rule__InFailureExpr__Group_3__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1759:1: ( rule__InFailureExpr__Group_3__1__Impl rule__InFailureExpr__Group_3__2 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1760:2: rule__InFailureExpr__Group_3__1__Impl rule__InFailureExpr__Group_3__2
-            {
-            pushFollow(FOLLOW_rule__InFailureExpr__Group_3__1__Impl_in_rule__InFailureExpr__Group_3__13721);
-            rule__InFailureExpr__Group_3__1__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__InFailureExpr__Group_3__2_in_rule__InFailureExpr__Group_3__13724);
-            rule__InFailureExpr__Group_3__2();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__InFailureExpr__Group_3__1"
-
-
-    // $ANTLR start "rule__InFailureExpr__Group_3__1__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1767:1: rule__InFailureExpr__Group_3__1__Impl : ( ( rule__InFailureExpr__FailuresAssignment_3_1 ) ) ;
-    public final void rule__InFailureExpr__Group_3__1__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1771:1: ( ( ( rule__InFailureExpr__FailuresAssignment_3_1 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1772:1: ( ( rule__InFailureExpr__FailuresAssignment_3_1 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1772:1: ( ( rule__InFailureExpr__FailuresAssignment_3_1 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1773:1: ( rule__InFailureExpr__FailuresAssignment_3_1 )
-            {
-             before(grammarAccess.getInFailureExprAccess().getFailuresAssignment_3_1()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1774:1: ( rule__InFailureExpr__FailuresAssignment_3_1 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1774:2: rule__InFailureExpr__FailuresAssignment_3_1
-            {
-            pushFollow(FOLLOW_rule__InFailureExpr__FailuresAssignment_3_1_in_rule__InFailureExpr__Group_3__1__Impl3751);
-            rule__InFailureExpr__FailuresAssignment_3_1();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getInFailureExprAccess().getFailuresAssignment_3_1()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__InFailureExpr__Group_3__1__Impl"
-
-
-    // $ANTLR start "rule__InFailureExpr__Group_3__2"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1784:1: rule__InFailureExpr__Group_3__2 : rule__InFailureExpr__Group_3__2__Impl rule__InFailureExpr__Group_3__3 ;
-    public final void rule__InFailureExpr__Group_3__2() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1788:1: ( rule__InFailureExpr__Group_3__2__Impl rule__InFailureExpr__Group_3__3 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1789:2: rule__InFailureExpr__Group_3__2__Impl rule__InFailureExpr__Group_3__3
-            {
-            pushFollow(FOLLOW_rule__InFailureExpr__Group_3__2__Impl_in_rule__InFailureExpr__Group_3__23781);
-            rule__InFailureExpr__Group_3__2__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__InFailureExpr__Group_3__3_in_rule__InFailureExpr__Group_3__23784);
-            rule__InFailureExpr__Group_3__3();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__InFailureExpr__Group_3__2"
-
-
-    // $ANTLR start "rule__InFailureExpr__Group_3__2__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1796:1: rule__InFailureExpr__Group_3__2__Impl : ( ( ( rule__InFailureExpr__Group_3_2__0 ) ) ( ( rule__InFailureExpr__Group_3_2__0 )* ) ) ;
-    public final void rule__InFailureExpr__Group_3__2__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1800:1: ( ( ( ( rule__InFailureExpr__Group_3_2__0 ) ) ( ( rule__InFailureExpr__Group_3_2__0 )* ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1801:1: ( ( ( rule__InFailureExpr__Group_3_2__0 ) ) ( ( rule__InFailureExpr__Group_3_2__0 )* ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1801:1: ( ( ( rule__InFailureExpr__Group_3_2__0 ) ) ( ( rule__InFailureExpr__Group_3_2__0 )* ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1802:1: ( ( rule__InFailureExpr__Group_3_2__0 ) ) ( ( rule__InFailureExpr__Group_3_2__0 )* )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1802:1: ( ( rule__InFailureExpr__Group_3_2__0 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1803:1: ( rule__InFailureExpr__Group_3_2__0 )
-            {
-             before(grammarAccess.getInFailureExprAccess().getGroup_3_2()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1804:1: ( rule__InFailureExpr__Group_3_2__0 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1804:2: rule__InFailureExpr__Group_3_2__0
-            {
-            pushFollow(FOLLOW_rule__InFailureExpr__Group_3_2__0_in_rule__InFailureExpr__Group_3__2__Impl3813);
-            rule__InFailureExpr__Group_3_2__0();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getInFailureExprAccess().getGroup_3_2()); 
-
-            }
-
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1807:1: ( ( rule__InFailureExpr__Group_3_2__0 )* )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1808:1: ( rule__InFailureExpr__Group_3_2__0 )*
-            {
-             before(grammarAccess.getInFailureExprAccess().getGroup_3_2()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1809:1: ( rule__InFailureExpr__Group_3_2__0 )*
-            loop17:
-            do {
-                int alt17=2;
-                int LA17_0 = input.LA(1);
-
-                if ( (LA17_0==35) ) {
-                    alt17=1;
-                }
-
-
-                switch (alt17) {
-            	case 1 :
-            	    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1809:2: rule__InFailureExpr__Group_3_2__0
-            	    {
-            	    pushFollow(FOLLOW_rule__InFailureExpr__Group_3_2__0_in_rule__InFailureExpr__Group_3__2__Impl3825);
-            	    rule__InFailureExpr__Group_3_2__0();
-
-            	    state._fsp--;
-
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop17;
-                }
-            } while (true);
-
-             after(grammarAccess.getInFailureExprAccess().getGroup_3_2()); 
-
-            }
-
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__InFailureExpr__Group_3__2__Impl"
-
-
-    // $ANTLR start "rule__InFailureExpr__Group_3__3"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1820:1: rule__InFailureExpr__Group_3__3 : rule__InFailureExpr__Group_3__3__Impl ;
-    public final void rule__InFailureExpr__Group_3__3() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1824:1: ( rule__InFailureExpr__Group_3__3__Impl )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1825:2: rule__InFailureExpr__Group_3__3__Impl
-            {
-            pushFollow(FOLLOW_rule__InFailureExpr__Group_3__3__Impl_in_rule__InFailureExpr__Group_3__33858);
-            rule__InFailureExpr__Group_3__3__Impl();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__InFailureExpr__Group_3__3"
-
-
-    // $ANTLR start "rule__InFailureExpr__Group_3__3__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1831:1: rule__InFailureExpr__Group_3__3__Impl : ( '}' ) ;
-    public final void rule__InFailureExpr__Group_3__3__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1835:1: ( ( '}' ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1836:1: ( '}' )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1836:1: ( '}' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1837:1: '}'
-            {
-             before(grammarAccess.getInFailureExprAccess().getRightCurlyBracketKeyword_3_3()); 
-            match(input,38,FOLLOW_38_in_rule__InFailureExpr__Group_3__3__Impl3886); 
-             after(grammarAccess.getInFailureExprAccess().getRightCurlyBracketKeyword_3_3()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__InFailureExpr__Group_3__3__Impl"
-
-
-    // $ANTLR start "rule__InFailureExpr__Group_3_2__0"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1858:1: rule__InFailureExpr__Group_3_2__0 : rule__InFailureExpr__Group_3_2__0__Impl rule__InFailureExpr__Group_3_2__1 ;
-    public final void rule__InFailureExpr__Group_3_2__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1862:1: ( rule__InFailureExpr__Group_3_2__0__Impl rule__InFailureExpr__Group_3_2__1 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1863:2: rule__InFailureExpr__Group_3_2__0__Impl rule__InFailureExpr__Group_3_2__1
-            {
-            pushFollow(FOLLOW_rule__InFailureExpr__Group_3_2__0__Impl_in_rule__InFailureExpr__Group_3_2__03925);
-            rule__InFailureExpr__Group_3_2__0__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__InFailureExpr__Group_3_2__1_in_rule__InFailureExpr__Group_3_2__03928);
-            rule__InFailureExpr__Group_3_2__1();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__InFailureExpr__Group_3_2__0"
-
-
-    // $ANTLR start "rule__InFailureExpr__Group_3_2__0__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1870:1: rule__InFailureExpr__Group_3_2__0__Impl : ( ',' ) ;
-    public final void rule__InFailureExpr__Group_3_2__0__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1874:1: ( ( ',' ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1875:1: ( ',' )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1875:1: ( ',' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1876:1: ','
-            {
-             before(grammarAccess.getInFailureExprAccess().getCommaKeyword_3_2_0()); 
-            match(input,35,FOLLOW_35_in_rule__InFailureExpr__Group_3_2__0__Impl3956); 
-             after(grammarAccess.getInFailureExprAccess().getCommaKeyword_3_2_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__InFailureExpr__Group_3_2__0__Impl"
-
-
-    // $ANTLR start "rule__InFailureExpr__Group_3_2__1"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1889:1: rule__InFailureExpr__Group_3_2__1 : rule__InFailureExpr__Group_3_2__1__Impl ;
-    public final void rule__InFailureExpr__Group_3_2__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1893:1: ( rule__InFailureExpr__Group_3_2__1__Impl )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1894:2: rule__InFailureExpr__Group_3_2__1__Impl
-            {
-            pushFollow(FOLLOW_rule__InFailureExpr__Group_3_2__1__Impl_in_rule__InFailureExpr__Group_3_2__13987);
-            rule__InFailureExpr__Group_3_2__1__Impl();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__InFailureExpr__Group_3_2__1"
-
-
-    // $ANTLR start "rule__InFailureExpr__Group_3_2__1__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1900:1: rule__InFailureExpr__Group_3_2__1__Impl : ( ( rule__InFailureExpr__FailuresAssignment_3_2_1 ) ) ;
-    public final void rule__InFailureExpr__Group_3_2__1__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1904:1: ( ( ( rule__InFailureExpr__FailuresAssignment_3_2_1 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1905:1: ( ( rule__InFailureExpr__FailuresAssignment_3_2_1 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1905:1: ( ( rule__InFailureExpr__FailuresAssignment_3_2_1 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1906:1: ( rule__InFailureExpr__FailuresAssignment_3_2_1 )
-            {
-             before(grammarAccess.getInFailureExprAccess().getFailuresAssignment_3_2_1()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1907:1: ( rule__InFailureExpr__FailuresAssignment_3_2_1 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1907:2: rule__InFailureExpr__FailuresAssignment_3_2_1
-            {
-            pushFollow(FOLLOW_rule__InFailureExpr__FailuresAssignment_3_2_1_in_rule__InFailureExpr__Group_3_2__1__Impl4014);
-            rule__InFailureExpr__FailuresAssignment_3_2_1();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getInFailureExprAccess().getFailuresAssignment_3_2_1()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__InFailureExpr__Group_3_2__1__Impl"
-
-
-    // $ANTLR start "rule__OutFailureExpr__Group_3__0"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1921:1: rule__OutFailureExpr__Group_3__0 : rule__OutFailureExpr__Group_3__0__Impl rule__OutFailureExpr__Group_3__1 ;
-    public final void rule__OutFailureExpr__Group_3__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1925:1: ( rule__OutFailureExpr__Group_3__0__Impl rule__OutFailureExpr__Group_3__1 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1926:2: rule__OutFailureExpr__Group_3__0__Impl rule__OutFailureExpr__Group_3__1
-            {
-            pushFollow(FOLLOW_rule__OutFailureExpr__Group_3__0__Impl_in_rule__OutFailureExpr__Group_3__04048);
-            rule__OutFailureExpr__Group_3__0__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__OutFailureExpr__Group_3__1_in_rule__OutFailureExpr__Group_3__04051);
-            rule__OutFailureExpr__Group_3__1();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__OutFailureExpr__Group_3__0"
-
-
-    // $ANTLR start "rule__OutFailureExpr__Group_3__0__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1933:1: rule__OutFailureExpr__Group_3__0__Impl : ( '{' ) ;
-    public final void rule__OutFailureExpr__Group_3__0__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1937:1: ( ( '{' ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1938:1: ( '{' )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1938:1: ( '{' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1939:1: '{'
-            {
-             before(grammarAccess.getOutFailureExprAccess().getLeftCurlyBracketKeyword_3_0()); 
-            match(input,37,FOLLOW_37_in_rule__OutFailureExpr__Group_3__0__Impl4079); 
-             after(grammarAccess.getOutFailureExprAccess().getLeftCurlyBracketKeyword_3_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__OutFailureExpr__Group_3__0__Impl"
-
-
-    // $ANTLR start "rule__OutFailureExpr__Group_3__1"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1952:1: rule__OutFailureExpr__Group_3__1 : rule__OutFailureExpr__Group_3__1__Impl rule__OutFailureExpr__Group_3__2 ;
-    public final void rule__OutFailureExpr__Group_3__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1956:1: ( rule__OutFailureExpr__Group_3__1__Impl rule__OutFailureExpr__Group_3__2 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1957:2: rule__OutFailureExpr__Group_3__1__Impl rule__OutFailureExpr__Group_3__2
-            {
-            pushFollow(FOLLOW_rule__OutFailureExpr__Group_3__1__Impl_in_rule__OutFailureExpr__Group_3__14110);
-            rule__OutFailureExpr__Group_3__1__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__OutFailureExpr__Group_3__2_in_rule__OutFailureExpr__Group_3__14113);
-            rule__OutFailureExpr__Group_3__2();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__OutFailureExpr__Group_3__1"
-
-
-    // $ANTLR start "rule__OutFailureExpr__Group_3__1__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1964:1: rule__OutFailureExpr__Group_3__1__Impl : ( ( rule__OutFailureExpr__FailuresAssignment_3_1 ) ) ;
-    public final void rule__OutFailureExpr__Group_3__1__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1968:1: ( ( ( rule__OutFailureExpr__FailuresAssignment_3_1 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1969:1: ( ( rule__OutFailureExpr__FailuresAssignment_3_1 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1969:1: ( ( rule__OutFailureExpr__FailuresAssignment_3_1 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1970:1: ( rule__OutFailureExpr__FailuresAssignment_3_1 )
-            {
-             before(grammarAccess.getOutFailureExprAccess().getFailuresAssignment_3_1()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1971:1: ( rule__OutFailureExpr__FailuresAssignment_3_1 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1971:2: rule__OutFailureExpr__FailuresAssignment_3_1
-            {
-            pushFollow(FOLLOW_rule__OutFailureExpr__FailuresAssignment_3_1_in_rule__OutFailureExpr__Group_3__1__Impl4140);
-            rule__OutFailureExpr__FailuresAssignment_3_1();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getOutFailureExprAccess().getFailuresAssignment_3_1()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__OutFailureExpr__Group_3__1__Impl"
-
-
-    // $ANTLR start "rule__OutFailureExpr__Group_3__2"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1981:1: rule__OutFailureExpr__Group_3__2 : rule__OutFailureExpr__Group_3__2__Impl rule__OutFailureExpr__Group_3__3 ;
-    public final void rule__OutFailureExpr__Group_3__2() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1985:1: ( rule__OutFailureExpr__Group_3__2__Impl rule__OutFailureExpr__Group_3__3 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1986:2: rule__OutFailureExpr__Group_3__2__Impl rule__OutFailureExpr__Group_3__3
-            {
-            pushFollow(FOLLOW_rule__OutFailureExpr__Group_3__2__Impl_in_rule__OutFailureExpr__Group_3__24170);
-            rule__OutFailureExpr__Group_3__2__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__OutFailureExpr__Group_3__3_in_rule__OutFailureExpr__Group_3__24173);
-            rule__OutFailureExpr__Group_3__3();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__OutFailureExpr__Group_3__2"
-
-
-    // $ANTLR start "rule__OutFailureExpr__Group_3__2__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1993:1: rule__OutFailureExpr__Group_3__2__Impl : ( ( ( rule__OutFailureExpr__Group_3_2__0 ) ) ( ( rule__OutFailureExpr__Group_3_2__0 )* ) ) ;
-    public final void rule__OutFailureExpr__Group_3__2__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1997:1: ( ( ( ( rule__OutFailureExpr__Group_3_2__0 ) ) ( ( rule__OutFailureExpr__Group_3_2__0 )* ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1998:1: ( ( ( rule__OutFailureExpr__Group_3_2__0 ) ) ( ( rule__OutFailureExpr__Group_3_2__0 )* ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1998:1: ( ( ( rule__OutFailureExpr__Group_3_2__0 ) ) ( ( rule__OutFailureExpr__Group_3_2__0 )* ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1999:1: ( ( rule__OutFailureExpr__Group_3_2__0 ) ) ( ( rule__OutFailureExpr__Group_3_2__0 )* )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:1999:1: ( ( rule__OutFailureExpr__Group_3_2__0 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2000:1: ( rule__OutFailureExpr__Group_3_2__0 )
-            {
-             before(grammarAccess.getOutFailureExprAccess().getGroup_3_2()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2001:1: ( rule__OutFailureExpr__Group_3_2__0 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2001:2: rule__OutFailureExpr__Group_3_2__0
-            {
-            pushFollow(FOLLOW_rule__OutFailureExpr__Group_3_2__0_in_rule__OutFailureExpr__Group_3__2__Impl4202);
-            rule__OutFailureExpr__Group_3_2__0();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getOutFailureExprAccess().getGroup_3_2()); 
-
-            }
-
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2004:1: ( ( rule__OutFailureExpr__Group_3_2__0 )* )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2005:1: ( rule__OutFailureExpr__Group_3_2__0 )*
-            {
-             before(grammarAccess.getOutFailureExprAccess().getGroup_3_2()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2006:1: ( rule__OutFailureExpr__Group_3_2__0 )*
-            loop18:
-            do {
-                int alt18=2;
-                int LA18_0 = input.LA(1);
-
-                if ( (LA18_0==35) ) {
-                    alt18=1;
-                }
-
-
-                switch (alt18) {
-            	case 1 :
-            	    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2006:2: rule__OutFailureExpr__Group_3_2__0
-            	    {
-            	    pushFollow(FOLLOW_rule__OutFailureExpr__Group_3_2__0_in_rule__OutFailureExpr__Group_3__2__Impl4214);
-            	    rule__OutFailureExpr__Group_3_2__0();
-
-            	    state._fsp--;
-
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop18;
-                }
-            } while (true);
-
-             after(grammarAccess.getOutFailureExprAccess().getGroup_3_2()); 
-
-            }
-
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__OutFailureExpr__Group_3__2__Impl"
-
-
-    // $ANTLR start "rule__OutFailureExpr__Group_3__3"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2017:1: rule__OutFailureExpr__Group_3__3 : rule__OutFailureExpr__Group_3__3__Impl ;
-    public final void rule__OutFailureExpr__Group_3__3() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2021:1: ( rule__OutFailureExpr__Group_3__3__Impl )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2022:2: rule__OutFailureExpr__Group_3__3__Impl
-            {
-            pushFollow(FOLLOW_rule__OutFailureExpr__Group_3__3__Impl_in_rule__OutFailureExpr__Group_3__34247);
-            rule__OutFailureExpr__Group_3__3__Impl();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__OutFailureExpr__Group_3__3"
-
-
-    // $ANTLR start "rule__OutFailureExpr__Group_3__3__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2028:1: rule__OutFailureExpr__Group_3__3__Impl : ( '}' ) ;
-    public final void rule__OutFailureExpr__Group_3__3__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2032:1: ( ( '}' ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2033:1: ( '}' )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2033:1: ( '}' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2034:1: '}'
-            {
-             before(grammarAccess.getOutFailureExprAccess().getRightCurlyBracketKeyword_3_3()); 
-            match(input,38,FOLLOW_38_in_rule__OutFailureExpr__Group_3__3__Impl4275); 
-             after(grammarAccess.getOutFailureExprAccess().getRightCurlyBracketKeyword_3_3()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__OutFailureExpr__Group_3__3__Impl"
-
-
-    // $ANTLR start "rule__OutFailureExpr__Group_3_2__0"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2055:1: rule__OutFailureExpr__Group_3_2__0 : rule__OutFailureExpr__Group_3_2__0__Impl rule__OutFailureExpr__Group_3_2__1 ;
-    public final void rule__OutFailureExpr__Group_3_2__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2059:1: ( rule__OutFailureExpr__Group_3_2__0__Impl rule__OutFailureExpr__Group_3_2__1 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2060:2: rule__OutFailureExpr__Group_3_2__0__Impl rule__OutFailureExpr__Group_3_2__1
-            {
-            pushFollow(FOLLOW_rule__OutFailureExpr__Group_3_2__0__Impl_in_rule__OutFailureExpr__Group_3_2__04314);
-            rule__OutFailureExpr__Group_3_2__0__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__OutFailureExpr__Group_3_2__1_in_rule__OutFailureExpr__Group_3_2__04317);
-            rule__OutFailureExpr__Group_3_2__1();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__OutFailureExpr__Group_3_2__0"
-
-
-    // $ANTLR start "rule__OutFailureExpr__Group_3_2__0__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2067:1: rule__OutFailureExpr__Group_3_2__0__Impl : ( ',' ) ;
-    public final void rule__OutFailureExpr__Group_3_2__0__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2071:1: ( ( ',' ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2072:1: ( ',' )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2072:1: ( ',' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2073:1: ','
-            {
-             before(grammarAccess.getOutFailureExprAccess().getCommaKeyword_3_2_0()); 
-            match(input,35,FOLLOW_35_in_rule__OutFailureExpr__Group_3_2__0__Impl4345); 
-             after(grammarAccess.getOutFailureExprAccess().getCommaKeyword_3_2_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__OutFailureExpr__Group_3_2__0__Impl"
-
-
-    // $ANTLR start "rule__OutFailureExpr__Group_3_2__1"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2086:1: rule__OutFailureExpr__Group_3_2__1 : rule__OutFailureExpr__Group_3_2__1__Impl ;
-    public final void rule__OutFailureExpr__Group_3_2__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2090:1: ( rule__OutFailureExpr__Group_3_2__1__Impl )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2091:2: rule__OutFailureExpr__Group_3_2__1__Impl
-            {
-            pushFollow(FOLLOW_rule__OutFailureExpr__Group_3_2__1__Impl_in_rule__OutFailureExpr__Group_3_2__14376);
-            rule__OutFailureExpr__Group_3_2__1__Impl();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__OutFailureExpr__Group_3_2__1"
-
-
-    // $ANTLR start "rule__OutFailureExpr__Group_3_2__1__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2097:1: rule__OutFailureExpr__Group_3_2__1__Impl : ( ( rule__OutFailureExpr__FailuresAssignment_3_2_1 ) ) ;
-    public final void rule__OutFailureExpr__Group_3_2__1__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2101:1: ( ( ( rule__OutFailureExpr__FailuresAssignment_3_2_1 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2102:1: ( ( rule__OutFailureExpr__FailuresAssignment_3_2_1 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2102:1: ( ( rule__OutFailureExpr__FailuresAssignment_3_2_1 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2103:1: ( rule__OutFailureExpr__FailuresAssignment_3_2_1 )
-            {
-             before(grammarAccess.getOutFailureExprAccess().getFailuresAssignment_3_2_1()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2104:1: ( rule__OutFailureExpr__FailuresAssignment_3_2_1 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2104:2: rule__OutFailureExpr__FailuresAssignment_3_2_1
-            {
-            pushFollow(FOLLOW_rule__OutFailureExpr__FailuresAssignment_3_2_1_in_rule__OutFailureExpr__Group_3_2__1__Impl4403);
-            rule__OutFailureExpr__FailuresAssignment_3_2_1();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getOutFailureExprAccess().getFailuresAssignment_3_2_1()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__OutFailureExpr__Group_3_2__1__Impl"
-
-
-    // $ANTLR start "rule__FailureDefinition__Group__0"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2118:1: rule__FailureDefinition__Group__0 : rule__FailureDefinition__Group__0__Impl rule__FailureDefinition__Group__1 ;
-    public final void rule__FailureDefinition__Group__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2122:1: ( rule__FailureDefinition__Group__0__Impl rule__FailureDefinition__Group__1 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2123:2: rule__FailureDefinition__Group__0__Impl rule__FailureDefinition__Group__1
-            {
-            pushFollow(FOLLOW_rule__FailureDefinition__Group__0__Impl_in_rule__FailureDefinition__Group__04437);
-            rule__FailureDefinition__Group__0__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__FailureDefinition__Group__1_in_rule__FailureDefinition__Group__04440);
-            rule__FailureDefinition__Group__1();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__FailureDefinition__Group__0"
-
-
-    // $ANTLR start "rule__FailureDefinition__Group__0__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2130:1: rule__FailureDefinition__Group__0__Impl : ( () ) ;
-    public final void rule__FailureDefinition__Group__0__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2134:1: ( ( () ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2135:1: ( () )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2135:1: ( () )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2136:1: ()
-            {
-             before(grammarAccess.getFailureDefinitionAccess().getFailureDefinitionAction_0()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2137:1: ()
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2139:1: 
-            {
-            }
-
-             after(grammarAccess.getFailureDefinitionAccess().getFailureDefinitionAction_0()); 
-
-            }
-
-
-            }
-
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__FailureDefinition__Group__0__Impl"
-
-
-    // $ANTLR start "rule__FailureDefinition__Group__1"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2149:1: rule__FailureDefinition__Group__1 : rule__FailureDefinition__Group__1__Impl rule__FailureDefinition__Group__2 ;
-    public final void rule__FailureDefinition__Group__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2153:1: ( rule__FailureDefinition__Group__1__Impl rule__FailureDefinition__Group__2 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2154:2: rule__FailureDefinition__Group__1__Impl rule__FailureDefinition__Group__2
-            {
-            pushFollow(FOLLOW_rule__FailureDefinition__Group__1__Impl_in_rule__FailureDefinition__Group__14498);
-            rule__FailureDefinition__Group__1__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__FailureDefinition__Group__2_in_rule__FailureDefinition__Group__14501);
-            rule__FailureDefinition__Group__2();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__FailureDefinition__Group__1"
-
-
-    // $ANTLR start "rule__FailureDefinition__Group__1__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2161:1: rule__FailureDefinition__Group__1__Impl : ( ( rule__FailureDefinition__TypeAssignment_1 ) ) ;
-    public final void rule__FailureDefinition__Group__1__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2165:1: ( ( ( rule__FailureDefinition__TypeAssignment_1 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2166:1: ( ( rule__FailureDefinition__TypeAssignment_1 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2166:1: ( ( rule__FailureDefinition__TypeAssignment_1 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2167:1: ( rule__FailureDefinition__TypeAssignment_1 )
-            {
-             before(grammarAccess.getFailureDefinitionAccess().getTypeAssignment_1()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2168:1: ( rule__FailureDefinition__TypeAssignment_1 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2168:2: rule__FailureDefinition__TypeAssignment_1
-            {
-            pushFollow(FOLLOW_rule__FailureDefinition__TypeAssignment_1_in_rule__FailureDefinition__Group__1__Impl4528);
-            rule__FailureDefinition__TypeAssignment_1();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getFailureDefinitionAccess().getTypeAssignment_1()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__FailureDefinition__Group__1__Impl"
-
-
-    // $ANTLR start "rule__FailureDefinition__Group__2"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2178:1: rule__FailureDefinition__Group__2 : rule__FailureDefinition__Group__2__Impl ;
-    public final void rule__FailureDefinition__Group__2() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2182:1: ( rule__FailureDefinition__Group__2__Impl )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2183:2: rule__FailureDefinition__Group__2__Impl
-            {
-            pushFollow(FOLLOW_rule__FailureDefinition__Group__2__Impl_in_rule__FailureDefinition__Group__24558);
-            rule__FailureDefinition__Group__2__Impl();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__FailureDefinition__Group__2"
-
-
-    // $ANTLR start "rule__FailureDefinition__Group__2__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2189:1: rule__FailureDefinition__Group__2__Impl : ( ( rule__FailureDefinition__Group_2__0 )? ) ;
-    public final void rule__FailureDefinition__Group__2__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2193:1: ( ( ( rule__FailureDefinition__Group_2__0 )? ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2194:1: ( ( rule__FailureDefinition__Group_2__0 )? )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2194:1: ( ( rule__FailureDefinition__Group_2__0 )? )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2195:1: ( rule__FailureDefinition__Group_2__0 )?
-            {
-             before(grammarAccess.getFailureDefinitionAccess().getGroup_2()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2196:1: ( rule__FailureDefinition__Group_2__0 )?
-            int alt19=2;
-            int LA19_0 = input.LA(1);
-
-            if ( (LA19_0==36) ) {
-                alt19=1;
-            }
-            switch (alt19) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2196:2: rule__FailureDefinition__Group_2__0
-                    {
-                    pushFollow(FOLLOW_rule__FailureDefinition__Group_2__0_in_rule__FailureDefinition__Group__2__Impl4585);
-                    rule__FailureDefinition__Group_2__0();
-
-                    state._fsp--;
-
-
-                    }
-                    break;
-
-            }
-
-             after(grammarAccess.getFailureDefinitionAccess().getGroup_2()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__FailureDefinition__Group__2__Impl"
-
-
-    // $ANTLR start "rule__FailureDefinition__Group_2__0"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2212:1: rule__FailureDefinition__Group_2__0 : rule__FailureDefinition__Group_2__0__Impl rule__FailureDefinition__Group_2__1 ;
-    public final void rule__FailureDefinition__Group_2__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2216:1: ( rule__FailureDefinition__Group_2__0__Impl rule__FailureDefinition__Group_2__1 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2217:2: rule__FailureDefinition__Group_2__0__Impl rule__FailureDefinition__Group_2__1
-            {
-            pushFollow(FOLLOW_rule__FailureDefinition__Group_2__0__Impl_in_rule__FailureDefinition__Group_2__04622);
-            rule__FailureDefinition__Group_2__0__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__FailureDefinition__Group_2__1_in_rule__FailureDefinition__Group_2__04625);
-            rule__FailureDefinition__Group_2__1();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__FailureDefinition__Group_2__0"
-
-
-    // $ANTLR start "rule__FailureDefinition__Group_2__0__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2224:1: rule__FailureDefinition__Group_2__0__Impl : ( '.' ) ;
-    public final void rule__FailureDefinition__Group_2__0__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2228:1: ( ( '.' ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2229:1: ( '.' )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2229:1: ( '.' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2230:1: '.'
-            {
-             before(grammarAccess.getFailureDefinitionAccess().getFullStopKeyword_2_0()); 
-            match(input,36,FOLLOW_36_in_rule__FailureDefinition__Group_2__0__Impl4653); 
-             after(grammarAccess.getFailureDefinitionAccess().getFullStopKeyword_2_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__FailureDefinition__Group_2__0__Impl"
-
-
-    // $ANTLR start "rule__FailureDefinition__Group_2__1"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2243:1: rule__FailureDefinition__Group_2__1 : rule__FailureDefinition__Group_2__1__Impl ;
-    public final void rule__FailureDefinition__Group_2__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2247:1: ( rule__FailureDefinition__Group_2__1__Impl )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2248:2: rule__FailureDefinition__Group_2__1__Impl
-            {
-            pushFollow(FOLLOW_rule__FailureDefinition__Group_2__1__Impl_in_rule__FailureDefinition__Group_2__14684);
-            rule__FailureDefinition__Group_2__1__Impl();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__FailureDefinition__Group_2__1"
-
-
-    // $ANTLR start "rule__FailureDefinition__Group_2__1__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2254:1: rule__FailureDefinition__Group_2__1__Impl : ( ( rule__FailureDefinition__AcidAvoidableAssignment_2_1 ) ) ;
-    public final void rule__FailureDefinition__Group_2__1__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2258:1: ( ( ( rule__FailureDefinition__AcidAvoidableAssignment_2_1 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2259:1: ( ( rule__FailureDefinition__AcidAvoidableAssignment_2_1 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2259:1: ( ( rule__FailureDefinition__AcidAvoidableAssignment_2_1 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2260:1: ( rule__FailureDefinition__AcidAvoidableAssignment_2_1 )
-            {
-             before(grammarAccess.getFailureDefinitionAccess().getAcidAvoidableAssignment_2_1()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2261:1: ( rule__FailureDefinition__AcidAvoidableAssignment_2_1 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2261:2: rule__FailureDefinition__AcidAvoidableAssignment_2_1
-            {
-            pushFollow(FOLLOW_rule__FailureDefinition__AcidAvoidableAssignment_2_1_in_rule__FailureDefinition__Group_2__1__Impl4711);
-            rule__FailureDefinition__AcidAvoidableAssignment_2_1();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getFailureDefinitionAccess().getAcidAvoidableAssignment_2_1()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__FailureDefinition__Group_2__1__Impl"
-
-
-    // $ANTLR start "rule__NoFailureDefinition__Group__0"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2275:1: rule__NoFailureDefinition__Group__0 : rule__NoFailureDefinition__Group__0__Impl rule__NoFailureDefinition__Group__1 ;
-    public final void rule__NoFailureDefinition__Group__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2279:1: ( rule__NoFailureDefinition__Group__0__Impl rule__NoFailureDefinition__Group__1 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2280:2: rule__NoFailureDefinition__Group__0__Impl rule__NoFailureDefinition__Group__1
-            {
-            pushFollow(FOLLOW_rule__NoFailureDefinition__Group__0__Impl_in_rule__NoFailureDefinition__Group__04745);
-            rule__NoFailureDefinition__Group__0__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__NoFailureDefinition__Group__1_in_rule__NoFailureDefinition__Group__04748);
-            rule__NoFailureDefinition__Group__1();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__NoFailureDefinition__Group__0"
-
-
-    // $ANTLR start "rule__NoFailureDefinition__Group__0__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2287:1: rule__NoFailureDefinition__Group__0__Impl : ( () ) ;
-    public final void rule__NoFailureDefinition__Group__0__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2291:1: ( ( () ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2292:1: ( () )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2292:1: ( () )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2293:1: ()
-            {
-             before(grammarAccess.getNoFailureDefinitionAccess().getNoFailureDefinitionAction_0()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2294:1: ()
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2296:1: 
-            {
-            }
-
-             after(grammarAccess.getNoFailureDefinitionAccess().getNoFailureDefinitionAction_0()); 
-
-            }
-
-
-            }
-
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__NoFailureDefinition__Group__0__Impl"
-
-
-    // $ANTLR start "rule__NoFailureDefinition__Group__1"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2306:1: rule__NoFailureDefinition__Group__1 : rule__NoFailureDefinition__Group__1__Impl ;
-    public final void rule__NoFailureDefinition__Group__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2310:1: ( rule__NoFailureDefinition__Group__1__Impl )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2311:2: rule__NoFailureDefinition__Group__1__Impl
-            {
-            pushFollow(FOLLOW_rule__NoFailureDefinition__Group__1__Impl_in_rule__NoFailureDefinition__Group__14806);
-            rule__NoFailureDefinition__Group__1__Impl();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__NoFailureDefinition__Group__1"
-
-
-    // $ANTLR start "rule__NoFailureDefinition__Group__1__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2317:1: rule__NoFailureDefinition__Group__1__Impl : ( 'noFailure' ) ;
-    public final void rule__NoFailureDefinition__Group__1__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2321:1: ( ( 'noFailure' ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2322:1: ( 'noFailure' )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2322:1: ( 'noFailure' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2323:1: 'noFailure'
-            {
-             before(grammarAccess.getNoFailureDefinitionAccess().getNoFailureKeyword_1()); 
-            match(input,39,FOLLOW_39_in_rule__NoFailureDefinition__Group__1__Impl4834); 
-             after(grammarAccess.getNoFailureDefinitionAccess().getNoFailureKeyword_1()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__NoFailureDefinition__Group__1__Impl"
-
-
-    // $ANTLR start "rule__ComplexNofailureDefinition__Group__0"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2340:1: rule__ComplexNofailureDefinition__Group__0 : rule__ComplexNofailureDefinition__Group__0__Impl rule__ComplexNofailureDefinition__Group__1 ;
-    public final void rule__ComplexNofailureDefinition__Group__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2344:1: ( rule__ComplexNofailureDefinition__Group__0__Impl rule__ComplexNofailureDefinition__Group__1 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2345:2: rule__ComplexNofailureDefinition__Group__0__Impl rule__ComplexNofailureDefinition__Group__1
-            {
-            pushFollow(FOLLOW_rule__ComplexNofailureDefinition__Group__0__Impl_in_rule__ComplexNofailureDefinition__Group__04869);
-            rule__ComplexNofailureDefinition__Group__0__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__ComplexNofailureDefinition__Group__1_in_rule__ComplexNofailureDefinition__Group__04872);
-            rule__ComplexNofailureDefinition__Group__1();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ComplexNofailureDefinition__Group__0"
-
-
-    // $ANTLR start "rule__ComplexNofailureDefinition__Group__0__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2352:1: rule__ComplexNofailureDefinition__Group__0__Impl : ( () ) ;
-    public final void rule__ComplexNofailureDefinition__Group__0__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2356:1: ( ( () ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2357:1: ( () )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2357:1: ( () )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2358:1: ()
-            {
-             before(grammarAccess.getComplexNofailureDefinitionAccess().getNoFailureDefinitionAction_0()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2359:1: ()
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2361:1: 
-            {
-            }
-
-             after(grammarAccess.getComplexNofailureDefinitionAccess().getNoFailureDefinitionAction_0()); 
-
-            }
-
-
-            }
-
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ComplexNofailureDefinition__Group__0__Impl"
-
-
-    // $ANTLR start "rule__ComplexNofailureDefinition__Group__1"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2371:1: rule__ComplexNofailureDefinition__Group__1 : rule__ComplexNofailureDefinition__Group__1__Impl rule__ComplexNofailureDefinition__Group__2 ;
-    public final void rule__ComplexNofailureDefinition__Group__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2375:1: ( rule__ComplexNofailureDefinition__Group__1__Impl rule__ComplexNofailureDefinition__Group__2 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2376:2: rule__ComplexNofailureDefinition__Group__1__Impl rule__ComplexNofailureDefinition__Group__2
-            {
-            pushFollow(FOLLOW_rule__ComplexNofailureDefinition__Group__1__Impl_in_rule__ComplexNofailureDefinition__Group__14930);
-            rule__ComplexNofailureDefinition__Group__1__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__ComplexNofailureDefinition__Group__2_in_rule__ComplexNofailureDefinition__Group__14933);
-            rule__ComplexNofailureDefinition__Group__2();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ComplexNofailureDefinition__Group__1"
-
-
-    // $ANTLR start "rule__ComplexNofailureDefinition__Group__1__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2383:1: rule__ComplexNofailureDefinition__Group__1__Impl : ( 'noFailure' ) ;
-    public final void rule__ComplexNofailureDefinition__Group__1__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2387:1: ( ( 'noFailure' ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2388:1: ( 'noFailure' )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2388:1: ( 'noFailure' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2389:1: 'noFailure'
-            {
-             before(grammarAccess.getComplexNofailureDefinitionAccess().getNoFailureKeyword_1()); 
-            match(input,39,FOLLOW_39_in_rule__ComplexNofailureDefinition__Group__1__Impl4961); 
-             after(grammarAccess.getComplexNofailureDefinitionAccess().getNoFailureKeyword_1()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ComplexNofailureDefinition__Group__1__Impl"
-
-
-    // $ANTLR start "rule__ComplexNofailureDefinition__Group__2"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2402:1: rule__ComplexNofailureDefinition__Group__2 : rule__ComplexNofailureDefinition__Group__2__Impl rule__ComplexNofailureDefinition__Group__3 ;
-    public final void rule__ComplexNofailureDefinition__Group__2() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2406:1: ( rule__ComplexNofailureDefinition__Group__2__Impl rule__ComplexNofailureDefinition__Group__3 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2407:2: rule__ComplexNofailureDefinition__Group__2__Impl rule__ComplexNofailureDefinition__Group__3
-            {
-            pushFollow(FOLLOW_rule__ComplexNofailureDefinition__Group__2__Impl_in_rule__ComplexNofailureDefinition__Group__24992);
-            rule__ComplexNofailureDefinition__Group__2__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__ComplexNofailureDefinition__Group__3_in_rule__ComplexNofailureDefinition__Group__24995);
-            rule__ComplexNofailureDefinition__Group__3();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ComplexNofailureDefinition__Group__2"
-
-
-    // $ANTLR start "rule__ComplexNofailureDefinition__Group__2__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2414:1: rule__ComplexNofailureDefinition__Group__2__Impl : ( '.' ) ;
-    public final void rule__ComplexNofailureDefinition__Group__2__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2418:1: ( ( '.' ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2419:1: ( '.' )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2419:1: ( '.' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2420:1: '.'
-            {
-             before(grammarAccess.getComplexNofailureDefinitionAccess().getFullStopKeyword_2()); 
-            match(input,36,FOLLOW_36_in_rule__ComplexNofailureDefinition__Group__2__Impl5023); 
-             after(grammarAccess.getComplexNofailureDefinitionAccess().getFullStopKeyword_2()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ComplexNofailureDefinition__Group__2__Impl"
-
-
-    // $ANTLR start "rule__ComplexNofailureDefinition__Group__3"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2433:1: rule__ComplexNofailureDefinition__Group__3 : rule__ComplexNofailureDefinition__Group__3__Impl ;
-    public final void rule__ComplexNofailureDefinition__Group__3() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2437:1: ( rule__ComplexNofailureDefinition__Group__3__Impl )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2438:2: rule__ComplexNofailureDefinition__Group__3__Impl
-            {
-            pushFollow(FOLLOW_rule__ComplexNofailureDefinition__Group__3__Impl_in_rule__ComplexNofailureDefinition__Group__35054);
-            rule__ComplexNofailureDefinition__Group__3__Impl();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ComplexNofailureDefinition__Group__3"
-
-
-    // $ANTLR start "rule__ComplexNofailureDefinition__Group__3__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2444:1: rule__ComplexNofailureDefinition__Group__3__Impl : ( ( rule__ComplexNofailureDefinition__AcidMitigationAssignment_3 ) ) ;
-    public final void rule__ComplexNofailureDefinition__Group__3__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2448:1: ( ( ( rule__ComplexNofailureDefinition__AcidMitigationAssignment_3 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2449:1: ( ( rule__ComplexNofailureDefinition__AcidMitigationAssignment_3 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2449:1: ( ( rule__ComplexNofailureDefinition__AcidMitigationAssignment_3 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2450:1: ( rule__ComplexNofailureDefinition__AcidMitigationAssignment_3 )
-            {
-             before(grammarAccess.getComplexNofailureDefinitionAccess().getAcidMitigationAssignment_3()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2451:1: ( rule__ComplexNofailureDefinition__AcidMitigationAssignment_3 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2451:2: rule__ComplexNofailureDefinition__AcidMitigationAssignment_3
-            {
-            pushFollow(FOLLOW_rule__ComplexNofailureDefinition__AcidMitigationAssignment_3_in_rule__ComplexNofailureDefinition__Group__3__Impl5081);
-            rule__ComplexNofailureDefinition__AcidMitigationAssignment_3();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getComplexNofailureDefinitionAccess().getAcidMitigationAssignment_3()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ComplexNofailureDefinition__Group__3__Impl"
-
-
-    // $ANTLR start "rule__WildcardDefinition__Group__0"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2469:1: rule__WildcardDefinition__Group__0 : rule__WildcardDefinition__Group__0__Impl rule__WildcardDefinition__Group__1 ;
-    public final void rule__WildcardDefinition__Group__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2473:1: ( rule__WildcardDefinition__Group__0__Impl rule__WildcardDefinition__Group__1 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2474:2: rule__WildcardDefinition__Group__0__Impl rule__WildcardDefinition__Group__1
-            {
-            pushFollow(FOLLOW_rule__WildcardDefinition__Group__0__Impl_in_rule__WildcardDefinition__Group__05119);
-            rule__WildcardDefinition__Group__0__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__WildcardDefinition__Group__1_in_rule__WildcardDefinition__Group__05122);
-            rule__WildcardDefinition__Group__1();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__WildcardDefinition__Group__0"
-
-
-    // $ANTLR start "rule__WildcardDefinition__Group__0__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2481:1: rule__WildcardDefinition__Group__0__Impl : ( () ) ;
-    public final void rule__WildcardDefinition__Group__0__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2485:1: ( ( () ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2486:1: ( () )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2486:1: ( () )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2487:1: ()
-            {
-             before(grammarAccess.getWildcardDefinitionAccess().getWildcardDefinitionAction_0()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2488:1: ()
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2490:1: 
-            {
-            }
-
-             after(grammarAccess.getWildcardDefinitionAccess().getWildcardDefinitionAction_0()); 
-
-            }
-
-
-            }
-
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__WildcardDefinition__Group__0__Impl"
-
-
-    // $ANTLR start "rule__WildcardDefinition__Group__1"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2500:1: rule__WildcardDefinition__Group__1 : rule__WildcardDefinition__Group__1__Impl ;
-    public final void rule__WildcardDefinition__Group__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2504:1: ( rule__WildcardDefinition__Group__1__Impl )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2505:2: rule__WildcardDefinition__Group__1__Impl
-            {
-            pushFollow(FOLLOW_rule__WildcardDefinition__Group__1__Impl_in_rule__WildcardDefinition__Group__15180);
-            rule__WildcardDefinition__Group__1__Impl();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__WildcardDefinition__Group__1"
-
-
-    // $ANTLR start "rule__WildcardDefinition__Group__1__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2511:1: rule__WildcardDefinition__Group__1__Impl : ( 'wildcard' ) ;
-    public final void rule__WildcardDefinition__Group__1__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2515:1: ( ( 'wildcard' ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2516:1: ( 'wildcard' )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2516:1: ( 'wildcard' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2517:1: 'wildcard'
-            {
-             before(grammarAccess.getWildcardDefinitionAccess().getWildcardKeyword_1()); 
-            match(input,40,FOLLOW_40_in_rule__WildcardDefinition__Group__1__Impl5208); 
-             after(grammarAccess.getWildcardDefinitionAccess().getWildcardKeyword_1()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__WildcardDefinition__Group__1__Impl"
-
-
-    // $ANTLR start "rule__VariableDefinition__Group__0"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2534:1: rule__VariableDefinition__Group__0 : rule__VariableDefinition__Group__0__Impl rule__VariableDefinition__Group__1 ;
-    public final void rule__VariableDefinition__Group__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2538:1: ( rule__VariableDefinition__Group__0__Impl rule__VariableDefinition__Group__1 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2539:2: rule__VariableDefinition__Group__0__Impl rule__VariableDefinition__Group__1
-            {
-            pushFollow(FOLLOW_rule__VariableDefinition__Group__0__Impl_in_rule__VariableDefinition__Group__05243);
-            rule__VariableDefinition__Group__0__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__VariableDefinition__Group__1_in_rule__VariableDefinition__Group__05246);
-            rule__VariableDefinition__Group__1();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__VariableDefinition__Group__0"
-
-
-    // $ANTLR start "rule__VariableDefinition__Group__0__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2546:1: rule__VariableDefinition__Group__0__Impl : ( () ) ;
-    public final void rule__VariableDefinition__Group__0__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2550:1: ( ( () ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2551:1: ( () )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2551:1: ( () )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2552:1: ()
-            {
-             before(grammarAccess.getVariableDefinitionAccess().getVariableDefinitionAction_0()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2553:1: ()
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2555:1: 
-            {
-            }
-
-             after(grammarAccess.getVariableDefinitionAccess().getVariableDefinitionAction_0()); 
-
-            }
-
-
-            }
-
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__VariableDefinition__Group__0__Impl"
-
-
-    // $ANTLR start "rule__VariableDefinition__Group__1"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2565:1: rule__VariableDefinition__Group__1 : rule__VariableDefinition__Group__1__Impl ;
-    public final void rule__VariableDefinition__Group__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2569:1: ( rule__VariableDefinition__Group__1__Impl )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2570:2: rule__VariableDefinition__Group__1__Impl
-            {
-            pushFollow(FOLLOW_rule__VariableDefinition__Group__1__Impl_in_rule__VariableDefinition__Group__15304);
-            rule__VariableDefinition__Group__1__Impl();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__VariableDefinition__Group__1"
-
-
-    // $ANTLR start "rule__VariableDefinition__Group__1__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2576:1: rule__VariableDefinition__Group__1__Impl : ( ( rule__VariableDefinition__VariableNameAssignment_1 ) ) ;
-    public final void rule__VariableDefinition__Group__1__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2580:1: ( ( ( rule__VariableDefinition__VariableNameAssignment_1 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2581:1: ( ( rule__VariableDefinition__VariableNameAssignment_1 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2581:1: ( ( rule__VariableDefinition__VariableNameAssignment_1 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2582:1: ( rule__VariableDefinition__VariableNameAssignment_1 )
-            {
-             before(grammarAccess.getVariableDefinitionAccess().getVariableNameAssignment_1()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2583:1: ( rule__VariableDefinition__VariableNameAssignment_1 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2583:2: rule__VariableDefinition__VariableNameAssignment_1
-            {
-            pushFollow(FOLLOW_rule__VariableDefinition__VariableNameAssignment_1_in_rule__VariableDefinition__Group__1__Impl5331);
-            rule__VariableDefinition__VariableNameAssignment_1();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getVariableDefinitionAccess().getVariableNameAssignment_1()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__VariableDefinition__Group__1__Impl"
-
-
-    // $ANTLR start "rule__ACIDavoidable__Group__0"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2597:1: rule__ACIDavoidable__Group__0 : rule__ACIDavoidable__Group__0__Impl rule__ACIDavoidable__Group__1 ;
-    public final void rule__ACIDavoidable__Group__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2601:1: ( rule__ACIDavoidable__Group__0__Impl rule__ACIDavoidable__Group__1 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2602:2: rule__ACIDavoidable__Group__0__Impl rule__ACIDavoidable__Group__1
-            {
-            pushFollow(FOLLOW_rule__ACIDavoidable__Group__0__Impl_in_rule__ACIDavoidable__Group__05365);
-            rule__ACIDavoidable__Group__0__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__ACIDavoidable__Group__1_in_rule__ACIDavoidable__Group__05368);
-            rule__ACIDavoidable__Group__1();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDavoidable__Group__0"
-
-
-    // $ANTLR start "rule__ACIDavoidable__Group__0__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2609:1: rule__ACIDavoidable__Group__0__Impl : ( ( rule__ACIDavoidable__AAssignment_0 ) ) ;
-    public final void rule__ACIDavoidable__Group__0__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2613:1: ( ( ( rule__ACIDavoidable__AAssignment_0 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2614:1: ( ( rule__ACIDavoidable__AAssignment_0 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2614:1: ( ( rule__ACIDavoidable__AAssignment_0 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2615:1: ( rule__ACIDavoidable__AAssignment_0 )
-            {
-             before(grammarAccess.getACIDavoidableAccess().getAAssignment_0()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2616:1: ( rule__ACIDavoidable__AAssignment_0 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2616:2: rule__ACIDavoidable__AAssignment_0
-            {
-            pushFollow(FOLLOW_rule__ACIDavoidable__AAssignment_0_in_rule__ACIDavoidable__Group__0__Impl5395);
-            rule__ACIDavoidable__AAssignment_0();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getACIDavoidableAccess().getAAssignment_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDavoidable__Group__0__Impl"
-
-
-    // $ANTLR start "rule__ACIDavoidable__Group__1"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2626:1: rule__ACIDavoidable__Group__1 : rule__ACIDavoidable__Group__1__Impl rule__ACIDavoidable__Group__2 ;
-    public final void rule__ACIDavoidable__Group__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2630:1: ( rule__ACIDavoidable__Group__1__Impl rule__ACIDavoidable__Group__2 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2631:2: rule__ACIDavoidable__Group__1__Impl rule__ACIDavoidable__Group__2
-            {
-            pushFollow(FOLLOW_rule__ACIDavoidable__Group__1__Impl_in_rule__ACIDavoidable__Group__15425);
-            rule__ACIDavoidable__Group__1__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__ACIDavoidable__Group__2_in_rule__ACIDavoidable__Group__15428);
-            rule__ACIDavoidable__Group__2();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDavoidable__Group__1"
-
-
-    // $ANTLR start "rule__ACIDavoidable__Group__1__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2638:1: rule__ACIDavoidable__Group__1__Impl : ( '.' ) ;
-    public final void rule__ACIDavoidable__Group__1__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2642:1: ( ( '.' ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2643:1: ( '.' )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2643:1: ( '.' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2644:1: '.'
-            {
-             before(grammarAccess.getACIDavoidableAccess().getFullStopKeyword_1()); 
-            match(input,36,FOLLOW_36_in_rule__ACIDavoidable__Group__1__Impl5456); 
-             after(grammarAccess.getACIDavoidableAccess().getFullStopKeyword_1()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDavoidable__Group__1__Impl"
-
-
-    // $ANTLR start "rule__ACIDavoidable__Group__2"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2657:1: rule__ACIDavoidable__Group__2 : rule__ACIDavoidable__Group__2__Impl rule__ACIDavoidable__Group__3 ;
-    public final void rule__ACIDavoidable__Group__2() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2661:1: ( rule__ACIDavoidable__Group__2__Impl rule__ACIDavoidable__Group__3 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2662:2: rule__ACIDavoidable__Group__2__Impl rule__ACIDavoidable__Group__3
-            {
-            pushFollow(FOLLOW_rule__ACIDavoidable__Group__2__Impl_in_rule__ACIDavoidable__Group__25487);
-            rule__ACIDavoidable__Group__2__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__ACIDavoidable__Group__3_in_rule__ACIDavoidable__Group__25490);
-            rule__ACIDavoidable__Group__3();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDavoidable__Group__2"
-
-
-    // $ANTLR start "rule__ACIDavoidable__Group__2__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2669:1: rule__ACIDavoidable__Group__2__Impl : ( ( rule__ACIDavoidable__CAssignment_2 ) ) ;
-    public final void rule__ACIDavoidable__Group__2__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2673:1: ( ( ( rule__ACIDavoidable__CAssignment_2 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2674:1: ( ( rule__ACIDavoidable__CAssignment_2 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2674:1: ( ( rule__ACIDavoidable__CAssignment_2 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2675:1: ( rule__ACIDavoidable__CAssignment_2 )
-            {
-             before(grammarAccess.getACIDavoidableAccess().getCAssignment_2()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2676:1: ( rule__ACIDavoidable__CAssignment_2 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2676:2: rule__ACIDavoidable__CAssignment_2
-            {
-            pushFollow(FOLLOW_rule__ACIDavoidable__CAssignment_2_in_rule__ACIDavoidable__Group__2__Impl5517);
-            rule__ACIDavoidable__CAssignment_2();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getACIDavoidableAccess().getCAssignment_2()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDavoidable__Group__2__Impl"
-
-
-    // $ANTLR start "rule__ACIDavoidable__Group__3"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2686:1: rule__ACIDavoidable__Group__3 : rule__ACIDavoidable__Group__3__Impl rule__ACIDavoidable__Group__4 ;
-    public final void rule__ACIDavoidable__Group__3() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2690:1: ( rule__ACIDavoidable__Group__3__Impl rule__ACIDavoidable__Group__4 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2691:2: rule__ACIDavoidable__Group__3__Impl rule__ACIDavoidable__Group__4
-            {
-            pushFollow(FOLLOW_rule__ACIDavoidable__Group__3__Impl_in_rule__ACIDavoidable__Group__35547);
-            rule__ACIDavoidable__Group__3__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__ACIDavoidable__Group__4_in_rule__ACIDavoidable__Group__35550);
-            rule__ACIDavoidable__Group__4();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDavoidable__Group__3"
-
-
-    // $ANTLR start "rule__ACIDavoidable__Group__3__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2698:1: rule__ACIDavoidable__Group__3__Impl : ( '.' ) ;
-    public final void rule__ACIDavoidable__Group__3__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2702:1: ( ( '.' ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2703:1: ( '.' )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2703:1: ( '.' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2704:1: '.'
-            {
-             before(grammarAccess.getACIDavoidableAccess().getFullStopKeyword_3()); 
-            match(input,36,FOLLOW_36_in_rule__ACIDavoidable__Group__3__Impl5578); 
-             after(grammarAccess.getACIDavoidableAccess().getFullStopKeyword_3()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDavoidable__Group__3__Impl"
-
-
-    // $ANTLR start "rule__ACIDavoidable__Group__4"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2717:1: rule__ACIDavoidable__Group__4 : rule__ACIDavoidable__Group__4__Impl rule__ACIDavoidable__Group__5 ;
-    public final void rule__ACIDavoidable__Group__4() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2721:1: ( rule__ACIDavoidable__Group__4__Impl rule__ACIDavoidable__Group__5 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2722:2: rule__ACIDavoidable__Group__4__Impl rule__ACIDavoidable__Group__5
-            {
-            pushFollow(FOLLOW_rule__ACIDavoidable__Group__4__Impl_in_rule__ACIDavoidable__Group__45609);
-            rule__ACIDavoidable__Group__4__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__ACIDavoidable__Group__5_in_rule__ACIDavoidable__Group__45612);
-            rule__ACIDavoidable__Group__5();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDavoidable__Group__4"
-
-
-    // $ANTLR start "rule__ACIDavoidable__Group__4__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2729:1: rule__ACIDavoidable__Group__4__Impl : ( ( rule__ACIDavoidable__IAssignment_4 ) ) ;
-    public final void rule__ACIDavoidable__Group__4__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2733:1: ( ( ( rule__ACIDavoidable__IAssignment_4 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2734:1: ( ( rule__ACIDavoidable__IAssignment_4 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2734:1: ( ( rule__ACIDavoidable__IAssignment_4 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2735:1: ( rule__ACIDavoidable__IAssignment_4 )
-            {
-             before(grammarAccess.getACIDavoidableAccess().getIAssignment_4()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2736:1: ( rule__ACIDavoidable__IAssignment_4 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2736:2: rule__ACIDavoidable__IAssignment_4
-            {
-            pushFollow(FOLLOW_rule__ACIDavoidable__IAssignment_4_in_rule__ACIDavoidable__Group__4__Impl5639);
-            rule__ACIDavoidable__IAssignment_4();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getACIDavoidableAccess().getIAssignment_4()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDavoidable__Group__4__Impl"
-
-
-    // $ANTLR start "rule__ACIDavoidable__Group__5"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2746:1: rule__ACIDavoidable__Group__5 : rule__ACIDavoidable__Group__5__Impl rule__ACIDavoidable__Group__6 ;
-    public final void rule__ACIDavoidable__Group__5() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2750:1: ( rule__ACIDavoidable__Group__5__Impl rule__ACIDavoidable__Group__6 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2751:2: rule__ACIDavoidable__Group__5__Impl rule__ACIDavoidable__Group__6
-            {
-            pushFollow(FOLLOW_rule__ACIDavoidable__Group__5__Impl_in_rule__ACIDavoidable__Group__55669);
-            rule__ACIDavoidable__Group__5__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__ACIDavoidable__Group__6_in_rule__ACIDavoidable__Group__55672);
-            rule__ACIDavoidable__Group__6();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDavoidable__Group__5"
-
-
-    // $ANTLR start "rule__ACIDavoidable__Group__5__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2758:1: rule__ACIDavoidable__Group__5__Impl : ( '.' ) ;
-    public final void rule__ACIDavoidable__Group__5__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2762:1: ( ( '.' ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2763:1: ( '.' )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2763:1: ( '.' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2764:1: '.'
-            {
-             before(grammarAccess.getACIDavoidableAccess().getFullStopKeyword_5()); 
-            match(input,36,FOLLOW_36_in_rule__ACIDavoidable__Group__5__Impl5700); 
-             after(grammarAccess.getACIDavoidableAccess().getFullStopKeyword_5()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDavoidable__Group__5__Impl"
-
-
-    // $ANTLR start "rule__ACIDavoidable__Group__6"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2777:1: rule__ACIDavoidable__Group__6 : rule__ACIDavoidable__Group__6__Impl ;
-    public final void rule__ACIDavoidable__Group__6() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2781:1: ( rule__ACIDavoidable__Group__6__Impl )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2782:2: rule__ACIDavoidable__Group__6__Impl
-            {
-            pushFollow(FOLLOW_rule__ACIDavoidable__Group__6__Impl_in_rule__ACIDavoidable__Group__65731);
-            rule__ACIDavoidable__Group__6__Impl();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDavoidable__Group__6"
-
-
-    // $ANTLR start "rule__ACIDavoidable__Group__6__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2788:1: rule__ACIDavoidable__Group__6__Impl : ( ( rule__ACIDavoidable__DAssignment_6 ) ) ;
-    public final void rule__ACIDavoidable__Group__6__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2792:1: ( ( ( rule__ACIDavoidable__DAssignment_6 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2793:1: ( ( rule__ACIDavoidable__DAssignment_6 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2793:1: ( ( rule__ACIDavoidable__DAssignment_6 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2794:1: ( rule__ACIDavoidable__DAssignment_6 )
-            {
-             before(grammarAccess.getACIDavoidableAccess().getDAssignment_6()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2795:1: ( rule__ACIDavoidable__DAssignment_6 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2795:2: rule__ACIDavoidable__DAssignment_6
-            {
-            pushFollow(FOLLOW_rule__ACIDavoidable__DAssignment_6_in_rule__ACIDavoidable__Group__6__Impl5758);
-            rule__ACIDavoidable__DAssignment_6();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getACIDavoidableAccess().getDAssignment_6()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDavoidable__Group__6__Impl"
-
-
-    // $ANTLR start "rule__ACIDMitigation__Group__0"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2819:1: rule__ACIDMitigation__Group__0 : rule__ACIDMitigation__Group__0__Impl rule__ACIDMitigation__Group__1 ;
-    public final void rule__ACIDMitigation__Group__0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2823:1: ( rule__ACIDMitigation__Group__0__Impl rule__ACIDMitigation__Group__1 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2824:2: rule__ACIDMitigation__Group__0__Impl rule__ACIDMitigation__Group__1
-            {
-            pushFollow(FOLLOW_rule__ACIDMitigation__Group__0__Impl_in_rule__ACIDMitigation__Group__05802);
-            rule__ACIDMitigation__Group__0__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__ACIDMitigation__Group__1_in_rule__ACIDMitigation__Group__05805);
-            rule__ACIDMitigation__Group__1();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDMitigation__Group__0"
-
-
-    // $ANTLR start "rule__ACIDMitigation__Group__0__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2831:1: rule__ACIDMitigation__Group__0__Impl : ( ( rule__ACIDMitigation__AAssignment_0 ) ) ;
-    public final void rule__ACIDMitigation__Group__0__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2835:1: ( ( ( rule__ACIDMitigation__AAssignment_0 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2836:1: ( ( rule__ACIDMitigation__AAssignment_0 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2836:1: ( ( rule__ACIDMitigation__AAssignment_0 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2837:1: ( rule__ACIDMitigation__AAssignment_0 )
-            {
-             before(grammarAccess.getACIDMitigationAccess().getAAssignment_0()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2838:1: ( rule__ACIDMitigation__AAssignment_0 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2838:2: rule__ACIDMitigation__AAssignment_0
-            {
-            pushFollow(FOLLOW_rule__ACIDMitigation__AAssignment_0_in_rule__ACIDMitigation__Group__0__Impl5832);
-            rule__ACIDMitigation__AAssignment_0();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getACIDMitigationAccess().getAAssignment_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDMitigation__Group__0__Impl"
-
-
-    // $ANTLR start "rule__ACIDMitigation__Group__1"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2848:1: rule__ACIDMitigation__Group__1 : rule__ACIDMitigation__Group__1__Impl rule__ACIDMitigation__Group__2 ;
-    public final void rule__ACIDMitigation__Group__1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2852:1: ( rule__ACIDMitigation__Group__1__Impl rule__ACIDMitigation__Group__2 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2853:2: rule__ACIDMitigation__Group__1__Impl rule__ACIDMitigation__Group__2
-            {
-            pushFollow(FOLLOW_rule__ACIDMitigation__Group__1__Impl_in_rule__ACIDMitigation__Group__15862);
-            rule__ACIDMitigation__Group__1__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__ACIDMitigation__Group__2_in_rule__ACIDMitigation__Group__15865);
-            rule__ACIDMitigation__Group__2();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDMitigation__Group__1"
-
-
-    // $ANTLR start "rule__ACIDMitigation__Group__1__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2860:1: rule__ACIDMitigation__Group__1__Impl : ( '.' ) ;
-    public final void rule__ACIDMitigation__Group__1__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2864:1: ( ( '.' ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2865:1: ( '.' )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2865:1: ( '.' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2866:1: '.'
-            {
-             before(grammarAccess.getACIDMitigationAccess().getFullStopKeyword_1()); 
-            match(input,36,FOLLOW_36_in_rule__ACIDMitigation__Group__1__Impl5893); 
-             after(grammarAccess.getACIDMitigationAccess().getFullStopKeyword_1()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDMitigation__Group__1__Impl"
-
-
-    // $ANTLR start "rule__ACIDMitigation__Group__2"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2879:1: rule__ACIDMitigation__Group__2 : rule__ACIDMitigation__Group__2__Impl rule__ACIDMitigation__Group__3 ;
-    public final void rule__ACIDMitigation__Group__2() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2883:1: ( rule__ACIDMitigation__Group__2__Impl rule__ACIDMitigation__Group__3 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2884:2: rule__ACIDMitigation__Group__2__Impl rule__ACIDMitigation__Group__3
-            {
-            pushFollow(FOLLOW_rule__ACIDMitigation__Group__2__Impl_in_rule__ACIDMitigation__Group__25924);
-            rule__ACIDMitigation__Group__2__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__ACIDMitigation__Group__3_in_rule__ACIDMitigation__Group__25927);
-            rule__ACIDMitigation__Group__3();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDMitigation__Group__2"
-
-
-    // $ANTLR start "rule__ACIDMitigation__Group__2__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2891:1: rule__ACIDMitigation__Group__2__Impl : ( ( rule__ACIDMitigation__CAssignment_2 ) ) ;
-    public final void rule__ACIDMitigation__Group__2__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2895:1: ( ( ( rule__ACIDMitigation__CAssignment_2 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2896:1: ( ( rule__ACIDMitigation__CAssignment_2 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2896:1: ( ( rule__ACIDMitigation__CAssignment_2 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2897:1: ( rule__ACIDMitigation__CAssignment_2 )
-            {
-             before(grammarAccess.getACIDMitigationAccess().getCAssignment_2()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2898:1: ( rule__ACIDMitigation__CAssignment_2 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2898:2: rule__ACIDMitigation__CAssignment_2
-            {
-            pushFollow(FOLLOW_rule__ACIDMitigation__CAssignment_2_in_rule__ACIDMitigation__Group__2__Impl5954);
-            rule__ACIDMitigation__CAssignment_2();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getACIDMitigationAccess().getCAssignment_2()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDMitigation__Group__2__Impl"
-
-
-    // $ANTLR start "rule__ACIDMitigation__Group__3"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2908:1: rule__ACIDMitigation__Group__3 : rule__ACIDMitigation__Group__3__Impl rule__ACIDMitigation__Group__4 ;
-    public final void rule__ACIDMitigation__Group__3() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2912:1: ( rule__ACIDMitigation__Group__3__Impl rule__ACIDMitigation__Group__4 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2913:2: rule__ACIDMitigation__Group__3__Impl rule__ACIDMitigation__Group__4
-            {
-            pushFollow(FOLLOW_rule__ACIDMitigation__Group__3__Impl_in_rule__ACIDMitigation__Group__35984);
-            rule__ACIDMitigation__Group__3__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__ACIDMitigation__Group__4_in_rule__ACIDMitigation__Group__35987);
-            rule__ACIDMitigation__Group__4();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDMitigation__Group__3"
-
-
-    // $ANTLR start "rule__ACIDMitigation__Group__3__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2920:1: rule__ACIDMitigation__Group__3__Impl : ( '.' ) ;
-    public final void rule__ACIDMitigation__Group__3__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2924:1: ( ( '.' ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2925:1: ( '.' )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2925:1: ( '.' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2926:1: '.'
-            {
-             before(grammarAccess.getACIDMitigationAccess().getFullStopKeyword_3()); 
-            match(input,36,FOLLOW_36_in_rule__ACIDMitigation__Group__3__Impl6015); 
-             after(grammarAccess.getACIDMitigationAccess().getFullStopKeyword_3()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDMitigation__Group__3__Impl"
-
-
-    // $ANTLR start "rule__ACIDMitigation__Group__4"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2939:1: rule__ACIDMitigation__Group__4 : rule__ACIDMitigation__Group__4__Impl rule__ACIDMitigation__Group__5 ;
-    public final void rule__ACIDMitigation__Group__4() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2943:1: ( rule__ACIDMitigation__Group__4__Impl rule__ACIDMitigation__Group__5 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2944:2: rule__ACIDMitigation__Group__4__Impl rule__ACIDMitigation__Group__5
-            {
-            pushFollow(FOLLOW_rule__ACIDMitigation__Group__4__Impl_in_rule__ACIDMitigation__Group__46046);
-            rule__ACIDMitigation__Group__4__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__ACIDMitigation__Group__5_in_rule__ACIDMitigation__Group__46049);
-            rule__ACIDMitigation__Group__5();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDMitigation__Group__4"
-
-
-    // $ANTLR start "rule__ACIDMitigation__Group__4__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2951:1: rule__ACIDMitigation__Group__4__Impl : ( ( rule__ACIDMitigation__IAssignment_4 ) ) ;
-    public final void rule__ACIDMitigation__Group__4__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2955:1: ( ( ( rule__ACIDMitigation__IAssignment_4 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2956:1: ( ( rule__ACIDMitigation__IAssignment_4 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2956:1: ( ( rule__ACIDMitigation__IAssignment_4 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2957:1: ( rule__ACIDMitigation__IAssignment_4 )
-            {
-             before(grammarAccess.getACIDMitigationAccess().getIAssignment_4()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2958:1: ( rule__ACIDMitigation__IAssignment_4 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2958:2: rule__ACIDMitigation__IAssignment_4
-            {
-            pushFollow(FOLLOW_rule__ACIDMitigation__IAssignment_4_in_rule__ACIDMitigation__Group__4__Impl6076);
-            rule__ACIDMitigation__IAssignment_4();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getACIDMitigationAccess().getIAssignment_4()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDMitigation__Group__4__Impl"
-
-
-    // $ANTLR start "rule__ACIDMitigation__Group__5"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2968:1: rule__ACIDMitigation__Group__5 : rule__ACIDMitigation__Group__5__Impl rule__ACIDMitigation__Group__6 ;
-    public final void rule__ACIDMitigation__Group__5() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2972:1: ( rule__ACIDMitigation__Group__5__Impl rule__ACIDMitigation__Group__6 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2973:2: rule__ACIDMitigation__Group__5__Impl rule__ACIDMitigation__Group__6
-            {
-            pushFollow(FOLLOW_rule__ACIDMitigation__Group__5__Impl_in_rule__ACIDMitigation__Group__56106);
-            rule__ACIDMitigation__Group__5__Impl();
-
-            state._fsp--;
-
-            pushFollow(FOLLOW_rule__ACIDMitigation__Group__6_in_rule__ACIDMitigation__Group__56109);
-            rule__ACIDMitigation__Group__6();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDMitigation__Group__5"
-
-
-    // $ANTLR start "rule__ACIDMitigation__Group__5__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2980:1: rule__ACIDMitigation__Group__5__Impl : ( '.' ) ;
-    public final void rule__ACIDMitigation__Group__5__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2984:1: ( ( '.' ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2985:1: ( '.' )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2985:1: ( '.' )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2986:1: '.'
-            {
-             before(grammarAccess.getACIDMitigationAccess().getFullStopKeyword_5()); 
-            match(input,36,FOLLOW_36_in_rule__ACIDMitigation__Group__5__Impl6137); 
-             after(grammarAccess.getACIDMitigationAccess().getFullStopKeyword_5()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDMitigation__Group__5__Impl"
-
-
-    // $ANTLR start "rule__ACIDMitigation__Group__6"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:2999:1: rule__ACIDMitigation__Group__6 : rule__ACIDMitigation__Group__6__Impl ;
-    public final void rule__ACIDMitigation__Group__6() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3003:1: ( rule__ACIDMitigation__Group__6__Impl )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3004:2: rule__ACIDMitigation__Group__6__Impl
-            {
-            pushFollow(FOLLOW_rule__ACIDMitigation__Group__6__Impl_in_rule__ACIDMitigation__Group__66168);
-            rule__ACIDMitigation__Group__6__Impl();
-
-            state._fsp--;
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDMitigation__Group__6"
-
-
-    // $ANTLR start "rule__ACIDMitigation__Group__6__Impl"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3010:1: rule__ACIDMitigation__Group__6__Impl : ( ( rule__ACIDMitigation__DAssignment_6 ) ) ;
-    public final void rule__ACIDMitigation__Group__6__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3014:1: ( ( ( rule__ACIDMitigation__DAssignment_6 ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3015:1: ( ( rule__ACIDMitigation__DAssignment_6 ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3015:1: ( ( rule__ACIDMitigation__DAssignment_6 ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3016:1: ( rule__ACIDMitigation__DAssignment_6 )
-            {
-             before(grammarAccess.getACIDMitigationAccess().getDAssignment_6()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3017:1: ( rule__ACIDMitigation__DAssignment_6 )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3017:2: rule__ACIDMitigation__DAssignment_6
-            {
-            pushFollow(FOLLOW_rule__ACIDMitigation__DAssignment_6_in_rule__ACIDMitigation__Group__6__Impl6195);
-            rule__ACIDMitigation__DAssignment_6();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getACIDMitigationAccess().getDAssignment_6()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDMitigation__Group__6__Impl"
-
-
-    // $ANTLR start "rule__Behaviour__RulesAssignment"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3044:1: rule__Behaviour__RulesAssignment : ( ruleExpression ) ;
-    public final void rule__Behaviour__RulesAssignment() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3048:1: ( ( ruleExpression ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3049:1: ( ruleExpression )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3049:1: ( ruleExpression )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3050:1: ruleExpression
-            {
-             before(grammarAccess.getBehaviourAccess().getRulesExpressionParserRuleCall_0()); 
-            pushFollow(FOLLOW_ruleExpression_in_rule__Behaviour__RulesAssignment6246);
-            ruleExpression();
-
-            state._fsp--;
-
-             after(grammarAccess.getBehaviourAccess().getRulesExpressionParserRuleCall_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Behaviour__RulesAssignment"
-
-
-    // $ANTLR start "rule__Expression__LhsAssignment_1"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3059:1: rule__Expression__LhsAssignment_1 : ( ruleLhs ) ;
-    public final void rule__Expression__LhsAssignment_1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3063:1: ( ( ruleLhs ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3064:1: ( ruleLhs )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3064:1: ( ruleLhs )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3065:1: ruleLhs
-            {
-             before(grammarAccess.getExpressionAccess().getLhsLhsParserRuleCall_1_0()); 
-            pushFollow(FOLLOW_ruleLhs_in_rule__Expression__LhsAssignment_16277);
-            ruleLhs();
-
-            state._fsp--;
-
-             after(grammarAccess.getExpressionAccess().getLhsLhsParserRuleCall_1_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Expression__LhsAssignment_1"
-
-
-    // $ANTLR start "rule__Expression__RhsAssignment_3"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3074:1: rule__Expression__RhsAssignment_3 : ( ruleRhs ) ;
-    public final void rule__Expression__RhsAssignment_3() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3078:1: ( ( ruleRhs ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3079:1: ( ruleRhs )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3079:1: ( ruleRhs )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3080:1: ruleRhs
-            {
-             before(grammarAccess.getExpressionAccess().getRhsRhsParserRuleCall_3_0()); 
-            pushFollow(FOLLOW_ruleRhs_in_rule__Expression__RhsAssignment_36308);
-            ruleRhs();
-
-            state._fsp--;
-
-             after(grammarAccess.getExpressionAccess().getRhsRhsParserRuleCall_3_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Expression__RhsAssignment_3"
-
-
-    // $ANTLR start "rule__Lhs__FailuresAssignment_0"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3089:1: rule__Lhs__FailuresAssignment_0 : ( ruleInputExpression ) ;
-    public final void rule__Lhs__FailuresAssignment_0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3093:1: ( ( ruleInputExpression ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3094:1: ( ruleInputExpression )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3094:1: ( ruleInputExpression )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3095:1: ruleInputExpression
-            {
-             before(grammarAccess.getLhsAccess().getFailuresInputExpressionParserRuleCall_0_0()); 
-            pushFollow(FOLLOW_ruleInputExpression_in_rule__Lhs__FailuresAssignment_06339);
-            ruleInputExpression();
-
-            state._fsp--;
-
-             after(grammarAccess.getLhsAccess().getFailuresInputExpressionParserRuleCall_0_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Lhs__FailuresAssignment_0"
-
-
-    // $ANTLR start "rule__Lhs__FailuresAssignment_1_1"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3104:1: rule__Lhs__FailuresAssignment_1_1 : ( ruleInputExpression ) ;
-    public final void rule__Lhs__FailuresAssignment_1_1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3108:1: ( ( ruleInputExpression ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3109:1: ( ruleInputExpression )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3109:1: ( ruleInputExpression )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3110:1: ruleInputExpression
-            {
-             before(grammarAccess.getLhsAccess().getFailuresInputExpressionParserRuleCall_1_1_0()); 
-            pushFollow(FOLLOW_ruleInputExpression_in_rule__Lhs__FailuresAssignment_1_16370);
-            ruleInputExpression();
-
-            state._fsp--;
-
-             after(grammarAccess.getLhsAccess().getFailuresInputExpressionParserRuleCall_1_1_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Lhs__FailuresAssignment_1_1"
-
-
-    // $ANTLR start "rule__Rhs__FailuresAssignment_0"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3119:1: rule__Rhs__FailuresAssignment_0 : ( ruleOutputExpression ) ;
-    public final void rule__Rhs__FailuresAssignment_0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3123:1: ( ( ruleOutputExpression ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3124:1: ( ruleOutputExpression )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3124:1: ( ruleOutputExpression )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3125:1: ruleOutputExpression
-            {
-             before(grammarAccess.getRhsAccess().getFailuresOutputExpressionParserRuleCall_0_0()); 
-            pushFollow(FOLLOW_ruleOutputExpression_in_rule__Rhs__FailuresAssignment_06401);
-            ruleOutputExpression();
-
-            state._fsp--;
-
-             after(grammarAccess.getRhsAccess().getFailuresOutputExpressionParserRuleCall_0_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Rhs__FailuresAssignment_0"
-
-
-    // $ANTLR start "rule__Rhs__FailuresAssignment_1_1"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3134:1: rule__Rhs__FailuresAssignment_1_1 : ( ruleOutputExpression ) ;
-    public final void rule__Rhs__FailuresAssignment_1_1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3138:1: ( ( ruleOutputExpression ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3139:1: ( ruleOutputExpression )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3139:1: ( ruleOutputExpression )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3140:1: ruleOutputExpression
-            {
-             before(grammarAccess.getRhsAccess().getFailuresOutputExpressionParserRuleCall_1_1_0()); 
-            pushFollow(FOLLOW_ruleOutputExpression_in_rule__Rhs__FailuresAssignment_1_16432);
-            ruleOutputExpression();
-
-            state._fsp--;
-
-             after(grammarAccess.getRhsAccess().getFailuresOutputExpressionParserRuleCall_1_1_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__Rhs__FailuresAssignment_1_1"
-
-
-    // $ANTLR start "rule__InputExpression__RefAssignment_0_0"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3149:1: rule__InputExpression__RefAssignment_0_0 : ( ( RULE_ID ) ) ;
-    public final void rule__InputExpression__RefAssignment_0_0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3153:1: ( ( ( RULE_ID ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3154:1: ( ( RULE_ID ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3154:1: ( ( RULE_ID ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3155:1: ( RULE_ID )
-            {
-             before(grammarAccess.getInputExpressionAccess().getRefPortCrossReference_0_0_0()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3156:1: ( RULE_ID )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3157:1: RULE_ID
-            {
-             before(grammarAccess.getInputExpressionAccess().getRefPortIDTerminalRuleCall_0_0_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__InputExpression__RefAssignment_0_06467); 
-             after(grammarAccess.getInputExpressionAccess().getRefPortIDTerminalRuleCall_0_0_0_1()); 
-
-            }
-
-             after(grammarAccess.getInputExpressionAccess().getRefPortCrossReference_0_0_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__InputExpression__RefAssignment_0_0"
-
-
-    // $ANTLR start "rule__InputExpression__FailureExprAssignment_2"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3168:1: rule__InputExpression__FailureExprAssignment_2 : ( ruleInFailureExpr ) ;
-    public final void rule__InputExpression__FailureExprAssignment_2() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3172:1: ( ( ruleInFailureExpr ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3173:1: ( ruleInFailureExpr )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3173:1: ( ruleInFailureExpr )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3174:1: ruleInFailureExpr
-            {
-             before(grammarAccess.getInputExpressionAccess().getFailureExprInFailureExprParserRuleCall_2_0()); 
-            pushFollow(FOLLOW_ruleInFailureExpr_in_rule__InputExpression__FailureExprAssignment_26502);
-            ruleInFailureExpr();
-
-            state._fsp--;
-
-             after(grammarAccess.getInputExpressionAccess().getFailureExprInFailureExprParserRuleCall_2_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__InputExpression__FailureExprAssignment_2"
-
-
-    // $ANTLR start "rule__OutputExpression__RefAssignment_0_0"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3183:1: rule__OutputExpression__RefAssignment_0_0 : ( ( RULE_ID ) ) ;
-    public final void rule__OutputExpression__RefAssignment_0_0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3187:1: ( ( ( RULE_ID ) ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3188:1: ( ( RULE_ID ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3188:1: ( ( RULE_ID ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3189:1: ( RULE_ID )
-            {
-             before(grammarAccess.getOutputExpressionAccess().getRefPortCrossReference_0_0_0()); 
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3190:1: ( RULE_ID )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3191:1: RULE_ID
-            {
-             before(grammarAccess.getOutputExpressionAccess().getRefPortIDTerminalRuleCall_0_0_0_1()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__OutputExpression__RefAssignment_0_06537); 
-             after(grammarAccess.getOutputExpressionAccess().getRefPortIDTerminalRuleCall_0_0_0_1()); 
-
-            }
-
-             after(grammarAccess.getOutputExpressionAccess().getRefPortCrossReference_0_0_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__OutputExpression__RefAssignment_0_0"
-
-
-    // $ANTLR start "rule__OutputExpression__FailureExprAssignment_2"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3202:1: rule__OutputExpression__FailureExprAssignment_2 : ( ruleOutFailureExpr ) ;
-    public final void rule__OutputExpression__FailureExprAssignment_2() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3206:1: ( ( ruleOutFailureExpr ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3207:1: ( ruleOutFailureExpr )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3207:1: ( ruleOutFailureExpr )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3208:1: ruleOutFailureExpr
-            {
-             before(grammarAccess.getOutputExpressionAccess().getFailureExprOutFailureExprParserRuleCall_2_0()); 
-            pushFollow(FOLLOW_ruleOutFailureExpr_in_rule__OutputExpression__FailureExprAssignment_26572);
-            ruleOutFailureExpr();
-
-            state._fsp--;
-
-             after(grammarAccess.getOutputExpressionAccess().getFailureExprOutFailureExprParserRuleCall_2_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__OutputExpression__FailureExprAssignment_2"
-
-
-    // $ANTLR start "rule__InFailureExpr__FailuresAssignment_0"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3217:1: rule__InFailureExpr__FailuresAssignment_0 : ( ruleWildcardDefinition ) ;
-    public final void rule__InFailureExpr__FailuresAssignment_0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3221:1: ( ( ruleWildcardDefinition ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3222:1: ( ruleWildcardDefinition )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3222:1: ( ruleWildcardDefinition )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3223:1: ruleWildcardDefinition
-            {
-             before(grammarAccess.getInFailureExprAccess().getFailuresWildcardDefinitionParserRuleCall_0_0()); 
-            pushFollow(FOLLOW_ruleWildcardDefinition_in_rule__InFailureExpr__FailuresAssignment_06603);
-            ruleWildcardDefinition();
-
-            state._fsp--;
-
-             after(grammarAccess.getInFailureExprAccess().getFailuresWildcardDefinitionParserRuleCall_0_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__InFailureExpr__FailuresAssignment_0"
-
-
-    // $ANTLR start "rule__InFailureExpr__FailuresAssignment_1"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3232:1: rule__InFailureExpr__FailuresAssignment_1 : ( ruleNoFailureDefinition ) ;
-    public final void rule__InFailureExpr__FailuresAssignment_1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3236:1: ( ( ruleNoFailureDefinition ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3237:1: ( ruleNoFailureDefinition )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3237:1: ( ruleNoFailureDefinition )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3238:1: ruleNoFailureDefinition
-            {
-             before(grammarAccess.getInFailureExprAccess().getFailuresNoFailureDefinitionParserRuleCall_1_0()); 
-            pushFollow(FOLLOW_ruleNoFailureDefinition_in_rule__InFailureExpr__FailuresAssignment_16634);
-            ruleNoFailureDefinition();
-
-            state._fsp--;
-
-             after(grammarAccess.getInFailureExprAccess().getFailuresNoFailureDefinitionParserRuleCall_1_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__InFailureExpr__FailuresAssignment_1"
-
-
-    // $ANTLR start "rule__InFailureExpr__FailuresAssignment_2"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3247:1: rule__InFailureExpr__FailuresAssignment_2 : ( ruleFailureDefinition ) ;
-    public final void rule__InFailureExpr__FailuresAssignment_2() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3251:1: ( ( ruleFailureDefinition ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3252:1: ( ruleFailureDefinition )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3252:1: ( ruleFailureDefinition )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3253:1: ruleFailureDefinition
-            {
-             before(grammarAccess.getInFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_2_0()); 
-            pushFollow(FOLLOW_ruleFailureDefinition_in_rule__InFailureExpr__FailuresAssignment_26665);
-            ruleFailureDefinition();
-
-            state._fsp--;
-
-             after(grammarAccess.getInFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_2_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__InFailureExpr__FailuresAssignment_2"
-
-
-    // $ANTLR start "rule__InFailureExpr__FailuresAssignment_3_1"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3262:1: rule__InFailureExpr__FailuresAssignment_3_1 : ( ruleFailureDefinition ) ;
-    public final void rule__InFailureExpr__FailuresAssignment_3_1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3266:1: ( ( ruleFailureDefinition ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3267:1: ( ruleFailureDefinition )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3267:1: ( ruleFailureDefinition )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3268:1: ruleFailureDefinition
-            {
-             before(grammarAccess.getInFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_3_1_0()); 
-            pushFollow(FOLLOW_ruleFailureDefinition_in_rule__InFailureExpr__FailuresAssignment_3_16696);
-            ruleFailureDefinition();
-
-            state._fsp--;
-
-             after(grammarAccess.getInFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_3_1_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__InFailureExpr__FailuresAssignment_3_1"
-
-
-    // $ANTLR start "rule__InFailureExpr__FailuresAssignment_3_2_1"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3277:1: rule__InFailureExpr__FailuresAssignment_3_2_1 : ( ruleFailureDefinition ) ;
-    public final void rule__InFailureExpr__FailuresAssignment_3_2_1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3281:1: ( ( ruleFailureDefinition ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3282:1: ( ruleFailureDefinition )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3282:1: ( ruleFailureDefinition )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3283:1: ruleFailureDefinition
-            {
-             before(grammarAccess.getInFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_3_2_1_0()); 
-            pushFollow(FOLLOW_ruleFailureDefinition_in_rule__InFailureExpr__FailuresAssignment_3_2_16727);
-            ruleFailureDefinition();
-
-            state._fsp--;
-
-             after(grammarAccess.getInFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_3_2_1_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__InFailureExpr__FailuresAssignment_3_2_1"
-
-
-    // $ANTLR start "rule__InFailureExpr__FailuresAssignment_4"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3292:1: rule__InFailureExpr__FailuresAssignment_4 : ( ruleVariableDefinition ) ;
-    public final void rule__InFailureExpr__FailuresAssignment_4() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3296:1: ( ( ruleVariableDefinition ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3297:1: ( ruleVariableDefinition )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3297:1: ( ruleVariableDefinition )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3298:1: ruleVariableDefinition
-            {
-             before(grammarAccess.getInFailureExprAccess().getFailuresVariableDefinitionParserRuleCall_4_0()); 
-            pushFollow(FOLLOW_ruleVariableDefinition_in_rule__InFailureExpr__FailuresAssignment_46758);
-            ruleVariableDefinition();
-
-            state._fsp--;
-
-             after(grammarAccess.getInFailureExprAccess().getFailuresVariableDefinitionParserRuleCall_4_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__InFailureExpr__FailuresAssignment_4"
-
-
-    // $ANTLR start "rule__OutFailureExpr__FailuresAssignment_0"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3307:1: rule__OutFailureExpr__FailuresAssignment_0 : ( ruleNoFailureDefinition ) ;
-    public final void rule__OutFailureExpr__FailuresAssignment_0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3311:1: ( ( ruleNoFailureDefinition ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3312:1: ( ruleNoFailureDefinition )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3312:1: ( ruleNoFailureDefinition )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3313:1: ruleNoFailureDefinition
-            {
-             before(grammarAccess.getOutFailureExprAccess().getFailuresNoFailureDefinitionParserRuleCall_0_0()); 
-            pushFollow(FOLLOW_ruleNoFailureDefinition_in_rule__OutFailureExpr__FailuresAssignment_06789);
-            ruleNoFailureDefinition();
-
-            state._fsp--;
-
-             after(grammarAccess.getOutFailureExprAccess().getFailuresNoFailureDefinitionParserRuleCall_0_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__OutFailureExpr__FailuresAssignment_0"
-
-
-    // $ANTLR start "rule__OutFailureExpr__FailuresAssignment_1"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3322:1: rule__OutFailureExpr__FailuresAssignment_1 : ( ruleComplexNofailureDefinition ) ;
-    public final void rule__OutFailureExpr__FailuresAssignment_1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3326:1: ( ( ruleComplexNofailureDefinition ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3327:1: ( ruleComplexNofailureDefinition )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3327:1: ( ruleComplexNofailureDefinition )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3328:1: ruleComplexNofailureDefinition
-            {
-             before(grammarAccess.getOutFailureExprAccess().getFailuresComplexNofailureDefinitionParserRuleCall_1_0()); 
-            pushFollow(FOLLOW_ruleComplexNofailureDefinition_in_rule__OutFailureExpr__FailuresAssignment_16820);
-            ruleComplexNofailureDefinition();
-
-            state._fsp--;
-
-             after(grammarAccess.getOutFailureExprAccess().getFailuresComplexNofailureDefinitionParserRuleCall_1_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__OutFailureExpr__FailuresAssignment_1"
-
-
-    // $ANTLR start "rule__OutFailureExpr__FailuresAssignment_2"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3337:1: rule__OutFailureExpr__FailuresAssignment_2 : ( ruleFailureDefinition ) ;
-    public final void rule__OutFailureExpr__FailuresAssignment_2() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3341:1: ( ( ruleFailureDefinition ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3342:1: ( ruleFailureDefinition )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3342:1: ( ruleFailureDefinition )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3343:1: ruleFailureDefinition
-            {
-             before(grammarAccess.getOutFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_2_0()); 
-            pushFollow(FOLLOW_ruleFailureDefinition_in_rule__OutFailureExpr__FailuresAssignment_26851);
-            ruleFailureDefinition();
-
-            state._fsp--;
-
-             after(grammarAccess.getOutFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_2_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__OutFailureExpr__FailuresAssignment_2"
-
-
-    // $ANTLR start "rule__OutFailureExpr__FailuresAssignment_3_1"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3352:1: rule__OutFailureExpr__FailuresAssignment_3_1 : ( ruleFailureDefinition ) ;
-    public final void rule__OutFailureExpr__FailuresAssignment_3_1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3356:1: ( ( ruleFailureDefinition ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3357:1: ( ruleFailureDefinition )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3357:1: ( ruleFailureDefinition )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3358:1: ruleFailureDefinition
-            {
-             before(grammarAccess.getOutFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_3_1_0()); 
-            pushFollow(FOLLOW_ruleFailureDefinition_in_rule__OutFailureExpr__FailuresAssignment_3_16882);
-            ruleFailureDefinition();
-
-            state._fsp--;
-
-             after(grammarAccess.getOutFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_3_1_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__OutFailureExpr__FailuresAssignment_3_1"
-
-
-    // $ANTLR start "rule__OutFailureExpr__FailuresAssignment_3_2_1"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3367:1: rule__OutFailureExpr__FailuresAssignment_3_2_1 : ( ruleFailureDefinition ) ;
-    public final void rule__OutFailureExpr__FailuresAssignment_3_2_1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3371:1: ( ( ruleFailureDefinition ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3372:1: ( ruleFailureDefinition )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3372:1: ( ruleFailureDefinition )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3373:1: ruleFailureDefinition
-            {
-             before(grammarAccess.getOutFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_3_2_1_0()); 
-            pushFollow(FOLLOW_ruleFailureDefinition_in_rule__OutFailureExpr__FailuresAssignment_3_2_16913);
-            ruleFailureDefinition();
-
-            state._fsp--;
-
-             after(grammarAccess.getOutFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_3_2_1_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__OutFailureExpr__FailuresAssignment_3_2_1"
-
-
-    // $ANTLR start "rule__OutFailureExpr__FailuresAssignment_4"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3382:1: rule__OutFailureExpr__FailuresAssignment_4 : ( ruleVariableDefinition ) ;
-    public final void rule__OutFailureExpr__FailuresAssignment_4() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3386:1: ( ( ruleVariableDefinition ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3387:1: ( ruleVariableDefinition )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3387:1: ( ruleVariableDefinition )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3388:1: ruleVariableDefinition
-            {
-             before(grammarAccess.getOutFailureExprAccess().getFailuresVariableDefinitionParserRuleCall_4_0()); 
-            pushFollow(FOLLOW_ruleVariableDefinition_in_rule__OutFailureExpr__FailuresAssignment_46944);
-            ruleVariableDefinition();
-
-            state._fsp--;
-
-             after(grammarAccess.getOutFailureExprAccess().getFailuresVariableDefinitionParserRuleCall_4_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__OutFailureExpr__FailuresAssignment_4"
-
-
-    // $ANTLR start "rule__FailureDefinition__TypeAssignment_1"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3397:1: rule__FailureDefinition__TypeAssignment_1 : ( ruleActualFailureType ) ;
-    public final void rule__FailureDefinition__TypeAssignment_1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3401:1: ( ( ruleActualFailureType ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3402:1: ( ruleActualFailureType )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3402:1: ( ruleActualFailureType )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3403:1: ruleActualFailureType
-            {
-             before(grammarAccess.getFailureDefinitionAccess().getTypeActualFailureTypeEnumRuleCall_1_0()); 
-            pushFollow(FOLLOW_ruleActualFailureType_in_rule__FailureDefinition__TypeAssignment_16975);
-            ruleActualFailureType();
-
-            state._fsp--;
-
-             after(grammarAccess.getFailureDefinitionAccess().getTypeActualFailureTypeEnumRuleCall_1_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__FailureDefinition__TypeAssignment_1"
-
-
-    // $ANTLR start "rule__FailureDefinition__AcidAvoidableAssignment_2_1"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3412:1: rule__FailureDefinition__AcidAvoidableAssignment_2_1 : ( ruleACIDavoidable ) ;
-    public final void rule__FailureDefinition__AcidAvoidableAssignment_2_1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3416:1: ( ( ruleACIDavoidable ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3417:1: ( ruleACIDavoidable )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3417:1: ( ruleACIDavoidable )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3418:1: ruleACIDavoidable
-            {
-             before(grammarAccess.getFailureDefinitionAccess().getAcidAvoidableACIDavoidableParserRuleCall_2_1_0()); 
-            pushFollow(FOLLOW_ruleACIDavoidable_in_rule__FailureDefinition__AcidAvoidableAssignment_2_17006);
-            ruleACIDavoidable();
-
-            state._fsp--;
-
-             after(grammarAccess.getFailureDefinitionAccess().getAcidAvoidableACIDavoidableParserRuleCall_2_1_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__FailureDefinition__AcidAvoidableAssignment_2_1"
-
-
-    // $ANTLR start "rule__ComplexNofailureDefinition__AcidMitigationAssignment_3"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3427:1: rule__ComplexNofailureDefinition__AcidMitigationAssignment_3 : ( ruleACIDMitigation ) ;
-    public final void rule__ComplexNofailureDefinition__AcidMitigationAssignment_3() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3431:1: ( ( ruleACIDMitigation ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3432:1: ( ruleACIDMitigation )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3432:1: ( ruleACIDMitigation )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3433:1: ruleACIDMitigation
-            {
-             before(grammarAccess.getComplexNofailureDefinitionAccess().getAcidMitigationACIDMitigationParserRuleCall_3_0()); 
-            pushFollow(FOLLOW_ruleACIDMitigation_in_rule__ComplexNofailureDefinition__AcidMitigationAssignment_37037);
-            ruleACIDMitigation();
-
-            state._fsp--;
-
-             after(grammarAccess.getComplexNofailureDefinitionAccess().getAcidMitigationACIDMitigationParserRuleCall_3_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ComplexNofailureDefinition__AcidMitigationAssignment_3"
-
-
-    // $ANTLR start "rule__VariableDefinition__VariableNameAssignment_1"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3442:1: rule__VariableDefinition__VariableNameAssignment_1 : ( RULE_ID ) ;
-    public final void rule__VariableDefinition__VariableNameAssignment_1() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3446:1: ( ( RULE_ID ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3447:1: ( RULE_ID )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3447:1: ( RULE_ID )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3448:1: RULE_ID
-            {
-             before(grammarAccess.getVariableDefinitionAccess().getVariableNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__VariableDefinition__VariableNameAssignment_17068); 
-             after(grammarAccess.getVariableDefinitionAccess().getVariableNameIDTerminalRuleCall_1_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__VariableDefinition__VariableNameAssignment_1"
-
-
-    // $ANTLR start "rule__ACIDavoidable__AAssignment_0"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3457:1: rule__ACIDavoidable__AAssignment_0 : ( ruleAavoidable ) ;
-    public final void rule__ACIDavoidable__AAssignment_0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3461:1: ( ( ruleAavoidable ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3462:1: ( ruleAavoidable )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3462:1: ( ruleAavoidable )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3463:1: ruleAavoidable
-            {
-             before(grammarAccess.getACIDavoidableAccess().getAAavoidableEnumRuleCall_0_0()); 
-            pushFollow(FOLLOW_ruleAavoidable_in_rule__ACIDavoidable__AAssignment_07099);
-            ruleAavoidable();
-
-            state._fsp--;
-
-             after(grammarAccess.getACIDavoidableAccess().getAAavoidableEnumRuleCall_0_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDavoidable__AAssignment_0"
-
-
-    // $ANTLR start "rule__ACIDavoidable__CAssignment_2"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3472:1: rule__ACIDavoidable__CAssignment_2 : ( ruleCavoidable ) ;
-    public final void rule__ACIDavoidable__CAssignment_2() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3476:1: ( ( ruleCavoidable ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3477:1: ( ruleCavoidable )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3477:1: ( ruleCavoidable )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3478:1: ruleCavoidable
-            {
-             before(grammarAccess.getACIDavoidableAccess().getCCavoidableEnumRuleCall_2_0()); 
-            pushFollow(FOLLOW_ruleCavoidable_in_rule__ACIDavoidable__CAssignment_27130);
-            ruleCavoidable();
-
-            state._fsp--;
-
-             after(grammarAccess.getACIDavoidableAccess().getCCavoidableEnumRuleCall_2_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDavoidable__CAssignment_2"
-
-
-    // $ANTLR start "rule__ACIDavoidable__IAssignment_4"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3487:1: rule__ACIDavoidable__IAssignment_4 : ( ruleIavoidable ) ;
-    public final void rule__ACIDavoidable__IAssignment_4() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3491:1: ( ( ruleIavoidable ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3492:1: ( ruleIavoidable )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3492:1: ( ruleIavoidable )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3493:1: ruleIavoidable
-            {
-             before(grammarAccess.getACIDavoidableAccess().getIIavoidableEnumRuleCall_4_0()); 
-            pushFollow(FOLLOW_ruleIavoidable_in_rule__ACIDavoidable__IAssignment_47161);
-            ruleIavoidable();
-
-            state._fsp--;
-
-             after(grammarAccess.getACIDavoidableAccess().getIIavoidableEnumRuleCall_4_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDavoidable__IAssignment_4"
-
-
-    // $ANTLR start "rule__ACIDavoidable__DAssignment_6"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3502:1: rule__ACIDavoidable__DAssignment_6 : ( ruleDavoidable ) ;
-    public final void rule__ACIDavoidable__DAssignment_6() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3506:1: ( ( ruleDavoidable ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3507:1: ( ruleDavoidable )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3507:1: ( ruleDavoidable )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3508:1: ruleDavoidable
-            {
-             before(grammarAccess.getACIDavoidableAccess().getDDavoidableEnumRuleCall_6_0()); 
-            pushFollow(FOLLOW_ruleDavoidable_in_rule__ACIDavoidable__DAssignment_67192);
-            ruleDavoidable();
-
-            state._fsp--;
-
-             after(grammarAccess.getACIDavoidableAccess().getDDavoidableEnumRuleCall_6_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDavoidable__DAssignment_6"
-
-
-    // $ANTLR start "rule__ACIDMitigation__AAssignment_0"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3517:1: rule__ACIDMitigation__AAssignment_0 : ( ruleAmitigation ) ;
-    public final void rule__ACIDMitigation__AAssignment_0() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3521:1: ( ( ruleAmitigation ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3522:1: ( ruleAmitigation )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3522:1: ( ruleAmitigation )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3523:1: ruleAmitigation
-            {
-             before(grammarAccess.getACIDMitigationAccess().getAAmitigationEnumRuleCall_0_0()); 
-            pushFollow(FOLLOW_ruleAmitigation_in_rule__ACIDMitigation__AAssignment_07223);
-            ruleAmitigation();
-
-            state._fsp--;
-
-             after(grammarAccess.getACIDMitigationAccess().getAAmitigationEnumRuleCall_0_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDMitigation__AAssignment_0"
-
-
-    // $ANTLR start "rule__ACIDMitigation__CAssignment_2"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3532:1: rule__ACIDMitigation__CAssignment_2 : ( ruleCmitigation ) ;
-    public final void rule__ACIDMitigation__CAssignment_2() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3536:1: ( ( ruleCmitigation ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3537:1: ( ruleCmitigation )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3537:1: ( ruleCmitigation )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3538:1: ruleCmitigation
-            {
-             before(grammarAccess.getACIDMitigationAccess().getCCmitigationEnumRuleCall_2_0()); 
-            pushFollow(FOLLOW_ruleCmitigation_in_rule__ACIDMitigation__CAssignment_27254);
-            ruleCmitigation();
-
-            state._fsp--;
-
-             after(grammarAccess.getACIDMitigationAccess().getCCmitigationEnumRuleCall_2_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDMitigation__CAssignment_2"
-
-
-    // $ANTLR start "rule__ACIDMitigation__IAssignment_4"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3547:1: rule__ACIDMitigation__IAssignment_4 : ( ruleImitigation ) ;
-    public final void rule__ACIDMitigation__IAssignment_4() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3551:1: ( ( ruleImitigation ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3552:1: ( ruleImitigation )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3552:1: ( ruleImitigation )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3553:1: ruleImitigation
-            {
-             before(grammarAccess.getACIDMitigationAccess().getIImitigationEnumRuleCall_4_0()); 
-            pushFollow(FOLLOW_ruleImitigation_in_rule__ACIDMitigation__IAssignment_47285);
-            ruleImitigation();
-
-            state._fsp--;
-
-             after(grammarAccess.getACIDMitigationAccess().getIImitigationEnumRuleCall_4_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDMitigation__IAssignment_4"
-
-
-    // $ANTLR start "rule__ACIDMitigation__DAssignment_6"
-    // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3562:1: rule__ACIDMitigation__DAssignment_6 : ( ruleDmitigation ) ;
-    public final void rule__ACIDMitigation__DAssignment_6() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3566:1: ( ( ruleDmitigation ) )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3567:1: ( ruleDmitigation )
-            {
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3567:1: ( ruleDmitigation )
-            // ../org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/contentassist/antlr/internal/InternalFlaDsl.g:3568:1: ruleDmitigation
-            {
-             before(grammarAccess.getACIDMitigationAccess().getDDmitigationEnumRuleCall_6_0()); 
-            pushFollow(FOLLOW_ruleDmitigation_in_rule__ACIDMitigation__DAssignment_67316);
-            ruleDmitigation();
-
-            state._fsp--;
-
-             after(grammarAccess.getACIDMitigationAccess().getDDmitigationEnumRuleCall_6_0()); 
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ACIDMitigation__DAssignment_6"
-
-    // Delegated rules
-
-
- 
-
-    public static final BitSet FOLLOW_ruleBehaviour_in_entryRuleBehaviour61 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleBehaviour68 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Behaviour__RulesAssignment_in_ruleBehaviour96 = new BitSet(new long[]{0x0000000100000002L});
-    public static final BitSet FOLLOW_rule__Behaviour__RulesAssignment_in_ruleBehaviour108 = new BitSet(new long[]{0x0000000100000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_entryRuleExpression138 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleExpression145 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Expression__Group__0_in_ruleExpression171 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLhs_in_entryRuleLhs198 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLhs205 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Lhs__Group__0_in_ruleLhs231 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRhs_in_entryRuleRhs258 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRhs265 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Rhs__Group__0_in_ruleRhs291 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInputExpression_in_entryRuleInputExpression318 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInputExpression325 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InputExpression__Group__0_in_ruleInputExpression351 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOutputExpression_in_entryRuleOutputExpression378 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOutputExpression385 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutputExpression__Group__0_in_ruleOutputExpression411 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInFailureExpr_in_entryRuleInFailureExpr438 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInFailureExpr445 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InFailureExpr__Alternatives_in_ruleInFailureExpr471 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOutFailureExpr_in_entryRuleOutFailureExpr498 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOutFailureExpr505 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutFailureExpr__Alternatives_in_ruleOutFailureExpr531 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFailureDefinition_in_entryRuleFailureDefinition560 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFailureDefinition567 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FailureDefinition__Group__0_in_ruleFailureDefinition593 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNoFailureDefinition_in_entryRuleNoFailureDefinition620 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNoFailureDefinition627 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NoFailureDefinition__Group__0_in_ruleNoFailureDefinition653 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleComplexNofailureDefinition_in_entryRuleComplexNofailureDefinition680 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleComplexNofailureDefinition687 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ComplexNofailureDefinition__Group__0_in_ruleComplexNofailureDefinition713 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleWildcardDefinition_in_entryRuleWildcardDefinition740 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleWildcardDefinition747 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__WildcardDefinition__Group__0_in_ruleWildcardDefinition773 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleVariableDefinition_in_entryRuleVariableDefinition800 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleVariableDefinition807 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__VariableDefinition__Group__0_in_ruleVariableDefinition833 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleACIDavoidable_in_entryRuleACIDavoidable860 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleACIDavoidable867 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ACIDavoidable__Group__0_in_ruleACIDavoidable893 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleACIDMitigation_in_entryRuleACIDMitigation920 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleACIDMitigation927 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ACIDMitigation__Group__0_in_ruleACIDMitigation953 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ActualFailureType__Alternatives_in_ruleActualFailureType994 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Aavoidable__Alternatives_in_ruleAavoidable1034 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Cavoidable__Alternatives_in_ruleCavoidable1070 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Iavoidable__Alternatives_in_ruleIavoidable1106 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Davoidable__Alternatives_in_ruleDavoidable1142 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Amitigation__Alternatives_in_ruleAmitigation1178 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Cmitigation__Alternatives_in_ruleCmitigation1214 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Imitigation__Alternatives_in_ruleImitigation1250 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Dmitigation__Alternatives_in_ruleDmitigation1286 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InputExpression__RefAssignment_0_0_in_rule__InputExpression__Alternatives_01321 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_11_in_rule__InputExpression__Alternatives_01340 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutputExpression__RefAssignment_0_0_in_rule__OutputExpression__Alternatives_01374 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_11_in_rule__OutputExpression__Alternatives_01393 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InFailureExpr__FailuresAssignment_0_in_rule__InFailureExpr__Alternatives1427 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InFailureExpr__FailuresAssignment_1_in_rule__InFailureExpr__Alternatives1445 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InFailureExpr__FailuresAssignment_2_in_rule__InFailureExpr__Alternatives1463 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InFailureExpr__Group_3__0_in_rule__InFailureExpr__Alternatives1481 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InFailureExpr__FailuresAssignment_4_in_rule__InFailureExpr__Alternatives1499 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutFailureExpr__FailuresAssignment_0_in_rule__OutFailureExpr__Alternatives1532 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutFailureExpr__FailuresAssignment_1_in_rule__OutFailureExpr__Alternatives1550 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutFailureExpr__FailuresAssignment_2_in_rule__OutFailureExpr__Alternatives1568 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutFailureExpr__Group_3__0_in_rule__OutFailureExpr__Alternatives1586 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutFailureExpr__FailuresAssignment_4_in_rule__OutFailureExpr__Alternatives1604 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_12_in_rule__ActualFailureType__Alternatives1640 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_13_in_rule__ActualFailureType__Alternatives1661 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_14_in_rule__ActualFailureType__Alternatives1682 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_15_in_rule__ActualFailureType__Alternatives1703 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_16_in_rule__ActualFailureType__Alternatives1724 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_rule__ActualFailureType__Alternatives1745 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_18_in_rule__Aavoidable__Alternatives1781 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_rule__Aavoidable__Alternatives1802 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__Aavoidable__Alternatives1823 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_rule__Cavoidable__Alternatives1859 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_rule__Cavoidable__Alternatives1880 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__Cavoidable__Alternatives1901 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_rule__Iavoidable__Alternatives1937 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_rule__Iavoidable__Alternatives1958 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__Iavoidable__Alternatives1979 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_rule__Davoidable__Alternatives2015 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_rule__Davoidable__Alternatives2036 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__Davoidable__Alternatives2057 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_rule__Amitigation__Alternatives2093 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_rule__Amitigation__Alternatives2114 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_rule__Amitigation__Alternatives2135 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__Amitigation__Alternatives2156 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__Cmitigation__Alternatives2192 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__Cmitigation__Alternatives2213 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_rule__Cmitigation__Alternatives2234 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__Cmitigation__Alternatives2255 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__Imitigation__Alternatives2291 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__Imitigation__Alternatives2312 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_rule__Imitigation__Alternatives2333 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__Imitigation__Alternatives2354 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__Dmitigation__Alternatives2390 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rule__Dmitigation__Alternatives2411 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_rule__Dmitigation__Alternatives2432 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__Dmitigation__Alternatives2453 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Expression__Group__0__Impl_in_rule__Expression__Group__02486 = new BitSet(new long[]{0x0000000000000810L});
-    public static final BitSet FOLLOW_rule__Expression__Group__1_in_rule__Expression__Group__02489 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__Expression__Group__0__Impl2517 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Expression__Group__1__Impl_in_rule__Expression__Group__12548 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_rule__Expression__Group__2_in_rule__Expression__Group__12551 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Expression__LhsAssignment_1_in_rule__Expression__Group__1__Impl2578 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Expression__Group__2__Impl_in_rule__Expression__Group__22608 = new BitSet(new long[]{0x0000000000000810L});
-    public static final BitSet FOLLOW_rule__Expression__Group__3_in_rule__Expression__Group__22611 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_rule__Expression__Group__2__Impl2639 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Expression__Group__3__Impl_in_rule__Expression__Group__32670 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_rule__Expression__Group__4_in_rule__Expression__Group__32673 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Expression__RhsAssignment_3_in_rule__Expression__Group__3__Impl2700 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Expression__Group__4__Impl_in_rule__Expression__Group__42730 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_rule__Expression__Group__4__Impl2758 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Lhs__Group__0__Impl_in_rule__Lhs__Group__02799 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_rule__Lhs__Group__1_in_rule__Lhs__Group__02802 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Lhs__FailuresAssignment_0_in_rule__Lhs__Group__0__Impl2829 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Lhs__Group__1__Impl_in_rule__Lhs__Group__12859 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Lhs__Group_1__0_in_rule__Lhs__Group__1__Impl2886 = new BitSet(new long[]{0x0000000800000002L});
-    public static final BitSet FOLLOW_rule__Lhs__Group_1__0__Impl_in_rule__Lhs__Group_1__02921 = new BitSet(new long[]{0x0000000000000810L});
-    public static final BitSet FOLLOW_rule__Lhs__Group_1__1_in_rule__Lhs__Group_1__02924 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_35_in_rule__Lhs__Group_1__0__Impl2952 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Lhs__Group_1__1__Impl_in_rule__Lhs__Group_1__12983 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Lhs__FailuresAssignment_1_1_in_rule__Lhs__Group_1__1__Impl3010 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Rhs__Group__0__Impl_in_rule__Rhs__Group__03044 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_rule__Rhs__Group__1_in_rule__Rhs__Group__03047 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Rhs__FailuresAssignment_0_in_rule__Rhs__Group__0__Impl3074 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Rhs__Group__1__Impl_in_rule__Rhs__Group__13104 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Rhs__Group_1__0_in_rule__Rhs__Group__1__Impl3131 = new BitSet(new long[]{0x0000000800000002L});
-    public static final BitSet FOLLOW_rule__Rhs__Group_1__0__Impl_in_rule__Rhs__Group_1__03166 = new BitSet(new long[]{0x0000000000000810L});
-    public static final BitSet FOLLOW_rule__Rhs__Group_1__1_in_rule__Rhs__Group_1__03169 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_35_in_rule__Rhs__Group_1__0__Impl3197 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Rhs__Group_1__1__Impl_in_rule__Rhs__Group_1__13228 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Rhs__FailuresAssignment_1_1_in_rule__Rhs__Group_1__1__Impl3255 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InputExpression__Group__0__Impl_in_rule__InputExpression__Group__03289 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_rule__InputExpression__Group__1_in_rule__InputExpression__Group__03292 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InputExpression__Alternatives_0_in_rule__InputExpression__Group__0__Impl3319 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InputExpression__Group__1__Impl_in_rule__InputExpression__Group__13349 = new BitSet(new long[]{0x000001A00003F010L});
-    public static final BitSet FOLLOW_rule__InputExpression__Group__2_in_rule__InputExpression__Group__13352 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rule__InputExpression__Group__1__Impl3380 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InputExpression__Group__2__Impl_in_rule__InputExpression__Group__23411 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InputExpression__FailureExprAssignment_2_in_rule__InputExpression__Group__2__Impl3438 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutputExpression__Group__0__Impl_in_rule__OutputExpression__Group__03474 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_rule__OutputExpression__Group__1_in_rule__OutputExpression__Group__03477 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutputExpression__Alternatives_0_in_rule__OutputExpression__Group__0__Impl3504 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutputExpression__Group__1__Impl_in_rule__OutputExpression__Group__13534 = new BitSet(new long[]{0x000001A00003F010L});
-    public static final BitSet FOLLOW_rule__OutputExpression__Group__2_in_rule__OutputExpression__Group__13537 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rule__OutputExpression__Group__1__Impl3565 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutputExpression__Group__2__Impl_in_rule__OutputExpression__Group__23596 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutputExpression__FailureExprAssignment_2_in_rule__OutputExpression__Group__2__Impl3623 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InFailureExpr__Group_3__0__Impl_in_rule__InFailureExpr__Group_3__03659 = new BitSet(new long[]{0x000000000003F000L});
-    public static final BitSet FOLLOW_rule__InFailureExpr__Group_3__1_in_rule__InFailureExpr__Group_3__03662 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_rule__InFailureExpr__Group_3__0__Impl3690 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InFailureExpr__Group_3__1__Impl_in_rule__InFailureExpr__Group_3__13721 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_rule__InFailureExpr__Group_3__2_in_rule__InFailureExpr__Group_3__13724 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InFailureExpr__FailuresAssignment_3_1_in_rule__InFailureExpr__Group_3__1__Impl3751 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InFailureExpr__Group_3__2__Impl_in_rule__InFailureExpr__Group_3__23781 = new BitSet(new long[]{0x0000004000000000L});
-    public static final BitSet FOLLOW_rule__InFailureExpr__Group_3__3_in_rule__InFailureExpr__Group_3__23784 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InFailureExpr__Group_3_2__0_in_rule__InFailureExpr__Group_3__2__Impl3813 = new BitSet(new long[]{0x0000000800000002L});
-    public static final BitSet FOLLOW_rule__InFailureExpr__Group_3_2__0_in_rule__InFailureExpr__Group_3__2__Impl3825 = new BitSet(new long[]{0x0000000800000002L});
-    public static final BitSet FOLLOW_rule__InFailureExpr__Group_3__3__Impl_in_rule__InFailureExpr__Group_3__33858 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_38_in_rule__InFailureExpr__Group_3__3__Impl3886 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InFailureExpr__Group_3_2__0__Impl_in_rule__InFailureExpr__Group_3_2__03925 = new BitSet(new long[]{0x000000000003F000L});
-    public static final BitSet FOLLOW_rule__InFailureExpr__Group_3_2__1_in_rule__InFailureExpr__Group_3_2__03928 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_35_in_rule__InFailureExpr__Group_3_2__0__Impl3956 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InFailureExpr__Group_3_2__1__Impl_in_rule__InFailureExpr__Group_3_2__13987 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__InFailureExpr__FailuresAssignment_3_2_1_in_rule__InFailureExpr__Group_3_2__1__Impl4014 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutFailureExpr__Group_3__0__Impl_in_rule__OutFailureExpr__Group_3__04048 = new BitSet(new long[]{0x000000000003F000L});
-    public static final BitSet FOLLOW_rule__OutFailureExpr__Group_3__1_in_rule__OutFailureExpr__Group_3__04051 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_rule__OutFailureExpr__Group_3__0__Impl4079 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutFailureExpr__Group_3__1__Impl_in_rule__OutFailureExpr__Group_3__14110 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_rule__OutFailureExpr__Group_3__2_in_rule__OutFailureExpr__Group_3__14113 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutFailureExpr__FailuresAssignment_3_1_in_rule__OutFailureExpr__Group_3__1__Impl4140 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutFailureExpr__Group_3__2__Impl_in_rule__OutFailureExpr__Group_3__24170 = new BitSet(new long[]{0x0000004000000000L});
-    public static final BitSet FOLLOW_rule__OutFailureExpr__Group_3__3_in_rule__OutFailureExpr__Group_3__24173 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutFailureExpr__Group_3_2__0_in_rule__OutFailureExpr__Group_3__2__Impl4202 = new BitSet(new long[]{0x0000000800000002L});
-    public static final BitSet FOLLOW_rule__OutFailureExpr__Group_3_2__0_in_rule__OutFailureExpr__Group_3__2__Impl4214 = new BitSet(new long[]{0x0000000800000002L});
-    public static final BitSet FOLLOW_rule__OutFailureExpr__Group_3__3__Impl_in_rule__OutFailureExpr__Group_3__34247 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_38_in_rule__OutFailureExpr__Group_3__3__Impl4275 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutFailureExpr__Group_3_2__0__Impl_in_rule__OutFailureExpr__Group_3_2__04314 = new BitSet(new long[]{0x000000000003F000L});
-    public static final BitSet FOLLOW_rule__OutFailureExpr__Group_3_2__1_in_rule__OutFailureExpr__Group_3_2__04317 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_35_in_rule__OutFailureExpr__Group_3_2__0__Impl4345 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutFailureExpr__Group_3_2__1__Impl_in_rule__OutFailureExpr__Group_3_2__14376 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__OutFailureExpr__FailuresAssignment_3_2_1_in_rule__OutFailureExpr__Group_3_2__1__Impl4403 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FailureDefinition__Group__0__Impl_in_rule__FailureDefinition__Group__04437 = new BitSet(new long[]{0x000000000003F000L});
-    public static final BitSet FOLLOW_rule__FailureDefinition__Group__1_in_rule__FailureDefinition__Group__04440 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FailureDefinition__Group__1__Impl_in_rule__FailureDefinition__Group__14498 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_rule__FailureDefinition__Group__2_in_rule__FailureDefinition__Group__14501 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FailureDefinition__TypeAssignment_1_in_rule__FailureDefinition__Group__1__Impl4528 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FailureDefinition__Group__2__Impl_in_rule__FailureDefinition__Group__24558 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FailureDefinition__Group_2__0_in_rule__FailureDefinition__Group__2__Impl4585 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FailureDefinition__Group_2__0__Impl_in_rule__FailureDefinition__Group_2__04622 = new BitSet(new long[]{0x00000000001C0000L});
-    public static final BitSet FOLLOW_rule__FailureDefinition__Group_2__1_in_rule__FailureDefinition__Group_2__04625 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rule__FailureDefinition__Group_2__0__Impl4653 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FailureDefinition__Group_2__1__Impl_in_rule__FailureDefinition__Group_2__14684 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__FailureDefinition__AcidAvoidableAssignment_2_1_in_rule__FailureDefinition__Group_2__1__Impl4711 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NoFailureDefinition__Group__0__Impl_in_rule__NoFailureDefinition__Group__04745 = new BitSet(new long[]{0x0000008000000000L});
-    public static final BitSet FOLLOW_rule__NoFailureDefinition__Group__1_in_rule__NoFailureDefinition__Group__04748 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__NoFailureDefinition__Group__1__Impl_in_rule__NoFailureDefinition__Group__14806 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_rule__NoFailureDefinition__Group__1__Impl4834 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ComplexNofailureDefinition__Group__0__Impl_in_rule__ComplexNofailureDefinition__Group__04869 = new BitSet(new long[]{0x0000008000000000L});
-    public static final BitSet FOLLOW_rule__ComplexNofailureDefinition__Group__1_in_rule__ComplexNofailureDefinition__Group__04872 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ComplexNofailureDefinition__Group__1__Impl_in_rule__ComplexNofailureDefinition__Group__14930 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_rule__ComplexNofailureDefinition__Group__2_in_rule__ComplexNofailureDefinition__Group__14933 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_rule__ComplexNofailureDefinition__Group__1__Impl4961 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ComplexNofailureDefinition__Group__2__Impl_in_rule__ComplexNofailureDefinition__Group__24992 = new BitSet(new long[]{0x0000000003180000L});
-    public static final BitSet FOLLOW_rule__ComplexNofailureDefinition__Group__3_in_rule__ComplexNofailureDefinition__Group__24995 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rule__ComplexNofailureDefinition__Group__2__Impl5023 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ComplexNofailureDefinition__Group__3__Impl_in_rule__ComplexNofailureDefinition__Group__35054 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ComplexNofailureDefinition__AcidMitigationAssignment_3_in_rule__ComplexNofailureDefinition__Group__3__Impl5081 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__WildcardDefinition__Group__0__Impl_in_rule__WildcardDefinition__Group__05119 = new BitSet(new long[]{0x0000010000000000L});
-    public static final BitSet FOLLOW_rule__WildcardDefinition__Group__1_in_rule__WildcardDefinition__Group__05122 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__WildcardDefinition__Group__1__Impl_in_rule__WildcardDefinition__Group__15180 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_rule__WildcardDefinition__Group__1__Impl5208 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__VariableDefinition__Group__0__Impl_in_rule__VariableDefinition__Group__05243 = new BitSet(new long[]{0x000001A00003F010L});
-    public static final BitSet FOLLOW_rule__VariableDefinition__Group__1_in_rule__VariableDefinition__Group__05246 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__VariableDefinition__Group__1__Impl_in_rule__VariableDefinition__Group__15304 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__VariableDefinition__VariableNameAssignment_1_in_rule__VariableDefinition__Group__1__Impl5331 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ACIDavoidable__Group__0__Impl_in_rule__ACIDavoidable__Group__05365 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_rule__ACIDavoidable__Group__1_in_rule__ACIDavoidable__Group__05368 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ACIDavoidable__AAssignment_0_in_rule__ACIDavoidable__Group__0__Impl5395 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ACIDavoidable__Group__1__Impl_in_rule__ACIDavoidable__Group__15425 = new BitSet(new long[]{0x0000000000380000L});
-    public static final BitSet FOLLOW_rule__ACIDavoidable__Group__2_in_rule__ACIDavoidable__Group__15428 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rule__ACIDavoidable__Group__1__Impl5456 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ACIDavoidable__Group__2__Impl_in_rule__ACIDavoidable__Group__25487 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_rule__ACIDavoidable__Group__3_in_rule__ACIDavoidable__Group__25490 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ACIDavoidable__CAssignment_2_in_rule__ACIDavoidable__Group__2__Impl5517 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ACIDavoidable__Group__3__Impl_in_rule__ACIDavoidable__Group__35547 = new BitSet(new long[]{0x0000000000580000L});
-    public static final BitSet FOLLOW_rule__ACIDavoidable__Group__4_in_rule__ACIDavoidable__Group__35550 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rule__ACIDavoidable__Group__3__Impl5578 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ACIDavoidable__Group__4__Impl_in_rule__ACIDavoidable__Group__45609 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_rule__ACIDavoidable__Group__5_in_rule__ACIDavoidable__Group__45612 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ACIDavoidable__IAssignment_4_in_rule__ACIDavoidable__Group__4__Impl5639 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ACIDavoidable__Group__5__Impl_in_rule__ACIDavoidable__Group__55669 = new BitSet(new long[]{0x0000000000980000L});
-    public static final BitSet FOLLOW_rule__ACIDavoidable__Group__6_in_rule__ACIDavoidable__Group__55672 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rule__ACIDavoidable__Group__5__Impl5700 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ACIDavoidable__Group__6__Impl_in_rule__ACIDavoidable__Group__65731 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ACIDavoidable__DAssignment_6_in_rule__ACIDavoidable__Group__6__Impl5758 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ACIDMitigation__Group__0__Impl_in_rule__ACIDMitigation__Group__05802 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_rule__ACIDMitigation__Group__1_in_rule__ACIDMitigation__Group__05805 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ACIDMitigation__AAssignment_0_in_rule__ACIDMitigation__Group__0__Impl5832 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ACIDMitigation__Group__1__Impl_in_rule__ACIDMitigation__Group__15862 = new BitSet(new long[]{0x000000000C180000L});
-    public static final BitSet FOLLOW_rule__ACIDMitigation__Group__2_in_rule__ACIDMitigation__Group__15865 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rule__ACIDMitigation__Group__1__Impl5893 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ACIDMitigation__Group__2__Impl_in_rule__ACIDMitigation__Group__25924 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_rule__ACIDMitigation__Group__3_in_rule__ACIDMitigation__Group__25927 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ACIDMitigation__CAssignment_2_in_rule__ACIDMitigation__Group__2__Impl5954 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ACIDMitigation__Group__3__Impl_in_rule__ACIDMitigation__Group__35984 = new BitSet(new long[]{0x0000000030180000L});
-    public static final BitSet FOLLOW_rule__ACIDMitigation__Group__4_in_rule__ACIDMitigation__Group__35987 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rule__ACIDMitigation__Group__3__Impl6015 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ACIDMitigation__Group__4__Impl_in_rule__ACIDMitigation__Group__46046 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_rule__ACIDMitigation__Group__5_in_rule__ACIDMitigation__Group__46049 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ACIDMitigation__IAssignment_4_in_rule__ACIDMitigation__Group__4__Impl6076 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ACIDMitigation__Group__5__Impl_in_rule__ACIDMitigation__Group__56106 = new BitSet(new long[]{0x00000000C0180000L});
-    public static final BitSet FOLLOW_rule__ACIDMitigation__Group__6_in_rule__ACIDMitigation__Group__56109 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_rule__ACIDMitigation__Group__5__Impl6137 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ACIDMitigation__Group__6__Impl_in_rule__ACIDMitigation__Group__66168 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__ACIDMitigation__DAssignment_6_in_rule__ACIDMitigation__Group__6__Impl6195 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_rule__Behaviour__RulesAssignment6246 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLhs_in_rule__Expression__LhsAssignment_16277 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRhs_in_rule__Expression__RhsAssignment_36308 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInputExpression_in_rule__Lhs__FailuresAssignment_06339 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInputExpression_in_rule__Lhs__FailuresAssignment_1_16370 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOutputExpression_in_rule__Rhs__FailuresAssignment_06401 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOutputExpression_in_rule__Rhs__FailuresAssignment_1_16432 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__InputExpression__RefAssignment_0_06467 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInFailureExpr_in_rule__InputExpression__FailureExprAssignment_26502 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__OutputExpression__RefAssignment_0_06537 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOutFailureExpr_in_rule__OutputExpression__FailureExprAssignment_26572 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleWildcardDefinition_in_rule__InFailureExpr__FailuresAssignment_06603 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNoFailureDefinition_in_rule__InFailureExpr__FailuresAssignment_16634 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFailureDefinition_in_rule__InFailureExpr__FailuresAssignment_26665 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFailureDefinition_in_rule__InFailureExpr__FailuresAssignment_3_16696 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFailureDefinition_in_rule__InFailureExpr__FailuresAssignment_3_2_16727 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleVariableDefinition_in_rule__InFailureExpr__FailuresAssignment_46758 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNoFailureDefinition_in_rule__OutFailureExpr__FailuresAssignment_06789 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleComplexNofailureDefinition_in_rule__OutFailureExpr__FailuresAssignment_16820 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFailureDefinition_in_rule__OutFailureExpr__FailuresAssignment_26851 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFailureDefinition_in_rule__OutFailureExpr__FailuresAssignment_3_16882 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFailureDefinition_in_rule__OutFailureExpr__FailuresAssignment_3_2_16913 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleVariableDefinition_in_rule__OutFailureExpr__FailuresAssignment_46944 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleActualFailureType_in_rule__FailureDefinition__TypeAssignment_16975 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleACIDavoidable_in_rule__FailureDefinition__AcidAvoidableAssignment_2_17006 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleACIDMitigation_in_rule__ComplexNofailureDefinition__AcidMitigationAssignment_37037 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__VariableDefinition__VariableNameAssignment_17068 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAavoidable_in_rule__ACIDavoidable__AAssignment_07099 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCavoidable_in_rule__ACIDavoidable__CAssignment_27130 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleIavoidable_in_rule__ACIDavoidable__IAssignment_47161 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDavoidable_in_rule__ACIDavoidable__DAssignment_67192 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAmitigation_in_rule__ACIDMitigation__AAssignment_07223 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleCmitigation_in_rule__ACIDMitigation__CAssignment_27254 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleImitigation_in_rule__ACIDMitigation__IAssignment_47285 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleDmitigation_in_rule__ACIDMitigation__DAssignment_67316 = new BitSet(new long[]{0x0000000000000002L});
-
-}
\ No newline at end of file
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/internal/FlaDslActivator.java b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/internal/FlaDslActivator.java
deleted file mode 100644
index 2a6faee8b1257b30e26e30a38bc5de35763b322d..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src-gen/org/polarsys/chess/xtext/ui/internal/FlaDslActivator.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * generated by Xtext
- */
-package org.polarsys.chess.xtext.ui.internal;
-
-import java.util.Collections;
-import java.util.Map;
-
-import org.apache.log4j.Logger;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.xtext.ui.shared.SharedStateModule;
-import org.eclipse.xtext.util.Modules2;
-import org.osgi.framework.BundleContext;
-
-import com.google.common.collect.Maps;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.Module;
-
-/**
- * This class was generated. Customizations should only happen in a newly
- * introduced subclass. 
- */
-public class FlaDslActivator extends AbstractUIPlugin {
-	
-	public static final String ORG_POLARSYS_CHESS_XTEXT_FLADSL = "org.polarsys.chess.xtext.FlaDsl";
-	
-	private static final Logger logger = Logger.getLogger(FlaDslActivator.class);
-	
-	private static FlaDslActivator INSTANCE;
-	
-	private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
-	
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		INSTANCE = this;
-	}
-	
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		injectors.clear();
-		INSTANCE = null;
-		super.stop(context);
-	}
-	
-	public static FlaDslActivator getInstance() {
-		return INSTANCE;
-	}
-	
-	public Injector getInjector(String language) {
-		synchronized (injectors) {
-			Injector injector = injectors.get(language);
-			if (injector == null) {
-				injectors.put(language, injector = createInjector(language));
-			}
-			return injector;
-		}
-	}
-	
-	protected Injector createInjector(String language) {
-		try {
-			Module runtimeModule = getRuntimeModule(language);
-			Module sharedStateModule = getSharedStateModule();
-			Module uiModule = getUiModule(language);
-			Module mergedModule = Modules2.mixin(runtimeModule, sharedStateModule, uiModule);
-			return Guice.createInjector(mergedModule);
-		} catch (Exception e) {
-			logger.error("Failed to create injector for " + language);
-			logger.error(e.getMessage(), e);
-			throw new RuntimeException("Failed to create injector for " + language, e);
-		}
-	}
-
-	protected Module getRuntimeModule(String grammar) {
-		if (ORG_POLARSYS_CHESS_XTEXT_FLADSL.equals(grammar)) {
-			return new org.polarsys.chess.xtext.FlaDslRuntimeModule();
-		}
-		
-		throw new IllegalArgumentException(grammar);
-	}
-	
-	protected Module getUiModule(String grammar) {
-		if (ORG_POLARSYS_CHESS_XTEXT_FLADSL.equals(grammar)) {
-			return new org.polarsys.chess.xtext.ui.FlaDslUiModule(this);
-		}
-		
-		throw new IllegalArgumentException(grammar);
-	}
-	
-	protected Module getSharedStateModule() {
-		return new SharedStateModule();
-	}
-	
-}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/contentassist/.FlaDslProposalProvider.xtendbin b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/contentassist/.FlaDslProposalProvider.xtendbin
deleted file mode 100644
index 1c72d3906de90475f9c06d8aeea3ed4c0569e982..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/contentassist/.FlaDslProposalProvider.xtendbin and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/contentassist/.gitignore b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/contentassist/.gitignore
deleted file mode 100644
index b19569182a864721cb8045e7b38185decc7eaa17..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/contentassist/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.FlaDslProposalProvider.java._trace
-/FlaDslProposalProvider.java
-/.FlaDslProposalProvider.xtendbin
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/labeling/.FlaDslDescriptionLabelProvider.xtendbin b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/labeling/.FlaDslDescriptionLabelProvider.xtendbin
deleted file mode 100644
index 64bdebbc0da0f17341667cf5fd3bfd6289399538..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/labeling/.FlaDslDescriptionLabelProvider.xtendbin and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/labeling/.FlaDslLabelProvider.xtendbin b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/labeling/.FlaDslLabelProvider.xtendbin
deleted file mode 100644
index a7c36724b8e9358d6e78ca897288a7a3b5b9b52e..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/labeling/.FlaDslLabelProvider.xtendbin and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/labeling/.gitignore b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/labeling/.gitignore
deleted file mode 100644
index b50ca16c338320f4d5355c0f2ed4cc69a7a5f5d6..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/labeling/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/.FlaDslDescriptionLabelProvider.java._trace
-/.FlaDslLabelProvider.java._trace
-/FlaDslDescriptionLabelProvider.java
-/FlaDslLabelProvider.java
-/.FlaDslDescriptionLabelProvider.xtendbin
-/.FlaDslLabelProvider.xtendbin
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/outline/.FlaDslOutlineTreeProvider.xtendbin b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/outline/.FlaDslOutlineTreeProvider.xtendbin
deleted file mode 100644
index 672069ec589b7c7a7612b31b97619d5d496a3af6..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/outline/.FlaDslOutlineTreeProvider.xtendbin and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/outline/.gitignore b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/outline/.gitignore
deleted file mode 100644
index 0453ab582ef8129d8a91ab0c28d0a2da990b480a..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/outline/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.FlaDslOutlineTreeProvider.java._trace
-/FlaDslOutlineTreeProvider.java
-/.FlaDslOutlineTreeProvider.xtendbin
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/quickfix/.FlaDslQuickfixProvider.xtendbin b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/quickfix/.FlaDslQuickfixProvider.xtendbin
deleted file mode 100644
index 4520fe1e964dcd0cbe21dbb8e82b3bb2fff41efc..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/quickfix/.FlaDslQuickfixProvider.xtendbin and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/quickfix/.gitignore b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/quickfix/.gitignore
deleted file mode 100644
index 07f0f5ce00fb37bb6386d79a578cbc1e7a263fea..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/xtend-gen/org/polarsys/chess/xtext/ui/quickfix/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.FlaDslQuickfixProvider.java._trace
-/FlaDslQuickfixProvider.java
-/.FlaDslQuickfixProvider.xtendbin
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/.classpath b/plugins/fla/org.polarsys.chess.xtext.fladsl/.classpath
index b2a978155c86febec615984441657a3b03afba58..4a3597edc8446f2652efae0df9d6b2dae4ea39a2 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/.classpath
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/.classpath
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="src" path="xtend-gen"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="xtend-gen"/>
+	<classpathentry kind="src" path="src-gen"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/.gitignore b/plugins/fla/org.polarsys.chess.xtext.fladsl/.gitignore
index 3e2fcc71712d1d9f84845f45b6eddd03e4e2fbfe..e6f918ae1d3f10bb00e86f5c473fe73665b27543 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/.gitignore
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/.gitignore
@@ -1 +1,5 @@
 /bin/
+/src-gen/
+/xtend-gen/
+/target/
+/model/
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/.launch/Launch Runtime Eclipse.launch b/plugins/fla/org.polarsys.chess.xtext.fladsl/.launch/Launch Runtime Eclipse.launch
deleted file mode 100644
index e0b45878d8b1afc7655c7a509e0ac2d38c8c1329..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/.launch/Launch Runtime Eclipse.launch	
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="true"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bad_container_name" value="/org.polarsys.chess.xtext.fladsl/.launch/"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="false"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Launch Runtime Eclipse"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-chessdevel2"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m -Xmx1024m -XX:PermSize=64m -XX:MaxPermSize=256m"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="true"/>
-<booleanAttribute key="usefeatures" value="false"/>
-</launchConfiguration>
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/.project b/plugins/fla/org.polarsys.chess.xtext.fladsl/.project
index f3f8aa1266326919c5253978a6b8d8def3ed735e..86f5c3b7fb4e2de2f5d6e8e0c49f3ba71a3d4578 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/.project
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/.project
@@ -25,8 +25,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/.settings/org.eclipse.jdt.core.prefs b/plugins/fla/org.polarsys.chess.xtext.fladsl/.settings/org.eclipse.jdt.core.prefs
index 11f6e462df7b697da0744bef232871f1aa1b0cb3..295926d964165896ea8aa7c1b1b3c9d3d3caa77e 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/.settings/org.eclipse.m2e.core.prefs b/plugins/fla/org.polarsys.chess.xtext.fladsl/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/fla/org.polarsys.chess.xtext.fladsl/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/META-INF/MANIFEST.MF b/plugins/fla/org.polarsys.chess.xtext.fladsl/META-INF/MANIFEST.MF
index a0ad82b911c5b4943caca454098f2649f86cfe9e..9191cea5a5c179b76dd6dea25b6d5eb109d3cade 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/META-INF/MANIFEST.MF
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/META-INF/MANIFEST.MF
@@ -26,7 +26,7 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport,
  org.polarsys.chess.chessmlprofile;bundle-version="0.9.0"
 Import-Package: org.apache.log4j,
  org.eclipse.xtext.xbase.lib
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.polarsys.chess.xtext.flaDsl,
  org.polarsys.chess.xtext.flaDsl.impl,
  org.polarsys.chess.xtext.flaDsl.util,
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/.gitignore b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/.gitignore
deleted file mode 100644
index cf1db2eed3105aa86842b8dff99b9083d9257a5f..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/org/
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/AbstractFlaDslRuntimeModule.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/AbstractFlaDslRuntimeModule.class
deleted file mode 100644
index e3977e0e6585854158d47508bf23db17a8f5f315..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/AbstractFlaDslRuntimeModule.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/FlaDsl.xtext b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/FlaDsl.xtext
deleted file mode 100644
index 40f25d2fb5c5e66d1223ce5fa120d24ff27dc13a..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/FlaDsl.xtext
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * TODO: License and author (Petter Isberg - MDH) 
- */
-
-grammar org.polarsys.chess.xtext.FlaDsl with org.eclipse.xtext.common.Terminals
-
-import "http://www.eclipse.org/uml2/5.0.0/UML" as uml
-import "http://www.eclipse.org/emf/2002/Ecore" as ecore
-
-generate flaDsl "http://www.intecs.org/chess/xtext/FlaDsl"
-
-/*
- * FLA Grammar
- */
- 
-Behaviour:
-	rules+=Expression+;
-	
-Expression:
-	'FLA:' lhs=Lhs '->' rhs=Rhs ';';
-
-Lhs: failures+=InputExpression (',' failures+=InputExpression)*;
-Rhs: failures+=OutputExpression (',' failures+=OutputExpression)*;
-
-InputExpression: (ref=[uml::Port]| "undefined") '.' failureExpr=InFailureExpr;
-OutputExpression: (ref=[uml::Port]| "undefined") '.' failureExpr=OutFailureExpr;
-
-InFailureExpr: 
-	failures+=WildcardDefinition | 
-	failures+=NoFailureDefinition | 
-	failures+=FailureDefinition |
-	'{' failures+=FailureDefinition (',' failures+=FailureDefinition)+ '}' | 
-	failures+=VariableDefinition
-; 
-
-OutFailureExpr: 
-	failures+=NoFailureDefinition | 
-	failures+=ComplexNofailureDefinition | 
-	failures+=FailureDefinition | 
-	'{' failures+=FailureDefinition (',' failures+=FailureDefinition)+ '}' |
-	failures+=VariableDefinition
-;
-
-Definitions: FailureDefinition | NoFailureDefinition | ComplexNofailureDefinition | WildcardDefinition | VariableDefinition;
-
-FailureDefinition: {FailureDefinition} type = ActualFailureType ('.' acidAvoidable = ACIDavoidable)?;
-NoFailureDefinition: {NoFailureDefinition} 'noFailure';
-ComplexNofailureDefinition: {NoFailureDefinition} 'noFailure' '.' acidMitigation = ACIDMitigation;
-WildcardDefinition: {WildcardDefinition} 'wildcard';
-VariableDefinition: {VariableDefinition} variableName=ID;
-
-enum FailureType: NO_FAILURE='noFailure' | EARLY='early'| LATE='late' | COMMISSION='commission' | OMISSION='omission' | VALUE_SUBTLE='valueSubtle' | VALUE_COARSE='valueCoarse' | WILDCARD="wildcard" | VARIABLE='variable';
-enum ActualFailureType returns FailureType: EARLY | LATE | COMMISSION | OMISSION | VALUE_SUBTLE | VALUE_COARSE;
-enum NoFailureType returns FailureType: NO_FAILURE;
-enum Wildcard returns FailureType: WILDCARD;
-
-ACIDavoidable: a = Aavoidable '.' c = Cavoidable '.' i = Iavoidable '.' d = Davoidable;
-
-enum Aavoidable: INCOMPLETION='incompletion' | NONE='none' | UNSPECIFIED='unspecified';
-enum Cavoidable: INCONSISTENCY='inconsistency' | NONE='none' | UNSPECIFIED='unspecified';
-enum Iavoidable: INTERFERENCE='interference' | NONE='none' | UNSPECIFIED='unspecified';
-enum Davoidable: IMPERMANENCE='impermanence' | NONE='none' | UNSPECIFIED='unspecified';
-
-ACIDMitigation: a = Amitigation '.' c = Cmitigation '.' i = Imitigation '.' d = Dmitigation;
-
-enum Amitigation: ALL_OR_NOTHING='all_or_nothing' | ALL_OR_COMPENSATION='all_or_compensation' | NONE='none' | UNSPECIFIED='unspecified';
-enum Cmitigation: FULL_CONSISTENCY='full_consistency' | RANGE_VIOLATION_ALLOWED='range_violation_allowed' | NONE='none' | UNSPECIFIED='unspecified';
-enum Imitigation: SERIALIZABLE='serializable' | PORTABLE_LEVEL='portable_level' | NONE='none' | UNSPECIFIED='unspecified';
-enum Dmitigation: NO_LOSS='no_loss' | PARTIAL_LOSS_ALLOWED='partial_loss_allowed' | NONE='none' | UNSPECIFIED='unspecified';
-	
-/*
- * Additional rule to refer UML elements in a Model
- */
-
-FQN returns ecore::EString :
-	ID('::'ID)*
-;
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/FlaDsl.xtextbin b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/FlaDsl.xtextbin
deleted file mode 100644
index 23ee3c8c288caf38610e27ae384afc6d6a483bc2..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/FlaDsl.xtextbin and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/FlaDslRuntimeModule.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/FlaDslRuntimeModule.class
deleted file mode 100644
index 19f841c9bea984054d6b61dc3c26ce1522180638..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/FlaDslRuntimeModule.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/FlaDslStandaloneSetup.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/FlaDslStandaloneSetup.class
deleted file mode 100644
index eac82d2ad1044392f5d4a119d4fba7af53ae6a76..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/FlaDslStandaloneSetup.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/FlaDslStandaloneSetupGenerated.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/FlaDslStandaloneSetupGenerated.class
deleted file mode 100644
index c041cbba971fc31171b8cb56ca62c152a445f202..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/FlaDslStandaloneSetupGenerated.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/GenerateFlaDsl.mwe2 b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/GenerateFlaDsl.mwe2
deleted file mode 100644
index a4fc28d75b21db3e2f41181f59e3239b1c003d21..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/GenerateFlaDsl.mwe2
+++ /dev/null
@@ -1,200 +0,0 @@
-/*------------------------------------------------------------------------------
- -
- - Copyright (c) 2013, 2015 Intecs SpA 
- - 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:
- - 
- - Stefano Puri stefano.puri@intecs.it
- -  
- - Initial API and implementation and/or initial documentation
- ------------------------------------------------------------------------------*/
-
-module org.polarsys.chess.xtext.GenerateFlaDsl
-
-import org.eclipse.emf.mwe.utils.*
-import org.eclipse.xtext.generator.*
-import org.eclipse.xtext.ui.generator.*
-
-var grammarURI = "classpath:/org/polarsys/chess/xtext/FlaDsl.xtext"
-var fileExtensions = "fladsl"
-var projectName = "org.polarsys.chess.xtext.fladsl"
-var runtimeProject = "../${projectName}"
-var generateXtendStub = true
-var encoding = "UTF-8"
-
-Workflow {
-    bean = StandaloneSetup {
-    	scanClassPath = true
-    	platformUri = "${runtimeProject}/.."
-    	
-    	//load EMF ECORE	
-		uriMap = {
-            from = "platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore"
-            to = "platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore"
-        }
-		
-		uriMap = { from = "platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel"
-           		   to = "platform:/resource/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel"
-       	}
-        uriMap = {
-          from = "platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel"
-           to = "platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel"
-        }
-        registerGeneratedEPackage = "org.eclipse.emf.ecore.EcorePackage"
-        registerGeneratedEPackage = "org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage"
-        registerGenModelFile = "platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel"	
-		registerGenModelFile = "platform:/resource/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel"
-		
-		//load UML
-		
-		uriMap = {
-            from = "platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel"
-            to = "platform:/resource/org.eclipse.uml2.types/model/Types.genmodel"
-        }
-        uriMap = {
-            from = "platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel"
-            to = "platform:/resource/org.eclipse.uml2.uml/model/UML.genmodel"
-        }
-		
- 		uriMap = {
-            from = "platform:/plugin/org.eclipse.uml2.codegen.ecore/model/GenModel.genmodel"
-            to = "platform:/resource/org.eclipse.uml2.codegen.ecore/model/GenModel.genmodel"
-        }
-        
-        uriMap = {
-            from = "platform:/plugin/org.eclipse.uml2.codegen.ecore/model/GenModel.ecore"
-            to = "platform:/resource/org.eclipse.uml2.codegen.ecore/model/GenModel.ecore"
-        }
-        uriMap = {
-            from = "platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore"
-            to = "platform:/resource/org.eclipse.uml2.uml/model/UML.ecore"
-        }
-        
-        uriMap = {
-            from = "platform:/plugin/org.eclipse.uml2.types/model/Types.ecore"
-            to = "platform:/resource/org.eclipse.uml2.types/model/Types.ecore"
-        }
-        registerGeneratedEPackage = "org.eclipse.uml2.types.TypesPackage"
-        registerGeneratedEPackage = "org.eclipse.uml2.uml.UMLPackage"
-        registerGeneratedEPackage = "org.eclipse.uml2.codegen.ecore.genmodel.GenModelPackage"
-        
-        registerGenModelFile = "platform:/resource/org.eclipse.uml2.types/model/Types.genmodel"
-	 	registerGenModelFile = "platform:/resource/org.eclipse.uml2.uml/model/UML.genmodel"
-        registerGenModelFile = "platform:/resource/org.eclipse.uml2.codegen.ecore/model/GenModel.genmodel"
-	}
-    
-    component = DirectoryCleaner {
-    	directory = "${runtimeProject}/src-gen"
-    }
-    
-    component = DirectoryCleaner {
-    	directory = "${runtimeProject}/model/generated"
-    }
-    
-    component = DirectoryCleaner {
-    	directory = "${runtimeProject}.ui/src-gen"
-    }
-    
-    component = DirectoryCleaner {
-    	directory = "${runtimeProject}.tests/src-gen"
-    }
-    
-    component = Generator {
-    	pathRtProject = runtimeProject
-    	pathUiProject = "${runtimeProject}.ui"
-    	projectNameRt = projectName
-    	projectNameUi = "${projectName}.ui"
-    	encoding = encoding
-    	language = auto-inject {
-    		
-    		uri = grammarURI
-    
-    		// Java API to access grammar elements (required by several other fragments)
-    		fragment = grammarAccess.GrammarAccessFragment auto-inject {}
-    
-    		// generates Java API for the generated EPackages
-    		fragment = ecore.EMFGeneratorFragment auto-inject {}
-    
-    		// the old serialization component
-    		// fragment = parseTreeConstructor.ParseTreeConstructorFragment auto-inject {}    
-    
-    		// serializer 2.0
-    		fragment = serializer.SerializerFragment auto-inject {
-    			generateStub = false
-    		}
-    
-    		// a custom ResourceFactory for use with EMF
-    		fragment = resourceFactory.ResourceFactoryFragment auto-inject {}
-    
-    		// The antlr parser generator fragment.
-    		fragment = parser.antlr.XtextAntlrGeneratorFragment auto-inject {
-    		//  options = {
-    		//      backtrack = true
-    		//  }
-    		}
-    
-    		// Xtend-based API for validation
-    		fragment = validation.ValidatorFragment auto-inject {
-    		    composedCheck = "org.eclipse.xtext.validation.ImportUriValidator"
-    		//    composedCheck = "org.eclipse.xtext.validation.NamesAreUniqueValidator"
-    		}
-    
-    		// old scoping and exporting API
-    		// fragment = scoping.ImportURIScopingFragment auto-inject {}
-    		// fragment = exporting.SimpleNamesFragment auto-inject {}
-    
-    		// scoping and exporting API
-    		fragment = scoping.ImportNamespacesScopingFragment auto-inject {}
-    		fragment = exporting.QualifiedNamesFragment auto-inject {}
-    		fragment = builder.BuilderIntegrationFragment auto-inject {}
-    
-    		// generator API
-    		fragment = generator.GeneratorFragment auto-inject {}
-    
-    		// formatter API
-    		fragment = formatting.FormatterFragment auto-inject {}
-    
-    		// labeling API
-    		fragment = labeling.LabelProviderFragment auto-inject {}
-    
-    		// outline API
-    		fragment = outline.OutlineTreeProviderFragment auto-inject {}
-    		fragment = outline.QuickOutlineFragment auto-inject {}
-    
-    		// quickfix API
-    		fragment = quickfix.QuickfixProviderFragment auto-inject {}
-    
-    		// content assist API
-    		fragment = contentAssist.ContentAssistFragment auto-inject {}
-    
-    		// generates a more lightweight Antlr parser and lexer tailored for content assist
-    		fragment = parser.antlr.XtextAntlrUiGeneratorFragment auto-inject {}
-    
-    		// generates junit test support classes into Generator#pathTestProject
-    		fragment = junit.Junit4Fragment auto-inject {}
-    
-    		// rename refactoring
-    		fragment = refactoring.RefactorElementNameFragment auto-inject {}
-    
-    		// provides the necessary bindings for java types integration
-    		fragment = types.TypesGeneratorFragment auto-inject {}
-    
-    		// generates the required bindings only if the grammar inherits from Xbase
-    		fragment = xbase.XbaseGeneratorFragment auto-inject {}
-    		
-    		// generates the required bindings only if the grammar inherits from Xtype
-    		fragment = xbase.XtypeGeneratorFragment auto-inject {}
-    
-    		// provides a preference page for template proposals
-    		fragment = templates.CodetemplatesGeneratorFragment auto-inject {}
-    
-    		// provides a compare view
-    		fragment = compare.CompareFragment auto-inject {}
-    	}
-    }
-}
-
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/ACIDMitigation.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/ACIDMitigation.class
deleted file mode 100644
index ab06b33a41c58ef6a320331fcf8e9623a5a3190a..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/ACIDMitigation.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/ACIDavoidable.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/ACIDavoidable.class
deleted file mode 100644
index 5bdeae3f006b82d69874e087801e38d8c5cb38a4..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/ACIDavoidable.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Aavoidable.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Aavoidable.class
deleted file mode 100644
index 88965c9d5f3325cb2f09d43f5d2616470f28bd4b..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Aavoidable.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Amitigation.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Amitigation.class
deleted file mode 100644
index 428bb67fd879b8df1e6070c485a19e9b35993836..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Amitigation.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Behaviour.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Behaviour.class
deleted file mode 100644
index ff08863a33cc725206225e01e035818a70173a2c..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Behaviour.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Cavoidable.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Cavoidable.class
deleted file mode 100644
index 2b4d00359ed7323f8459d9eaea2677a81704edda..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Cavoidable.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Cmitigation.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Cmitigation.class
deleted file mode 100644
index 52f2e2fc436c23eabab94e23fb04ca6c147738d1..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Cmitigation.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/ComplexNofailureDefinition.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/ComplexNofailureDefinition.class
deleted file mode 100644
index 805c9558262c583cb3cc9a9047875e4b085e5b9f..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/ComplexNofailureDefinition.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Davoidable.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Davoidable.class
deleted file mode 100644
index edd1c8f361b58bdfd8fd39fe17d6f1ae04267319..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Davoidable.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Definitions.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Definitions.class
deleted file mode 100644
index 734e293701ac5347ba96aa131d34e69375e984b7..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Definitions.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Dmitigation.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Dmitigation.class
deleted file mode 100644
index f6f3897d90d01b53d6f7e576674f39b2ef6f9cfa..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Dmitigation.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Expression.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Expression.class
deleted file mode 100644
index 29f2820695391982b2613ef943de6cea9535c0ca..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Expression.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/FailureDefinition.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/FailureDefinition.class
deleted file mode 100644
index 283f42353add005a0eeac9afb10dc133b41eb4a8..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/FailureDefinition.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/FailureType.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/FailureType.class
deleted file mode 100644
index 5d814556273142f7a9dcd4c58da6bd086df9b977..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/FailureType.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/FlaDslFactory.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/FlaDslFactory.class
deleted file mode 100644
index a5cc86d9c1dad3fddfaafeeec4abf319a2bb00fe..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/FlaDslFactory.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/FlaDslPackage$Literals.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/FlaDslPackage$Literals.class
deleted file mode 100644
index b0f3389a3112bf1552bc036ff9071b144405be97..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/FlaDslPackage$Literals.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/FlaDslPackage.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/FlaDslPackage.class
deleted file mode 100644
index 4a65eb0f7304fc35d4f15cd08de83d64379e6448..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/FlaDslPackage.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Iavoidable.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Iavoidable.class
deleted file mode 100644
index eba7d66f6d1b6210410f6c39e6aaaa4fe3a7080a..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Iavoidable.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Imitigation.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Imitigation.class
deleted file mode 100644
index 29f54f0fa35bf9514a75b51b84db9b67dd239d72..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Imitigation.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/InFailureExpr.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/InFailureExpr.class
deleted file mode 100644
index 38b93914992679c0ed85b5388124b92d9d0cf606..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/InFailureExpr.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/InputExpression.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/InputExpression.class
deleted file mode 100644
index 4329d95890b9dd75c30bb5013f2a528f0e0b5d11..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/InputExpression.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Lhs.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Lhs.class
deleted file mode 100644
index 6c642b0eea28548a53f8dbc6f97648e3340682e1..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Lhs.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/NoFailureDefinition.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/NoFailureDefinition.class
deleted file mode 100644
index 72aed64857c16f1861c44fce761b69240c0e9f41..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/NoFailureDefinition.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/OutFailureExpr.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/OutFailureExpr.class
deleted file mode 100644
index 9b549417ef47d0586d439474e8e022b100dd7237..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/OutFailureExpr.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/OutputExpression.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/OutputExpression.class
deleted file mode 100644
index 2cfb88a35d9c94a94bd11191e8096c4d76da00d9..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/OutputExpression.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Rhs.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Rhs.class
deleted file mode 100644
index 0c40f0b5ce49a7f7caf8324ab9ee22f293394016..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/Rhs.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/VariableDefinition.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/VariableDefinition.class
deleted file mode 100644
index 65b262ca244252820bcfaac23d1aecc250d2959a..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/VariableDefinition.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/WildcardDefinition.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/WildcardDefinition.class
deleted file mode 100644
index 7c56b9d8744048977733c3e42664db9ae454d085..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/WildcardDefinition.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/ACIDMitigationImpl.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/ACIDMitigationImpl.class
deleted file mode 100644
index 08adf4bd315779c2255d08c7555a55d3c1df7403..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/ACIDMitigationImpl.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/ACIDavoidableImpl.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/ACIDavoidableImpl.class
deleted file mode 100644
index 1b281b6d792b3c73d2c14deb5d635465cadfd09e..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/ACIDavoidableImpl.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/BehaviourImpl.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/BehaviourImpl.class
deleted file mode 100644
index 98711dcdb1108ae8c28cc0cfa1cbaf29fd7df5b4..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/BehaviourImpl.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/ComplexNofailureDefinitionImpl.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/ComplexNofailureDefinitionImpl.class
deleted file mode 100644
index 705e8675e3b85c5c0fe6402240a5794836d90b78..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/ComplexNofailureDefinitionImpl.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/DefinitionsImpl.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/DefinitionsImpl.class
deleted file mode 100644
index 2af9b27c9379a778d37af64b4a2fc688066b7047..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/DefinitionsImpl.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/ExpressionImpl.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/ExpressionImpl.class
deleted file mode 100644
index b0340062e8615e1de111d98576025e808fe1c3c0..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/ExpressionImpl.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/FailureDefinitionImpl.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/FailureDefinitionImpl.class
deleted file mode 100644
index 575b41e8d45ba40c088391af403e774097001737..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/FailureDefinitionImpl.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/FlaDslFactoryImpl.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/FlaDslFactoryImpl.class
deleted file mode 100644
index e00eb75e2c495650321f4337ef6525bab594f406..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/FlaDslFactoryImpl.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/FlaDslPackageImpl.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/FlaDslPackageImpl.class
deleted file mode 100644
index abaee4ac1656cc5ce28cf28a44370f11faca5f2a..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/FlaDslPackageImpl.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/InFailureExprImpl.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/InFailureExprImpl.class
deleted file mode 100644
index c552de73351450135a735b66f298907ed51f4342..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/InFailureExprImpl.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/InputExpressionImpl.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/InputExpressionImpl.class
deleted file mode 100644
index ab46cafffc94a306ed3b4e0d94d40c19fb1423f4..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/InputExpressionImpl.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/LhsImpl.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/LhsImpl.class
deleted file mode 100644
index c8bdd60c4558bb48c8009787865de09299553d83..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/LhsImpl.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/NoFailureDefinitionImpl.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/NoFailureDefinitionImpl.class
deleted file mode 100644
index 922af1926375be0d77d78c1a1726bc0250e36934..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/NoFailureDefinitionImpl.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/OutFailureExprImpl.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/OutFailureExprImpl.class
deleted file mode 100644
index 34d86f0be9b8881ea82dea4926d9203e944e5079..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/OutFailureExprImpl.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/OutputExpressionImpl.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/OutputExpressionImpl.class
deleted file mode 100644
index 735e097dbe81934ffb8b3a7c155f8331b2319d73..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/OutputExpressionImpl.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/RhsImpl.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/RhsImpl.class
deleted file mode 100644
index 0407715d92ba7f5a8990885ac8aee5d2e048ec9b..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/RhsImpl.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/VariableDefinitionImpl.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/VariableDefinitionImpl.class
deleted file mode 100644
index 791b491e940444f339d97ffb9af0014fcbc879f2..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/VariableDefinitionImpl.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/WildcardDefinitionImpl.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/WildcardDefinitionImpl.class
deleted file mode 100644
index 3735f28431bf68f5456ebc827ace6c8322a4cd14..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/impl/WildcardDefinitionImpl.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/util/FlaDslAdapterFactory$1.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/util/FlaDslAdapterFactory$1.class
deleted file mode 100644
index bfed691a930610ee2ffd80582fb730baa7f78fc6..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/util/FlaDslAdapterFactory$1.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/util/FlaDslAdapterFactory.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/util/FlaDslAdapterFactory.class
deleted file mode 100644
index 9f8210731161eec2796a1e729eb7866c151fd192..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/util/FlaDslAdapterFactory.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/util/FlaDslSwitch.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/util/FlaDslSwitch.class
deleted file mode 100644
index 413264e98d08c85e2d44d4ddf64d6e27afff48f9..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/flaDsl/util/FlaDslSwitch.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/formatting/.gitignore b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/formatting/.gitignore
deleted file mode 100644
index 599582e0a4377ba9d0e1916dc8306b4f042e7a50..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/formatting/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.FlaDslFormatter.java._trace
-/.FlaDslFormatter.xtendbin
-/FlaDslFormatter.java
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/formatting/FlaDslFormatter.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/formatting/FlaDslFormatter.class
deleted file mode 100644
index 570ac7be3fbba603907a214435888b667b7bfea8..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/formatting/FlaDslFormatter.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/generator/.gitignore b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/generator/.gitignore
deleted file mode 100644
index e54c9e0e2d04344888516c7af4665c719695c5fe..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/generator/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.FlaDslGenerator.java._trace
-/.FlaDslGenerator.xtendbin
-/FlaDslGenerator.java
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/generator/FlaDslGenerator.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/generator/FlaDslGenerator.class
deleted file mode 100644
index e2ee7a286dc1384edacb19a718b99d2794606827..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/generator/FlaDslGenerator.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/parser/antlr/FlaDslAntlrTokenFileProvider.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/parser/antlr/FlaDslAntlrTokenFileProvider.class
deleted file mode 100644
index d65a1d378ea392ed0582696fcfcec18ace23d9b1..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/parser/antlr/FlaDslAntlrTokenFileProvider.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/parser/antlr/FlaDslParser.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/parser/antlr/FlaDslParser.class
deleted file mode 100644
index d23c9a7224247a61dd532ad8b5339f14c22d6a1b..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/parser/antlr/FlaDslParser.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g
deleted file mode 100644
index 92a039a8f70e29d9c1c9444a80f19038f4160b9c..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g
+++ /dev/null
@@ -1,1437 +0,0 @@
-/*
-* generated by Xtext
-*/
-grammar InternalFlaDsl;
-
-options {
-	superClass=AbstractInternalAntlrParser;
-	
-}
-
-@lexer::header {
-package org.polarsys.chess.xtext.parser.antlr.internal;
-
-// Hack: Use our own Lexer superclass by means of import. 
-// Currently there is no other way to specify the superclass for the lexer.
-import org.eclipse.xtext.parser.antlr.Lexer;
-}
-
-@parser::header {
-package org.polarsys.chess.xtext.parser.antlr.internal; 
-
-import org.eclipse.xtext.*;
-import org.eclipse.xtext.parser.*;
-import org.eclipse.xtext.parser.impl.*;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.common.util.Enumerator;
-import org.eclipse.xtext.parser.antlr.AbstractInternalAntlrParser;
-import org.eclipse.xtext.parser.antlr.XtextTokenStream;
-import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
-import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;
-import org.polarsys.chess.xtext.services.FlaDslGrammarAccess;
-
-}
-
-@parser::members {
-
- 	private FlaDslGrammarAccess grammarAccess;
- 	
-    public InternalFlaDslParser(TokenStream input, FlaDslGrammarAccess grammarAccess) {
-        this(input);
-        this.grammarAccess = grammarAccess;
-        registerRules(grammarAccess.getGrammar());
-    }
-    
-    @Override
-    protected String getFirstRuleName() {
-    	return "Behaviour";	
-   	}
-   	
-   	@Override
-   	protected FlaDslGrammarAccess getGrammarAccess() {
-   		return grammarAccess;
-   	}
-}
-
-@rulecatch { 
-    catch (RecognitionException re) { 
-        recover(input,re); 
-        appendSkippedTokens();
-    } 
-}
-
-
-
-
-// Entry rule entryRuleBehaviour
-entryRuleBehaviour returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getBehaviourRule()); }
-	 iv_ruleBehaviour=ruleBehaviour 
-	 { $current=$iv_ruleBehaviour.current; } 
-	 EOF 
-;
-
-// Rule Behaviour
-ruleBehaviour returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getBehaviourAccess().getRulesExpressionParserRuleCall_0()); 
-	    }
-		lv_rules_0_0=ruleExpression		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getBehaviourRule());
-	        }
-       		add(
-       			$current, 
-       			"rules",
-        		lv_rules_0_0, 
-        		"Expression");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)+
-;
-
-
-
-
-
-// Entry rule entryRuleExpression
-entryRuleExpression returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getExpressionRule()); }
-	 iv_ruleExpression=ruleExpression 
-	 { $current=$iv_ruleExpression.current; } 
-	 EOF 
-;
-
-// Rule Expression
-ruleExpression returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-(	otherlv_0='FLA:' 
-    {
-    	newLeafNode(otherlv_0, grammarAccess.getExpressionAccess().getFLAKeyword_0());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getExpressionAccess().getLhsLhsParserRuleCall_1_0()); 
-	    }
-		lv_lhs_1_0=ruleLhs		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getExpressionRule());
-	        }
-       		set(
-       			$current, 
-       			"lhs",
-        		lv_lhs_1_0, 
-        		"Lhs");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)	otherlv_2='->' 
-    {
-    	newLeafNode(otherlv_2, grammarAccess.getExpressionAccess().getHyphenMinusGreaterThanSignKeyword_2());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getExpressionAccess().getRhsRhsParserRuleCall_3_0()); 
-	    }
-		lv_rhs_3_0=ruleRhs		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getExpressionRule());
-	        }
-       		set(
-       			$current, 
-       			"rhs",
-        		lv_rhs_3_0, 
-        		"Rhs");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)	otherlv_4=';' 
-    {
-    	newLeafNode(otherlv_4, grammarAccess.getExpressionAccess().getSemicolonKeyword_4());
-    }
-)
-;
-
-
-
-
-
-// Entry rule entryRuleLhs
-entryRuleLhs returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getLhsRule()); }
-	 iv_ruleLhs=ruleLhs 
-	 { $current=$iv_ruleLhs.current; } 
-	 EOF 
-;
-
-// Rule Lhs
-ruleLhs returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-(
-		{ 
-	        newCompositeNode(grammarAccess.getLhsAccess().getFailuresInputExpressionParserRuleCall_0_0()); 
-	    }
-		lv_failures_0_0=ruleInputExpression		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getLhsRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_0_0, 
-        		"InputExpression");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)(	otherlv_1=',' 
-    {
-    	newLeafNode(otherlv_1, grammarAccess.getLhsAccess().getCommaKeyword_1_0());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getLhsAccess().getFailuresInputExpressionParserRuleCall_1_1_0()); 
-	    }
-		lv_failures_2_0=ruleInputExpression		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getLhsRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_2_0, 
-        		"InputExpression");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-))*)
-;
-
-
-
-
-
-// Entry rule entryRuleRhs
-entryRuleRhs returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getRhsRule()); }
-	 iv_ruleRhs=ruleRhs 
-	 { $current=$iv_ruleRhs.current; } 
-	 EOF 
-;
-
-// Rule Rhs
-ruleRhs returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-(
-		{ 
-	        newCompositeNode(grammarAccess.getRhsAccess().getFailuresOutputExpressionParserRuleCall_0_0()); 
-	    }
-		lv_failures_0_0=ruleOutputExpression		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getRhsRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_0_0, 
-        		"OutputExpression");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)(	otherlv_1=',' 
-    {
-    	newLeafNode(otherlv_1, grammarAccess.getRhsAccess().getCommaKeyword_1_0());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getRhsAccess().getFailuresOutputExpressionParserRuleCall_1_1_0()); 
-	    }
-		lv_failures_2_0=ruleOutputExpression		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getRhsRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_2_0, 
-        		"OutputExpression");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-))*)
-;
-
-
-
-
-
-// Entry rule entryRuleInputExpression
-entryRuleInputExpression returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getInputExpressionRule()); }
-	 iv_ruleInputExpression=ruleInputExpression 
-	 { $current=$iv_ruleInputExpression.current; } 
-	 EOF 
-;
-
-// Rule InputExpression
-ruleInputExpression returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-(((
-(
-		{
-			if ($current==null) {
-	            $current = createModelElement(grammarAccess.getInputExpressionRule());
-	        }
-        }
-	otherlv_0=RULE_ID
-	{
-		newLeafNode(otherlv_0, grammarAccess.getInputExpressionAccess().getRefPortCrossReference_0_0_0()); 
-	}
-
-)
-)
-    |	otherlv_1='undefined' 
-    {
-    	newLeafNode(otherlv_1, grammarAccess.getInputExpressionAccess().getUndefinedKeyword_0_1());
-    }
-)	otherlv_2='.' 
-    {
-    	newLeafNode(otherlv_2, grammarAccess.getInputExpressionAccess().getFullStopKeyword_1());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getInputExpressionAccess().getFailureExprInFailureExprParserRuleCall_2_0()); 
-	    }
-		lv_failureExpr_3_0=ruleInFailureExpr		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getInputExpressionRule());
-	        }
-       		set(
-       			$current, 
-       			"failureExpr",
-        		lv_failureExpr_3_0, 
-        		"InFailureExpr");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-))
-;
-
-
-
-
-
-// Entry rule entryRuleOutputExpression
-entryRuleOutputExpression returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getOutputExpressionRule()); }
-	 iv_ruleOutputExpression=ruleOutputExpression 
-	 { $current=$iv_ruleOutputExpression.current; } 
-	 EOF 
-;
-
-// Rule OutputExpression
-ruleOutputExpression returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-(((
-(
-		{
-			if ($current==null) {
-	            $current = createModelElement(grammarAccess.getOutputExpressionRule());
-	        }
-        }
-	otherlv_0=RULE_ID
-	{
-		newLeafNode(otherlv_0, grammarAccess.getOutputExpressionAccess().getRefPortCrossReference_0_0_0()); 
-	}
-
-)
-)
-    |	otherlv_1='undefined' 
-    {
-    	newLeafNode(otherlv_1, grammarAccess.getOutputExpressionAccess().getUndefinedKeyword_0_1());
-    }
-)	otherlv_2='.' 
-    {
-    	newLeafNode(otherlv_2, grammarAccess.getOutputExpressionAccess().getFullStopKeyword_1());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getOutputExpressionAccess().getFailureExprOutFailureExprParserRuleCall_2_0()); 
-	    }
-		lv_failureExpr_3_0=ruleOutFailureExpr		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getOutputExpressionRule());
-	        }
-       		set(
-       			$current, 
-       			"failureExpr",
-        		lv_failureExpr_3_0, 
-        		"OutFailureExpr");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-))
-;
-
-
-
-
-
-// Entry rule entryRuleInFailureExpr
-entryRuleInFailureExpr returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getInFailureExprRule()); }
-	 iv_ruleInFailureExpr=ruleInFailureExpr 
-	 { $current=$iv_ruleInFailureExpr.current; } 
-	 EOF 
-;
-
-// Rule InFailureExpr
-ruleInFailureExpr returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-(
-		{ 
-	        newCompositeNode(grammarAccess.getInFailureExprAccess().getFailuresWildcardDefinitionParserRuleCall_0_0()); 
-	    }
-		lv_failures_0_0=ruleWildcardDefinition		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getInFailureExprRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_0_0, 
-        		"WildcardDefinition");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)
-    |(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getInFailureExprAccess().getFailuresNoFailureDefinitionParserRuleCall_1_0()); 
-	    }
-		lv_failures_1_0=ruleNoFailureDefinition		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getInFailureExprRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_1_0, 
-        		"NoFailureDefinition");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)
-    |(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getInFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_2_0()); 
-	    }
-		lv_failures_2_0=ruleFailureDefinition		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getInFailureExprRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_2_0, 
-        		"FailureDefinition");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)
-    |(	otherlv_3='{' 
-    {
-    	newLeafNode(otherlv_3, grammarAccess.getInFailureExprAccess().getLeftCurlyBracketKeyword_3_0());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getInFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_3_1_0()); 
-	    }
-		lv_failures_4_0=ruleFailureDefinition		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getInFailureExprRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_4_0, 
-        		"FailureDefinition");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)(	otherlv_5=',' 
-    {
-    	newLeafNode(otherlv_5, grammarAccess.getInFailureExprAccess().getCommaKeyword_3_2_0());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getInFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_3_2_1_0()); 
-	    }
-		lv_failures_6_0=ruleFailureDefinition		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getInFailureExprRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_6_0, 
-        		"FailureDefinition");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-))+	otherlv_7='}' 
-    {
-    	newLeafNode(otherlv_7, grammarAccess.getInFailureExprAccess().getRightCurlyBracketKeyword_3_3());
-    }
-)
-    |(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getInFailureExprAccess().getFailuresVariableDefinitionParserRuleCall_4_0()); 
-	    }
-		lv_failures_8_0=ruleVariableDefinition		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getInFailureExprRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_8_0, 
-        		"VariableDefinition");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-))
-;
-
-
-
-
-
-// Entry rule entryRuleOutFailureExpr
-entryRuleOutFailureExpr returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getOutFailureExprRule()); }
-	 iv_ruleOutFailureExpr=ruleOutFailureExpr 
-	 { $current=$iv_ruleOutFailureExpr.current; } 
-	 EOF 
-;
-
-// Rule OutFailureExpr
-ruleOutFailureExpr returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-(
-		{ 
-	        newCompositeNode(grammarAccess.getOutFailureExprAccess().getFailuresNoFailureDefinitionParserRuleCall_0_0()); 
-	    }
-		lv_failures_0_0=ruleNoFailureDefinition		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getOutFailureExprRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_0_0, 
-        		"NoFailureDefinition");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)
-    |(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getOutFailureExprAccess().getFailuresComplexNofailureDefinitionParserRuleCall_1_0()); 
-	    }
-		lv_failures_1_0=ruleComplexNofailureDefinition		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getOutFailureExprRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_1_0, 
-        		"ComplexNofailureDefinition");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)
-    |(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getOutFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_2_0()); 
-	    }
-		lv_failures_2_0=ruleFailureDefinition		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getOutFailureExprRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_2_0, 
-        		"FailureDefinition");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)
-    |(	otherlv_3='{' 
-    {
-    	newLeafNode(otherlv_3, grammarAccess.getOutFailureExprAccess().getLeftCurlyBracketKeyword_3_0());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getOutFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_3_1_0()); 
-	    }
-		lv_failures_4_0=ruleFailureDefinition		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getOutFailureExprRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_4_0, 
-        		"FailureDefinition");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)(	otherlv_5=',' 
-    {
-    	newLeafNode(otherlv_5, grammarAccess.getOutFailureExprAccess().getCommaKeyword_3_2_0());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getOutFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_3_2_1_0()); 
-	    }
-		lv_failures_6_0=ruleFailureDefinition		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getOutFailureExprRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_6_0, 
-        		"FailureDefinition");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-))+	otherlv_7='}' 
-    {
-    	newLeafNode(otherlv_7, grammarAccess.getOutFailureExprAccess().getRightCurlyBracketKeyword_3_3());
-    }
-)
-    |(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getOutFailureExprAccess().getFailuresVariableDefinitionParserRuleCall_4_0()); 
-	    }
-		lv_failures_8_0=ruleVariableDefinition		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getOutFailureExprRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_8_0, 
-        		"VariableDefinition");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-))
-;
-
-
-
-
-
-
-
-// Entry rule entryRuleFailureDefinition
-entryRuleFailureDefinition returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getFailureDefinitionRule()); }
-	 iv_ruleFailureDefinition=ruleFailureDefinition 
-	 { $current=$iv_ruleFailureDefinition.current; } 
-	 EOF 
-;
-
-// Rule FailureDefinition
-ruleFailureDefinition returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-    {
-        $current = forceCreateModelElement(
-            grammarAccess.getFailureDefinitionAccess().getFailureDefinitionAction_0(),
-            $current);
-    }
-)(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getFailureDefinitionAccess().getTypeActualFailureTypeEnumRuleCall_1_0()); 
-	    }
-		lv_type_1_0=ruleActualFailureType		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getFailureDefinitionRule());
-	        }
-       		set(
-       			$current, 
-       			"type",
-        		lv_type_1_0, 
-        		"ActualFailureType");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)(	otherlv_2='.' 
-    {
-    	newLeafNode(otherlv_2, grammarAccess.getFailureDefinitionAccess().getFullStopKeyword_2_0());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getFailureDefinitionAccess().getAcidAvoidableACIDavoidableParserRuleCall_2_1_0()); 
-	    }
-		lv_acidAvoidable_3_0=ruleACIDavoidable		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getFailureDefinitionRule());
-	        }
-       		set(
-       			$current, 
-       			"acidAvoidable",
-        		lv_acidAvoidable_3_0, 
-        		"ACIDavoidable");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-))?)
-;
-
-
-
-
-
-// Entry rule entryRuleNoFailureDefinition
-entryRuleNoFailureDefinition returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getNoFailureDefinitionRule()); }
-	 iv_ruleNoFailureDefinition=ruleNoFailureDefinition 
-	 { $current=$iv_ruleNoFailureDefinition.current; } 
-	 EOF 
-;
-
-// Rule NoFailureDefinition
-ruleNoFailureDefinition returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-    {
-        $current = forceCreateModelElement(
-            grammarAccess.getNoFailureDefinitionAccess().getNoFailureDefinitionAction_0(),
-            $current);
-    }
-)	otherlv_1='noFailure' 
-    {
-    	newLeafNode(otherlv_1, grammarAccess.getNoFailureDefinitionAccess().getNoFailureKeyword_1());
-    }
-)
-;
-
-
-
-
-
-// Entry rule entryRuleComplexNofailureDefinition
-entryRuleComplexNofailureDefinition returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getComplexNofailureDefinitionRule()); }
-	 iv_ruleComplexNofailureDefinition=ruleComplexNofailureDefinition 
-	 { $current=$iv_ruleComplexNofailureDefinition.current; } 
-	 EOF 
-;
-
-// Rule ComplexNofailureDefinition
-ruleComplexNofailureDefinition returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-    {
-        $current = forceCreateModelElement(
-            grammarAccess.getComplexNofailureDefinitionAccess().getNoFailureDefinitionAction_0(),
-            $current);
-    }
-)	otherlv_1='noFailure' 
-    {
-    	newLeafNode(otherlv_1, grammarAccess.getComplexNofailureDefinitionAccess().getNoFailureKeyword_1());
-    }
-	otherlv_2='.' 
-    {
-    	newLeafNode(otherlv_2, grammarAccess.getComplexNofailureDefinitionAccess().getFullStopKeyword_2());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getComplexNofailureDefinitionAccess().getAcidMitigationACIDMitigationParserRuleCall_3_0()); 
-	    }
-		lv_acidMitigation_3_0=ruleACIDMitigation		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getComplexNofailureDefinitionRule());
-	        }
-       		set(
-       			$current, 
-       			"acidMitigation",
-        		lv_acidMitigation_3_0, 
-        		"ACIDMitigation");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-))
-;
-
-
-
-
-
-// Entry rule entryRuleWildcardDefinition
-entryRuleWildcardDefinition returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getWildcardDefinitionRule()); }
-	 iv_ruleWildcardDefinition=ruleWildcardDefinition 
-	 { $current=$iv_ruleWildcardDefinition.current; } 
-	 EOF 
-;
-
-// Rule WildcardDefinition
-ruleWildcardDefinition returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-    {
-        $current = forceCreateModelElement(
-            grammarAccess.getWildcardDefinitionAccess().getWildcardDefinitionAction_0(),
-            $current);
-    }
-)	otherlv_1='wildcard' 
-    {
-    	newLeafNode(otherlv_1, grammarAccess.getWildcardDefinitionAccess().getWildcardKeyword_1());
-    }
-)
-;
-
-
-
-
-
-// Entry rule entryRuleVariableDefinition
-entryRuleVariableDefinition returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getVariableDefinitionRule()); }
-	 iv_ruleVariableDefinition=ruleVariableDefinition 
-	 { $current=$iv_ruleVariableDefinition.current; } 
-	 EOF 
-;
-
-// Rule VariableDefinition
-ruleVariableDefinition returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-    {
-        $current = forceCreateModelElement(
-            grammarAccess.getVariableDefinitionAccess().getVariableDefinitionAction_0(),
-            $current);
-    }
-)(
-(
-		lv_variableName_1_0=RULE_ID
-		{
-			newLeafNode(lv_variableName_1_0, grammarAccess.getVariableDefinitionAccess().getVariableNameIDTerminalRuleCall_1_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getVariableDefinitionRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"variableName",
-        		lv_variableName_1_0, 
-        		"ID");
-	    }
-
-)
-))
-;
-
-
-
-
-
-// Entry rule entryRuleACIDavoidable
-entryRuleACIDavoidable returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getACIDavoidableRule()); }
-	 iv_ruleACIDavoidable=ruleACIDavoidable 
-	 { $current=$iv_ruleACIDavoidable.current; } 
-	 EOF 
-;
-
-// Rule ACIDavoidable
-ruleACIDavoidable returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-(
-		{ 
-	        newCompositeNode(grammarAccess.getACIDavoidableAccess().getAAavoidableEnumRuleCall_0_0()); 
-	    }
-		lv_a_0_0=ruleAavoidable		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getACIDavoidableRule());
-	        }
-       		set(
-       			$current, 
-       			"a",
-        		lv_a_0_0, 
-        		"Aavoidable");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)	otherlv_1='.' 
-    {
-    	newLeafNode(otherlv_1, grammarAccess.getACIDavoidableAccess().getFullStopKeyword_1());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getACIDavoidableAccess().getCCavoidableEnumRuleCall_2_0()); 
-	    }
-		lv_c_2_0=ruleCavoidable		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getACIDavoidableRule());
-	        }
-       		set(
-       			$current, 
-       			"c",
-        		lv_c_2_0, 
-        		"Cavoidable");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)	otherlv_3='.' 
-    {
-    	newLeafNode(otherlv_3, grammarAccess.getACIDavoidableAccess().getFullStopKeyword_3());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getACIDavoidableAccess().getIIavoidableEnumRuleCall_4_0()); 
-	    }
-		lv_i_4_0=ruleIavoidable		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getACIDavoidableRule());
-	        }
-       		set(
-       			$current, 
-       			"i",
-        		lv_i_4_0, 
-        		"Iavoidable");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)	otherlv_5='.' 
-    {
-    	newLeafNode(otherlv_5, grammarAccess.getACIDavoidableAccess().getFullStopKeyword_5());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getACIDavoidableAccess().getDDavoidableEnumRuleCall_6_0()); 
-	    }
-		lv_d_6_0=ruleDavoidable		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getACIDavoidableRule());
-	        }
-       		set(
-       			$current, 
-       			"d",
-        		lv_d_6_0, 
-        		"Davoidable");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-))
-;
-
-
-
-
-
-// Entry rule entryRuleACIDMitigation
-entryRuleACIDMitigation returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getACIDMitigationRule()); }
-	 iv_ruleACIDMitigation=ruleACIDMitigation 
-	 { $current=$iv_ruleACIDMitigation.current; } 
-	 EOF 
-;
-
-// Rule ACIDMitigation
-ruleACIDMitigation returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-(
-		{ 
-	        newCompositeNode(grammarAccess.getACIDMitigationAccess().getAAmitigationEnumRuleCall_0_0()); 
-	    }
-		lv_a_0_0=ruleAmitigation		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getACIDMitigationRule());
-	        }
-       		set(
-       			$current, 
-       			"a",
-        		lv_a_0_0, 
-        		"Amitigation");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)	otherlv_1='.' 
-    {
-    	newLeafNode(otherlv_1, grammarAccess.getACIDMitigationAccess().getFullStopKeyword_1());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getACIDMitigationAccess().getCCmitigationEnumRuleCall_2_0()); 
-	    }
-		lv_c_2_0=ruleCmitigation		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getACIDMitigationRule());
-	        }
-       		set(
-       			$current, 
-       			"c",
-        		lv_c_2_0, 
-        		"Cmitigation");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)	otherlv_3='.' 
-    {
-    	newLeafNode(otherlv_3, grammarAccess.getACIDMitigationAccess().getFullStopKeyword_3());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getACIDMitigationAccess().getIImitigationEnumRuleCall_4_0()); 
-	    }
-		lv_i_4_0=ruleImitigation		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getACIDMitigationRule());
-	        }
-       		set(
-       			$current, 
-       			"i",
-        		lv_i_4_0, 
-        		"Imitigation");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)	otherlv_5='.' 
-    {
-    	newLeafNode(otherlv_5, grammarAccess.getACIDMitigationAccess().getFullStopKeyword_5());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getACIDMitigationAccess().getDDmitigationEnumRuleCall_6_0()); 
-	    }
-		lv_d_6_0=ruleDmitigation		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getACIDMitigationRule());
-	        }
-       		set(
-       			$current, 
-       			"d",
-        		lv_d_6_0, 
-        		"Dmitigation");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-))
-;
-
-
-
-
-
-
-
-
-
-// Rule ActualFailureType
-ruleActualFailureType returns [Enumerator current=null] 
-    @init { enterRule(); }
-    @after { leaveRule(); }:
-((	enumLiteral_0='early' 
-	{
-        $current = grammarAccess.getActualFailureTypeAccess().getEARLYEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_0, grammarAccess.getActualFailureTypeAccess().getEARLYEnumLiteralDeclaration_0()); 
-    }
-)
-    |(	enumLiteral_1='late' 
-	{
-        $current = grammarAccess.getActualFailureTypeAccess().getLATEEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_1, grammarAccess.getActualFailureTypeAccess().getLATEEnumLiteralDeclaration_1()); 
-    }
-)
-    |(	enumLiteral_2='commission' 
-	{
-        $current = grammarAccess.getActualFailureTypeAccess().getCOMMISSIONEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_2, grammarAccess.getActualFailureTypeAccess().getCOMMISSIONEnumLiteralDeclaration_2()); 
-    }
-)
-    |(	enumLiteral_3='omission' 
-	{
-        $current = grammarAccess.getActualFailureTypeAccess().getOMISSIONEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_3, grammarAccess.getActualFailureTypeAccess().getOMISSIONEnumLiteralDeclaration_3()); 
-    }
-)
-    |(	enumLiteral_4='valueSubtle' 
-	{
-        $current = grammarAccess.getActualFailureTypeAccess().getVALUE_SUBTLEEnumLiteralDeclaration_4().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_4, grammarAccess.getActualFailureTypeAccess().getVALUE_SUBTLEEnumLiteralDeclaration_4()); 
-    }
-)
-    |(	enumLiteral_5='valueCoarse' 
-	{
-        $current = grammarAccess.getActualFailureTypeAccess().getVALUE_COARSEEnumLiteralDeclaration_5().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_5, grammarAccess.getActualFailureTypeAccess().getVALUE_COARSEEnumLiteralDeclaration_5()); 
-    }
-));
-
-
-
-
-
-
-
-// Rule Aavoidable
-ruleAavoidable returns [Enumerator current=null] 
-    @init { enterRule(); }
-    @after { leaveRule(); }:
-((	enumLiteral_0='incompletion' 
-	{
-        $current = grammarAccess.getAavoidableAccess().getINCOMPLETIONEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_0, grammarAccess.getAavoidableAccess().getINCOMPLETIONEnumLiteralDeclaration_0()); 
-    }
-)
-    |(	enumLiteral_1='none' 
-	{
-        $current = grammarAccess.getAavoidableAccess().getNONEEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_1, grammarAccess.getAavoidableAccess().getNONEEnumLiteralDeclaration_1()); 
-    }
-)
-    |(	enumLiteral_2='unspecified' 
-	{
-        $current = grammarAccess.getAavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_2, grammarAccess.getAavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2()); 
-    }
-));
-
-
-
-// Rule Cavoidable
-ruleCavoidable returns [Enumerator current=null] 
-    @init { enterRule(); }
-    @after { leaveRule(); }:
-((	enumLiteral_0='inconsistency' 
-	{
-        $current = grammarAccess.getCavoidableAccess().getINCONSISTENCYEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_0, grammarAccess.getCavoidableAccess().getINCONSISTENCYEnumLiteralDeclaration_0()); 
-    }
-)
-    |(	enumLiteral_1='none' 
-	{
-        $current = grammarAccess.getCavoidableAccess().getNONEEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_1, grammarAccess.getCavoidableAccess().getNONEEnumLiteralDeclaration_1()); 
-    }
-)
-    |(	enumLiteral_2='unspecified' 
-	{
-        $current = grammarAccess.getCavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_2, grammarAccess.getCavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2()); 
-    }
-));
-
-
-
-// Rule Iavoidable
-ruleIavoidable returns [Enumerator current=null] 
-    @init { enterRule(); }
-    @after { leaveRule(); }:
-((	enumLiteral_0='interference' 
-	{
-        $current = grammarAccess.getIavoidableAccess().getINTERFERENCEEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_0, grammarAccess.getIavoidableAccess().getINTERFERENCEEnumLiteralDeclaration_0()); 
-    }
-)
-    |(	enumLiteral_1='none' 
-	{
-        $current = grammarAccess.getIavoidableAccess().getNONEEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_1, grammarAccess.getIavoidableAccess().getNONEEnumLiteralDeclaration_1()); 
-    }
-)
-    |(	enumLiteral_2='unspecified' 
-	{
-        $current = grammarAccess.getIavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_2, grammarAccess.getIavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2()); 
-    }
-));
-
-
-
-// Rule Davoidable
-ruleDavoidable returns [Enumerator current=null] 
-    @init { enterRule(); }
-    @after { leaveRule(); }:
-((	enumLiteral_0='impermanence' 
-	{
-        $current = grammarAccess.getDavoidableAccess().getIMPERMANENCEEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_0, grammarAccess.getDavoidableAccess().getIMPERMANENCEEnumLiteralDeclaration_0()); 
-    }
-)
-    |(	enumLiteral_1='none' 
-	{
-        $current = grammarAccess.getDavoidableAccess().getNONEEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_1, grammarAccess.getDavoidableAccess().getNONEEnumLiteralDeclaration_1()); 
-    }
-)
-    |(	enumLiteral_2='unspecified' 
-	{
-        $current = grammarAccess.getDavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_2, grammarAccess.getDavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2()); 
-    }
-));
-
-
-
-// Rule Amitigation
-ruleAmitigation returns [Enumerator current=null] 
-    @init { enterRule(); }
-    @after { leaveRule(); }:
-((	enumLiteral_0='all_or_nothing' 
-	{
-        $current = grammarAccess.getAmitigationAccess().getALL_OR_NOTHINGEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_0, grammarAccess.getAmitigationAccess().getALL_OR_NOTHINGEnumLiteralDeclaration_0()); 
-    }
-)
-    |(	enumLiteral_1='all_or_compensation' 
-	{
-        $current = grammarAccess.getAmitigationAccess().getALL_OR_COMPENSATIONEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_1, grammarAccess.getAmitigationAccess().getALL_OR_COMPENSATIONEnumLiteralDeclaration_1()); 
-    }
-)
-    |(	enumLiteral_2='none' 
-	{
-        $current = grammarAccess.getAmitigationAccess().getNONEEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_2, grammarAccess.getAmitigationAccess().getNONEEnumLiteralDeclaration_2()); 
-    }
-)
-    |(	enumLiteral_3='unspecified' 
-	{
-        $current = grammarAccess.getAmitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_3, grammarAccess.getAmitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3()); 
-    }
-));
-
-
-
-// Rule Cmitigation
-ruleCmitigation returns [Enumerator current=null] 
-    @init { enterRule(); }
-    @after { leaveRule(); }:
-((	enumLiteral_0='full_consistency' 
-	{
-        $current = grammarAccess.getCmitigationAccess().getFULL_CONSISTENCYEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_0, grammarAccess.getCmitigationAccess().getFULL_CONSISTENCYEnumLiteralDeclaration_0()); 
-    }
-)
-    |(	enumLiteral_1='range_violation_allowed' 
-	{
-        $current = grammarAccess.getCmitigationAccess().getRANGE_VIOLATION_ALLOWEDEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_1, grammarAccess.getCmitigationAccess().getRANGE_VIOLATION_ALLOWEDEnumLiteralDeclaration_1()); 
-    }
-)
-    |(	enumLiteral_2='none' 
-	{
-        $current = grammarAccess.getCmitigationAccess().getNONEEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_2, grammarAccess.getCmitigationAccess().getNONEEnumLiteralDeclaration_2()); 
-    }
-)
-    |(	enumLiteral_3='unspecified' 
-	{
-        $current = grammarAccess.getCmitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_3, grammarAccess.getCmitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3()); 
-    }
-));
-
-
-
-// Rule Imitigation
-ruleImitigation returns [Enumerator current=null] 
-    @init { enterRule(); }
-    @after { leaveRule(); }:
-((	enumLiteral_0='serializable' 
-	{
-        $current = grammarAccess.getImitigationAccess().getSERIALIZABLEEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_0, grammarAccess.getImitigationAccess().getSERIALIZABLEEnumLiteralDeclaration_0()); 
-    }
-)
-    |(	enumLiteral_1='portable_level' 
-	{
-        $current = grammarAccess.getImitigationAccess().getPORTABLE_LEVELEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_1, grammarAccess.getImitigationAccess().getPORTABLE_LEVELEnumLiteralDeclaration_1()); 
-    }
-)
-    |(	enumLiteral_2='none' 
-	{
-        $current = grammarAccess.getImitigationAccess().getNONEEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_2, grammarAccess.getImitigationAccess().getNONEEnumLiteralDeclaration_2()); 
-    }
-)
-    |(	enumLiteral_3='unspecified' 
-	{
-        $current = grammarAccess.getImitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_3, grammarAccess.getImitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3()); 
-    }
-));
-
-
-
-// Rule Dmitigation
-ruleDmitigation returns [Enumerator current=null] 
-    @init { enterRule(); }
-    @after { leaveRule(); }:
-((	enumLiteral_0='no_loss' 
-	{
-        $current = grammarAccess.getDmitigationAccess().getNO_LOSSEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_0, grammarAccess.getDmitigationAccess().getNO_LOSSEnumLiteralDeclaration_0()); 
-    }
-)
-    |(	enumLiteral_1='partial_loss_allowed' 
-	{
-        $current = grammarAccess.getDmitigationAccess().getPARTIAL_LOSS_ALLOWEDEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_1, grammarAccess.getDmitigationAccess().getPARTIAL_LOSS_ALLOWEDEnumLiteralDeclaration_1()); 
-    }
-)
-    |(	enumLiteral_2='none' 
-	{
-        $current = grammarAccess.getDmitigationAccess().getNONEEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_2, grammarAccess.getDmitigationAccess().getNONEEnumLiteralDeclaration_2()); 
-    }
-)
-    |(	enumLiteral_3='unspecified' 
-	{
-        $current = grammarAccess.getDmitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_3, grammarAccess.getDmitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3()); 
-    }
-));
-
-
-
-RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
-
-RULE_INT : ('0'..'9')+;
-
-RULE_STRING : ('"' ('\\' .|~(('\\'|'"')))* '"'|'\'' ('\\' .|~(('\\'|'\'')))* '\'');
-
-RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
-
-RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?;
-
-RULE_WS : (' '|'\t'|'\r'|'\n')+;
-
-RULE_ANY_OTHER : .;
-
-
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.tokens b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.tokens
deleted file mode 100644
index c1e6535a13361b4550e2cba316ad87bf454451eb..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.tokens
+++ /dev/null
@@ -1,67 +0,0 @@
-','=14
-'->'=12
-'.'=16
-';'=13
-'FLA:'=11
-'all_or_compensation'=34
-'all_or_nothing'=33
-'commission'=23
-'early'=21
-'full_consistency'=35
-'impermanence'=32
-'incompletion'=27
-'inconsistency'=30
-'interference'=31
-'late'=22
-'noFailure'=19
-'no_loss'=39
-'none'=28
-'omission'=24
-'partial_loss_allowed'=40
-'portable_level'=38
-'range_violation_allowed'=36
-'serializable'=37
-'undefined'=15
-'unspecified'=29
-'valueCoarse'=26
-'valueSubtle'=25
-'wildcard'=20
-'{'=17
-'}'=18
-RULE_ANY_OTHER=10
-RULE_ID=4
-RULE_INT=5
-RULE_ML_COMMENT=7
-RULE_SL_COMMENT=8
-RULE_STRING=6
-RULE_WS=9
-T__11=11
-T__12=12
-T__13=13
-T__14=14
-T__15=15
-T__16=16
-T__17=17
-T__18=18
-T__19=19
-T__20=20
-T__21=21
-T__22=22
-T__23=23
-T__24=24
-T__25=25
-T__26=26
-T__27=27
-T__28=28
-T__29=29
-T__30=30
-T__31=31
-T__32=32
-T__33=33
-T__34=34
-T__35=35
-T__36=36
-T__37=37
-T__38=38
-T__39=39
-T__40=40
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDslLexer$DFA12.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDslLexer$DFA12.class
deleted file mode 100644
index 5dc2cb3f2f4197b9b59684fe24fbf6f38f97d693..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDslLexer$DFA12.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDslLexer.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDslLexer.class
deleted file mode 100644
index 952cfcb998fc33b5fe4fcf3d34906e6918fb9547..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDslLexer.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDslParser.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDslParser.class
deleted file mode 100644
index 9fa1db7f65b8cdff161185a82a4d1f92dfbf2b4b..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDslParser.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/scoping/.gitignore b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/scoping/.gitignore
deleted file mode 100644
index 5e9b15c6b73e5c88df7460efc55fbcb7c08466c0..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/scoping/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.FlaDslScopeProvider.java._trace
-/.FlaDslScopeProvider.xtendbin
-/FlaDslScopeProvider.java
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/scoping/FlaDslScopeProvider.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/scoping/FlaDslScopeProvider.class
deleted file mode 100644
index 01a8927b36608957ed88e9a959e37f008bbcfa79..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/scoping/FlaDslScopeProvider.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/serializer/FlaDslSemanticSequencer.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/serializer/FlaDslSemanticSequencer.class
deleted file mode 100644
index 288c95201257ad44f12c96b508974251c003b8a0..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/serializer/FlaDslSemanticSequencer.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/serializer/FlaDslSyntacticSequencer.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/serializer/FlaDslSyntacticSequencer.class
deleted file mode 100644
index fa8cf89e73415735cfccd346886eff72b53b0547..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/serializer/FlaDslSyntacticSequencer.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$ACIDMitigationElements.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$ACIDMitigationElements.class
deleted file mode 100644
index ba3e77dbce9ff5b4a159d1fb16304ed395542b22..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$ACIDMitigationElements.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$ACIDavoidableElements.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$ACIDavoidableElements.class
deleted file mode 100644
index 371bdf0825fff37393039f95241c2cc8411ec572..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$ACIDavoidableElements.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$AavoidableElements.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$AavoidableElements.class
deleted file mode 100644
index af942a6cec5728f589ea931365e9b9e068c7beb0..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$AavoidableElements.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$ActualFailureTypeElements.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$ActualFailureTypeElements.class
deleted file mode 100644
index f33f4d9678887bfa310fb1555a812af26aa19517..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$ActualFailureTypeElements.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$AmitigationElements.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$AmitigationElements.class
deleted file mode 100644
index 50457955515da4406fd9d9fc9fa8f7bb4c1436e1..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$AmitigationElements.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$BehaviourElements.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$BehaviourElements.class
deleted file mode 100644
index 75ad9ebad59eeb47b0e12c1d49ec822872dab6d2..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$BehaviourElements.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$CavoidableElements.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$CavoidableElements.class
deleted file mode 100644
index 4d15e78d0508665f1033d373b07f6ea79e9983de..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$CavoidableElements.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$CmitigationElements.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$CmitigationElements.class
deleted file mode 100644
index 45ca1b5f962fbc6cbdd993f287f96a31b61ecb31..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$CmitigationElements.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$ComplexNofailureDefinitionElements.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$ComplexNofailureDefinitionElements.class
deleted file mode 100644
index df60dc39e12d4e092f8c72df7b43417b52c5b5bb..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$ComplexNofailureDefinitionElements.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$DavoidableElements.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$DavoidableElements.class
deleted file mode 100644
index 6d8e2f172f53ebb562af97a77677d3aeb684c350..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$DavoidableElements.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$DefinitionsElements.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$DefinitionsElements.class
deleted file mode 100644
index 8bf3540ba2a1666f26892210469609a3c4e60db3..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$DefinitionsElements.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$DmitigationElements.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$DmitigationElements.class
deleted file mode 100644
index 10a03cb5d4934a0a3c1a69b341bd8e778ef83d4e..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$DmitigationElements.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$ExpressionElements.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$ExpressionElements.class
deleted file mode 100644
index 70c979af4a8c0dc384cc93f5d1817a0f1172eb29..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$ExpressionElements.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$FQNElements.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$FQNElements.class
deleted file mode 100644
index 077a978dc3898624164e0992a3b45de130b7f647..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$FQNElements.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$FailureDefinitionElements.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$FailureDefinitionElements.class
deleted file mode 100644
index 93cdf4423975839397faa56d55c7fc18a1d2743f..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$FailureDefinitionElements.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$FailureTypeElements.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$FailureTypeElements.class
deleted file mode 100644
index c24275b6807008f390cd3447b203be962ea6fc93..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$FailureTypeElements.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$IavoidableElements.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$IavoidableElements.class
deleted file mode 100644
index 68beba19b2960d9b4bcb1bff9f546363a03bb028..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$IavoidableElements.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$ImitigationElements.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$ImitigationElements.class
deleted file mode 100644
index d7b093ce3f8505435657600470e6fb93766cb22c..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$ImitigationElements.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$InFailureExprElements.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$InFailureExprElements.class
deleted file mode 100644
index 681355031fa2e670dba5e468f29e74e53b1964cc..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$InFailureExprElements.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$InputExpressionElements.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$InputExpressionElements.class
deleted file mode 100644
index 37fb81b52116cb82626fb3f47dc281750e448983..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$InputExpressionElements.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$LhsElements.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$LhsElements.class
deleted file mode 100644
index 3b305da9e187f99254c19671fdb5e03e35b2a6a0..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$LhsElements.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$NoFailureDefinitionElements.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$NoFailureDefinitionElements.class
deleted file mode 100644
index c32e3b8d11805b655ea6372c47938c041ca8e421..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$NoFailureDefinitionElements.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$NoFailureTypeElements.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$NoFailureTypeElements.class
deleted file mode 100644
index e21ed7cbb26349ea883817cc0b73bc3f91b5c642..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$NoFailureTypeElements.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$OutFailureExprElements.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$OutFailureExprElements.class
deleted file mode 100644
index c2977a553a088d44f7ee5a9b0c8ba31e8d58781f..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$OutFailureExprElements.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$OutputExpressionElements.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$OutputExpressionElements.class
deleted file mode 100644
index caf14818bc566c2d04b09b6dbcb242ae71e6311e..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$OutputExpressionElements.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$RhsElements.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$RhsElements.class
deleted file mode 100644
index c0e753f0254508263a272a0bc2d3558f8bbe7ee6..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$RhsElements.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$VariableDefinitionElements.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$VariableDefinitionElements.class
deleted file mode 100644
index d10aae63d1250924cb7c4a12a95ae282947344bc..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$VariableDefinitionElements.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$WildcardDefinitionElements.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$WildcardDefinitionElements.class
deleted file mode 100644
index 54d5405ef04b7ddb712bca724b62fbf6b2e334cd..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$WildcardDefinitionElements.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$WildcardElements.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$WildcardElements.class
deleted file mode 100644
index 9d8c797e6e9fca01498737588fe305979a5a3030..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess$WildcardElements.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess.class
deleted file mode 100644
index f75427c80542ee19e397a9f487301b2d0eca6a16..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/services/FlaDslGrammarAccess.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/validation/.gitignore b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/validation/.gitignore
deleted file mode 100644
index 7311c130584a59ac9333b6922e8852ad511212f5..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/validation/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.FlaDslValidator.java._trace
-/.FlaDslValidator.xtendbin
-/FlaDslValidator.java
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/validation/AbstractFlaDslValidator.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/validation/AbstractFlaDslValidator.class
deleted file mode 100644
index 6ca5b0437cf91dc2239fd54a1307adbe98432049..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/validation/AbstractFlaDslValidator.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/validation/FlaDslValidator.class b/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/validation/FlaDslValidator.class
deleted file mode 100644
index 083c80310a3fedfcde624e173166716983615d7e..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/bin/org/polarsys/chess/xtext/validation/FlaDslValidator.class and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/model/generated/FlaDsl.ecore b/plugins/fla/org.polarsys.chess.xtext.fladsl/model/generated/FlaDsl.ecore
deleted file mode 100644
index 299a589ddbe7b00f50e99e0b2540735381815b82..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/model/generated/FlaDsl.ecore
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="flaDsl" nsURI="http://www.intecs.org/chess/xtext/FlaDsl" nsPrefix="flaDsl">
-  <eClassifiers xsi:type="ecore:EClass" name="Behaviour">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="rules" upperBound="-1"
-        eType="#//Expression" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Expression">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="lhs" eType="#//Lhs" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="rhs" eType="#//Rhs" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Lhs">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="failures" upperBound="-1"
-        eType="#//InputExpression" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Rhs">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="failures" upperBound="-1"
-        eType="#//OutputExpression" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="InputExpression">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ref" eType="ecore:EClass platform:/resource/org.eclipse.uml2.uml/model/UML.ecore#//Port"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="failureExpr" eType="#//InFailureExpr"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="OutputExpression">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ref" eType="ecore:EClass platform:/resource/org.eclipse.uml2.uml/model/UML.ecore#//Port"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="failureExpr" eType="#//OutFailureExpr"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="InFailureExpr">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="failures" upperBound="-1"
-        eType="#//Definitions" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="OutFailureExpr">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="failures" upperBound="-1"
-        eType="#//Definitions" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Definitions"/>
-  <eClassifiers xsi:type="ecore:EClass" name="FailureDefinition" eSuperTypes="#//Definitions">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//FailureType"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="acidAvoidable" eType="#//ACIDavoidable"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="NoFailureDefinition" eSuperTypes="#//Definitions #//ComplexNofailureDefinition">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="acidMitigation" eType="#//ACIDMitigation"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ComplexNofailureDefinition" eSuperTypes="#//Definitions"/>
-  <eClassifiers xsi:type="ecore:EClass" name="WildcardDefinition" eSuperTypes="#//Definitions"/>
-  <eClassifiers xsi:type="ecore:EClass" name="VariableDefinition" eSuperTypes="#//Definitions">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="variableName" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="FailureType">
-    <eLiterals name="NO_FAILURE" literal="noFailure"/>
-    <eLiterals name="EARLY" value="1" literal="early"/>
-    <eLiterals name="LATE" value="2" literal="late"/>
-    <eLiterals name="COMMISSION" value="3" literal="commission"/>
-    <eLiterals name="OMISSION" value="4" literal="omission"/>
-    <eLiterals name="VALUE_SUBTLE" value="5" literal="valueSubtle"/>
-    <eLiterals name="VALUE_COARSE" value="6" literal="valueCoarse"/>
-    <eLiterals name="WILDCARD" value="7" literal="wildcard"/>
-    <eLiterals name="VARIABLE" value="8" literal="variable"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ACIDavoidable">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="a" eType="#//Aavoidable"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="c" eType="#//Cavoidable"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="i" eType="#//Iavoidable"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="d" eType="#//Davoidable"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="Aavoidable">
-    <eLiterals name="INCOMPLETION" literal="incompletion"/>
-    <eLiterals name="NONE" value="1" literal="none"/>
-    <eLiterals name="UNSPECIFIED" value="2" literal="unspecified"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="Cavoidable">
-    <eLiterals name="INCONSISTENCY" literal="inconsistency"/>
-    <eLiterals name="NONE" value="1" literal="none"/>
-    <eLiterals name="UNSPECIFIED" value="2" literal="unspecified"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="Iavoidable">
-    <eLiterals name="INTERFERENCE" literal="interference"/>
-    <eLiterals name="NONE" value="1" literal="none"/>
-    <eLiterals name="UNSPECIFIED" value="2" literal="unspecified"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="Davoidable">
-    <eLiterals name="IMPERMANENCE" literal="impermanence"/>
-    <eLiterals name="NONE" value="1" literal="none"/>
-    <eLiterals name="UNSPECIFIED" value="2" literal="unspecified"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ACIDMitigation">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="a" eType="#//Amitigation"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="c" eType="#//Cmitigation"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="i" eType="#//Imitigation"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="d" eType="#//Dmitigation"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="Amitigation">
-    <eLiterals name="ALL_OR_NOTHING" literal="all_or_nothing"/>
-    <eLiterals name="ALL_OR_COMPENSATION" value="1" literal="all_or_compensation"/>
-    <eLiterals name="NONE" value="2" literal="none"/>
-    <eLiterals name="UNSPECIFIED" value="3" literal="unspecified"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="Cmitigation">
-    <eLiterals name="FULL_CONSISTENCY" literal="full_consistency"/>
-    <eLiterals name="RANGE_VIOLATION_ALLOWED" value="1" literal="range_violation_allowed"/>
-    <eLiterals name="NONE" value="2" literal="none"/>
-    <eLiterals name="UNSPECIFIED" value="3" literal="unspecified"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="Imitigation">
-    <eLiterals name="SERIALIZABLE" literal="serializable"/>
-    <eLiterals name="PORTABLE_LEVEL" value="1" literal="portable_level"/>
-    <eLiterals name="NONE" value="2" literal="none"/>
-    <eLiterals name="UNSPECIFIED" value="3" literal="unspecified"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="Dmitigation">
-    <eLiterals name="NO_LOSS" literal="no_loss"/>
-    <eLiterals name="PARTIAL_LOSS_ALLOWED" value="1" literal="partial_loss_allowed"/>
-    <eLiterals name="NONE" value="2" literal="none"/>
-    <eLiterals name="UNSPECIFIED" value="3" literal="unspecified"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/model/generated/FlaDsl.genmodel b/plugins/fla/org.polarsys.chess.xtext.fladsl/model/generated/FlaDsl.genmodel
deleted file mode 100644
index 2c3794ba4d140708796c8abb1b780a506ff56611..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/model/generated/FlaDsl.genmodel
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.polarsys.chess.xtext.fladsl/src-gen" editDirectory="/org.polarsys.chess.xtext.fladsl.edit/src"
-    editorDirectory="/org.polarsys.chess.xtext.fladsl.editor/src" modelPluginID="org.polarsys.chess.xtext.fladsl"
-    forceOverwrite="true" modelName="FlaDsl" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="5.0" copyrightFields="false" editPluginID="org.polarsys.chess.xtext.fladsl.edit"
-    editorPluginID="org.polarsys.chess.xtext.fladsl.editor" runtimeVersion="2.11"
-    usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/resource/org.eclipse.uml2.uml/model/UML.genmodel#//uml">
-  <genPackages prefix="FlaDsl" basePackage="org.polarsys.chess.xtext" disposableProviderFactory="true"
-      fileExtensions="fladsl" ecorePackage="FlaDsl.ecore#/">
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="FlaDsl.ecore#//FailureType">
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//FailureType/NO_FAILURE"/>
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//FailureType/EARLY"/>
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//FailureType/LATE"/>
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//FailureType/COMMISSION"/>
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//FailureType/OMISSION"/>
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//FailureType/VALUE_SUBTLE"/>
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//FailureType/VALUE_COARSE"/>
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//FailureType/WILDCARD"/>
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//FailureType/VARIABLE"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="FlaDsl.ecore#//Aavoidable">
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//Aavoidable/INCOMPLETION"/>
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//Aavoidable/NONE"/>
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//Aavoidable/UNSPECIFIED"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="FlaDsl.ecore#//Cavoidable">
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//Cavoidable/INCONSISTENCY"/>
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//Cavoidable/NONE"/>
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//Cavoidable/UNSPECIFIED"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="FlaDsl.ecore#//Iavoidable">
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//Iavoidable/INTERFERENCE"/>
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//Iavoidable/NONE"/>
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//Iavoidable/UNSPECIFIED"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="FlaDsl.ecore#//Davoidable">
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//Davoidable/IMPERMANENCE"/>
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//Davoidable/NONE"/>
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//Davoidable/UNSPECIFIED"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="FlaDsl.ecore#//Amitigation">
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//Amitigation/ALL_OR_NOTHING"/>
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//Amitigation/ALL_OR_COMPENSATION"/>
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//Amitigation/NONE"/>
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//Amitigation/UNSPECIFIED"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="FlaDsl.ecore#//Cmitigation">
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//Cmitigation/FULL_CONSISTENCY"/>
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//Cmitigation/RANGE_VIOLATION_ALLOWED"/>
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//Cmitigation/NONE"/>
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//Cmitigation/UNSPECIFIED"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="FlaDsl.ecore#//Imitigation">
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//Imitigation/SERIALIZABLE"/>
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//Imitigation/PORTABLE_LEVEL"/>
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//Imitigation/NONE"/>
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//Imitigation/UNSPECIFIED"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="FlaDsl.ecore#//Dmitigation">
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//Dmitigation/NO_LOSS"/>
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//Dmitigation/PARTIAL_LOSS_ALLOWED"/>
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//Dmitigation/NONE"/>
-      <genEnumLiterals ecoreEnumLiteral="FlaDsl.ecore#//Dmitigation/UNSPECIFIED"/>
-    </genEnums>
-    <genClasses ecoreClass="FlaDsl.ecore#//Behaviour">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FlaDsl.ecore#//Behaviour/rules"/>
-    </genClasses>
-    <genClasses ecoreClass="FlaDsl.ecore#//Expression">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FlaDsl.ecore#//Expression/lhs"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FlaDsl.ecore#//Expression/rhs"/>
-    </genClasses>
-    <genClasses ecoreClass="FlaDsl.ecore#//Lhs">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FlaDsl.ecore#//Lhs/failures"/>
-    </genClasses>
-    <genClasses ecoreClass="FlaDsl.ecore#//Rhs">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FlaDsl.ecore#//Rhs/failures"/>
-    </genClasses>
-    <genClasses ecoreClass="FlaDsl.ecore#//InputExpression">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference FlaDsl.ecore#//InputExpression/ref"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FlaDsl.ecore#//InputExpression/failureExpr"/>
-    </genClasses>
-    <genClasses ecoreClass="FlaDsl.ecore#//OutputExpression">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference FlaDsl.ecore#//OutputExpression/ref"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FlaDsl.ecore#//OutputExpression/failureExpr"/>
-    </genClasses>
-    <genClasses ecoreClass="FlaDsl.ecore#//InFailureExpr">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FlaDsl.ecore#//InFailureExpr/failures"/>
-    </genClasses>
-    <genClasses ecoreClass="FlaDsl.ecore#//OutFailureExpr">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FlaDsl.ecore#//OutFailureExpr/failures"/>
-    </genClasses>
-    <genClasses ecoreClass="FlaDsl.ecore#//Definitions"/>
-    <genClasses ecoreClass="FlaDsl.ecore#//FailureDefinition">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute FlaDsl.ecore#//FailureDefinition/type"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FlaDsl.ecore#//FailureDefinition/acidAvoidable"/>
-    </genClasses>
-    <genClasses ecoreClass="FlaDsl.ecore#//NoFailureDefinition">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FlaDsl.ecore#//NoFailureDefinition/acidMitigation"/>
-    </genClasses>
-    <genClasses ecoreClass="FlaDsl.ecore#//ComplexNofailureDefinition"/>
-    <genClasses ecoreClass="FlaDsl.ecore#//WildcardDefinition"/>
-    <genClasses ecoreClass="FlaDsl.ecore#//VariableDefinition">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute FlaDsl.ecore#//VariableDefinition/variableName"/>
-    </genClasses>
-    <genClasses ecoreClass="FlaDsl.ecore#//ACIDavoidable">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute FlaDsl.ecore#//ACIDavoidable/a"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute FlaDsl.ecore#//ACIDavoidable/c"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute FlaDsl.ecore#//ACIDavoidable/i"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute FlaDsl.ecore#//ACIDavoidable/d"/>
-    </genClasses>
-    <genClasses ecoreClass="FlaDsl.ecore#//ACIDMitigation">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute FlaDsl.ecore#//ACIDMitigation/a"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute FlaDsl.ecore#//ACIDMitigation/c"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute FlaDsl.ecore#//ACIDMitigation/i"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute FlaDsl.ecore#//ACIDMitigation/d"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/plugin.xml_gen b/plugins/fla/org.polarsys.chess.xtext.fladsl/plugin.xml_gen
index ca15dd9e702379e606b73d568ec5656e45c77d26..eb3f0e7b2c85e3da322cab290bd6e70c3d7d782c 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/plugin.xml_gen
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/plugin.xml_gen
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-  <extension point="org.eclipse.emf.ecore.generated_package">
-    <package 
-       uri = "http://www.intecs.org/chess/xtext/FlaDsl" 
-       class = "org.polarsys.chess.xtext.flaDsl.FlaDslPackage"
-       genModel = "model/generated/FlaDsl.genmodel" /> 
-	
-  </extension>
-
-
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<plugin>
+
+  <extension point="org.eclipse.emf.ecore.generated_package">
+    <package 
+       uri = "http://www.intecs.org/chess/xtext/FlaDsl" 
+       class = "org.polarsys.chess.xtext.flaDsl.FlaDslPackage"
+       genModel = "model/generated/FlaDsl.genmodel" /> 
+	
+  </extension>
+
+
+
+</plugin>
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/pom.xml b/plugins/fla/org.polarsys.chess.xtext.fladsl/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9bd800ae8ee373857ec188c5336ebd8d2372773a
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/pom.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.xtext.fladsl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+  
+  <build>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>exec-maven-plugin</artifactId>
+				<version>1.4.0</version>
+				<executions>
+					<execution>
+						<id>mwe2Launcher</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>java</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<mainClass>org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher</mainClass>
+					<arguments>
+						<argument>/${project.basedir}/src/org/polarsys/chess/xtext/GenerateFlaDsl.mwe2</argument>
+						<argument>-p</argument>
+						<argument>rootPath=/${project.basedir}/..</argument>
+						<argument>-p</argument>
+						<argument>grammarURI=/${project.basedir}/src/org/polarsys/chess/xtext/FlaDsl.xtext</argument>
+						<argument>-p</argument>
+						<argument>runtimeProject=${project.basedir}</argument>
+					</arguments>
+					<classpathScope>compile</classpathScope>
+					<includePluginDependencies>true</includePluginDependencies>
+					<cleanupDaemonThreads>false</cleanupDaemonThreads><!-- see https://bugs.eclipse.org/bugs/show_bug.cgi?id=475098#c3 -->
+				</configuration>
+				<dependencies>
+					<dependency>
+						<groupId>org.eclipse.emf</groupId>
+						<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
+						<version>${mwe2Version}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.eclipse.xtext</groupId>
+						<artifactId>org.eclipse.xtext.common.types</artifactId>
+						<version>${xtextVersion}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.eclipse.xtext</groupId>
+						<artifactId>org.eclipse.xtext.xtext.generator</artifactId>
+						<version>${xtextVersion}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.eclipse.xtext</groupId>
+						<artifactId>org.eclipse.xtext.xbase</artifactId>
+						<version>${xtextVersion}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.eclipse.xtext</groupId>
+						<artifactId>xtext-antlr-generator</artifactId>
+						<version>[2.1.1, 3)</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.xtend</groupId>
+				<artifactId>xtend-maven-plugin</artifactId>
+			</plugin>
+	
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-clean-plugin</artifactId>
+				<configuration>
+					<filesets combine.children="append">
+						<fileset>
+							<directory>${basedir}/../plugin/org.polarsys.chess.xtext.fladslins/src-gen/</directory>
+							<includes>
+								<include>**/*</include>
+							</includes>
+						</fileset>
+						<fileset>
+							<directory>${basedir}/../plugin/org.polarsys.chess.xtext.fladslins.tests/src-gen/</directory>
+							<includes>
+								<include>**/*</include>
+							</includes>
+						</fileset>
+						<fileset>
+							<directory>${basedir}/../plugin/org.polarsys.chess.xtext.fladslins.ui/src-gen/</directory>
+							<includes>
+								<include>**/*</include>
+							</includes>
+						</fileset>
+						<fileset>
+							<directory>${basedir}/../plugin/org.polarsys.chess.xtext.fladslins.ui.tests/src-gen/</directory>
+							<includes>
+								<include>**/*</include>
+							</includes>
+						</fileset>
+						<fileset>
+							<directory>${basedir}/../plugin/org.polarsys.chess.xtext.fladslins/model/generated/</directory>
+						</fileset>
+					</filesets>
+				</configuration>
+			</plugin>
+		</plugins>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.codehaus.mojo
+										</groupId>
+										<artifactId>
+											exec-maven-plugin
+										</artifactId>
+										<versionRange>
+											[1.2.1,)
+										</versionRange>
+										<goals>
+											<goal>java</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
+  
+</project>
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/AbstractFlaDslRuntimeModule.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/AbstractFlaDslRuntimeModule.java
deleted file mode 100644
index a4b9ed3daf70128f30247a93bc5e9d26532455e4..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/AbstractFlaDslRuntimeModule.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * generated by Xtext
- */
-package org.polarsys.chess.xtext;
-
-import java.util.Properties;
-
-import org.eclipse.xtext.Constants;
-import org.eclipse.xtext.service.DefaultRuntimeModule;
-
-import com.google.inject.Binder;
-import com.google.inject.name.Names;
-
-/**
- * Manual modifications go to {org.polarsys.chess.xtext.FlaDslRuntimeModule}
- */
- @SuppressWarnings("all")
-public abstract class AbstractFlaDslRuntimeModule extends DefaultRuntimeModule {
-
-	protected Properties properties = null;
-
-	@Override
-	public void configure(Binder binder) {
-		properties = tryBindProperties(binder, "org/polarsys/chess/xtext/FlaDsl.properties");
-		super.configure(binder);
-	}
-	
-	public void configureLanguageName(Binder binder) {
-		binder.bind(String.class).annotatedWith(Names.named(Constants.LANGUAGE_NAME)).toInstance("org.polarsys.chess.xtext.FlaDsl");
-	}
-	
-	public void configureFileExtensions(Binder binder) {
-		if (properties == null || properties.getProperty(Constants.FILE_EXTENSIONS) == null)
-			binder.bind(String.class).annotatedWith(Names.named(Constants.FILE_EXTENSIONS)).toInstance("fladsl");
-	}
-	
-	// contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment
-	public Class<? extends org.eclipse.xtext.IGrammarAccess> bindIGrammarAccess() {
-		return org.polarsys.chess.xtext.services.FlaDslGrammarAccess.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.serializer.SerializerFragment
-	public Class<? extends org.eclipse.xtext.serializer.sequencer.ISemanticSequencer> bindISemanticSequencer() {
-		return org.polarsys.chess.xtext.serializer.FlaDslSemanticSequencer.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.serializer.SerializerFragment
-	public Class<? extends org.eclipse.xtext.serializer.sequencer.ISyntacticSequencer> bindISyntacticSequencer() {
-		return org.polarsys.chess.xtext.serializer.FlaDslSyntacticSequencer.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.serializer.SerializerFragment
-	public Class<? extends org.eclipse.xtext.serializer.ISerializer> bindISerializer() {
-		return org.eclipse.xtext.serializer.impl.Serializer.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
-	public Class<? extends org.eclipse.xtext.parser.IParser> bindIParser() {
-		return org.polarsys.chess.xtext.parser.antlr.FlaDslParser.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
-	public Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> bindITokenToStringConverter() {
-		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
-	public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> bindIAntlrTokenFileProvider() {
-		return org.polarsys.chess.xtext.parser.antlr.FlaDslAntlrTokenFileProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
-	public Class<? extends org.eclipse.xtext.parser.antlr.Lexer> bindLexer() {
-		return org.polarsys.chess.xtext.parser.antlr.internal.InternalFlaDslLexer.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
-	public com.google.inject.Provider<org.polarsys.chess.xtext.parser.antlr.internal.InternalFlaDslLexer> provideInternalFlaDslLexer() {
-		return org.eclipse.xtext.parser.antlr.LexerProvider.create(org.polarsys.chess.xtext.parser.antlr.internal.InternalFlaDslLexer.class);
-	}
-
-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
-	public void configureRuntimeLexer(com.google.inject.Binder binder) {
-		binder.bind(org.eclipse.xtext.parser.antlr.Lexer.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.parser.antlr.LexerBindings.RUNTIME)).to(org.polarsys.chess.xtext.parser.antlr.internal.InternalFlaDslLexer.class);
-	}
-
-	// contributed by org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment
-	public Class<? extends org.eclipse.xtext.parser.antlr.ITokenDefProvider> bindITokenDefProvider() {
-		return org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.validation.ValidatorFragment
-	@org.eclipse.xtext.service.SingletonBinding(eager=true)	public Class<? extends org.polarsys.chess.xtext.validation.FlaDslValidator> bindFlaDslValidator() {
-		return org.polarsys.chess.xtext.validation.FlaDslValidator.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
-	public Class<? extends org.eclipse.xtext.scoping.IScopeProvider> bindIScopeProvider() {
-		return org.polarsys.chess.xtext.scoping.FlaDslScopeProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
-	public void configureIScopeProviderDelegate(com.google.inject.Binder binder) {
-		binder.bind(org.eclipse.xtext.scoping.IScopeProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider.NAMED_DELEGATE)).to(org.eclipse.xtext.scoping.impl.ImportedNamespaceAwareLocalScopeProvider.class);
-	}
-
-	// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
-	public void configureIgnoreCaseLinking(com.google.inject.Binder binder) {
-		binder.bindConstant().annotatedWith(org.eclipse.xtext.scoping.IgnoreCaseLinking.class).to(false);
-	}
-
-	// contributed by org.eclipse.xtext.generator.exporting.QualifiedNamesFragment
-	public Class<? extends org.eclipse.xtext.naming.IQualifiedNameProvider> bindIQualifiedNameProvider() {
-		return org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
-	public Class<? extends org.eclipse.xtext.resource.IContainer.Manager> bindIContainer$Manager() {
-		return org.eclipse.xtext.resource.containers.StateBasedContainerManager.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
-	public Class<? extends org.eclipse.xtext.resource.containers.IAllContainersState.Provider> bindIAllContainersState$Provider() {
-		return org.eclipse.xtext.resource.containers.ResourceSetBasedAllContainersStateProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
-	public void configureIResourceDescriptions(com.google.inject.Binder binder) {
-		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);
-	}
-
-	// contributed by org.eclipse.xtext.generator.builder.BuilderIntegrationFragment
-	public void configureIResourceDescriptionsPersisted(com.google.inject.Binder binder) {
-		binder.bind(org.eclipse.xtext.resource.IResourceDescriptions.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.PERSISTED_DESCRIPTIONS)).to(org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions.class);
-	}
-
-	// contributed by org.eclipse.xtext.generator.generator.GeneratorFragment
-	public Class<? extends org.eclipse.xtext.generator.IGenerator> bindIGenerator() {
-		return org.polarsys.chess.xtext.generator.FlaDslGenerator.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.formatting.FormatterFragment
-	public Class<? extends org.eclipse.xtext.formatting.IFormatter> bindIFormatter() {
-		return org.polarsys.chess.xtext.formatting.FlaDslFormatter.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public java.lang.ClassLoader bindClassLoaderToInstance() {
-		return getClass().getClassLoader();
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public org.eclipse.xtext.common.types.TypesFactory bindTypesFactoryToInstance() {
-		return org.eclipse.xtext.common.types.TypesFactory.eINSTANCE;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.access.IJvmTypeProvider.Factory> bindIJvmTypeProvider$Factory() {
-		return org.eclipse.xtext.common.types.access.ClasspathTypeProviderFactory.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.common.types.xtext.AbstractTypeScopeProvider> bindAbstractTypeScopeProvider() {
-		return org.eclipse.xtext.common.types.xtext.ClasspathBasedTypeScopeProvider.class;
-	}
-
-	// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
-	public Class<? extends org.eclipse.xtext.scoping.IGlobalScopeProvider> bindIGlobalScopeProvider() {
-		return org.eclipse.xtext.common.types.xtext.TypesAwareDefaultGlobalScopeProvider.class;
-	}
-
-}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/FlaDsl.xtextbin b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/FlaDsl.xtextbin
deleted file mode 100644
index 23ee3c8c288caf38610e27ae384afc6d6a483bc2..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/FlaDsl.xtextbin and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/FlaDslStandaloneSetupGenerated.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/FlaDslStandaloneSetupGenerated.java
deleted file mode 100644
index 13edbb86d8d2368a8c6f73ad5412f177d9f5a798..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/FlaDslStandaloneSetupGenerated.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-* generated by Xtext
-*/
-package org.polarsys.chess.xtext;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.xtext.ISetup;
-import org.eclipse.emf.ecore.resource.Resource;
-
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-/**
- * Generated from StandaloneSetup.xpt!
- */
-@SuppressWarnings("all")
-public class FlaDslStandaloneSetupGenerated implements ISetup {
-
-	public Injector createInjectorAndDoEMFRegistration() {
-		org.eclipse.xtext.common.TerminalsStandaloneSetup.doSetup();
-
-		Injector injector = createInjector();
-		register(injector);
-		return injector;
-	}
-	
-	public Injector createInjector() {
-		return Guice.createInjector(new org.polarsys.chess.xtext.FlaDslRuntimeModule());
-	}
-	
-	public void register(Injector injector) {
-	if (!EPackage.Registry.INSTANCE.containsKey("http://www.intecs.org/chess/xtext/FlaDsl")) {
-		EPackage.Registry.INSTANCE.put("http://www.intecs.org/chess/xtext/FlaDsl", org.polarsys.chess.xtext.flaDsl.FlaDslPackage.eINSTANCE);
-	}
-
-		org.eclipse.xtext.resource.IResourceFactory resourceFactory = injector.getInstance(org.eclipse.xtext.resource.IResourceFactory.class);
-		org.eclipse.xtext.resource.IResourceServiceProvider serviceProvider = injector.getInstance(org.eclipse.xtext.resource.IResourceServiceProvider.class);
-		Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("fladsl", resourceFactory);
-		org.eclipse.xtext.resource.IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().put("fladsl", serviceProvider);
-		
-
-
-	}
-}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/ACIDMitigation.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/ACIDMitigation.java
deleted file mode 100644
index 069db44cd5ea01cb4ab4b4704690a4584b9e27e0..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/ACIDMitigation.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>ACID Mitigation</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.ACIDMitigation#getA <em>A</em>}</li>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.ACIDMitigation#getC <em>C</em>}</li>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.ACIDMitigation#getI <em>I</em>}</li>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.ACIDMitigation#getD <em>D</em>}</li>
- * </ul>
- *
- * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getACIDMitigation()
- * @model
- * @generated
- */
-public interface ACIDMitigation extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>A</b></em>' attribute.
-   * The literals are from the enumeration {@link org.polarsys.chess.xtext.flaDsl.Amitigation}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>A</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>A</em>' attribute.
-   * @see org.polarsys.chess.xtext.flaDsl.Amitigation
-   * @see #setA(Amitigation)
-   * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getACIDMitigation_A()
-   * @model
-   * @generated
-   */
-  Amitigation getA();
-
-  /**
-   * Sets the value of the '{@link org.polarsys.chess.xtext.flaDsl.ACIDMitigation#getA <em>A</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>A</em>' attribute.
-   * @see org.polarsys.chess.xtext.flaDsl.Amitigation
-   * @see #getA()
-   * @generated
-   */
-  void setA(Amitigation value);
-
-  /**
-   * Returns the value of the '<em><b>C</b></em>' attribute.
-   * The literals are from the enumeration {@link org.polarsys.chess.xtext.flaDsl.Cmitigation}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>C</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>C</em>' attribute.
-   * @see org.polarsys.chess.xtext.flaDsl.Cmitigation
-   * @see #setC(Cmitigation)
-   * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getACIDMitigation_C()
-   * @model
-   * @generated
-   */
-  Cmitigation getC();
-
-  /**
-   * Sets the value of the '{@link org.polarsys.chess.xtext.flaDsl.ACIDMitigation#getC <em>C</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>C</em>' attribute.
-   * @see org.polarsys.chess.xtext.flaDsl.Cmitigation
-   * @see #getC()
-   * @generated
-   */
-  void setC(Cmitigation value);
-
-  /**
-   * Returns the value of the '<em><b>I</b></em>' attribute.
-   * The literals are from the enumeration {@link org.polarsys.chess.xtext.flaDsl.Imitigation}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>I</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>I</em>' attribute.
-   * @see org.polarsys.chess.xtext.flaDsl.Imitigation
-   * @see #setI(Imitigation)
-   * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getACIDMitigation_I()
-   * @model
-   * @generated
-   */
-  Imitigation getI();
-
-  /**
-   * Sets the value of the '{@link org.polarsys.chess.xtext.flaDsl.ACIDMitigation#getI <em>I</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>I</em>' attribute.
-   * @see org.polarsys.chess.xtext.flaDsl.Imitigation
-   * @see #getI()
-   * @generated
-   */
-  void setI(Imitigation value);
-
-  /**
-   * Returns the value of the '<em><b>D</b></em>' attribute.
-   * The literals are from the enumeration {@link org.polarsys.chess.xtext.flaDsl.Dmitigation}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>D</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>D</em>' attribute.
-   * @see org.polarsys.chess.xtext.flaDsl.Dmitigation
-   * @see #setD(Dmitigation)
-   * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getACIDMitigation_D()
-   * @model
-   * @generated
-   */
-  Dmitigation getD();
-
-  /**
-   * Sets the value of the '{@link org.polarsys.chess.xtext.flaDsl.ACIDMitigation#getD <em>D</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>D</em>' attribute.
-   * @see org.polarsys.chess.xtext.flaDsl.Dmitigation
-   * @see #getD()
-   * @generated
-   */
-  void setD(Dmitigation value);
-
-} // ACIDMitigation
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/ACIDavoidable.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/ACIDavoidable.java
deleted file mode 100644
index edda3ff8df7bd33f8bed6f85c1cbcaba2e367150..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/ACIDavoidable.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>ACI Davoidable</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.ACIDavoidable#getA <em>A</em>}</li>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.ACIDavoidable#getC <em>C</em>}</li>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.ACIDavoidable#getI <em>I</em>}</li>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.ACIDavoidable#getD <em>D</em>}</li>
- * </ul>
- *
- * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getACIDavoidable()
- * @model
- * @generated
- */
-public interface ACIDavoidable extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>A</b></em>' attribute.
-   * The literals are from the enumeration {@link org.polarsys.chess.xtext.flaDsl.Aavoidable}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>A</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>A</em>' attribute.
-   * @see org.polarsys.chess.xtext.flaDsl.Aavoidable
-   * @see #setA(Aavoidable)
-   * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getACIDavoidable_A()
-   * @model
-   * @generated
-   */
-  Aavoidable getA();
-
-  /**
-   * Sets the value of the '{@link org.polarsys.chess.xtext.flaDsl.ACIDavoidable#getA <em>A</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>A</em>' attribute.
-   * @see org.polarsys.chess.xtext.flaDsl.Aavoidable
-   * @see #getA()
-   * @generated
-   */
-  void setA(Aavoidable value);
-
-  /**
-   * Returns the value of the '<em><b>C</b></em>' attribute.
-   * The literals are from the enumeration {@link org.polarsys.chess.xtext.flaDsl.Cavoidable}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>C</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>C</em>' attribute.
-   * @see org.polarsys.chess.xtext.flaDsl.Cavoidable
-   * @see #setC(Cavoidable)
-   * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getACIDavoidable_C()
-   * @model
-   * @generated
-   */
-  Cavoidable getC();
-
-  /**
-   * Sets the value of the '{@link org.polarsys.chess.xtext.flaDsl.ACIDavoidable#getC <em>C</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>C</em>' attribute.
-   * @see org.polarsys.chess.xtext.flaDsl.Cavoidable
-   * @see #getC()
-   * @generated
-   */
-  void setC(Cavoidable value);
-
-  /**
-   * Returns the value of the '<em><b>I</b></em>' attribute.
-   * The literals are from the enumeration {@link org.polarsys.chess.xtext.flaDsl.Iavoidable}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>I</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>I</em>' attribute.
-   * @see org.polarsys.chess.xtext.flaDsl.Iavoidable
-   * @see #setI(Iavoidable)
-   * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getACIDavoidable_I()
-   * @model
-   * @generated
-   */
-  Iavoidable getI();
-
-  /**
-   * Sets the value of the '{@link org.polarsys.chess.xtext.flaDsl.ACIDavoidable#getI <em>I</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>I</em>' attribute.
-   * @see org.polarsys.chess.xtext.flaDsl.Iavoidable
-   * @see #getI()
-   * @generated
-   */
-  void setI(Iavoidable value);
-
-  /**
-   * Returns the value of the '<em><b>D</b></em>' attribute.
-   * The literals are from the enumeration {@link org.polarsys.chess.xtext.flaDsl.Davoidable}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>D</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>D</em>' attribute.
-   * @see org.polarsys.chess.xtext.flaDsl.Davoidable
-   * @see #setD(Davoidable)
-   * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getACIDavoidable_D()
-   * @model
-   * @generated
-   */
-  Davoidable getD();
-
-  /**
-   * Sets the value of the '{@link org.polarsys.chess.xtext.flaDsl.ACIDavoidable#getD <em>D</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>D</em>' attribute.
-   * @see org.polarsys.chess.xtext.flaDsl.Davoidable
-   * @see #getD()
-   * @generated
-   */
-  void setD(Davoidable value);
-
-} // ACIDavoidable
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Aavoidable.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Aavoidable.java
deleted file mode 100644
index 50a135efc52dca7dd181a84ec52b066c96b685d6..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Aavoidable.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Aavoidable</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getAavoidable()
- * @model
- * @generated
- */
-public enum Aavoidable implements Enumerator
-{
-  /**
-   * The '<em><b>INCOMPLETION</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #INCOMPLETION_VALUE
-   * @generated
-   * @ordered
-   */
-  INCOMPLETION(0, "INCOMPLETION", "incompletion"),
-
-  /**
-   * The '<em><b>NONE</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #NONE_VALUE
-   * @generated
-   * @ordered
-   */
-  NONE(1, "NONE", "none"),
-
-  /**
-   * The '<em><b>UNSPECIFIED</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #UNSPECIFIED_VALUE
-   * @generated
-   * @ordered
-   */
-  UNSPECIFIED(2, "UNSPECIFIED", "unspecified");
-
-  /**
-   * The '<em><b>INCOMPLETION</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>INCOMPLETION</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #INCOMPLETION
-   * @model literal="incompletion"
-   * @generated
-   * @ordered
-   */
-  public static final int INCOMPLETION_VALUE = 0;
-
-  /**
-   * The '<em><b>NONE</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>NONE</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #NONE
-   * @model literal="none"
-   * @generated
-   * @ordered
-   */
-  public static final int NONE_VALUE = 1;
-
-  /**
-   * The '<em><b>UNSPECIFIED</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>UNSPECIFIED</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #UNSPECIFIED
-   * @model literal="unspecified"
-   * @generated
-   * @ordered
-   */
-  public static final int UNSPECIFIED_VALUE = 2;
-
-  /**
-   * An array of all the '<em><b>Aavoidable</b></em>' enumerators.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private static final Aavoidable[] VALUES_ARRAY =
-    new Aavoidable[]
-    {
-      INCOMPLETION,
-      NONE,
-      UNSPECIFIED,
-    };
-
-  /**
-   * A public read-only list of all the '<em><b>Aavoidable</b></em>' enumerators.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final List<Aavoidable> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-  /**
-   * Returns the '<em><b>Aavoidable</b></em>' literal with the specified literal value.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param literal the literal.
-   * @return the matching enumerator or <code>null</code>.
-   * @generated
-   */
-  public static Aavoidable get(String literal)
-  {
-    for (int i = 0; i < VALUES_ARRAY.length; ++i)
-    {
-      Aavoidable result = VALUES_ARRAY[i];
-      if (result.toString().equals(literal))
-      {
-        return result;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Returns the '<em><b>Aavoidable</b></em>' literal with the specified name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param name the name.
-   * @return the matching enumerator or <code>null</code>.
-   * @generated
-   */
-  public static Aavoidable getByName(String name)
-  {
-    for (int i = 0; i < VALUES_ARRAY.length; ++i)
-    {
-      Aavoidable result = VALUES_ARRAY[i];
-      if (result.getName().equals(name))
-      {
-        return result;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Returns the '<em><b>Aavoidable</b></em>' literal with the specified integer value.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the integer value.
-   * @return the matching enumerator or <code>null</code>.
-   * @generated
-   */
-  public static Aavoidable get(int value)
-  {
-    switch (value)
-    {
-      case INCOMPLETION_VALUE: return INCOMPLETION;
-      case NONE_VALUE: return NONE;
-      case UNSPECIFIED_VALUE: return UNSPECIFIED;
-    }
-    return null;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private final int value;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private final String name;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private final String literal;
-
-  /**
-   * Only this class can construct instances.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private Aavoidable(int value, String name, String literal)
-  {
-    this.value = value;
-    this.name = name;
-    this.literal = literal;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public int getValue()
-  {
-    return value;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getLiteral()
-  {
-    return literal;
-  }
-
-  /**
-   * Returns the literal value of the enumerator, which is its string representation.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    return literal;
-  }
-  
-} //Aavoidable
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Amitigation.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Amitigation.java
deleted file mode 100644
index fb76c77123e2a48698acdc28cdfa45fc1817ba26..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Amitigation.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Amitigation</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getAmitigation()
- * @model
- * @generated
- */
-public enum Amitigation implements Enumerator
-{
-  /**
-   * The '<em><b>ALL OR NOTHING</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #ALL_OR_NOTHING_VALUE
-   * @generated
-   * @ordered
-   */
-  ALL_OR_NOTHING(0, "ALL_OR_NOTHING", "all_or_nothing"),
-
-  /**
-   * The '<em><b>ALL OR COMPENSATION</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #ALL_OR_COMPENSATION_VALUE
-   * @generated
-   * @ordered
-   */
-  ALL_OR_COMPENSATION(1, "ALL_OR_COMPENSATION", "all_or_compensation"),
-
-  /**
-   * The '<em><b>NONE</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #NONE_VALUE
-   * @generated
-   * @ordered
-   */
-  NONE(2, "NONE", "none"),
-
-  /**
-   * The '<em><b>UNSPECIFIED</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #UNSPECIFIED_VALUE
-   * @generated
-   * @ordered
-   */
-  UNSPECIFIED(3, "UNSPECIFIED", "unspecified");
-
-  /**
-   * The '<em><b>ALL OR NOTHING</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>ALL OR NOTHING</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #ALL_OR_NOTHING
-   * @model literal="all_or_nothing"
-   * @generated
-   * @ordered
-   */
-  public static final int ALL_OR_NOTHING_VALUE = 0;
-
-  /**
-   * The '<em><b>ALL OR COMPENSATION</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>ALL OR COMPENSATION</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #ALL_OR_COMPENSATION
-   * @model literal="all_or_compensation"
-   * @generated
-   * @ordered
-   */
-  public static final int ALL_OR_COMPENSATION_VALUE = 1;
-
-  /**
-   * The '<em><b>NONE</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>NONE</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #NONE
-   * @model literal="none"
-   * @generated
-   * @ordered
-   */
-  public static final int NONE_VALUE = 2;
-
-  /**
-   * The '<em><b>UNSPECIFIED</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>UNSPECIFIED</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #UNSPECIFIED
-   * @model literal="unspecified"
-   * @generated
-   * @ordered
-   */
-  public static final int UNSPECIFIED_VALUE = 3;
-
-  /**
-   * An array of all the '<em><b>Amitigation</b></em>' enumerators.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private static final Amitigation[] VALUES_ARRAY =
-    new Amitigation[]
-    {
-      ALL_OR_NOTHING,
-      ALL_OR_COMPENSATION,
-      NONE,
-      UNSPECIFIED,
-    };
-
-  /**
-   * A public read-only list of all the '<em><b>Amitigation</b></em>' enumerators.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final List<Amitigation> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-  /**
-   * Returns the '<em><b>Amitigation</b></em>' literal with the specified literal value.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param literal the literal.
-   * @return the matching enumerator or <code>null</code>.
-   * @generated
-   */
-  public static Amitigation get(String literal)
-  {
-    for (int i = 0; i < VALUES_ARRAY.length; ++i)
-    {
-      Amitigation result = VALUES_ARRAY[i];
-      if (result.toString().equals(literal))
-      {
-        return result;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Returns the '<em><b>Amitigation</b></em>' literal with the specified name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param name the name.
-   * @return the matching enumerator or <code>null</code>.
-   * @generated
-   */
-  public static Amitigation getByName(String name)
-  {
-    for (int i = 0; i < VALUES_ARRAY.length; ++i)
-    {
-      Amitigation result = VALUES_ARRAY[i];
-      if (result.getName().equals(name))
-      {
-        return result;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Returns the '<em><b>Amitigation</b></em>' literal with the specified integer value.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the integer value.
-   * @return the matching enumerator or <code>null</code>.
-   * @generated
-   */
-  public static Amitigation get(int value)
-  {
-    switch (value)
-    {
-      case ALL_OR_NOTHING_VALUE: return ALL_OR_NOTHING;
-      case ALL_OR_COMPENSATION_VALUE: return ALL_OR_COMPENSATION;
-      case NONE_VALUE: return NONE;
-      case UNSPECIFIED_VALUE: return UNSPECIFIED;
-    }
-    return null;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private final int value;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private final String name;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private final String literal;
-
-  /**
-   * Only this class can construct instances.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private Amitigation(int value, String name, String literal)
-  {
-    this.value = value;
-    this.name = name;
-    this.literal = literal;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public int getValue()
-  {
-    return value;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getLiteral()
-  {
-    return literal;
-  }
-
-  /**
-   * Returns the literal value of the enumerator, which is its string representation.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    return literal;
-  }
-  
-} //Amitigation
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Behaviour.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Behaviour.java
deleted file mode 100644
index e56078027006fad04a1d7495841dd7ac6fd34ea6..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Behaviour.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Behaviour</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.Behaviour#getRules <em>Rules</em>}</li>
- * </ul>
- *
- * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getBehaviour()
- * @model
- * @generated
- */
-public interface Behaviour extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>Rules</b></em>' containment reference list.
-   * The list contents are of type {@link org.polarsys.chess.xtext.flaDsl.Expression}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Rules</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Rules</em>' containment reference list.
-   * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getBehaviour_Rules()
-   * @model containment="true"
-   * @generated
-   */
-  EList<Expression> getRules();
-
-} // Behaviour
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Cavoidable.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Cavoidable.java
deleted file mode 100644
index 2081a89c212bfea8f745674ea4a5e55eaa0ae673..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Cavoidable.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Cavoidable</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getCavoidable()
- * @model
- * @generated
- */
-public enum Cavoidable implements Enumerator
-{
-  /**
-   * The '<em><b>INCONSISTENCY</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #INCONSISTENCY_VALUE
-   * @generated
-   * @ordered
-   */
-  INCONSISTENCY(0, "INCONSISTENCY", "inconsistency"),
-
-  /**
-   * The '<em><b>NONE</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #NONE_VALUE
-   * @generated
-   * @ordered
-   */
-  NONE(1, "NONE", "none"),
-
-  /**
-   * The '<em><b>UNSPECIFIED</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #UNSPECIFIED_VALUE
-   * @generated
-   * @ordered
-   */
-  UNSPECIFIED(2, "UNSPECIFIED", "unspecified");
-
-  /**
-   * The '<em><b>INCONSISTENCY</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>INCONSISTENCY</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #INCONSISTENCY
-   * @model literal="inconsistency"
-   * @generated
-   * @ordered
-   */
-  public static final int INCONSISTENCY_VALUE = 0;
-
-  /**
-   * The '<em><b>NONE</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>NONE</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #NONE
-   * @model literal="none"
-   * @generated
-   * @ordered
-   */
-  public static final int NONE_VALUE = 1;
-
-  /**
-   * The '<em><b>UNSPECIFIED</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>UNSPECIFIED</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #UNSPECIFIED
-   * @model literal="unspecified"
-   * @generated
-   * @ordered
-   */
-  public static final int UNSPECIFIED_VALUE = 2;
-
-  /**
-   * An array of all the '<em><b>Cavoidable</b></em>' enumerators.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private static final Cavoidable[] VALUES_ARRAY =
-    new Cavoidable[]
-    {
-      INCONSISTENCY,
-      NONE,
-      UNSPECIFIED,
-    };
-
-  /**
-   * A public read-only list of all the '<em><b>Cavoidable</b></em>' enumerators.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final List<Cavoidable> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-  /**
-   * Returns the '<em><b>Cavoidable</b></em>' literal with the specified literal value.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param literal the literal.
-   * @return the matching enumerator or <code>null</code>.
-   * @generated
-   */
-  public static Cavoidable get(String literal)
-  {
-    for (int i = 0; i < VALUES_ARRAY.length; ++i)
-    {
-      Cavoidable result = VALUES_ARRAY[i];
-      if (result.toString().equals(literal))
-      {
-        return result;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Returns the '<em><b>Cavoidable</b></em>' literal with the specified name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param name the name.
-   * @return the matching enumerator or <code>null</code>.
-   * @generated
-   */
-  public static Cavoidable getByName(String name)
-  {
-    for (int i = 0; i < VALUES_ARRAY.length; ++i)
-    {
-      Cavoidable result = VALUES_ARRAY[i];
-      if (result.getName().equals(name))
-      {
-        return result;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Returns the '<em><b>Cavoidable</b></em>' literal with the specified integer value.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the integer value.
-   * @return the matching enumerator or <code>null</code>.
-   * @generated
-   */
-  public static Cavoidable get(int value)
-  {
-    switch (value)
-    {
-      case INCONSISTENCY_VALUE: return INCONSISTENCY;
-      case NONE_VALUE: return NONE;
-      case UNSPECIFIED_VALUE: return UNSPECIFIED;
-    }
-    return null;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private final int value;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private final String name;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private final String literal;
-
-  /**
-   * Only this class can construct instances.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private Cavoidable(int value, String name, String literal)
-  {
-    this.value = value;
-    this.name = name;
-    this.literal = literal;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public int getValue()
-  {
-    return value;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getLiteral()
-  {
-    return literal;
-  }
-
-  /**
-   * Returns the literal value of the enumerator, which is its string representation.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    return literal;
-  }
-  
-} //Cavoidable
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Cmitigation.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Cmitigation.java
deleted file mode 100644
index bbabad6506c61c90da1a4c9f2ac693d12c1021c4..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Cmitigation.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Cmitigation</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getCmitigation()
- * @model
- * @generated
- */
-public enum Cmitigation implements Enumerator
-{
-  /**
-   * The '<em><b>FULL CONSISTENCY</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #FULL_CONSISTENCY_VALUE
-   * @generated
-   * @ordered
-   */
-  FULL_CONSISTENCY(0, "FULL_CONSISTENCY", "full_consistency"),
-
-  /**
-   * The '<em><b>RANGE VIOLATION ALLOWED</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #RANGE_VIOLATION_ALLOWED_VALUE
-   * @generated
-   * @ordered
-   */
-  RANGE_VIOLATION_ALLOWED(1, "RANGE_VIOLATION_ALLOWED", "range_violation_allowed"),
-
-  /**
-   * The '<em><b>NONE</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #NONE_VALUE
-   * @generated
-   * @ordered
-   */
-  NONE(2, "NONE", "none"),
-
-  /**
-   * The '<em><b>UNSPECIFIED</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #UNSPECIFIED_VALUE
-   * @generated
-   * @ordered
-   */
-  UNSPECIFIED(3, "UNSPECIFIED", "unspecified");
-
-  /**
-   * The '<em><b>FULL CONSISTENCY</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>FULL CONSISTENCY</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #FULL_CONSISTENCY
-   * @model literal="full_consistency"
-   * @generated
-   * @ordered
-   */
-  public static final int FULL_CONSISTENCY_VALUE = 0;
-
-  /**
-   * The '<em><b>RANGE VIOLATION ALLOWED</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>RANGE VIOLATION ALLOWED</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #RANGE_VIOLATION_ALLOWED
-   * @model literal="range_violation_allowed"
-   * @generated
-   * @ordered
-   */
-  public static final int RANGE_VIOLATION_ALLOWED_VALUE = 1;
-
-  /**
-   * The '<em><b>NONE</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>NONE</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #NONE
-   * @model literal="none"
-   * @generated
-   * @ordered
-   */
-  public static final int NONE_VALUE = 2;
-
-  /**
-   * The '<em><b>UNSPECIFIED</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>UNSPECIFIED</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #UNSPECIFIED
-   * @model literal="unspecified"
-   * @generated
-   * @ordered
-   */
-  public static final int UNSPECIFIED_VALUE = 3;
-
-  /**
-   * An array of all the '<em><b>Cmitigation</b></em>' enumerators.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private static final Cmitigation[] VALUES_ARRAY =
-    new Cmitigation[]
-    {
-      FULL_CONSISTENCY,
-      RANGE_VIOLATION_ALLOWED,
-      NONE,
-      UNSPECIFIED,
-    };
-
-  /**
-   * A public read-only list of all the '<em><b>Cmitigation</b></em>' enumerators.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final List<Cmitigation> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-  /**
-   * Returns the '<em><b>Cmitigation</b></em>' literal with the specified literal value.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param literal the literal.
-   * @return the matching enumerator or <code>null</code>.
-   * @generated
-   */
-  public static Cmitigation get(String literal)
-  {
-    for (int i = 0; i < VALUES_ARRAY.length; ++i)
-    {
-      Cmitigation result = VALUES_ARRAY[i];
-      if (result.toString().equals(literal))
-      {
-        return result;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Returns the '<em><b>Cmitigation</b></em>' literal with the specified name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param name the name.
-   * @return the matching enumerator or <code>null</code>.
-   * @generated
-   */
-  public static Cmitigation getByName(String name)
-  {
-    for (int i = 0; i < VALUES_ARRAY.length; ++i)
-    {
-      Cmitigation result = VALUES_ARRAY[i];
-      if (result.getName().equals(name))
-      {
-        return result;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Returns the '<em><b>Cmitigation</b></em>' literal with the specified integer value.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the integer value.
-   * @return the matching enumerator or <code>null</code>.
-   * @generated
-   */
-  public static Cmitigation get(int value)
-  {
-    switch (value)
-    {
-      case FULL_CONSISTENCY_VALUE: return FULL_CONSISTENCY;
-      case RANGE_VIOLATION_ALLOWED_VALUE: return RANGE_VIOLATION_ALLOWED;
-      case NONE_VALUE: return NONE;
-      case UNSPECIFIED_VALUE: return UNSPECIFIED;
-    }
-    return null;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private final int value;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private final String name;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private final String literal;
-
-  /**
-   * Only this class can construct instances.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private Cmitigation(int value, String name, String literal)
-  {
-    this.value = value;
-    this.name = name;
-    this.literal = literal;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public int getValue()
-  {
-    return value;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getLiteral()
-  {
-    return literal;
-  }
-
-  /**
-   * Returns the literal value of the enumerator, which is its string representation.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    return literal;
-  }
-  
-} //Cmitigation
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/ComplexNofailureDefinition.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/ComplexNofailureDefinition.java
deleted file mode 100644
index 43cdf2714f37c79777ccb5f2fb85c52e5bab9324..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/ComplexNofailureDefinition.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Complex Nofailure Definition</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getComplexNofailureDefinition()
- * @model
- * @generated
- */
-public interface ComplexNofailureDefinition extends Definitions
-{
-} // ComplexNofailureDefinition
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Davoidable.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Davoidable.java
deleted file mode 100644
index b8c039fb7640db118f9391701a8dc522b7a891d3..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Davoidable.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Davoidable</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getDavoidable()
- * @model
- * @generated
- */
-public enum Davoidable implements Enumerator
-{
-  /**
-   * The '<em><b>IMPERMANENCE</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #IMPERMANENCE_VALUE
-   * @generated
-   * @ordered
-   */
-  IMPERMANENCE(0, "IMPERMANENCE", "impermanence"),
-
-  /**
-   * The '<em><b>NONE</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #NONE_VALUE
-   * @generated
-   * @ordered
-   */
-  NONE(1, "NONE", "none"),
-
-  /**
-   * The '<em><b>UNSPECIFIED</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #UNSPECIFIED_VALUE
-   * @generated
-   * @ordered
-   */
-  UNSPECIFIED(2, "UNSPECIFIED", "unspecified");
-
-  /**
-   * The '<em><b>IMPERMANENCE</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>IMPERMANENCE</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #IMPERMANENCE
-   * @model literal="impermanence"
-   * @generated
-   * @ordered
-   */
-  public static final int IMPERMANENCE_VALUE = 0;
-
-  /**
-   * The '<em><b>NONE</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>NONE</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #NONE
-   * @model literal="none"
-   * @generated
-   * @ordered
-   */
-  public static final int NONE_VALUE = 1;
-
-  /**
-   * The '<em><b>UNSPECIFIED</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>UNSPECIFIED</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #UNSPECIFIED
-   * @model literal="unspecified"
-   * @generated
-   * @ordered
-   */
-  public static final int UNSPECIFIED_VALUE = 2;
-
-  /**
-   * An array of all the '<em><b>Davoidable</b></em>' enumerators.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private static final Davoidable[] VALUES_ARRAY =
-    new Davoidable[]
-    {
-      IMPERMANENCE,
-      NONE,
-      UNSPECIFIED,
-    };
-
-  /**
-   * A public read-only list of all the '<em><b>Davoidable</b></em>' enumerators.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final List<Davoidable> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-  /**
-   * Returns the '<em><b>Davoidable</b></em>' literal with the specified literal value.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param literal the literal.
-   * @return the matching enumerator or <code>null</code>.
-   * @generated
-   */
-  public static Davoidable get(String literal)
-  {
-    for (int i = 0; i < VALUES_ARRAY.length; ++i)
-    {
-      Davoidable result = VALUES_ARRAY[i];
-      if (result.toString().equals(literal))
-      {
-        return result;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Returns the '<em><b>Davoidable</b></em>' literal with the specified name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param name the name.
-   * @return the matching enumerator or <code>null</code>.
-   * @generated
-   */
-  public static Davoidable getByName(String name)
-  {
-    for (int i = 0; i < VALUES_ARRAY.length; ++i)
-    {
-      Davoidable result = VALUES_ARRAY[i];
-      if (result.getName().equals(name))
-      {
-        return result;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Returns the '<em><b>Davoidable</b></em>' literal with the specified integer value.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the integer value.
-   * @return the matching enumerator or <code>null</code>.
-   * @generated
-   */
-  public static Davoidable get(int value)
-  {
-    switch (value)
-    {
-      case IMPERMANENCE_VALUE: return IMPERMANENCE;
-      case NONE_VALUE: return NONE;
-      case UNSPECIFIED_VALUE: return UNSPECIFIED;
-    }
-    return null;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private final int value;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private final String name;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private final String literal;
-
-  /**
-   * Only this class can construct instances.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private Davoidable(int value, String name, String literal)
-  {
-    this.value = value;
-    this.name = name;
-    this.literal = literal;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public int getValue()
-  {
-    return value;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getLiteral()
-  {
-    return literal;
-  }
-
-  /**
-   * Returns the literal value of the enumerator, which is its string representation.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    return literal;
-  }
-  
-} //Davoidable
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Definitions.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Definitions.java
deleted file mode 100644
index 43267bd9f382aa78bddeb32ddd6532b4e1e4e0de..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Definitions.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Definitions</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getDefinitions()
- * @model
- * @generated
- */
-public interface Definitions extends EObject
-{
-} // Definitions
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Dmitigation.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Dmitigation.java
deleted file mode 100644
index 80a67b29703a4a22aee982d3c4ce9795b708c076..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Dmitigation.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Dmitigation</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getDmitigation()
- * @model
- * @generated
- */
-public enum Dmitigation implements Enumerator
-{
-  /**
-   * The '<em><b>NO LOSS</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #NO_LOSS_VALUE
-   * @generated
-   * @ordered
-   */
-  NO_LOSS(0, "NO_LOSS", "no_loss"),
-
-  /**
-   * The '<em><b>PARTIAL LOSS ALLOWED</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #PARTIAL_LOSS_ALLOWED_VALUE
-   * @generated
-   * @ordered
-   */
-  PARTIAL_LOSS_ALLOWED(1, "PARTIAL_LOSS_ALLOWED", "partial_loss_allowed"),
-
-  /**
-   * The '<em><b>NONE</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #NONE_VALUE
-   * @generated
-   * @ordered
-   */
-  NONE(2, "NONE", "none"),
-
-  /**
-   * The '<em><b>UNSPECIFIED</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #UNSPECIFIED_VALUE
-   * @generated
-   * @ordered
-   */
-  UNSPECIFIED(3, "UNSPECIFIED", "unspecified");
-
-  /**
-   * The '<em><b>NO LOSS</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>NO LOSS</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #NO_LOSS
-   * @model literal="no_loss"
-   * @generated
-   * @ordered
-   */
-  public static final int NO_LOSS_VALUE = 0;
-
-  /**
-   * The '<em><b>PARTIAL LOSS ALLOWED</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>PARTIAL LOSS ALLOWED</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #PARTIAL_LOSS_ALLOWED
-   * @model literal="partial_loss_allowed"
-   * @generated
-   * @ordered
-   */
-  public static final int PARTIAL_LOSS_ALLOWED_VALUE = 1;
-
-  /**
-   * The '<em><b>NONE</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>NONE</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #NONE
-   * @model literal="none"
-   * @generated
-   * @ordered
-   */
-  public static final int NONE_VALUE = 2;
-
-  /**
-   * The '<em><b>UNSPECIFIED</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>UNSPECIFIED</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #UNSPECIFIED
-   * @model literal="unspecified"
-   * @generated
-   * @ordered
-   */
-  public static final int UNSPECIFIED_VALUE = 3;
-
-  /**
-   * An array of all the '<em><b>Dmitigation</b></em>' enumerators.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private static final Dmitigation[] VALUES_ARRAY =
-    new Dmitigation[]
-    {
-      NO_LOSS,
-      PARTIAL_LOSS_ALLOWED,
-      NONE,
-      UNSPECIFIED,
-    };
-
-  /**
-   * A public read-only list of all the '<em><b>Dmitigation</b></em>' enumerators.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final List<Dmitigation> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-  /**
-   * Returns the '<em><b>Dmitigation</b></em>' literal with the specified literal value.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param literal the literal.
-   * @return the matching enumerator or <code>null</code>.
-   * @generated
-   */
-  public static Dmitigation get(String literal)
-  {
-    for (int i = 0; i < VALUES_ARRAY.length; ++i)
-    {
-      Dmitigation result = VALUES_ARRAY[i];
-      if (result.toString().equals(literal))
-      {
-        return result;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Returns the '<em><b>Dmitigation</b></em>' literal with the specified name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param name the name.
-   * @return the matching enumerator or <code>null</code>.
-   * @generated
-   */
-  public static Dmitigation getByName(String name)
-  {
-    for (int i = 0; i < VALUES_ARRAY.length; ++i)
-    {
-      Dmitigation result = VALUES_ARRAY[i];
-      if (result.getName().equals(name))
-      {
-        return result;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Returns the '<em><b>Dmitigation</b></em>' literal with the specified integer value.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the integer value.
-   * @return the matching enumerator or <code>null</code>.
-   * @generated
-   */
-  public static Dmitigation get(int value)
-  {
-    switch (value)
-    {
-      case NO_LOSS_VALUE: return NO_LOSS;
-      case PARTIAL_LOSS_ALLOWED_VALUE: return PARTIAL_LOSS_ALLOWED;
-      case NONE_VALUE: return NONE;
-      case UNSPECIFIED_VALUE: return UNSPECIFIED;
-    }
-    return null;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private final int value;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private final String name;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private final String literal;
-
-  /**
-   * Only this class can construct instances.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private Dmitigation(int value, String name, String literal)
-  {
-    this.value = value;
-    this.name = name;
-    this.literal = literal;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public int getValue()
-  {
-    return value;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getLiteral()
-  {
-    return literal;
-  }
-
-  /**
-   * Returns the literal value of the enumerator, which is its string representation.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    return literal;
-  }
-  
-} //Dmitigation
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Expression.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Expression.java
deleted file mode 100644
index 89dc93ddd7386121744ec311b2a3af057eb82089..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Expression.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Expression</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.Expression#getLhs <em>Lhs</em>}</li>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.Expression#getRhs <em>Rhs</em>}</li>
- * </ul>
- *
- * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getExpression()
- * @model
- * @generated
- */
-public interface Expression extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>Lhs</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Lhs</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Lhs</em>' containment reference.
-   * @see #setLhs(Lhs)
-   * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getExpression_Lhs()
-   * @model containment="true"
-   * @generated
-   */
-  Lhs getLhs();
-
-  /**
-   * Sets the value of the '{@link org.polarsys.chess.xtext.flaDsl.Expression#getLhs <em>Lhs</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Lhs</em>' containment reference.
-   * @see #getLhs()
-   * @generated
-   */
-  void setLhs(Lhs value);
-
-  /**
-   * Returns the value of the '<em><b>Rhs</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Rhs</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Rhs</em>' containment reference.
-   * @see #setRhs(Rhs)
-   * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getExpression_Rhs()
-   * @model containment="true"
-   * @generated
-   */
-  Rhs getRhs();
-
-  /**
-   * Sets the value of the '{@link org.polarsys.chess.xtext.flaDsl.Expression#getRhs <em>Rhs</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Rhs</em>' containment reference.
-   * @see #getRhs()
-   * @generated
-   */
-  void setRhs(Rhs value);
-
-} // Expression
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/FailureDefinition.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/FailureDefinition.java
deleted file mode 100644
index b24f91a928d2a758863bb031921554e9a3f112f9..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/FailureDefinition.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Failure Definition</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.FailureDefinition#getType <em>Type</em>}</li>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.FailureDefinition#getAcidAvoidable <em>Acid Avoidable</em>}</li>
- * </ul>
- *
- * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getFailureDefinition()
- * @model
- * @generated
- */
-public interface FailureDefinition extends Definitions
-{
-  /**
-   * Returns the value of the '<em><b>Type</b></em>' attribute.
-   * The literals are from the enumeration {@link org.polarsys.chess.xtext.flaDsl.FailureType}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Type</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Type</em>' attribute.
-   * @see org.polarsys.chess.xtext.flaDsl.FailureType
-   * @see #setType(FailureType)
-   * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getFailureDefinition_Type()
-   * @model
-   * @generated
-   */
-  FailureType getType();
-
-  /**
-   * Sets the value of the '{@link org.polarsys.chess.xtext.flaDsl.FailureDefinition#getType <em>Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Type</em>' attribute.
-   * @see org.polarsys.chess.xtext.flaDsl.FailureType
-   * @see #getType()
-   * @generated
-   */
-  void setType(FailureType value);
-
-  /**
-   * Returns the value of the '<em><b>Acid Avoidable</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Acid Avoidable</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Acid Avoidable</em>' containment reference.
-   * @see #setAcidAvoidable(ACIDavoidable)
-   * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getFailureDefinition_AcidAvoidable()
-   * @model containment="true"
-   * @generated
-   */
-  ACIDavoidable getAcidAvoidable();
-
-  /**
-   * Sets the value of the '{@link org.polarsys.chess.xtext.flaDsl.FailureDefinition#getAcidAvoidable <em>Acid Avoidable</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Acid Avoidable</em>' containment reference.
-   * @see #getAcidAvoidable()
-   * @generated
-   */
-  void setAcidAvoidable(ACIDavoidable value);
-
-} // FailureDefinition
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/FailureType.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/FailureType.java
deleted file mode 100644
index 66e9460c47bfbd23d63651ae80f48a40a7dc7bb9..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/FailureType.java
+++ /dev/null
@@ -1,418 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Failure Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getFailureType()
- * @model
- * @generated
- */
-public enum FailureType implements Enumerator
-{
-  /**
-   * The '<em><b>NO FAILURE</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #NO_FAILURE_VALUE
-   * @generated
-   * @ordered
-   */
-  NO_FAILURE(0, "NO_FAILURE", "noFailure"),
-
-  /**
-   * The '<em><b>EARLY</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #EARLY_VALUE
-   * @generated
-   * @ordered
-   */
-  EARLY(1, "EARLY", "early"),
-
-  /**
-   * The '<em><b>LATE</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #LATE_VALUE
-   * @generated
-   * @ordered
-   */
-  LATE(2, "LATE", "late"),
-
-  /**
-   * The '<em><b>COMMISSION</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #COMMISSION_VALUE
-   * @generated
-   * @ordered
-   */
-  COMMISSION(3, "COMMISSION", "commission"),
-
-  /**
-   * The '<em><b>OMISSION</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #OMISSION_VALUE
-   * @generated
-   * @ordered
-   */
-  OMISSION(4, "OMISSION", "omission"),
-
-  /**
-   * The '<em><b>VALUE SUBTLE</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #VALUE_SUBTLE_VALUE
-   * @generated
-   * @ordered
-   */
-  VALUE_SUBTLE(5, "VALUE_SUBTLE", "valueSubtle"),
-
-  /**
-   * The '<em><b>VALUE COARSE</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #VALUE_COARSE_VALUE
-   * @generated
-   * @ordered
-   */
-  VALUE_COARSE(6, "VALUE_COARSE", "valueCoarse"),
-
-  /**
-   * The '<em><b>WILDCARD</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #WILDCARD_VALUE
-   * @generated
-   * @ordered
-   */
-  WILDCARD(7, "WILDCARD", "wildcard"),
-
-  /**
-   * The '<em><b>VARIABLE</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #VARIABLE_VALUE
-   * @generated
-   * @ordered
-   */
-  VARIABLE(8, "VARIABLE", "variable");
-
-  /**
-   * The '<em><b>NO FAILURE</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>NO FAILURE</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #NO_FAILURE
-   * @model literal="noFailure"
-   * @generated
-   * @ordered
-   */
-  public static final int NO_FAILURE_VALUE = 0;
-
-  /**
-   * The '<em><b>EARLY</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>EARLY</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #EARLY
-   * @model literal="early"
-   * @generated
-   * @ordered
-   */
-  public static final int EARLY_VALUE = 1;
-
-  /**
-   * The '<em><b>LATE</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>LATE</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #LATE
-   * @model literal="late"
-   * @generated
-   * @ordered
-   */
-  public static final int LATE_VALUE = 2;
-
-  /**
-   * The '<em><b>COMMISSION</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>COMMISSION</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #COMMISSION
-   * @model literal="commission"
-   * @generated
-   * @ordered
-   */
-  public static final int COMMISSION_VALUE = 3;
-
-  /**
-   * The '<em><b>OMISSION</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>OMISSION</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #OMISSION
-   * @model literal="omission"
-   * @generated
-   * @ordered
-   */
-  public static final int OMISSION_VALUE = 4;
-
-  /**
-   * The '<em><b>VALUE SUBTLE</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>VALUE SUBTLE</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #VALUE_SUBTLE
-   * @model literal="valueSubtle"
-   * @generated
-   * @ordered
-   */
-  public static final int VALUE_SUBTLE_VALUE = 5;
-
-  /**
-   * The '<em><b>VALUE COARSE</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>VALUE COARSE</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #VALUE_COARSE
-   * @model literal="valueCoarse"
-   * @generated
-   * @ordered
-   */
-  public static final int VALUE_COARSE_VALUE = 6;
-
-  /**
-   * The '<em><b>WILDCARD</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>WILDCARD</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #WILDCARD
-   * @model literal="wildcard"
-   * @generated
-   * @ordered
-   */
-  public static final int WILDCARD_VALUE = 7;
-
-  /**
-   * The '<em><b>VARIABLE</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>VARIABLE</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #VARIABLE
-   * @model literal="variable"
-   * @generated
-   * @ordered
-   */
-  public static final int VARIABLE_VALUE = 8;
-
-  /**
-   * An array of all the '<em><b>Failure Type</b></em>' enumerators.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private static final FailureType[] VALUES_ARRAY =
-    new FailureType[]
-    {
-      NO_FAILURE,
-      EARLY,
-      LATE,
-      COMMISSION,
-      OMISSION,
-      VALUE_SUBTLE,
-      VALUE_COARSE,
-      WILDCARD,
-      VARIABLE,
-    };
-
-  /**
-   * A public read-only list of all the '<em><b>Failure Type</b></em>' enumerators.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final List<FailureType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-  /**
-   * Returns the '<em><b>Failure Type</b></em>' literal with the specified literal value.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param literal the literal.
-   * @return the matching enumerator or <code>null</code>.
-   * @generated
-   */
-  public static FailureType get(String literal)
-  {
-    for (int i = 0; i < VALUES_ARRAY.length; ++i)
-    {
-      FailureType result = VALUES_ARRAY[i];
-      if (result.toString().equals(literal))
-      {
-        return result;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Returns the '<em><b>Failure Type</b></em>' literal with the specified name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param name the name.
-   * @return the matching enumerator or <code>null</code>.
-   * @generated
-   */
-  public static FailureType getByName(String name)
-  {
-    for (int i = 0; i < VALUES_ARRAY.length; ++i)
-    {
-      FailureType result = VALUES_ARRAY[i];
-      if (result.getName().equals(name))
-      {
-        return result;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Returns the '<em><b>Failure Type</b></em>' literal with the specified integer value.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the integer value.
-   * @return the matching enumerator or <code>null</code>.
-   * @generated
-   */
-  public static FailureType get(int value)
-  {
-    switch (value)
-    {
-      case NO_FAILURE_VALUE: return NO_FAILURE;
-      case EARLY_VALUE: return EARLY;
-      case LATE_VALUE: return LATE;
-      case COMMISSION_VALUE: return COMMISSION;
-      case OMISSION_VALUE: return OMISSION;
-      case VALUE_SUBTLE_VALUE: return VALUE_SUBTLE;
-      case VALUE_COARSE_VALUE: return VALUE_COARSE;
-      case WILDCARD_VALUE: return WILDCARD;
-      case VARIABLE_VALUE: return VARIABLE;
-    }
-    return null;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private final int value;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private final String name;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private final String literal;
-
-  /**
-   * Only this class can construct instances.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private FailureType(int value, String name, String literal)
-  {
-    this.value = value;
-    this.name = name;
-    this.literal = literal;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public int getValue()
-  {
-    return value;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getLiteral()
-  {
-    return literal;
-  }
-
-  /**
-   * Returns the literal value of the enumerator, which is its string representation.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    return literal;
-  }
-  
-} //FailureType
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/FlaDslFactory.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/FlaDslFactory.java
deleted file mode 100644
index 28d60c84356e37beb888c4cdd3eeb6fb71a7b2a5..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/FlaDslFactory.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage
- * @generated
- */
-public interface FlaDslFactory extends EFactory
-{
-  /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  FlaDslFactory eINSTANCE = org.polarsys.chess.xtext.flaDsl.impl.FlaDslFactoryImpl.init();
-
-  /**
-   * Returns a new object of class '<em>Behaviour</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Behaviour</em>'.
-   * @generated
-   */
-  Behaviour createBehaviour();
-
-  /**
-   * Returns a new object of class '<em>Expression</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Expression</em>'.
-   * @generated
-   */
-  Expression createExpression();
-
-  /**
-   * Returns a new object of class '<em>Lhs</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Lhs</em>'.
-   * @generated
-   */
-  Lhs createLhs();
-
-  /**
-   * Returns a new object of class '<em>Rhs</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Rhs</em>'.
-   * @generated
-   */
-  Rhs createRhs();
-
-  /**
-   * Returns a new object of class '<em>Input Expression</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Input Expression</em>'.
-   * @generated
-   */
-  InputExpression createInputExpression();
-
-  /**
-   * Returns a new object of class '<em>Output Expression</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Output Expression</em>'.
-   * @generated
-   */
-  OutputExpression createOutputExpression();
-
-  /**
-   * Returns a new object of class '<em>In Failure Expr</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>In Failure Expr</em>'.
-   * @generated
-   */
-  InFailureExpr createInFailureExpr();
-
-  /**
-   * Returns a new object of class '<em>Out Failure Expr</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Out Failure Expr</em>'.
-   * @generated
-   */
-  OutFailureExpr createOutFailureExpr();
-
-  /**
-   * Returns a new object of class '<em>Definitions</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Definitions</em>'.
-   * @generated
-   */
-  Definitions createDefinitions();
-
-  /**
-   * Returns a new object of class '<em>Failure Definition</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Failure Definition</em>'.
-   * @generated
-   */
-  FailureDefinition createFailureDefinition();
-
-  /**
-   * Returns a new object of class '<em>No Failure Definition</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>No Failure Definition</em>'.
-   * @generated
-   */
-  NoFailureDefinition createNoFailureDefinition();
-
-  /**
-   * Returns a new object of class '<em>Complex Nofailure Definition</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Complex Nofailure Definition</em>'.
-   * @generated
-   */
-  ComplexNofailureDefinition createComplexNofailureDefinition();
-
-  /**
-   * Returns a new object of class '<em>Wildcard Definition</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Wildcard Definition</em>'.
-   * @generated
-   */
-  WildcardDefinition createWildcardDefinition();
-
-  /**
-   * Returns a new object of class '<em>Variable Definition</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Variable Definition</em>'.
-   * @generated
-   */
-  VariableDefinition createVariableDefinition();
-
-  /**
-   * Returns a new object of class '<em>ACI Davoidable</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>ACI Davoidable</em>'.
-   * @generated
-   */
-  ACIDavoidable createACIDavoidable();
-
-  /**
-   * Returns a new object of class '<em>ACID Mitigation</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>ACID Mitigation</em>'.
-   * @generated
-   */
-  ACIDMitigation createACIDMitigation();
-
-  /**
-   * Returns the package supported by this factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the package supported by this factory.
-   * @generated
-   */
-  FlaDslPackage getFlaDslPackage();
-
-} //FlaDslFactory
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/FlaDslPackage.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/FlaDslPackage.java
deleted file mode 100644
index d1abb3a35cdd255332bd613cb69b87fb66b7f363..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/FlaDslPackage.java
+++ /dev/null
@@ -1,1624 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.polarsys.chess.xtext.flaDsl.FlaDslFactory
- * @model kind="package"
- * @generated
- */
-public interface FlaDslPackage extends EPackage
-{
-  /**
-   * The package name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNAME = "flaDsl";
-
-  /**
-   * The package namespace URI.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_URI = "http://www.intecs.org/chess/xtext/FlaDsl";
-
-  /**
-   * The package namespace name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_PREFIX = "flaDsl";
-
-  /**
-   * The singleton instance of the package.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  FlaDslPackage eINSTANCE = org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl.init();
-
-  /**
-   * The meta object id for the '{@link org.polarsys.chess.xtext.flaDsl.impl.BehaviourImpl <em>Behaviour</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.polarsys.chess.xtext.flaDsl.impl.BehaviourImpl
-   * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getBehaviour()
-   * @generated
-   */
-  int BEHAVIOUR = 0;
-
-  /**
-   * The feature id for the '<em><b>Rules</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BEHAVIOUR__RULES = 0;
-
-  /**
-   * The number of structural features of the '<em>Behaviour</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BEHAVIOUR_FEATURE_COUNT = 1;
-
-  /**
-   * The meta object id for the '{@link org.polarsys.chess.xtext.flaDsl.impl.ExpressionImpl <em>Expression</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.polarsys.chess.xtext.flaDsl.impl.ExpressionImpl
-   * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getExpression()
-   * @generated
-   */
-  int EXPRESSION = 1;
-
-  /**
-   * The feature id for the '<em><b>Lhs</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EXPRESSION__LHS = 0;
-
-  /**
-   * The feature id for the '<em><b>Rhs</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EXPRESSION__RHS = 1;
-
-  /**
-   * The number of structural features of the '<em>Expression</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EXPRESSION_FEATURE_COUNT = 2;
-
-  /**
-   * The meta object id for the '{@link org.polarsys.chess.xtext.flaDsl.impl.LhsImpl <em>Lhs</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.polarsys.chess.xtext.flaDsl.impl.LhsImpl
-   * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getLhs()
-   * @generated
-   */
-  int LHS = 2;
-
-  /**
-   * The feature id for the '<em><b>Failures</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int LHS__FAILURES = 0;
-
-  /**
-   * The number of structural features of the '<em>Lhs</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int LHS_FEATURE_COUNT = 1;
-
-  /**
-   * The meta object id for the '{@link org.polarsys.chess.xtext.flaDsl.impl.RhsImpl <em>Rhs</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.polarsys.chess.xtext.flaDsl.impl.RhsImpl
-   * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getRhs()
-   * @generated
-   */
-  int RHS = 3;
-
-  /**
-   * The feature id for the '<em><b>Failures</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int RHS__FAILURES = 0;
-
-  /**
-   * The number of structural features of the '<em>Rhs</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int RHS_FEATURE_COUNT = 1;
-
-  /**
-   * The meta object id for the '{@link org.polarsys.chess.xtext.flaDsl.impl.InputExpressionImpl <em>Input Expression</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.polarsys.chess.xtext.flaDsl.impl.InputExpressionImpl
-   * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getInputExpression()
-   * @generated
-   */
-  int INPUT_EXPRESSION = 4;
-
-  /**
-   * The feature id for the '<em><b>Ref</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int INPUT_EXPRESSION__REF = 0;
-
-  /**
-   * The feature id for the '<em><b>Failure Expr</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int INPUT_EXPRESSION__FAILURE_EXPR = 1;
-
-  /**
-   * The number of structural features of the '<em>Input Expression</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int INPUT_EXPRESSION_FEATURE_COUNT = 2;
-
-  /**
-   * The meta object id for the '{@link org.polarsys.chess.xtext.flaDsl.impl.OutputExpressionImpl <em>Output Expression</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.polarsys.chess.xtext.flaDsl.impl.OutputExpressionImpl
-   * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getOutputExpression()
-   * @generated
-   */
-  int OUTPUT_EXPRESSION = 5;
-
-  /**
-   * The feature id for the '<em><b>Ref</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OUTPUT_EXPRESSION__REF = 0;
-
-  /**
-   * The feature id for the '<em><b>Failure Expr</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OUTPUT_EXPRESSION__FAILURE_EXPR = 1;
-
-  /**
-   * The number of structural features of the '<em>Output Expression</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OUTPUT_EXPRESSION_FEATURE_COUNT = 2;
-
-  /**
-   * The meta object id for the '{@link org.polarsys.chess.xtext.flaDsl.impl.InFailureExprImpl <em>In Failure Expr</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.polarsys.chess.xtext.flaDsl.impl.InFailureExprImpl
-   * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getInFailureExpr()
-   * @generated
-   */
-  int IN_FAILURE_EXPR = 6;
-
-  /**
-   * The feature id for the '<em><b>Failures</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IN_FAILURE_EXPR__FAILURES = 0;
-
-  /**
-   * The number of structural features of the '<em>In Failure Expr</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IN_FAILURE_EXPR_FEATURE_COUNT = 1;
-
-  /**
-   * The meta object id for the '{@link org.polarsys.chess.xtext.flaDsl.impl.OutFailureExprImpl <em>Out Failure Expr</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.polarsys.chess.xtext.flaDsl.impl.OutFailureExprImpl
-   * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getOutFailureExpr()
-   * @generated
-   */
-  int OUT_FAILURE_EXPR = 7;
-
-  /**
-   * The feature id for the '<em><b>Failures</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OUT_FAILURE_EXPR__FAILURES = 0;
-
-  /**
-   * The number of structural features of the '<em>Out Failure Expr</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OUT_FAILURE_EXPR_FEATURE_COUNT = 1;
-
-  /**
-   * The meta object id for the '{@link org.polarsys.chess.xtext.flaDsl.impl.DefinitionsImpl <em>Definitions</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.polarsys.chess.xtext.flaDsl.impl.DefinitionsImpl
-   * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getDefinitions()
-   * @generated
-   */
-  int DEFINITIONS = 8;
-
-  /**
-   * The number of structural features of the '<em>Definitions</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITIONS_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link org.polarsys.chess.xtext.flaDsl.impl.FailureDefinitionImpl <em>Failure Definition</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.polarsys.chess.xtext.flaDsl.impl.FailureDefinitionImpl
-   * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getFailureDefinition()
-   * @generated
-   */
-  int FAILURE_DEFINITION = 9;
-
-  /**
-   * The feature id for the '<em><b>Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int FAILURE_DEFINITION__TYPE = DEFINITIONS_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Acid Avoidable</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int FAILURE_DEFINITION__ACID_AVOIDABLE = DEFINITIONS_FEATURE_COUNT + 1;
-
-  /**
-   * The number of structural features of the '<em>Failure Definition</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int FAILURE_DEFINITION_FEATURE_COUNT = DEFINITIONS_FEATURE_COUNT + 2;
-
-  /**
-   * The meta object id for the '{@link org.polarsys.chess.xtext.flaDsl.impl.NoFailureDefinitionImpl <em>No Failure Definition</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.polarsys.chess.xtext.flaDsl.impl.NoFailureDefinitionImpl
-   * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getNoFailureDefinition()
-   * @generated
-   */
-  int NO_FAILURE_DEFINITION = 10;
-
-  /**
-   * The feature id for the '<em><b>Acid Mitigation</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int NO_FAILURE_DEFINITION__ACID_MITIGATION = DEFINITIONS_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the '<em>No Failure Definition</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int NO_FAILURE_DEFINITION_FEATURE_COUNT = DEFINITIONS_FEATURE_COUNT + 1;
-
-  /**
-   * The meta object id for the '{@link org.polarsys.chess.xtext.flaDsl.impl.ComplexNofailureDefinitionImpl <em>Complex Nofailure Definition</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.polarsys.chess.xtext.flaDsl.impl.ComplexNofailureDefinitionImpl
-   * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getComplexNofailureDefinition()
-   * @generated
-   */
-  int COMPLEX_NOFAILURE_DEFINITION = 11;
-
-  /**
-   * The number of structural features of the '<em>Complex Nofailure Definition</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int COMPLEX_NOFAILURE_DEFINITION_FEATURE_COUNT = DEFINITIONS_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.polarsys.chess.xtext.flaDsl.impl.WildcardDefinitionImpl <em>Wildcard Definition</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.polarsys.chess.xtext.flaDsl.impl.WildcardDefinitionImpl
-   * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getWildcardDefinition()
-   * @generated
-   */
-  int WILDCARD_DEFINITION = 12;
-
-  /**
-   * The number of structural features of the '<em>Wildcard Definition</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WILDCARD_DEFINITION_FEATURE_COUNT = DEFINITIONS_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.polarsys.chess.xtext.flaDsl.impl.VariableDefinitionImpl <em>Variable Definition</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.polarsys.chess.xtext.flaDsl.impl.VariableDefinitionImpl
-   * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getVariableDefinition()
-   * @generated
-   */
-  int VARIABLE_DEFINITION = 13;
-
-  /**
-   * The feature id for the '<em><b>Variable Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int VARIABLE_DEFINITION__VARIABLE_NAME = DEFINITIONS_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the '<em>Variable Definition</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int VARIABLE_DEFINITION_FEATURE_COUNT = DEFINITIONS_FEATURE_COUNT + 1;
-
-  /**
-   * The meta object id for the '{@link org.polarsys.chess.xtext.flaDsl.impl.ACIDavoidableImpl <em>ACI Davoidable</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.polarsys.chess.xtext.flaDsl.impl.ACIDavoidableImpl
-   * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getACIDavoidable()
-   * @generated
-   */
-  int ACI_DAVOIDABLE = 14;
-
-  /**
-   * The feature id for the '<em><b>A</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ACI_DAVOIDABLE__A = 0;
-
-  /**
-   * The feature id for the '<em><b>C</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ACI_DAVOIDABLE__C = 1;
-
-  /**
-   * The feature id for the '<em><b>I</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ACI_DAVOIDABLE__I = 2;
-
-  /**
-   * The feature id for the '<em><b>D</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ACI_DAVOIDABLE__D = 3;
-
-  /**
-   * The number of structural features of the '<em>ACI Davoidable</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ACI_DAVOIDABLE_FEATURE_COUNT = 4;
-
-  /**
-   * The meta object id for the '{@link org.polarsys.chess.xtext.flaDsl.impl.ACIDMitigationImpl <em>ACID Mitigation</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.polarsys.chess.xtext.flaDsl.impl.ACIDMitigationImpl
-   * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getACIDMitigation()
-   * @generated
-   */
-  int ACID_MITIGATION = 15;
-
-  /**
-   * The feature id for the '<em><b>A</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ACID_MITIGATION__A = 0;
-
-  /**
-   * The feature id for the '<em><b>C</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ACID_MITIGATION__C = 1;
-
-  /**
-   * The feature id for the '<em><b>I</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ACID_MITIGATION__I = 2;
-
-  /**
-   * The feature id for the '<em><b>D</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ACID_MITIGATION__D = 3;
-
-  /**
-   * The number of structural features of the '<em>ACID Mitigation</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ACID_MITIGATION_FEATURE_COUNT = 4;
-
-  /**
-   * The meta object id for the '{@link org.polarsys.chess.xtext.flaDsl.FailureType <em>Failure Type</em>}' enum.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.polarsys.chess.xtext.flaDsl.FailureType
-   * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getFailureType()
-   * @generated
-   */
-  int FAILURE_TYPE = 16;
-
-  /**
-   * The meta object id for the '{@link org.polarsys.chess.xtext.flaDsl.Aavoidable <em>Aavoidable</em>}' enum.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.polarsys.chess.xtext.flaDsl.Aavoidable
-   * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getAavoidable()
-   * @generated
-   */
-  int AAVOIDABLE = 17;
-
-  /**
-   * The meta object id for the '{@link org.polarsys.chess.xtext.flaDsl.Cavoidable <em>Cavoidable</em>}' enum.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.polarsys.chess.xtext.flaDsl.Cavoidable
-   * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getCavoidable()
-   * @generated
-   */
-  int CAVOIDABLE = 18;
-
-  /**
-   * The meta object id for the '{@link org.polarsys.chess.xtext.flaDsl.Iavoidable <em>Iavoidable</em>}' enum.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.polarsys.chess.xtext.flaDsl.Iavoidable
-   * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getIavoidable()
-   * @generated
-   */
-  int IAVOIDABLE = 19;
-
-  /**
-   * The meta object id for the '{@link org.polarsys.chess.xtext.flaDsl.Davoidable <em>Davoidable</em>}' enum.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.polarsys.chess.xtext.flaDsl.Davoidable
-   * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getDavoidable()
-   * @generated
-   */
-  int DAVOIDABLE = 20;
-
-  /**
-   * The meta object id for the '{@link org.polarsys.chess.xtext.flaDsl.Amitigation <em>Amitigation</em>}' enum.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.polarsys.chess.xtext.flaDsl.Amitigation
-   * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getAmitigation()
-   * @generated
-   */
-  int AMITIGATION = 21;
-
-  /**
-   * The meta object id for the '{@link org.polarsys.chess.xtext.flaDsl.Cmitigation <em>Cmitigation</em>}' enum.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.polarsys.chess.xtext.flaDsl.Cmitigation
-   * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getCmitigation()
-   * @generated
-   */
-  int CMITIGATION = 22;
-
-  /**
-   * The meta object id for the '{@link org.polarsys.chess.xtext.flaDsl.Imitigation <em>Imitigation</em>}' enum.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.polarsys.chess.xtext.flaDsl.Imitigation
-   * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getImitigation()
-   * @generated
-   */
-  int IMITIGATION = 23;
-
-  /**
-   * The meta object id for the '{@link org.polarsys.chess.xtext.flaDsl.Dmitigation <em>Dmitigation</em>}' enum.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.polarsys.chess.xtext.flaDsl.Dmitigation
-   * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getDmitigation()
-   * @generated
-   */
-  int DMITIGATION = 24;
-
-
-  /**
-   * Returns the meta object for class '{@link org.polarsys.chess.xtext.flaDsl.Behaviour <em>Behaviour</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Behaviour</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.Behaviour
-   * @generated
-   */
-  EClass getBehaviour();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.polarsys.chess.xtext.flaDsl.Behaviour#getRules <em>Rules</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Rules</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.Behaviour#getRules()
-   * @see #getBehaviour()
-   * @generated
-   */
-  EReference getBehaviour_Rules();
-
-  /**
-   * Returns the meta object for class '{@link org.polarsys.chess.xtext.flaDsl.Expression <em>Expression</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Expression</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.Expression
-   * @generated
-   */
-  EClass getExpression();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.polarsys.chess.xtext.flaDsl.Expression#getLhs <em>Lhs</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Lhs</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.Expression#getLhs()
-   * @see #getExpression()
-   * @generated
-   */
-  EReference getExpression_Lhs();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.polarsys.chess.xtext.flaDsl.Expression#getRhs <em>Rhs</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Rhs</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.Expression#getRhs()
-   * @see #getExpression()
-   * @generated
-   */
-  EReference getExpression_Rhs();
-
-  /**
-   * Returns the meta object for class '{@link org.polarsys.chess.xtext.flaDsl.Lhs <em>Lhs</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Lhs</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.Lhs
-   * @generated
-   */
-  EClass getLhs();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.polarsys.chess.xtext.flaDsl.Lhs#getFailures <em>Failures</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Failures</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.Lhs#getFailures()
-   * @see #getLhs()
-   * @generated
-   */
-  EReference getLhs_Failures();
-
-  /**
-   * Returns the meta object for class '{@link org.polarsys.chess.xtext.flaDsl.Rhs <em>Rhs</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Rhs</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.Rhs
-   * @generated
-   */
-  EClass getRhs();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.polarsys.chess.xtext.flaDsl.Rhs#getFailures <em>Failures</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Failures</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.Rhs#getFailures()
-   * @see #getRhs()
-   * @generated
-   */
-  EReference getRhs_Failures();
-
-  /**
-   * Returns the meta object for class '{@link org.polarsys.chess.xtext.flaDsl.InputExpression <em>Input Expression</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Input Expression</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.InputExpression
-   * @generated
-   */
-  EClass getInputExpression();
-
-  /**
-   * Returns the meta object for the reference '{@link org.polarsys.chess.xtext.flaDsl.InputExpression#getRef <em>Ref</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>Ref</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.InputExpression#getRef()
-   * @see #getInputExpression()
-   * @generated
-   */
-  EReference getInputExpression_Ref();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.polarsys.chess.xtext.flaDsl.InputExpression#getFailureExpr <em>Failure Expr</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Failure Expr</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.InputExpression#getFailureExpr()
-   * @see #getInputExpression()
-   * @generated
-   */
-  EReference getInputExpression_FailureExpr();
-
-  /**
-   * Returns the meta object for class '{@link org.polarsys.chess.xtext.flaDsl.OutputExpression <em>Output Expression</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Output Expression</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.OutputExpression
-   * @generated
-   */
-  EClass getOutputExpression();
-
-  /**
-   * Returns the meta object for the reference '{@link org.polarsys.chess.xtext.flaDsl.OutputExpression#getRef <em>Ref</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>Ref</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.OutputExpression#getRef()
-   * @see #getOutputExpression()
-   * @generated
-   */
-  EReference getOutputExpression_Ref();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.polarsys.chess.xtext.flaDsl.OutputExpression#getFailureExpr <em>Failure Expr</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Failure Expr</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.OutputExpression#getFailureExpr()
-   * @see #getOutputExpression()
-   * @generated
-   */
-  EReference getOutputExpression_FailureExpr();
-
-  /**
-   * Returns the meta object for class '{@link org.polarsys.chess.xtext.flaDsl.InFailureExpr <em>In Failure Expr</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>In Failure Expr</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.InFailureExpr
-   * @generated
-   */
-  EClass getInFailureExpr();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.polarsys.chess.xtext.flaDsl.InFailureExpr#getFailures <em>Failures</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Failures</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.InFailureExpr#getFailures()
-   * @see #getInFailureExpr()
-   * @generated
-   */
-  EReference getInFailureExpr_Failures();
-
-  /**
-   * Returns the meta object for class '{@link org.polarsys.chess.xtext.flaDsl.OutFailureExpr <em>Out Failure Expr</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Out Failure Expr</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.OutFailureExpr
-   * @generated
-   */
-  EClass getOutFailureExpr();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.polarsys.chess.xtext.flaDsl.OutFailureExpr#getFailures <em>Failures</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Failures</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.OutFailureExpr#getFailures()
-   * @see #getOutFailureExpr()
-   * @generated
-   */
-  EReference getOutFailureExpr_Failures();
-
-  /**
-   * Returns the meta object for class '{@link org.polarsys.chess.xtext.flaDsl.Definitions <em>Definitions</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Definitions</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.Definitions
-   * @generated
-   */
-  EClass getDefinitions();
-
-  /**
-   * Returns the meta object for class '{@link org.polarsys.chess.xtext.flaDsl.FailureDefinition <em>Failure Definition</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Failure Definition</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.FailureDefinition
-   * @generated
-   */
-  EClass getFailureDefinition();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.polarsys.chess.xtext.flaDsl.FailureDefinition#getType <em>Type</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Type</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.FailureDefinition#getType()
-   * @see #getFailureDefinition()
-   * @generated
-   */
-  EAttribute getFailureDefinition_Type();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.polarsys.chess.xtext.flaDsl.FailureDefinition#getAcidAvoidable <em>Acid Avoidable</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Acid Avoidable</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.FailureDefinition#getAcidAvoidable()
-   * @see #getFailureDefinition()
-   * @generated
-   */
-  EReference getFailureDefinition_AcidAvoidable();
-
-  /**
-   * Returns the meta object for class '{@link org.polarsys.chess.xtext.flaDsl.NoFailureDefinition <em>No Failure Definition</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>No Failure Definition</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.NoFailureDefinition
-   * @generated
-   */
-  EClass getNoFailureDefinition();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.polarsys.chess.xtext.flaDsl.NoFailureDefinition#getAcidMitigation <em>Acid Mitigation</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Acid Mitigation</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.NoFailureDefinition#getAcidMitigation()
-   * @see #getNoFailureDefinition()
-   * @generated
-   */
-  EReference getNoFailureDefinition_AcidMitigation();
-
-  /**
-   * Returns the meta object for class '{@link org.polarsys.chess.xtext.flaDsl.ComplexNofailureDefinition <em>Complex Nofailure Definition</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Complex Nofailure Definition</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.ComplexNofailureDefinition
-   * @generated
-   */
-  EClass getComplexNofailureDefinition();
-
-  /**
-   * Returns the meta object for class '{@link org.polarsys.chess.xtext.flaDsl.WildcardDefinition <em>Wildcard Definition</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Wildcard Definition</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.WildcardDefinition
-   * @generated
-   */
-  EClass getWildcardDefinition();
-
-  /**
-   * Returns the meta object for class '{@link org.polarsys.chess.xtext.flaDsl.VariableDefinition <em>Variable Definition</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Variable Definition</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.VariableDefinition
-   * @generated
-   */
-  EClass getVariableDefinition();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.polarsys.chess.xtext.flaDsl.VariableDefinition#getVariableName <em>Variable Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Variable Name</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.VariableDefinition#getVariableName()
-   * @see #getVariableDefinition()
-   * @generated
-   */
-  EAttribute getVariableDefinition_VariableName();
-
-  /**
-   * Returns the meta object for class '{@link org.polarsys.chess.xtext.flaDsl.ACIDavoidable <em>ACI Davoidable</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>ACI Davoidable</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.ACIDavoidable
-   * @generated
-   */
-  EClass getACIDavoidable();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.polarsys.chess.xtext.flaDsl.ACIDavoidable#getA <em>A</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>A</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.ACIDavoidable#getA()
-   * @see #getACIDavoidable()
-   * @generated
-   */
-  EAttribute getACIDavoidable_A();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.polarsys.chess.xtext.flaDsl.ACIDavoidable#getC <em>C</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>C</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.ACIDavoidable#getC()
-   * @see #getACIDavoidable()
-   * @generated
-   */
-  EAttribute getACIDavoidable_C();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.polarsys.chess.xtext.flaDsl.ACIDavoidable#getI <em>I</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>I</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.ACIDavoidable#getI()
-   * @see #getACIDavoidable()
-   * @generated
-   */
-  EAttribute getACIDavoidable_I();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.polarsys.chess.xtext.flaDsl.ACIDavoidable#getD <em>D</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>D</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.ACIDavoidable#getD()
-   * @see #getACIDavoidable()
-   * @generated
-   */
-  EAttribute getACIDavoidable_D();
-
-  /**
-   * Returns the meta object for class '{@link org.polarsys.chess.xtext.flaDsl.ACIDMitigation <em>ACID Mitigation</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>ACID Mitigation</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.ACIDMitigation
-   * @generated
-   */
-  EClass getACIDMitigation();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.polarsys.chess.xtext.flaDsl.ACIDMitigation#getA <em>A</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>A</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.ACIDMitigation#getA()
-   * @see #getACIDMitigation()
-   * @generated
-   */
-  EAttribute getACIDMitigation_A();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.polarsys.chess.xtext.flaDsl.ACIDMitigation#getC <em>C</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>C</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.ACIDMitigation#getC()
-   * @see #getACIDMitigation()
-   * @generated
-   */
-  EAttribute getACIDMitigation_C();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.polarsys.chess.xtext.flaDsl.ACIDMitigation#getI <em>I</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>I</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.ACIDMitigation#getI()
-   * @see #getACIDMitigation()
-   * @generated
-   */
-  EAttribute getACIDMitigation_I();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.polarsys.chess.xtext.flaDsl.ACIDMitigation#getD <em>D</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>D</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.ACIDMitigation#getD()
-   * @see #getACIDMitigation()
-   * @generated
-   */
-  EAttribute getACIDMitigation_D();
-
-  /**
-   * Returns the meta object for enum '{@link org.polarsys.chess.xtext.flaDsl.FailureType <em>Failure Type</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for enum '<em>Failure Type</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.FailureType
-   * @generated
-   */
-  EEnum getFailureType();
-
-  /**
-   * Returns the meta object for enum '{@link org.polarsys.chess.xtext.flaDsl.Aavoidable <em>Aavoidable</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for enum '<em>Aavoidable</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.Aavoidable
-   * @generated
-   */
-  EEnum getAavoidable();
-
-  /**
-   * Returns the meta object for enum '{@link org.polarsys.chess.xtext.flaDsl.Cavoidable <em>Cavoidable</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for enum '<em>Cavoidable</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.Cavoidable
-   * @generated
-   */
-  EEnum getCavoidable();
-
-  /**
-   * Returns the meta object for enum '{@link org.polarsys.chess.xtext.flaDsl.Iavoidable <em>Iavoidable</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for enum '<em>Iavoidable</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.Iavoidable
-   * @generated
-   */
-  EEnum getIavoidable();
-
-  /**
-   * Returns the meta object for enum '{@link org.polarsys.chess.xtext.flaDsl.Davoidable <em>Davoidable</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for enum '<em>Davoidable</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.Davoidable
-   * @generated
-   */
-  EEnum getDavoidable();
-
-  /**
-   * Returns the meta object for enum '{@link org.polarsys.chess.xtext.flaDsl.Amitigation <em>Amitigation</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for enum '<em>Amitigation</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.Amitigation
-   * @generated
-   */
-  EEnum getAmitigation();
-
-  /**
-   * Returns the meta object for enum '{@link org.polarsys.chess.xtext.flaDsl.Cmitigation <em>Cmitigation</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for enum '<em>Cmitigation</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.Cmitigation
-   * @generated
-   */
-  EEnum getCmitigation();
-
-  /**
-   * Returns the meta object for enum '{@link org.polarsys.chess.xtext.flaDsl.Imitigation <em>Imitigation</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for enum '<em>Imitigation</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.Imitigation
-   * @generated
-   */
-  EEnum getImitigation();
-
-  /**
-   * Returns the meta object for enum '{@link org.polarsys.chess.xtext.flaDsl.Dmitigation <em>Dmitigation</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for enum '<em>Dmitigation</em>'.
-   * @see org.polarsys.chess.xtext.flaDsl.Dmitigation
-   * @generated
-   */
-  EEnum getDmitigation();
-
-  /**
-   * Returns the factory that creates the instances of the model.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the factory that creates the instances of the model.
-   * @generated
-   */
-  FlaDslFactory getFlaDslFactory();
-
-  /**
-   * <!-- begin-user-doc -->
-   * Defines literals for the meta objects that represent
-   * <ul>
-   *   <li>each class,</li>
-   *   <li>each feature of each class,</li>
-   *   <li>each enum,</li>
-   *   <li>and each data type</li>
-   * </ul>
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  interface Literals
-  {
-    /**
-     * The meta object literal for the '{@link org.polarsys.chess.xtext.flaDsl.impl.BehaviourImpl <em>Behaviour</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.polarsys.chess.xtext.flaDsl.impl.BehaviourImpl
-     * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getBehaviour()
-     * @generated
-     */
-    EClass BEHAVIOUR = eINSTANCE.getBehaviour();
-
-    /**
-     * The meta object literal for the '<em><b>Rules</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference BEHAVIOUR__RULES = eINSTANCE.getBehaviour_Rules();
-
-    /**
-     * The meta object literal for the '{@link org.polarsys.chess.xtext.flaDsl.impl.ExpressionImpl <em>Expression</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.polarsys.chess.xtext.flaDsl.impl.ExpressionImpl
-     * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getExpression()
-     * @generated
-     */
-    EClass EXPRESSION = eINSTANCE.getExpression();
-
-    /**
-     * The meta object literal for the '<em><b>Lhs</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference EXPRESSION__LHS = eINSTANCE.getExpression_Lhs();
-
-    /**
-     * The meta object literal for the '<em><b>Rhs</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference EXPRESSION__RHS = eINSTANCE.getExpression_Rhs();
-
-    /**
-     * The meta object literal for the '{@link org.polarsys.chess.xtext.flaDsl.impl.LhsImpl <em>Lhs</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.polarsys.chess.xtext.flaDsl.impl.LhsImpl
-     * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getLhs()
-     * @generated
-     */
-    EClass LHS = eINSTANCE.getLhs();
-
-    /**
-     * The meta object literal for the '<em><b>Failures</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference LHS__FAILURES = eINSTANCE.getLhs_Failures();
-
-    /**
-     * The meta object literal for the '{@link org.polarsys.chess.xtext.flaDsl.impl.RhsImpl <em>Rhs</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.polarsys.chess.xtext.flaDsl.impl.RhsImpl
-     * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getRhs()
-     * @generated
-     */
-    EClass RHS = eINSTANCE.getRhs();
-
-    /**
-     * The meta object literal for the '<em><b>Failures</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference RHS__FAILURES = eINSTANCE.getRhs_Failures();
-
-    /**
-     * The meta object literal for the '{@link org.polarsys.chess.xtext.flaDsl.impl.InputExpressionImpl <em>Input Expression</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.polarsys.chess.xtext.flaDsl.impl.InputExpressionImpl
-     * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getInputExpression()
-     * @generated
-     */
-    EClass INPUT_EXPRESSION = eINSTANCE.getInputExpression();
-
-    /**
-     * The meta object literal for the '<em><b>Ref</b></em>' reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference INPUT_EXPRESSION__REF = eINSTANCE.getInputExpression_Ref();
-
-    /**
-     * The meta object literal for the '<em><b>Failure Expr</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference INPUT_EXPRESSION__FAILURE_EXPR = eINSTANCE.getInputExpression_FailureExpr();
-
-    /**
-     * The meta object literal for the '{@link org.polarsys.chess.xtext.flaDsl.impl.OutputExpressionImpl <em>Output Expression</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.polarsys.chess.xtext.flaDsl.impl.OutputExpressionImpl
-     * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getOutputExpression()
-     * @generated
-     */
-    EClass OUTPUT_EXPRESSION = eINSTANCE.getOutputExpression();
-
-    /**
-     * The meta object literal for the '<em><b>Ref</b></em>' reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference OUTPUT_EXPRESSION__REF = eINSTANCE.getOutputExpression_Ref();
-
-    /**
-     * The meta object literal for the '<em><b>Failure Expr</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference OUTPUT_EXPRESSION__FAILURE_EXPR = eINSTANCE.getOutputExpression_FailureExpr();
-
-    /**
-     * The meta object literal for the '{@link org.polarsys.chess.xtext.flaDsl.impl.InFailureExprImpl <em>In Failure Expr</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.polarsys.chess.xtext.flaDsl.impl.InFailureExprImpl
-     * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getInFailureExpr()
-     * @generated
-     */
-    EClass IN_FAILURE_EXPR = eINSTANCE.getInFailureExpr();
-
-    /**
-     * The meta object literal for the '<em><b>Failures</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference IN_FAILURE_EXPR__FAILURES = eINSTANCE.getInFailureExpr_Failures();
-
-    /**
-     * The meta object literal for the '{@link org.polarsys.chess.xtext.flaDsl.impl.OutFailureExprImpl <em>Out Failure Expr</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.polarsys.chess.xtext.flaDsl.impl.OutFailureExprImpl
-     * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getOutFailureExpr()
-     * @generated
-     */
-    EClass OUT_FAILURE_EXPR = eINSTANCE.getOutFailureExpr();
-
-    /**
-     * The meta object literal for the '<em><b>Failures</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference OUT_FAILURE_EXPR__FAILURES = eINSTANCE.getOutFailureExpr_Failures();
-
-    /**
-     * The meta object literal for the '{@link org.polarsys.chess.xtext.flaDsl.impl.DefinitionsImpl <em>Definitions</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.polarsys.chess.xtext.flaDsl.impl.DefinitionsImpl
-     * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getDefinitions()
-     * @generated
-     */
-    EClass DEFINITIONS = eINSTANCE.getDefinitions();
-
-    /**
-     * The meta object literal for the '{@link org.polarsys.chess.xtext.flaDsl.impl.FailureDefinitionImpl <em>Failure Definition</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.polarsys.chess.xtext.flaDsl.impl.FailureDefinitionImpl
-     * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getFailureDefinition()
-     * @generated
-     */
-    EClass FAILURE_DEFINITION = eINSTANCE.getFailureDefinition();
-
-    /**
-     * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute FAILURE_DEFINITION__TYPE = eINSTANCE.getFailureDefinition_Type();
-
-    /**
-     * The meta object literal for the '<em><b>Acid Avoidable</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference FAILURE_DEFINITION__ACID_AVOIDABLE = eINSTANCE.getFailureDefinition_AcidAvoidable();
-
-    /**
-     * The meta object literal for the '{@link org.polarsys.chess.xtext.flaDsl.impl.NoFailureDefinitionImpl <em>No Failure Definition</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.polarsys.chess.xtext.flaDsl.impl.NoFailureDefinitionImpl
-     * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getNoFailureDefinition()
-     * @generated
-     */
-    EClass NO_FAILURE_DEFINITION = eINSTANCE.getNoFailureDefinition();
-
-    /**
-     * The meta object literal for the '<em><b>Acid Mitigation</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference NO_FAILURE_DEFINITION__ACID_MITIGATION = eINSTANCE.getNoFailureDefinition_AcidMitigation();
-
-    /**
-     * The meta object literal for the '{@link org.polarsys.chess.xtext.flaDsl.impl.ComplexNofailureDefinitionImpl <em>Complex Nofailure Definition</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.polarsys.chess.xtext.flaDsl.impl.ComplexNofailureDefinitionImpl
-     * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getComplexNofailureDefinition()
-     * @generated
-     */
-    EClass COMPLEX_NOFAILURE_DEFINITION = eINSTANCE.getComplexNofailureDefinition();
-
-    /**
-     * The meta object literal for the '{@link org.polarsys.chess.xtext.flaDsl.impl.WildcardDefinitionImpl <em>Wildcard Definition</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.polarsys.chess.xtext.flaDsl.impl.WildcardDefinitionImpl
-     * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getWildcardDefinition()
-     * @generated
-     */
-    EClass WILDCARD_DEFINITION = eINSTANCE.getWildcardDefinition();
-
-    /**
-     * The meta object literal for the '{@link org.polarsys.chess.xtext.flaDsl.impl.VariableDefinitionImpl <em>Variable Definition</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.polarsys.chess.xtext.flaDsl.impl.VariableDefinitionImpl
-     * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getVariableDefinition()
-     * @generated
-     */
-    EClass VARIABLE_DEFINITION = eINSTANCE.getVariableDefinition();
-
-    /**
-     * The meta object literal for the '<em><b>Variable Name</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute VARIABLE_DEFINITION__VARIABLE_NAME = eINSTANCE.getVariableDefinition_VariableName();
-
-    /**
-     * The meta object literal for the '{@link org.polarsys.chess.xtext.flaDsl.impl.ACIDavoidableImpl <em>ACI Davoidable</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.polarsys.chess.xtext.flaDsl.impl.ACIDavoidableImpl
-     * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getACIDavoidable()
-     * @generated
-     */
-    EClass ACI_DAVOIDABLE = eINSTANCE.getACIDavoidable();
-
-    /**
-     * The meta object literal for the '<em><b>A</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute ACI_DAVOIDABLE__A = eINSTANCE.getACIDavoidable_A();
-
-    /**
-     * The meta object literal for the '<em><b>C</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute ACI_DAVOIDABLE__C = eINSTANCE.getACIDavoidable_C();
-
-    /**
-     * The meta object literal for the '<em><b>I</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute ACI_DAVOIDABLE__I = eINSTANCE.getACIDavoidable_I();
-
-    /**
-     * The meta object literal for the '<em><b>D</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute ACI_DAVOIDABLE__D = eINSTANCE.getACIDavoidable_D();
-
-    /**
-     * The meta object literal for the '{@link org.polarsys.chess.xtext.flaDsl.impl.ACIDMitigationImpl <em>ACID Mitigation</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.polarsys.chess.xtext.flaDsl.impl.ACIDMitigationImpl
-     * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getACIDMitigation()
-     * @generated
-     */
-    EClass ACID_MITIGATION = eINSTANCE.getACIDMitigation();
-
-    /**
-     * The meta object literal for the '<em><b>A</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute ACID_MITIGATION__A = eINSTANCE.getACIDMitigation_A();
-
-    /**
-     * The meta object literal for the '<em><b>C</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute ACID_MITIGATION__C = eINSTANCE.getACIDMitigation_C();
-
-    /**
-     * The meta object literal for the '<em><b>I</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute ACID_MITIGATION__I = eINSTANCE.getACIDMitigation_I();
-
-    /**
-     * The meta object literal for the '<em><b>D</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute ACID_MITIGATION__D = eINSTANCE.getACIDMitigation_D();
-
-    /**
-     * The meta object literal for the '{@link org.polarsys.chess.xtext.flaDsl.FailureType <em>Failure Type</em>}' enum.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.polarsys.chess.xtext.flaDsl.FailureType
-     * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getFailureType()
-     * @generated
-     */
-    EEnum FAILURE_TYPE = eINSTANCE.getFailureType();
-
-    /**
-     * The meta object literal for the '{@link org.polarsys.chess.xtext.flaDsl.Aavoidable <em>Aavoidable</em>}' enum.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.polarsys.chess.xtext.flaDsl.Aavoidable
-     * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getAavoidable()
-     * @generated
-     */
-    EEnum AAVOIDABLE = eINSTANCE.getAavoidable();
-
-    /**
-     * The meta object literal for the '{@link org.polarsys.chess.xtext.flaDsl.Cavoidable <em>Cavoidable</em>}' enum.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.polarsys.chess.xtext.flaDsl.Cavoidable
-     * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getCavoidable()
-     * @generated
-     */
-    EEnum CAVOIDABLE = eINSTANCE.getCavoidable();
-
-    /**
-     * The meta object literal for the '{@link org.polarsys.chess.xtext.flaDsl.Iavoidable <em>Iavoidable</em>}' enum.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.polarsys.chess.xtext.flaDsl.Iavoidable
-     * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getIavoidable()
-     * @generated
-     */
-    EEnum IAVOIDABLE = eINSTANCE.getIavoidable();
-
-    /**
-     * The meta object literal for the '{@link org.polarsys.chess.xtext.flaDsl.Davoidable <em>Davoidable</em>}' enum.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.polarsys.chess.xtext.flaDsl.Davoidable
-     * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getDavoidable()
-     * @generated
-     */
-    EEnum DAVOIDABLE = eINSTANCE.getDavoidable();
-
-    /**
-     * The meta object literal for the '{@link org.polarsys.chess.xtext.flaDsl.Amitigation <em>Amitigation</em>}' enum.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.polarsys.chess.xtext.flaDsl.Amitigation
-     * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getAmitigation()
-     * @generated
-     */
-    EEnum AMITIGATION = eINSTANCE.getAmitigation();
-
-    /**
-     * The meta object literal for the '{@link org.polarsys.chess.xtext.flaDsl.Cmitigation <em>Cmitigation</em>}' enum.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.polarsys.chess.xtext.flaDsl.Cmitigation
-     * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getCmitigation()
-     * @generated
-     */
-    EEnum CMITIGATION = eINSTANCE.getCmitigation();
-
-    /**
-     * The meta object literal for the '{@link org.polarsys.chess.xtext.flaDsl.Imitigation <em>Imitigation</em>}' enum.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.polarsys.chess.xtext.flaDsl.Imitigation
-     * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getImitigation()
-     * @generated
-     */
-    EEnum IMITIGATION = eINSTANCE.getImitigation();
-
-    /**
-     * The meta object literal for the '{@link org.polarsys.chess.xtext.flaDsl.Dmitigation <em>Dmitigation</em>}' enum.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.polarsys.chess.xtext.flaDsl.Dmitigation
-     * @see org.polarsys.chess.xtext.flaDsl.impl.FlaDslPackageImpl#getDmitigation()
-     * @generated
-     */
-    EEnum DMITIGATION = eINSTANCE.getDmitigation();
-
-  }
-
-} //FlaDslPackage
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Iavoidable.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Iavoidable.java
deleted file mode 100644
index 6804f355d6b6f3b7094d2a4ee2e7a4e91a370094..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Iavoidable.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Iavoidable</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getIavoidable()
- * @model
- * @generated
- */
-public enum Iavoidable implements Enumerator
-{
-  /**
-   * The '<em><b>INTERFERENCE</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #INTERFERENCE_VALUE
-   * @generated
-   * @ordered
-   */
-  INTERFERENCE(0, "INTERFERENCE", "interference"),
-
-  /**
-   * The '<em><b>NONE</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #NONE_VALUE
-   * @generated
-   * @ordered
-   */
-  NONE(1, "NONE", "none"),
-
-  /**
-   * The '<em><b>UNSPECIFIED</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #UNSPECIFIED_VALUE
-   * @generated
-   * @ordered
-   */
-  UNSPECIFIED(2, "UNSPECIFIED", "unspecified");
-
-  /**
-   * The '<em><b>INTERFERENCE</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>INTERFERENCE</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #INTERFERENCE
-   * @model literal="interference"
-   * @generated
-   * @ordered
-   */
-  public static final int INTERFERENCE_VALUE = 0;
-
-  /**
-   * The '<em><b>NONE</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>NONE</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #NONE
-   * @model literal="none"
-   * @generated
-   * @ordered
-   */
-  public static final int NONE_VALUE = 1;
-
-  /**
-   * The '<em><b>UNSPECIFIED</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>UNSPECIFIED</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #UNSPECIFIED
-   * @model literal="unspecified"
-   * @generated
-   * @ordered
-   */
-  public static final int UNSPECIFIED_VALUE = 2;
-
-  /**
-   * An array of all the '<em><b>Iavoidable</b></em>' enumerators.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private static final Iavoidable[] VALUES_ARRAY =
-    new Iavoidable[]
-    {
-      INTERFERENCE,
-      NONE,
-      UNSPECIFIED,
-    };
-
-  /**
-   * A public read-only list of all the '<em><b>Iavoidable</b></em>' enumerators.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final List<Iavoidable> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-  /**
-   * Returns the '<em><b>Iavoidable</b></em>' literal with the specified literal value.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param literal the literal.
-   * @return the matching enumerator or <code>null</code>.
-   * @generated
-   */
-  public static Iavoidable get(String literal)
-  {
-    for (int i = 0; i < VALUES_ARRAY.length; ++i)
-    {
-      Iavoidable result = VALUES_ARRAY[i];
-      if (result.toString().equals(literal))
-      {
-        return result;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Returns the '<em><b>Iavoidable</b></em>' literal with the specified name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param name the name.
-   * @return the matching enumerator or <code>null</code>.
-   * @generated
-   */
-  public static Iavoidable getByName(String name)
-  {
-    for (int i = 0; i < VALUES_ARRAY.length; ++i)
-    {
-      Iavoidable result = VALUES_ARRAY[i];
-      if (result.getName().equals(name))
-      {
-        return result;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Returns the '<em><b>Iavoidable</b></em>' literal with the specified integer value.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the integer value.
-   * @return the matching enumerator or <code>null</code>.
-   * @generated
-   */
-  public static Iavoidable get(int value)
-  {
-    switch (value)
-    {
-      case INTERFERENCE_VALUE: return INTERFERENCE;
-      case NONE_VALUE: return NONE;
-      case UNSPECIFIED_VALUE: return UNSPECIFIED;
-    }
-    return null;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private final int value;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private final String name;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private final String literal;
-
-  /**
-   * Only this class can construct instances.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private Iavoidable(int value, String name, String literal)
-  {
-    this.value = value;
-    this.name = name;
-    this.literal = literal;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public int getValue()
-  {
-    return value;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getLiteral()
-  {
-    return literal;
-  }
-
-  /**
-   * Returns the literal value of the enumerator, which is its string representation.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    return literal;
-  }
-  
-} //Iavoidable
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Imitigation.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Imitigation.java
deleted file mode 100644
index c237b418c3270b44667a6f8bd3ac53980b42eb74..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Imitigation.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Imitigation</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getImitigation()
- * @model
- * @generated
- */
-public enum Imitigation implements Enumerator
-{
-  /**
-   * The '<em><b>SERIALIZABLE</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #SERIALIZABLE_VALUE
-   * @generated
-   * @ordered
-   */
-  SERIALIZABLE(0, "SERIALIZABLE", "serializable"),
-
-  /**
-   * The '<em><b>PORTABLE LEVEL</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #PORTABLE_LEVEL_VALUE
-   * @generated
-   * @ordered
-   */
-  PORTABLE_LEVEL(1, "PORTABLE_LEVEL", "portable_level"),
-
-  /**
-   * The '<em><b>NONE</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #NONE_VALUE
-   * @generated
-   * @ordered
-   */
-  NONE(2, "NONE", "none"),
-
-  /**
-   * The '<em><b>UNSPECIFIED</b></em>' literal object.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #UNSPECIFIED_VALUE
-   * @generated
-   * @ordered
-   */
-  UNSPECIFIED(3, "UNSPECIFIED", "unspecified");
-
-  /**
-   * The '<em><b>SERIALIZABLE</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>SERIALIZABLE</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #SERIALIZABLE
-   * @model literal="serializable"
-   * @generated
-   * @ordered
-   */
-  public static final int SERIALIZABLE_VALUE = 0;
-
-  /**
-   * The '<em><b>PORTABLE LEVEL</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>PORTABLE LEVEL</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #PORTABLE_LEVEL
-   * @model literal="portable_level"
-   * @generated
-   * @ordered
-   */
-  public static final int PORTABLE_LEVEL_VALUE = 1;
-
-  /**
-   * The '<em><b>NONE</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>NONE</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #NONE
-   * @model literal="none"
-   * @generated
-   * @ordered
-   */
-  public static final int NONE_VALUE = 2;
-
-  /**
-   * The '<em><b>UNSPECIFIED</b></em>' literal value.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>UNSPECIFIED</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @see #UNSPECIFIED
-   * @model literal="unspecified"
-   * @generated
-   * @ordered
-   */
-  public static final int UNSPECIFIED_VALUE = 3;
-
-  /**
-   * An array of all the '<em><b>Imitigation</b></em>' enumerators.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private static final Imitigation[] VALUES_ARRAY =
-    new Imitigation[]
-    {
-      SERIALIZABLE,
-      PORTABLE_LEVEL,
-      NONE,
-      UNSPECIFIED,
-    };
-
-  /**
-   * A public read-only list of all the '<em><b>Imitigation</b></em>' enumerators.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final List<Imitigation> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-  /**
-   * Returns the '<em><b>Imitigation</b></em>' literal with the specified literal value.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param literal the literal.
-   * @return the matching enumerator or <code>null</code>.
-   * @generated
-   */
-  public static Imitigation get(String literal)
-  {
-    for (int i = 0; i < VALUES_ARRAY.length; ++i)
-    {
-      Imitigation result = VALUES_ARRAY[i];
-      if (result.toString().equals(literal))
-      {
-        return result;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Returns the '<em><b>Imitigation</b></em>' literal with the specified name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param name the name.
-   * @return the matching enumerator or <code>null</code>.
-   * @generated
-   */
-  public static Imitigation getByName(String name)
-  {
-    for (int i = 0; i < VALUES_ARRAY.length; ++i)
-    {
-      Imitigation result = VALUES_ARRAY[i];
-      if (result.getName().equals(name))
-      {
-        return result;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Returns the '<em><b>Imitigation</b></em>' literal with the specified integer value.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the integer value.
-   * @return the matching enumerator or <code>null</code>.
-   * @generated
-   */
-  public static Imitigation get(int value)
-  {
-    switch (value)
-    {
-      case SERIALIZABLE_VALUE: return SERIALIZABLE;
-      case PORTABLE_LEVEL_VALUE: return PORTABLE_LEVEL;
-      case NONE_VALUE: return NONE;
-      case UNSPECIFIED_VALUE: return UNSPECIFIED;
-    }
-    return null;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private final int value;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private final String name;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private final String literal;
-
-  /**
-   * Only this class can construct instances.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private Imitigation(int value, String name, String literal)
-  {
-    this.value = value;
-    this.name = name;
-    this.literal = literal;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public int getValue()
-  {
-    return value;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getLiteral()
-  {
-    return literal;
-  }
-
-  /**
-   * Returns the literal value of the enumerator, which is its string representation.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    return literal;
-  }
-  
-} //Imitigation
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/InFailureExpr.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/InFailureExpr.java
deleted file mode 100644
index 30b21d6354d56c97627bbb1c31993bc84fbcf2b7..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/InFailureExpr.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>In Failure Expr</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.InFailureExpr#getFailures <em>Failures</em>}</li>
- * </ul>
- *
- * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getInFailureExpr()
- * @model
- * @generated
- */
-public interface InFailureExpr extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>Failures</b></em>' containment reference list.
-   * The list contents are of type {@link org.polarsys.chess.xtext.flaDsl.Definitions}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Failures</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Failures</em>' containment reference list.
-   * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getInFailureExpr_Failures()
-   * @model containment="true"
-   * @generated
-   */
-  EList<Definitions> getFailures();
-
-} // InFailureExpr
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/InputExpression.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/InputExpression.java
deleted file mode 100644
index 8d54de88223650324c9545b746abe53d3d34497b..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/InputExpression.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.uml2.uml.Port;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Input Expression</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.InputExpression#getRef <em>Ref</em>}</li>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.InputExpression#getFailureExpr <em>Failure Expr</em>}</li>
- * </ul>
- *
- * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getInputExpression()
- * @model
- * @generated
- */
-public interface InputExpression extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>Ref</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Ref</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Ref</em>' reference.
-   * @see #setRef(Port)
-   * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getInputExpression_Ref()
-   * @model
-   * @generated
-   */
-  Port getRef();
-
-  /**
-   * Sets the value of the '{@link org.polarsys.chess.xtext.flaDsl.InputExpression#getRef <em>Ref</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Ref</em>' reference.
-   * @see #getRef()
-   * @generated
-   */
-  void setRef(Port value);
-
-  /**
-   * Returns the value of the '<em><b>Failure Expr</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Failure Expr</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Failure Expr</em>' containment reference.
-   * @see #setFailureExpr(InFailureExpr)
-   * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getInputExpression_FailureExpr()
-   * @model containment="true"
-   * @generated
-   */
-  InFailureExpr getFailureExpr();
-
-  /**
-   * Sets the value of the '{@link org.polarsys.chess.xtext.flaDsl.InputExpression#getFailureExpr <em>Failure Expr</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Failure Expr</em>' containment reference.
-   * @see #getFailureExpr()
-   * @generated
-   */
-  void setFailureExpr(InFailureExpr value);
-
-} // InputExpression
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Lhs.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Lhs.java
deleted file mode 100644
index 7e0d32cdcd1c43b345a7ab21cfcf613335aee975..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Lhs.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Lhs</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.Lhs#getFailures <em>Failures</em>}</li>
- * </ul>
- *
- * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getLhs()
- * @model
- * @generated
- */
-public interface Lhs extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>Failures</b></em>' containment reference list.
-   * The list contents are of type {@link org.polarsys.chess.xtext.flaDsl.InputExpression}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Failures</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Failures</em>' containment reference list.
-   * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getLhs_Failures()
-   * @model containment="true"
-   * @generated
-   */
-  EList<InputExpression> getFailures();
-
-} // Lhs
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/NoFailureDefinition.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/NoFailureDefinition.java
deleted file mode 100644
index de3beb5dbb842cec0e069b903fcaa21e534cfa4b..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/NoFailureDefinition.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>No Failure Definition</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.NoFailureDefinition#getAcidMitigation <em>Acid Mitigation</em>}</li>
- * </ul>
- *
- * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getNoFailureDefinition()
- * @model
- * @generated
- */
-public interface NoFailureDefinition extends Definitions, ComplexNofailureDefinition
-{
-  /**
-   * Returns the value of the '<em><b>Acid Mitigation</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Acid Mitigation</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Acid Mitigation</em>' containment reference.
-   * @see #setAcidMitigation(ACIDMitigation)
-   * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getNoFailureDefinition_AcidMitigation()
-   * @model containment="true"
-   * @generated
-   */
-  ACIDMitigation getAcidMitigation();
-
-  /**
-   * Sets the value of the '{@link org.polarsys.chess.xtext.flaDsl.NoFailureDefinition#getAcidMitigation <em>Acid Mitigation</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Acid Mitigation</em>' containment reference.
-   * @see #getAcidMitigation()
-   * @generated
-   */
-  void setAcidMitigation(ACIDMitigation value);
-
-} // NoFailureDefinition
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/OutFailureExpr.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/OutFailureExpr.java
deleted file mode 100644
index 2b5e4f2abdf53abcd857af417fee85c337be124c..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/OutFailureExpr.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Out Failure Expr</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.OutFailureExpr#getFailures <em>Failures</em>}</li>
- * </ul>
- *
- * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getOutFailureExpr()
- * @model
- * @generated
- */
-public interface OutFailureExpr extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>Failures</b></em>' containment reference list.
-   * The list contents are of type {@link org.polarsys.chess.xtext.flaDsl.Definitions}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Failures</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Failures</em>' containment reference list.
-   * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getOutFailureExpr_Failures()
-   * @model containment="true"
-   * @generated
-   */
-  EList<Definitions> getFailures();
-
-} // OutFailureExpr
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/OutputExpression.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/OutputExpression.java
deleted file mode 100644
index b524a6766ec4959fe23c1bcb5d33e8e4dcb6b9cd..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/OutputExpression.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.uml2.uml.Port;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Output Expression</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.OutputExpression#getRef <em>Ref</em>}</li>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.OutputExpression#getFailureExpr <em>Failure Expr</em>}</li>
- * </ul>
- *
- * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getOutputExpression()
- * @model
- * @generated
- */
-public interface OutputExpression extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>Ref</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Ref</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Ref</em>' reference.
-   * @see #setRef(Port)
-   * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getOutputExpression_Ref()
-   * @model
-   * @generated
-   */
-  Port getRef();
-
-  /**
-   * Sets the value of the '{@link org.polarsys.chess.xtext.flaDsl.OutputExpression#getRef <em>Ref</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Ref</em>' reference.
-   * @see #getRef()
-   * @generated
-   */
-  void setRef(Port value);
-
-  /**
-   * Returns the value of the '<em><b>Failure Expr</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Failure Expr</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Failure Expr</em>' containment reference.
-   * @see #setFailureExpr(OutFailureExpr)
-   * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getOutputExpression_FailureExpr()
-   * @model containment="true"
-   * @generated
-   */
-  OutFailureExpr getFailureExpr();
-
-  /**
-   * Sets the value of the '{@link org.polarsys.chess.xtext.flaDsl.OutputExpression#getFailureExpr <em>Failure Expr</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Failure Expr</em>' containment reference.
-   * @see #getFailureExpr()
-   * @generated
-   */
-  void setFailureExpr(OutFailureExpr value);
-
-} // OutputExpression
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Rhs.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Rhs.java
deleted file mode 100644
index dcfe8024eb0b19932c2ff64b891b9081f8f0f3c7..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/Rhs.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Rhs</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.Rhs#getFailures <em>Failures</em>}</li>
- * </ul>
- *
- * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getRhs()
- * @model
- * @generated
- */
-public interface Rhs extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>Failures</b></em>' containment reference list.
-   * The list contents are of type {@link org.polarsys.chess.xtext.flaDsl.OutputExpression}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Failures</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Failures</em>' containment reference list.
-   * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getRhs_Failures()
-   * @model containment="true"
-   * @generated
-   */
-  EList<OutputExpression> getFailures();
-
-} // Rhs
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/VariableDefinition.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/VariableDefinition.java
deleted file mode 100644
index 392536be88446cf9686e4f9eea89a4fd831a96cd..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/VariableDefinition.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Variable Definition</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.VariableDefinition#getVariableName <em>Variable Name</em>}</li>
- * </ul>
- *
- * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getVariableDefinition()
- * @model
- * @generated
- */
-public interface VariableDefinition extends Definitions
-{
-  /**
-   * Returns the value of the '<em><b>Variable Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Variable 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>Variable Name</em>' attribute.
-   * @see #setVariableName(String)
-   * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getVariableDefinition_VariableName()
-   * @model
-   * @generated
-   */
-  String getVariableName();
-
-  /**
-   * Sets the value of the '{@link org.polarsys.chess.xtext.flaDsl.VariableDefinition#getVariableName <em>Variable Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Variable Name</em>' attribute.
-   * @see #getVariableName()
-   * @generated
-   */
-  void setVariableName(String value);
-
-} // VariableDefinition
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/WildcardDefinition.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/WildcardDefinition.java
deleted file mode 100644
index f56f8b9f0425755d3b1e7574ef06ef481e3f4f42..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/WildcardDefinition.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Wildcard Definition</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#getWildcardDefinition()
- * @model
- * @generated
- */
-public interface WildcardDefinition extends Definitions
-{
-} // WildcardDefinition
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/ACIDMitigationImpl.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/ACIDMitigationImpl.java
deleted file mode 100644
index 92a8eddc4d489408cf29990e0146cd83d8aa283f..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/ACIDMitigationImpl.java
+++ /dev/null
@@ -1,349 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import org.polarsys.chess.xtext.flaDsl.ACIDMitigation;
-import org.polarsys.chess.xtext.flaDsl.Amitigation;
-import org.polarsys.chess.xtext.flaDsl.Cmitigation;
-import org.polarsys.chess.xtext.flaDsl.Dmitigation;
-import org.polarsys.chess.xtext.flaDsl.FlaDslPackage;
-import org.polarsys.chess.xtext.flaDsl.Imitigation;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>ACID Mitigation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.impl.ACIDMitigationImpl#getA <em>A</em>}</li>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.impl.ACIDMitigationImpl#getC <em>C</em>}</li>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.impl.ACIDMitigationImpl#getI <em>I</em>}</li>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.impl.ACIDMitigationImpl#getD <em>D</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class ACIDMitigationImpl extends MinimalEObjectImpl.Container implements ACIDMitigation
-{
-  /**
-   * The default value of the '{@link #getA() <em>A</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getA()
-   * @generated
-   * @ordered
-   */
-  protected static final Amitigation A_EDEFAULT = Amitigation.ALL_OR_NOTHING;
-
-  /**
-   * The cached value of the '{@link #getA() <em>A</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getA()
-   * @generated
-   * @ordered
-   */
-  protected Amitigation a = A_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getC() <em>C</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getC()
-   * @generated
-   * @ordered
-   */
-  protected static final Cmitigation C_EDEFAULT = Cmitigation.FULL_CONSISTENCY;
-
-  /**
-   * The cached value of the '{@link #getC() <em>C</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getC()
-   * @generated
-   * @ordered
-   */
-  protected Cmitigation c = C_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getI() <em>I</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getI()
-   * @generated
-   * @ordered
-   */
-  protected static final Imitigation I_EDEFAULT = Imitigation.SERIALIZABLE;
-
-  /**
-   * The cached value of the '{@link #getI() <em>I</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getI()
-   * @generated
-   * @ordered
-   */
-  protected Imitigation i = I_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getD() <em>D</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getD()
-   * @generated
-   * @ordered
-   */
-  protected static final Dmitigation D_EDEFAULT = Dmitigation.NO_LOSS;
-
-  /**
-   * The cached value of the '{@link #getD() <em>D</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getD()
-   * @generated
-   * @ordered
-   */
-  protected Dmitigation d = D_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ACIDMitigationImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return FlaDslPackage.Literals.ACID_MITIGATION;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Amitigation getA()
-  {
-    return a;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setA(Amitigation newA)
-  {
-    Amitigation oldA = a;
-    a = newA == null ? A_EDEFAULT : newA;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, FlaDslPackage.ACID_MITIGATION__A, oldA, a));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Cmitigation getC()
-  {
-    return c;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setC(Cmitigation newC)
-  {
-    Cmitigation oldC = c;
-    c = newC == null ? C_EDEFAULT : newC;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, FlaDslPackage.ACID_MITIGATION__C, oldC, c));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Imitigation getI()
-  {
-    return i;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setI(Imitigation newI)
-  {
-    Imitigation oldI = i;
-    i = newI == null ? I_EDEFAULT : newI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, FlaDslPackage.ACID_MITIGATION__I, oldI, i));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Dmitigation getD()
-  {
-    return d;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setD(Dmitigation newD)
-  {
-    Dmitigation oldD = d;
-    d = newD == null ? D_EDEFAULT : newD;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, FlaDslPackage.ACID_MITIGATION__D, oldD, d));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.ACID_MITIGATION__A:
-        return getA();
-      case FlaDslPackage.ACID_MITIGATION__C:
-        return getC();
-      case FlaDslPackage.ACID_MITIGATION__I:
-        return getI();
-      case FlaDslPackage.ACID_MITIGATION__D:
-        return getD();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.ACID_MITIGATION__A:
-        setA((Amitigation)newValue);
-        return;
-      case FlaDslPackage.ACID_MITIGATION__C:
-        setC((Cmitigation)newValue);
-        return;
-      case FlaDslPackage.ACID_MITIGATION__I:
-        setI((Imitigation)newValue);
-        return;
-      case FlaDslPackage.ACID_MITIGATION__D:
-        setD((Dmitigation)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.ACID_MITIGATION__A:
-        setA(A_EDEFAULT);
-        return;
-      case FlaDslPackage.ACID_MITIGATION__C:
-        setC(C_EDEFAULT);
-        return;
-      case FlaDslPackage.ACID_MITIGATION__I:
-        setI(I_EDEFAULT);
-        return;
-      case FlaDslPackage.ACID_MITIGATION__D:
-        setD(D_EDEFAULT);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.ACID_MITIGATION__A:
-        return a != A_EDEFAULT;
-      case FlaDslPackage.ACID_MITIGATION__C:
-        return c != C_EDEFAULT;
-      case FlaDslPackage.ACID_MITIGATION__I:
-        return i != I_EDEFAULT;
-      case FlaDslPackage.ACID_MITIGATION__D:
-        return d != D_EDEFAULT;
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (a: ");
-    result.append(a);
-    result.append(", c: ");
-    result.append(c);
-    result.append(", i: ");
-    result.append(i);
-    result.append(", d: ");
-    result.append(d);
-    result.append(')');
-    return result.toString();
-  }
-
-} //ACIDMitigationImpl
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/ACIDavoidableImpl.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/ACIDavoidableImpl.java
deleted file mode 100644
index 0e457d9a930224e1e246fed4e6c4a9323817d0f6..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/ACIDavoidableImpl.java
+++ /dev/null
@@ -1,349 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import org.polarsys.chess.xtext.flaDsl.ACIDavoidable;
-import org.polarsys.chess.xtext.flaDsl.Aavoidable;
-import org.polarsys.chess.xtext.flaDsl.Cavoidable;
-import org.polarsys.chess.xtext.flaDsl.Davoidable;
-import org.polarsys.chess.xtext.flaDsl.FlaDslPackage;
-import org.polarsys.chess.xtext.flaDsl.Iavoidable;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>ACI Davoidable</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.impl.ACIDavoidableImpl#getA <em>A</em>}</li>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.impl.ACIDavoidableImpl#getC <em>C</em>}</li>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.impl.ACIDavoidableImpl#getI <em>I</em>}</li>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.impl.ACIDavoidableImpl#getD <em>D</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class ACIDavoidableImpl extends MinimalEObjectImpl.Container implements ACIDavoidable
-{
-  /**
-   * The default value of the '{@link #getA() <em>A</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getA()
-   * @generated
-   * @ordered
-   */
-  protected static final Aavoidable A_EDEFAULT = Aavoidable.INCOMPLETION;
-
-  /**
-   * The cached value of the '{@link #getA() <em>A</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getA()
-   * @generated
-   * @ordered
-   */
-  protected Aavoidable a = A_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getC() <em>C</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getC()
-   * @generated
-   * @ordered
-   */
-  protected static final Cavoidable C_EDEFAULT = Cavoidable.INCONSISTENCY;
-
-  /**
-   * The cached value of the '{@link #getC() <em>C</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getC()
-   * @generated
-   * @ordered
-   */
-  protected Cavoidable c = C_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getI() <em>I</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getI()
-   * @generated
-   * @ordered
-   */
-  protected static final Iavoidable I_EDEFAULT = Iavoidable.INTERFERENCE;
-
-  /**
-   * The cached value of the '{@link #getI() <em>I</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getI()
-   * @generated
-   * @ordered
-   */
-  protected Iavoidable i = I_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getD() <em>D</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getD()
-   * @generated
-   * @ordered
-   */
-  protected static final Davoidable D_EDEFAULT = Davoidable.IMPERMANENCE;
-
-  /**
-   * The cached value of the '{@link #getD() <em>D</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getD()
-   * @generated
-   * @ordered
-   */
-  protected Davoidable d = D_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ACIDavoidableImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return FlaDslPackage.Literals.ACI_DAVOIDABLE;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Aavoidable getA()
-  {
-    return a;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setA(Aavoidable newA)
-  {
-    Aavoidable oldA = a;
-    a = newA == null ? A_EDEFAULT : newA;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, FlaDslPackage.ACI_DAVOIDABLE__A, oldA, a));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Cavoidable getC()
-  {
-    return c;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setC(Cavoidable newC)
-  {
-    Cavoidable oldC = c;
-    c = newC == null ? C_EDEFAULT : newC;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, FlaDslPackage.ACI_DAVOIDABLE__C, oldC, c));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Iavoidable getI()
-  {
-    return i;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setI(Iavoidable newI)
-  {
-    Iavoidable oldI = i;
-    i = newI == null ? I_EDEFAULT : newI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, FlaDslPackage.ACI_DAVOIDABLE__I, oldI, i));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Davoidable getD()
-  {
-    return d;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setD(Davoidable newD)
-  {
-    Davoidable oldD = d;
-    d = newD == null ? D_EDEFAULT : newD;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, FlaDslPackage.ACI_DAVOIDABLE__D, oldD, d));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.ACI_DAVOIDABLE__A:
-        return getA();
-      case FlaDslPackage.ACI_DAVOIDABLE__C:
-        return getC();
-      case FlaDslPackage.ACI_DAVOIDABLE__I:
-        return getI();
-      case FlaDslPackage.ACI_DAVOIDABLE__D:
-        return getD();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.ACI_DAVOIDABLE__A:
-        setA((Aavoidable)newValue);
-        return;
-      case FlaDslPackage.ACI_DAVOIDABLE__C:
-        setC((Cavoidable)newValue);
-        return;
-      case FlaDslPackage.ACI_DAVOIDABLE__I:
-        setI((Iavoidable)newValue);
-        return;
-      case FlaDslPackage.ACI_DAVOIDABLE__D:
-        setD((Davoidable)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.ACI_DAVOIDABLE__A:
-        setA(A_EDEFAULT);
-        return;
-      case FlaDslPackage.ACI_DAVOIDABLE__C:
-        setC(C_EDEFAULT);
-        return;
-      case FlaDslPackage.ACI_DAVOIDABLE__I:
-        setI(I_EDEFAULT);
-        return;
-      case FlaDslPackage.ACI_DAVOIDABLE__D:
-        setD(D_EDEFAULT);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.ACI_DAVOIDABLE__A:
-        return a != A_EDEFAULT;
-      case FlaDslPackage.ACI_DAVOIDABLE__C:
-        return c != C_EDEFAULT;
-      case FlaDslPackage.ACI_DAVOIDABLE__I:
-        return i != I_EDEFAULT;
-      case FlaDslPackage.ACI_DAVOIDABLE__D:
-        return d != D_EDEFAULT;
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (a: ");
-    result.append(a);
-    result.append(", c: ");
-    result.append(c);
-    result.append(", i: ");
-    result.append(i);
-    result.append(", d: ");
-    result.append(d);
-    result.append(')');
-    return result.toString();
-  }
-
-} //ACIDavoidableImpl
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/BehaviourImpl.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/BehaviourImpl.java
deleted file mode 100644
index d2b35ff6b911ed757f39ffe2bb33973a6b3f7b3a..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/BehaviourImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.polarsys.chess.xtext.flaDsl.Behaviour;
-import org.polarsys.chess.xtext.flaDsl.Expression;
-import org.polarsys.chess.xtext.flaDsl.FlaDslPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Behaviour</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.impl.BehaviourImpl#getRules <em>Rules</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class BehaviourImpl extends MinimalEObjectImpl.Container implements Behaviour
-{
-  /**
-   * The cached value of the '{@link #getRules() <em>Rules</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getRules()
-   * @generated
-   * @ordered
-   */
-  protected EList<Expression> rules;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected BehaviourImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return FlaDslPackage.Literals.BEHAVIOUR;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList<Expression> getRules()
-  {
-    if (rules == null)
-    {
-      rules = new EObjectContainmentEList<Expression>(Expression.class, this, FlaDslPackage.BEHAVIOUR__RULES);
-    }
-    return rules;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.BEHAVIOUR__RULES:
-        return ((InternalEList<?>)getRules()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.BEHAVIOUR__RULES:
-        return getRules();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.BEHAVIOUR__RULES:
-        getRules().clear();
-        getRules().addAll((Collection<? extends Expression>)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.BEHAVIOUR__RULES:
-        getRules().clear();
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.BEHAVIOUR__RULES:
-        return rules != null && !rules.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-
-} //BehaviourImpl
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/ComplexNofailureDefinitionImpl.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/ComplexNofailureDefinitionImpl.java
deleted file mode 100644
index 4b425866b5def58cbfacf1a417be2337632d8721..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/ComplexNofailureDefinitionImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.polarsys.chess.xtext.flaDsl.ComplexNofailureDefinition;
-import org.polarsys.chess.xtext.flaDsl.FlaDslPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Complex Nofailure Definition</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class ComplexNofailureDefinitionImpl extends DefinitionsImpl implements ComplexNofailureDefinition
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ComplexNofailureDefinitionImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return FlaDslPackage.Literals.COMPLEX_NOFAILURE_DEFINITION;
-  }
-
-} //ComplexNofailureDefinitionImpl
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/DefinitionsImpl.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/DefinitionsImpl.java
deleted file mode 100644
index 16facce7deeafa4c274a3e6479d18440416556bf..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/DefinitionsImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import org.polarsys.chess.xtext.flaDsl.Definitions;
-import org.polarsys.chess.xtext.flaDsl.FlaDslPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Definitions</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class DefinitionsImpl extends MinimalEObjectImpl.Container implements Definitions
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected DefinitionsImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return FlaDslPackage.Literals.DEFINITIONS;
-  }
-
-} //DefinitionsImpl
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/ExpressionImpl.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/ExpressionImpl.java
deleted file mode 100644
index 8eb2a414c15b37703f199bda017b1086bfc2860d..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/ExpressionImpl.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import org.polarsys.chess.xtext.flaDsl.Expression;
-import org.polarsys.chess.xtext.flaDsl.FlaDslPackage;
-import org.polarsys.chess.xtext.flaDsl.Lhs;
-import org.polarsys.chess.xtext.flaDsl.Rhs;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Expression</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.impl.ExpressionImpl#getLhs <em>Lhs</em>}</li>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.impl.ExpressionImpl#getRhs <em>Rhs</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class ExpressionImpl extends MinimalEObjectImpl.Container implements Expression
-{
-  /**
-   * The cached value of the '{@link #getLhs() <em>Lhs</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getLhs()
-   * @generated
-   * @ordered
-   */
-  protected Lhs lhs;
-
-  /**
-   * The cached value of the '{@link #getRhs() <em>Rhs</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getRhs()
-   * @generated
-   * @ordered
-   */
-  protected Rhs rhs;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ExpressionImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return FlaDslPackage.Literals.EXPRESSION;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Lhs getLhs()
-  {
-    return lhs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetLhs(Lhs newLhs, NotificationChain msgs)
-  {
-    Lhs oldLhs = lhs;
-    lhs = newLhs;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FlaDslPackage.EXPRESSION__LHS, oldLhs, newLhs);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setLhs(Lhs newLhs)
-  {
-    if (newLhs != lhs)
-    {
-      NotificationChain msgs = null;
-      if (lhs != null)
-        msgs = ((InternalEObject)lhs).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FlaDslPackage.EXPRESSION__LHS, null, msgs);
-      if (newLhs != null)
-        msgs = ((InternalEObject)newLhs).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FlaDslPackage.EXPRESSION__LHS, null, msgs);
-      msgs = basicSetLhs(newLhs, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, FlaDslPackage.EXPRESSION__LHS, newLhs, newLhs));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Rhs getRhs()
-  {
-    return rhs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetRhs(Rhs newRhs, NotificationChain msgs)
-  {
-    Rhs oldRhs = rhs;
-    rhs = newRhs;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FlaDslPackage.EXPRESSION__RHS, oldRhs, newRhs);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setRhs(Rhs newRhs)
-  {
-    if (newRhs != rhs)
-    {
-      NotificationChain msgs = null;
-      if (rhs != null)
-        msgs = ((InternalEObject)rhs).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FlaDslPackage.EXPRESSION__RHS, null, msgs);
-      if (newRhs != null)
-        msgs = ((InternalEObject)newRhs).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FlaDslPackage.EXPRESSION__RHS, null, msgs);
-      msgs = basicSetRhs(newRhs, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, FlaDslPackage.EXPRESSION__RHS, newRhs, newRhs));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.EXPRESSION__LHS:
-        return basicSetLhs(null, msgs);
-      case FlaDslPackage.EXPRESSION__RHS:
-        return basicSetRhs(null, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.EXPRESSION__LHS:
-        return getLhs();
-      case FlaDslPackage.EXPRESSION__RHS:
-        return getRhs();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.EXPRESSION__LHS:
-        setLhs((Lhs)newValue);
-        return;
-      case FlaDslPackage.EXPRESSION__RHS:
-        setRhs((Rhs)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.EXPRESSION__LHS:
-        setLhs((Lhs)null);
-        return;
-      case FlaDslPackage.EXPRESSION__RHS:
-        setRhs((Rhs)null);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.EXPRESSION__LHS:
-        return lhs != null;
-      case FlaDslPackage.EXPRESSION__RHS:
-        return rhs != null;
-    }
-    return super.eIsSet(featureID);
-  }
-
-} //ExpressionImpl
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/FailureDefinitionImpl.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/FailureDefinitionImpl.java
deleted file mode 100644
index 6e1366e42a3204713b93118674442d55f0ad3802..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/FailureDefinitionImpl.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.polarsys.chess.xtext.flaDsl.ACIDavoidable;
-import org.polarsys.chess.xtext.flaDsl.FailureDefinition;
-import org.polarsys.chess.xtext.flaDsl.FailureType;
-import org.polarsys.chess.xtext.flaDsl.FlaDslPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Failure Definition</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.impl.FailureDefinitionImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.impl.FailureDefinitionImpl#getAcidAvoidable <em>Acid Avoidable</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class FailureDefinitionImpl extends DefinitionsImpl implements FailureDefinition
-{
-  /**
-   * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getType()
-   * @generated
-   * @ordered
-   */
-  protected static final FailureType TYPE_EDEFAULT = FailureType.NO_FAILURE;
-
-  /**
-   * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getType()
-   * @generated
-   * @ordered
-   */
-  protected FailureType type = TYPE_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getAcidAvoidable() <em>Acid Avoidable</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getAcidAvoidable()
-   * @generated
-   * @ordered
-   */
-  protected ACIDavoidable acidAvoidable;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected FailureDefinitionImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return FlaDslPackage.Literals.FAILURE_DEFINITION;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public FailureType getType()
-  {
-    return type;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setType(FailureType newType)
-  {
-    FailureType oldType = type;
-    type = newType == null ? TYPE_EDEFAULT : newType;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, FlaDslPackage.FAILURE_DEFINITION__TYPE, oldType, type));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ACIDavoidable getAcidAvoidable()
-  {
-    return acidAvoidable;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetAcidAvoidable(ACIDavoidable newAcidAvoidable, NotificationChain msgs)
-  {
-    ACIDavoidable oldAcidAvoidable = acidAvoidable;
-    acidAvoidable = newAcidAvoidable;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FlaDslPackage.FAILURE_DEFINITION__ACID_AVOIDABLE, oldAcidAvoidable, newAcidAvoidable);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setAcidAvoidable(ACIDavoidable newAcidAvoidable)
-  {
-    if (newAcidAvoidable != acidAvoidable)
-    {
-      NotificationChain msgs = null;
-      if (acidAvoidable != null)
-        msgs = ((InternalEObject)acidAvoidable).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FlaDslPackage.FAILURE_DEFINITION__ACID_AVOIDABLE, null, msgs);
-      if (newAcidAvoidable != null)
-        msgs = ((InternalEObject)newAcidAvoidable).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FlaDslPackage.FAILURE_DEFINITION__ACID_AVOIDABLE, null, msgs);
-      msgs = basicSetAcidAvoidable(newAcidAvoidable, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, FlaDslPackage.FAILURE_DEFINITION__ACID_AVOIDABLE, newAcidAvoidable, newAcidAvoidable));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.FAILURE_DEFINITION__ACID_AVOIDABLE:
-        return basicSetAcidAvoidable(null, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.FAILURE_DEFINITION__TYPE:
-        return getType();
-      case FlaDslPackage.FAILURE_DEFINITION__ACID_AVOIDABLE:
-        return getAcidAvoidable();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.FAILURE_DEFINITION__TYPE:
-        setType((FailureType)newValue);
-        return;
-      case FlaDslPackage.FAILURE_DEFINITION__ACID_AVOIDABLE:
-        setAcidAvoidable((ACIDavoidable)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.FAILURE_DEFINITION__TYPE:
-        setType(TYPE_EDEFAULT);
-        return;
-      case FlaDslPackage.FAILURE_DEFINITION__ACID_AVOIDABLE:
-        setAcidAvoidable((ACIDavoidable)null);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.FAILURE_DEFINITION__TYPE:
-        return type != TYPE_EDEFAULT;
-      case FlaDslPackage.FAILURE_DEFINITION__ACID_AVOIDABLE:
-        return acidAvoidable != null;
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (type: ");
-    result.append(type);
-    result.append(')');
-    return result.toString();
-  }
-
-} //FailureDefinitionImpl
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/FlaDslFactoryImpl.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/FlaDslFactoryImpl.java
deleted file mode 100644
index 334d6d37048d76e39fc8fc62fe1ab8d68a2db465..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/FlaDslFactoryImpl.java
+++ /dev/null
@@ -1,551 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.polarsys.chess.xtext.flaDsl.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class FlaDslFactoryImpl extends EFactoryImpl implements FlaDslFactory
-{
-  /**
-   * Creates the default factory implementation.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static FlaDslFactory init()
-  {
-    try
-    {
-      FlaDslFactory theFlaDslFactory = (FlaDslFactory)EPackage.Registry.INSTANCE.getEFactory(FlaDslPackage.eNS_URI);
-      if (theFlaDslFactory != null)
-      {
-        return theFlaDslFactory;
-      }
-    }
-    catch (Exception exception)
-    {
-      EcorePlugin.INSTANCE.log(exception);
-    }
-    return new FlaDslFactoryImpl();
-  }
-
-  /**
-   * Creates an instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public FlaDslFactoryImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EObject create(EClass eClass)
-  {
-    switch (eClass.getClassifierID())
-    {
-      case FlaDslPackage.BEHAVIOUR: return createBehaviour();
-      case FlaDslPackage.EXPRESSION: return createExpression();
-      case FlaDslPackage.LHS: return createLhs();
-      case FlaDslPackage.RHS: return createRhs();
-      case FlaDslPackage.INPUT_EXPRESSION: return createInputExpression();
-      case FlaDslPackage.OUTPUT_EXPRESSION: return createOutputExpression();
-      case FlaDslPackage.IN_FAILURE_EXPR: return createInFailureExpr();
-      case FlaDslPackage.OUT_FAILURE_EXPR: return createOutFailureExpr();
-      case FlaDslPackage.DEFINITIONS: return createDefinitions();
-      case FlaDslPackage.FAILURE_DEFINITION: return createFailureDefinition();
-      case FlaDslPackage.NO_FAILURE_DEFINITION: return createNoFailureDefinition();
-      case FlaDslPackage.COMPLEX_NOFAILURE_DEFINITION: return createComplexNofailureDefinition();
-      case FlaDslPackage.WILDCARD_DEFINITION: return createWildcardDefinition();
-      case FlaDslPackage.VARIABLE_DEFINITION: return createVariableDefinition();
-      case FlaDslPackage.ACI_DAVOIDABLE: return createACIDavoidable();
-      case FlaDslPackage.ACID_MITIGATION: return createACIDMitigation();
-      default:
-        throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object createFromString(EDataType eDataType, String initialValue)
-  {
-    switch (eDataType.getClassifierID())
-    {
-      case FlaDslPackage.FAILURE_TYPE:
-        return createFailureTypeFromString(eDataType, initialValue);
-      case FlaDslPackage.AAVOIDABLE:
-        return createAavoidableFromString(eDataType, initialValue);
-      case FlaDslPackage.CAVOIDABLE:
-        return createCavoidableFromString(eDataType, initialValue);
-      case FlaDslPackage.IAVOIDABLE:
-        return createIavoidableFromString(eDataType, initialValue);
-      case FlaDslPackage.DAVOIDABLE:
-        return createDavoidableFromString(eDataType, initialValue);
-      case FlaDslPackage.AMITIGATION:
-        return createAmitigationFromString(eDataType, initialValue);
-      case FlaDslPackage.CMITIGATION:
-        return createCmitigationFromString(eDataType, initialValue);
-      case FlaDslPackage.IMITIGATION:
-        return createImitigationFromString(eDataType, initialValue);
-      case FlaDslPackage.DMITIGATION:
-        return createDmitigationFromString(eDataType, initialValue);
-      default:
-        throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String convertToString(EDataType eDataType, Object instanceValue)
-  {
-    switch (eDataType.getClassifierID())
-    {
-      case FlaDslPackage.FAILURE_TYPE:
-        return convertFailureTypeToString(eDataType, instanceValue);
-      case FlaDslPackage.AAVOIDABLE:
-        return convertAavoidableToString(eDataType, instanceValue);
-      case FlaDslPackage.CAVOIDABLE:
-        return convertCavoidableToString(eDataType, instanceValue);
-      case FlaDslPackage.IAVOIDABLE:
-        return convertIavoidableToString(eDataType, instanceValue);
-      case FlaDslPackage.DAVOIDABLE:
-        return convertDavoidableToString(eDataType, instanceValue);
-      case FlaDslPackage.AMITIGATION:
-        return convertAmitigationToString(eDataType, instanceValue);
-      case FlaDslPackage.CMITIGATION:
-        return convertCmitigationToString(eDataType, instanceValue);
-      case FlaDslPackage.IMITIGATION:
-        return convertImitigationToString(eDataType, instanceValue);
-      case FlaDslPackage.DMITIGATION:
-        return convertDmitigationToString(eDataType, instanceValue);
-      default:
-        throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Behaviour createBehaviour()
-  {
-    BehaviourImpl behaviour = new BehaviourImpl();
-    return behaviour;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Expression createExpression()
-  {
-    ExpressionImpl expression = new ExpressionImpl();
-    return expression;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Lhs createLhs()
-  {
-    LhsImpl lhs = new LhsImpl();
-    return lhs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Rhs createRhs()
-  {
-    RhsImpl rhs = new RhsImpl();
-    return rhs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public InputExpression createInputExpression()
-  {
-    InputExpressionImpl inputExpression = new InputExpressionImpl();
-    return inputExpression;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public OutputExpression createOutputExpression()
-  {
-    OutputExpressionImpl outputExpression = new OutputExpressionImpl();
-    return outputExpression;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public InFailureExpr createInFailureExpr()
-  {
-    InFailureExprImpl inFailureExpr = new InFailureExprImpl();
-    return inFailureExpr;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public OutFailureExpr createOutFailureExpr()
-  {
-    OutFailureExprImpl outFailureExpr = new OutFailureExprImpl();
-    return outFailureExpr;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Definitions createDefinitions()
-  {
-    DefinitionsImpl definitions = new DefinitionsImpl();
-    return definitions;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public FailureDefinition createFailureDefinition()
-  {
-    FailureDefinitionImpl failureDefinition = new FailureDefinitionImpl();
-    return failureDefinition;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NoFailureDefinition createNoFailureDefinition()
-  {
-    NoFailureDefinitionImpl noFailureDefinition = new NoFailureDefinitionImpl();
-    return noFailureDefinition;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ComplexNofailureDefinition createComplexNofailureDefinition()
-  {
-    ComplexNofailureDefinitionImpl complexNofailureDefinition = new ComplexNofailureDefinitionImpl();
-    return complexNofailureDefinition;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public WildcardDefinition createWildcardDefinition()
-  {
-    WildcardDefinitionImpl wildcardDefinition = new WildcardDefinitionImpl();
-    return wildcardDefinition;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public VariableDefinition createVariableDefinition()
-  {
-    VariableDefinitionImpl variableDefinition = new VariableDefinitionImpl();
-    return variableDefinition;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ACIDavoidable createACIDavoidable()
-  {
-    ACIDavoidableImpl aciDavoidable = new ACIDavoidableImpl();
-    return aciDavoidable;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ACIDMitigation createACIDMitigation()
-  {
-    ACIDMitigationImpl acidMitigation = new ACIDMitigationImpl();
-    return acidMitigation;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public FailureType createFailureTypeFromString(EDataType eDataType, String initialValue)
-  {
-    FailureType result = FailureType.get(initialValue);
-    if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-    return result;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String convertFailureTypeToString(EDataType eDataType, Object instanceValue)
-  {
-    return instanceValue == null ? null : instanceValue.toString();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Aavoidable createAavoidableFromString(EDataType eDataType, String initialValue)
-  {
-    Aavoidable result = Aavoidable.get(initialValue);
-    if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-    return result;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String convertAavoidableToString(EDataType eDataType, Object instanceValue)
-  {
-    return instanceValue == null ? null : instanceValue.toString();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Cavoidable createCavoidableFromString(EDataType eDataType, String initialValue)
-  {
-    Cavoidable result = Cavoidable.get(initialValue);
-    if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-    return result;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String convertCavoidableToString(EDataType eDataType, Object instanceValue)
-  {
-    return instanceValue == null ? null : instanceValue.toString();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Iavoidable createIavoidableFromString(EDataType eDataType, String initialValue)
-  {
-    Iavoidable result = Iavoidable.get(initialValue);
-    if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-    return result;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String convertIavoidableToString(EDataType eDataType, Object instanceValue)
-  {
-    return instanceValue == null ? null : instanceValue.toString();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Davoidable createDavoidableFromString(EDataType eDataType, String initialValue)
-  {
-    Davoidable result = Davoidable.get(initialValue);
-    if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-    return result;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String convertDavoidableToString(EDataType eDataType, Object instanceValue)
-  {
-    return instanceValue == null ? null : instanceValue.toString();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Amitigation createAmitigationFromString(EDataType eDataType, String initialValue)
-  {
-    Amitigation result = Amitigation.get(initialValue);
-    if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-    return result;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String convertAmitigationToString(EDataType eDataType, Object instanceValue)
-  {
-    return instanceValue == null ? null : instanceValue.toString();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Cmitigation createCmitigationFromString(EDataType eDataType, String initialValue)
-  {
-    Cmitigation result = Cmitigation.get(initialValue);
-    if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-    return result;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String convertCmitigationToString(EDataType eDataType, Object instanceValue)
-  {
-    return instanceValue == null ? null : instanceValue.toString();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Imitigation createImitigationFromString(EDataType eDataType, String initialValue)
-  {
-    Imitigation result = Imitigation.get(initialValue);
-    if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-    return result;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String convertImitigationToString(EDataType eDataType, Object instanceValue)
-  {
-    return instanceValue == null ? null : instanceValue.toString();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Dmitigation createDmitigationFromString(EDataType eDataType, String initialValue)
-  {
-    Dmitigation result = Dmitigation.get(initialValue);
-    if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-    return result;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String convertDmitigationToString(EDataType eDataType, Object instanceValue)
-  {
-    return instanceValue == null ? null : instanceValue.toString();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public FlaDslPackage getFlaDslPackage()
-  {
-    return (FlaDslPackage)getEPackage();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @deprecated
-   * @generated
-   */
-  @Deprecated
-  public static FlaDslPackage getPackage()
-  {
-    return FlaDslPackage.eINSTANCE;
-  }
-
-} //FlaDslFactoryImpl
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/FlaDslPackageImpl.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/FlaDslPackageImpl.java
deleted file mode 100644
index 759df3c1b15ed51e1542181ad2397cb6b85601d8..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/FlaDslPackageImpl.java
+++ /dev/null
@@ -1,1026 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.uml2.uml.UMLPackage;
-
-import org.polarsys.chess.xtext.flaDsl.ACIDMitigation;
-import org.polarsys.chess.xtext.flaDsl.ACIDavoidable;
-import org.polarsys.chess.xtext.flaDsl.Aavoidable;
-import org.polarsys.chess.xtext.flaDsl.Amitigation;
-import org.polarsys.chess.xtext.flaDsl.Behaviour;
-import org.polarsys.chess.xtext.flaDsl.Cavoidable;
-import org.polarsys.chess.xtext.flaDsl.Cmitigation;
-import org.polarsys.chess.xtext.flaDsl.ComplexNofailureDefinition;
-import org.polarsys.chess.xtext.flaDsl.Davoidable;
-import org.polarsys.chess.xtext.flaDsl.Definitions;
-import org.polarsys.chess.xtext.flaDsl.Dmitigation;
-import org.polarsys.chess.xtext.flaDsl.Expression;
-import org.polarsys.chess.xtext.flaDsl.FailureDefinition;
-import org.polarsys.chess.xtext.flaDsl.FailureType;
-import org.polarsys.chess.xtext.flaDsl.FlaDslFactory;
-import org.polarsys.chess.xtext.flaDsl.FlaDslPackage;
-import org.polarsys.chess.xtext.flaDsl.Iavoidable;
-import org.polarsys.chess.xtext.flaDsl.Imitigation;
-import org.polarsys.chess.xtext.flaDsl.InFailureExpr;
-import org.polarsys.chess.xtext.flaDsl.InputExpression;
-import org.polarsys.chess.xtext.flaDsl.Lhs;
-import org.polarsys.chess.xtext.flaDsl.NoFailureDefinition;
-import org.polarsys.chess.xtext.flaDsl.OutFailureExpr;
-import org.polarsys.chess.xtext.flaDsl.OutputExpression;
-import org.polarsys.chess.xtext.flaDsl.Rhs;
-import org.polarsys.chess.xtext.flaDsl.VariableDefinition;
-import org.polarsys.chess.xtext.flaDsl.WildcardDefinition;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class FlaDslPackageImpl extends EPackageImpl implements FlaDslPackage
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass behaviourEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass expressionEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass lhsEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass rhsEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass inputExpressionEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass outputExpressionEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass inFailureExprEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass outFailureExprEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass definitionsEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass failureDefinitionEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass noFailureDefinitionEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass complexNofailureDefinitionEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass wildcardDefinitionEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass variableDefinitionEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass aciDavoidableEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass acidMitigationEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EEnum failureTypeEEnum = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EEnum aavoidableEEnum = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EEnum cavoidableEEnum = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EEnum iavoidableEEnum = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EEnum davoidableEEnum = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EEnum amitigationEEnum = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EEnum cmitigationEEnum = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EEnum imitigationEEnum = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EEnum dmitigationEEnum = 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.
-   * <p>Note: the correct way to create the package is via the static
-   * factory method {@link #init init()}, which also performs
-   * initialization of the package, or returns the registered package,
-   * if one already exists.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.emf.ecore.EPackage.Registry
-   * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage#eNS_URI
-   * @see #init()
-   * @generated
-   */
-  private FlaDslPackageImpl()
-  {
-    super(eNS_URI, FlaDslFactory.eINSTANCE);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private static boolean isInited = false;
-
-  /**
-   * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
-   * <p>This method is used to initialize {@link FlaDslPackage#eINSTANCE} when that field is accessed.
-   * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #eNS_URI
-   * @see #createPackageContents()
-   * @see #initializePackageContents()
-   * @generated
-   */
-  public static FlaDslPackage init()
-  {
-    if (isInited) return (FlaDslPackage)EPackage.Registry.INSTANCE.getEPackage(FlaDslPackage.eNS_URI);
-
-    // Obtain or create and register package
-    FlaDslPackageImpl theFlaDslPackage = (FlaDslPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof FlaDslPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new FlaDslPackageImpl());
-
-    isInited = true;
-
-    // Initialize simple dependencies
-    UMLPackage.eINSTANCE.eClass();
-
-    // Create package meta-data objects
-    theFlaDslPackage.createPackageContents();
-
-    // Initialize created meta-data
-    theFlaDslPackage.initializePackageContents();
-
-    // Mark meta-data to indicate it can't be changed
-    theFlaDslPackage.freeze();
-
-  
-    // Update the registry and return the package
-    EPackage.Registry.INSTANCE.put(FlaDslPackage.eNS_URI, theFlaDslPackage);
-    return theFlaDslPackage;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getBehaviour()
-  {
-    return behaviourEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getBehaviour_Rules()
-  {
-    return (EReference)behaviourEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getExpression()
-  {
-    return expressionEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getExpression_Lhs()
-  {
-    return (EReference)expressionEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getExpression_Rhs()
-  {
-    return (EReference)expressionEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getLhs()
-  {
-    return lhsEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getLhs_Failures()
-  {
-    return (EReference)lhsEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getRhs()
-  {
-    return rhsEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getRhs_Failures()
-  {
-    return (EReference)rhsEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getInputExpression()
-  {
-    return inputExpressionEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getInputExpression_Ref()
-  {
-    return (EReference)inputExpressionEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getInputExpression_FailureExpr()
-  {
-    return (EReference)inputExpressionEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getOutputExpression()
-  {
-    return outputExpressionEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getOutputExpression_Ref()
-  {
-    return (EReference)outputExpressionEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getOutputExpression_FailureExpr()
-  {
-    return (EReference)outputExpressionEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getInFailureExpr()
-  {
-    return inFailureExprEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getInFailureExpr_Failures()
-  {
-    return (EReference)inFailureExprEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getOutFailureExpr()
-  {
-    return outFailureExprEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getOutFailureExpr_Failures()
-  {
-    return (EReference)outFailureExprEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getDefinitions()
-  {
-    return definitionsEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getFailureDefinition()
-  {
-    return failureDefinitionEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getFailureDefinition_Type()
-  {
-    return (EAttribute)failureDefinitionEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getFailureDefinition_AcidAvoidable()
-  {
-    return (EReference)failureDefinitionEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getNoFailureDefinition()
-  {
-    return noFailureDefinitionEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getNoFailureDefinition_AcidMitigation()
-  {
-    return (EReference)noFailureDefinitionEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getComplexNofailureDefinition()
-  {
-    return complexNofailureDefinitionEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getWildcardDefinition()
-  {
-    return wildcardDefinitionEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getVariableDefinition()
-  {
-    return variableDefinitionEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getVariableDefinition_VariableName()
-  {
-    return (EAttribute)variableDefinitionEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getACIDavoidable()
-  {
-    return aciDavoidableEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getACIDavoidable_A()
-  {
-    return (EAttribute)aciDavoidableEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getACIDavoidable_C()
-  {
-    return (EAttribute)aciDavoidableEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getACIDavoidable_I()
-  {
-    return (EAttribute)aciDavoidableEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getACIDavoidable_D()
-  {
-    return (EAttribute)aciDavoidableEClass.getEStructuralFeatures().get(3);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getACIDMitigation()
-  {
-    return acidMitigationEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getACIDMitigation_A()
-  {
-    return (EAttribute)acidMitigationEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getACIDMitigation_C()
-  {
-    return (EAttribute)acidMitigationEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getACIDMitigation_I()
-  {
-    return (EAttribute)acidMitigationEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getACIDMitigation_D()
-  {
-    return (EAttribute)acidMitigationEClass.getEStructuralFeatures().get(3);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EEnum getFailureType()
-  {
-    return failureTypeEEnum;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EEnum getAavoidable()
-  {
-    return aavoidableEEnum;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EEnum getCavoidable()
-  {
-    return cavoidableEEnum;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EEnum getIavoidable()
-  {
-    return iavoidableEEnum;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EEnum getDavoidable()
-  {
-    return davoidableEEnum;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EEnum getAmitigation()
-  {
-    return amitigationEEnum;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EEnum getCmitigation()
-  {
-    return cmitigationEEnum;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EEnum getImitigation()
-  {
-    return imitigationEEnum;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EEnum getDmitigation()
-  {
-    return dmitigationEEnum;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public FlaDslFactory getFlaDslFactory()
-  {
-    return (FlaDslFactory)getEFactoryInstance();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private boolean isCreated = false;
-
-  /**
-   * Creates the meta-model objects for the package.  This method is
-   * guarded to have no affect on any invocation but its first.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void createPackageContents()
-  {
-    if (isCreated) return;
-    isCreated = true;
-
-    // Create classes and their features
-    behaviourEClass = createEClass(BEHAVIOUR);
-    createEReference(behaviourEClass, BEHAVIOUR__RULES);
-
-    expressionEClass = createEClass(EXPRESSION);
-    createEReference(expressionEClass, EXPRESSION__LHS);
-    createEReference(expressionEClass, EXPRESSION__RHS);
-
-    lhsEClass = createEClass(LHS);
-    createEReference(lhsEClass, LHS__FAILURES);
-
-    rhsEClass = createEClass(RHS);
-    createEReference(rhsEClass, RHS__FAILURES);
-
-    inputExpressionEClass = createEClass(INPUT_EXPRESSION);
-    createEReference(inputExpressionEClass, INPUT_EXPRESSION__REF);
-    createEReference(inputExpressionEClass, INPUT_EXPRESSION__FAILURE_EXPR);
-
-    outputExpressionEClass = createEClass(OUTPUT_EXPRESSION);
-    createEReference(outputExpressionEClass, OUTPUT_EXPRESSION__REF);
-    createEReference(outputExpressionEClass, OUTPUT_EXPRESSION__FAILURE_EXPR);
-
-    inFailureExprEClass = createEClass(IN_FAILURE_EXPR);
-    createEReference(inFailureExprEClass, IN_FAILURE_EXPR__FAILURES);
-
-    outFailureExprEClass = createEClass(OUT_FAILURE_EXPR);
-    createEReference(outFailureExprEClass, OUT_FAILURE_EXPR__FAILURES);
-
-    definitionsEClass = createEClass(DEFINITIONS);
-
-    failureDefinitionEClass = createEClass(FAILURE_DEFINITION);
-    createEAttribute(failureDefinitionEClass, FAILURE_DEFINITION__TYPE);
-    createEReference(failureDefinitionEClass, FAILURE_DEFINITION__ACID_AVOIDABLE);
-
-    noFailureDefinitionEClass = createEClass(NO_FAILURE_DEFINITION);
-    createEReference(noFailureDefinitionEClass, NO_FAILURE_DEFINITION__ACID_MITIGATION);
-
-    complexNofailureDefinitionEClass = createEClass(COMPLEX_NOFAILURE_DEFINITION);
-
-    wildcardDefinitionEClass = createEClass(WILDCARD_DEFINITION);
-
-    variableDefinitionEClass = createEClass(VARIABLE_DEFINITION);
-    createEAttribute(variableDefinitionEClass, VARIABLE_DEFINITION__VARIABLE_NAME);
-
-    aciDavoidableEClass = createEClass(ACI_DAVOIDABLE);
-    createEAttribute(aciDavoidableEClass, ACI_DAVOIDABLE__A);
-    createEAttribute(aciDavoidableEClass, ACI_DAVOIDABLE__C);
-    createEAttribute(aciDavoidableEClass, ACI_DAVOIDABLE__I);
-    createEAttribute(aciDavoidableEClass, ACI_DAVOIDABLE__D);
-
-    acidMitigationEClass = createEClass(ACID_MITIGATION);
-    createEAttribute(acidMitigationEClass, ACID_MITIGATION__A);
-    createEAttribute(acidMitigationEClass, ACID_MITIGATION__C);
-    createEAttribute(acidMitigationEClass, ACID_MITIGATION__I);
-    createEAttribute(acidMitigationEClass, ACID_MITIGATION__D);
-
-    // Create enums
-    failureTypeEEnum = createEEnum(FAILURE_TYPE);
-    aavoidableEEnum = createEEnum(AAVOIDABLE);
-    cavoidableEEnum = createEEnum(CAVOIDABLE);
-    iavoidableEEnum = createEEnum(IAVOIDABLE);
-    davoidableEEnum = createEEnum(DAVOIDABLE);
-    amitigationEEnum = createEEnum(AMITIGATION);
-    cmitigationEEnum = createEEnum(CMITIGATION);
-    imitigationEEnum = createEEnum(IMITIGATION);
-    dmitigationEEnum = createEEnum(DMITIGATION);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private boolean isInitialized = false;
-
-  /**
-   * Complete the initialization of the package and its meta-model.  This
-   * method is guarded to have no affect on any invocation but its first.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void initializePackageContents()
-  {
-    if (isInitialized) return;
-    isInitialized = true;
-
-    // Initialize package
-    setName(eNAME);
-    setNsPrefix(eNS_PREFIX);
-    setNsURI(eNS_URI);
-
-    // Obtain other dependent packages
-    UMLPackage theUMLPackage = (UMLPackage)EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);
-    EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-
-    // Create type parameters
-
-    // Set bounds for type parameters
-
-    // Add supertypes to classes
-    failureDefinitionEClass.getESuperTypes().add(this.getDefinitions());
-    noFailureDefinitionEClass.getESuperTypes().add(this.getDefinitions());
-    noFailureDefinitionEClass.getESuperTypes().add(this.getComplexNofailureDefinition());
-    complexNofailureDefinitionEClass.getESuperTypes().add(this.getDefinitions());
-    wildcardDefinitionEClass.getESuperTypes().add(this.getDefinitions());
-    variableDefinitionEClass.getESuperTypes().add(this.getDefinitions());
-
-    // Initialize classes and features; add operations and parameters
-    initEClass(behaviourEClass, Behaviour.class, "Behaviour", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getBehaviour_Rules(), this.getExpression(), null, "rules", null, 0, -1, Behaviour.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(expressionEClass, Expression.class, "Expression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getExpression_Lhs(), this.getLhs(), null, "lhs", null, 0, 1, Expression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getExpression_Rhs(), this.getRhs(), null, "rhs", null, 0, 1, Expression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(lhsEClass, Lhs.class, "Lhs", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getLhs_Failures(), this.getInputExpression(), null, "failures", null, 0, -1, Lhs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(rhsEClass, Rhs.class, "Rhs", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRhs_Failures(), this.getOutputExpression(), null, "failures", null, 0, -1, Rhs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(inputExpressionEClass, InputExpression.class, "InputExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getInputExpression_Ref(), theUMLPackage.getPort(), null, "ref", null, 0, 1, InputExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getInputExpression_FailureExpr(), this.getInFailureExpr(), null, "failureExpr", null, 0, 1, InputExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(outputExpressionEClass, OutputExpression.class, "OutputExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOutputExpression_Ref(), theUMLPackage.getPort(), null, "ref", null, 0, 1, OutputExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getOutputExpression_FailureExpr(), this.getOutFailureExpr(), null, "failureExpr", null, 0, 1, OutputExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(inFailureExprEClass, InFailureExpr.class, "InFailureExpr", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getInFailureExpr_Failures(), this.getDefinitions(), null, "failures", null, 0, -1, InFailureExpr.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(outFailureExprEClass, OutFailureExpr.class, "OutFailureExpr", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOutFailureExpr_Failures(), this.getDefinitions(), null, "failures", null, 0, -1, OutFailureExpr.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(definitionsEClass, Definitions.class, "Definitions", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(failureDefinitionEClass, FailureDefinition.class, "FailureDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getFailureDefinition_Type(), this.getFailureType(), "type", null, 0, 1, FailureDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getFailureDefinition_AcidAvoidable(), this.getACIDavoidable(), null, "acidAvoidable", null, 0, 1, FailureDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(noFailureDefinitionEClass, NoFailureDefinition.class, "NoFailureDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getNoFailureDefinition_AcidMitigation(), this.getACIDMitigation(), null, "acidMitigation", null, 0, 1, NoFailureDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(complexNofailureDefinitionEClass, ComplexNofailureDefinition.class, "ComplexNofailureDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(wildcardDefinitionEClass, WildcardDefinition.class, "WildcardDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(variableDefinitionEClass, VariableDefinition.class, "VariableDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getVariableDefinition_VariableName(), theEcorePackage.getEString(), "variableName", null, 0, 1, VariableDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(aciDavoidableEClass, ACIDavoidable.class, "ACIDavoidable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getACIDavoidable_A(), this.getAavoidable(), "a", null, 0, 1, ACIDavoidable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getACIDavoidable_C(), this.getCavoidable(), "c", null, 0, 1, ACIDavoidable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getACIDavoidable_I(), this.getIavoidable(), "i", null, 0, 1, ACIDavoidable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getACIDavoidable_D(), this.getDavoidable(), "d", null, 0, 1, ACIDavoidable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(acidMitigationEClass, ACIDMitigation.class, "ACIDMitigation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getACIDMitigation_A(), this.getAmitigation(), "a", null, 0, 1, ACIDMitigation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getACIDMitigation_C(), this.getCmitigation(), "c", null, 0, 1, ACIDMitigation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getACIDMitigation_I(), this.getImitigation(), "i", null, 0, 1, ACIDMitigation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getACIDMitigation_D(), this.getDmitigation(), "d", null, 0, 1, ACIDMitigation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    // Initialize enums and add enum literals
-    initEEnum(failureTypeEEnum, FailureType.class, "FailureType");
-    addEEnumLiteral(failureTypeEEnum, FailureType.NO_FAILURE);
-    addEEnumLiteral(failureTypeEEnum, FailureType.EARLY);
-    addEEnumLiteral(failureTypeEEnum, FailureType.LATE);
-    addEEnumLiteral(failureTypeEEnum, FailureType.COMMISSION);
-    addEEnumLiteral(failureTypeEEnum, FailureType.OMISSION);
-    addEEnumLiteral(failureTypeEEnum, FailureType.VALUE_SUBTLE);
-    addEEnumLiteral(failureTypeEEnum, FailureType.VALUE_COARSE);
-    addEEnumLiteral(failureTypeEEnum, FailureType.WILDCARD);
-    addEEnumLiteral(failureTypeEEnum, FailureType.VARIABLE);
-
-    initEEnum(aavoidableEEnum, Aavoidable.class, "Aavoidable");
-    addEEnumLiteral(aavoidableEEnum, Aavoidable.INCOMPLETION);
-    addEEnumLiteral(aavoidableEEnum, Aavoidable.NONE);
-    addEEnumLiteral(aavoidableEEnum, Aavoidable.UNSPECIFIED);
-
-    initEEnum(cavoidableEEnum, Cavoidable.class, "Cavoidable");
-    addEEnumLiteral(cavoidableEEnum, Cavoidable.INCONSISTENCY);
-    addEEnumLiteral(cavoidableEEnum, Cavoidable.NONE);
-    addEEnumLiteral(cavoidableEEnum, Cavoidable.UNSPECIFIED);
-
-    initEEnum(iavoidableEEnum, Iavoidable.class, "Iavoidable");
-    addEEnumLiteral(iavoidableEEnum, Iavoidable.INTERFERENCE);
-    addEEnumLiteral(iavoidableEEnum, Iavoidable.NONE);
-    addEEnumLiteral(iavoidableEEnum, Iavoidable.UNSPECIFIED);
-
-    initEEnum(davoidableEEnum, Davoidable.class, "Davoidable");
-    addEEnumLiteral(davoidableEEnum, Davoidable.IMPERMANENCE);
-    addEEnumLiteral(davoidableEEnum, Davoidable.NONE);
-    addEEnumLiteral(davoidableEEnum, Davoidable.UNSPECIFIED);
-
-    initEEnum(amitigationEEnum, Amitigation.class, "Amitigation");
-    addEEnumLiteral(amitigationEEnum, Amitigation.ALL_OR_NOTHING);
-    addEEnumLiteral(amitigationEEnum, Amitigation.ALL_OR_COMPENSATION);
-    addEEnumLiteral(amitigationEEnum, Amitigation.NONE);
-    addEEnumLiteral(amitigationEEnum, Amitigation.UNSPECIFIED);
-
-    initEEnum(cmitigationEEnum, Cmitigation.class, "Cmitigation");
-    addEEnumLiteral(cmitigationEEnum, Cmitigation.FULL_CONSISTENCY);
-    addEEnumLiteral(cmitigationEEnum, Cmitigation.RANGE_VIOLATION_ALLOWED);
-    addEEnumLiteral(cmitigationEEnum, Cmitigation.NONE);
-    addEEnumLiteral(cmitigationEEnum, Cmitigation.UNSPECIFIED);
-
-    initEEnum(imitigationEEnum, Imitigation.class, "Imitigation");
-    addEEnumLiteral(imitigationEEnum, Imitigation.SERIALIZABLE);
-    addEEnumLiteral(imitigationEEnum, Imitigation.PORTABLE_LEVEL);
-    addEEnumLiteral(imitigationEEnum, Imitigation.NONE);
-    addEEnumLiteral(imitigationEEnum, Imitigation.UNSPECIFIED);
-
-    initEEnum(dmitigationEEnum, Dmitigation.class, "Dmitigation");
-    addEEnumLiteral(dmitigationEEnum, Dmitigation.NO_LOSS);
-    addEEnumLiteral(dmitigationEEnum, Dmitigation.PARTIAL_LOSS_ALLOWED);
-    addEEnumLiteral(dmitigationEEnum, Dmitigation.NONE);
-    addEEnumLiteral(dmitigationEEnum, Dmitigation.UNSPECIFIED);
-
-    // Create resource
-    createResource(eNS_URI);
-  }
-
-} //FlaDslPackageImpl
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/InFailureExprImpl.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/InFailureExprImpl.java
deleted file mode 100644
index 238ea9edef20ae2cbecfa1476f1511839bee42ad..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/InFailureExprImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.polarsys.chess.xtext.flaDsl.Definitions;
-import org.polarsys.chess.xtext.flaDsl.FlaDslPackage;
-import org.polarsys.chess.xtext.flaDsl.InFailureExpr;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>In Failure Expr</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.impl.InFailureExprImpl#getFailures <em>Failures</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class InFailureExprImpl extends MinimalEObjectImpl.Container implements InFailureExpr
-{
-  /**
-   * The cached value of the '{@link #getFailures() <em>Failures</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getFailures()
-   * @generated
-   * @ordered
-   */
-  protected EList<Definitions> failures;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected InFailureExprImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return FlaDslPackage.Literals.IN_FAILURE_EXPR;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList<Definitions> getFailures()
-  {
-    if (failures == null)
-    {
-      failures = new EObjectContainmentEList<Definitions>(Definitions.class, this, FlaDslPackage.IN_FAILURE_EXPR__FAILURES);
-    }
-    return failures;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.IN_FAILURE_EXPR__FAILURES:
-        return ((InternalEList<?>)getFailures()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.IN_FAILURE_EXPR__FAILURES:
-        return getFailures();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.IN_FAILURE_EXPR__FAILURES:
-        getFailures().clear();
-        getFailures().addAll((Collection<? extends Definitions>)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.IN_FAILURE_EXPR__FAILURES:
-        getFailures().clear();
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.IN_FAILURE_EXPR__FAILURES:
-        return failures != null && !failures.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-
-} //InFailureExprImpl
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/InputExpressionImpl.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/InputExpressionImpl.java
deleted file mode 100644
index d3831a514d2a2660d2f4a976254f255f924d8cd6..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/InputExpressionImpl.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import org.eclipse.uml2.uml.Port;
-
-import org.polarsys.chess.xtext.flaDsl.FlaDslPackage;
-import org.polarsys.chess.xtext.flaDsl.InFailureExpr;
-import org.polarsys.chess.xtext.flaDsl.InputExpression;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Input Expression</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.impl.InputExpressionImpl#getRef <em>Ref</em>}</li>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.impl.InputExpressionImpl#getFailureExpr <em>Failure Expr</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class InputExpressionImpl extends MinimalEObjectImpl.Container implements InputExpression
-{
-  /**
-   * The cached value of the '{@link #getRef() <em>Ref</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getRef()
-   * @generated
-   * @ordered
-   */
-  protected Port ref;
-
-  /**
-   * The cached value of the '{@link #getFailureExpr() <em>Failure Expr</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getFailureExpr()
-   * @generated
-   * @ordered
-   */
-  protected InFailureExpr failureExpr;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected InputExpressionImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return FlaDslPackage.Literals.INPUT_EXPRESSION;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Port getRef()
-  {
-    if (ref != null && ref.eIsProxy())
-    {
-      InternalEObject oldRef = (InternalEObject)ref;
-      ref = (Port)eResolveProxy(oldRef);
-      if (ref != oldRef)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, FlaDslPackage.INPUT_EXPRESSION__REF, oldRef, ref));
-      }
-    }
-    return ref;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Port basicGetRef()
-  {
-    return ref;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setRef(Port newRef)
-  {
-    Port oldRef = ref;
-    ref = newRef;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, FlaDslPackage.INPUT_EXPRESSION__REF, oldRef, ref));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public InFailureExpr getFailureExpr()
-  {
-    return failureExpr;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetFailureExpr(InFailureExpr newFailureExpr, NotificationChain msgs)
-  {
-    InFailureExpr oldFailureExpr = failureExpr;
-    failureExpr = newFailureExpr;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FlaDslPackage.INPUT_EXPRESSION__FAILURE_EXPR, oldFailureExpr, newFailureExpr);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setFailureExpr(InFailureExpr newFailureExpr)
-  {
-    if (newFailureExpr != failureExpr)
-    {
-      NotificationChain msgs = null;
-      if (failureExpr != null)
-        msgs = ((InternalEObject)failureExpr).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FlaDslPackage.INPUT_EXPRESSION__FAILURE_EXPR, null, msgs);
-      if (newFailureExpr != null)
-        msgs = ((InternalEObject)newFailureExpr).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FlaDslPackage.INPUT_EXPRESSION__FAILURE_EXPR, null, msgs);
-      msgs = basicSetFailureExpr(newFailureExpr, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, FlaDslPackage.INPUT_EXPRESSION__FAILURE_EXPR, newFailureExpr, newFailureExpr));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.INPUT_EXPRESSION__FAILURE_EXPR:
-        return basicSetFailureExpr(null, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.INPUT_EXPRESSION__REF:
-        if (resolve) return getRef();
-        return basicGetRef();
-      case FlaDslPackage.INPUT_EXPRESSION__FAILURE_EXPR:
-        return getFailureExpr();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.INPUT_EXPRESSION__REF:
-        setRef((Port)newValue);
-        return;
-      case FlaDslPackage.INPUT_EXPRESSION__FAILURE_EXPR:
-        setFailureExpr((InFailureExpr)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.INPUT_EXPRESSION__REF:
-        setRef((Port)null);
-        return;
-      case FlaDslPackage.INPUT_EXPRESSION__FAILURE_EXPR:
-        setFailureExpr((InFailureExpr)null);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.INPUT_EXPRESSION__REF:
-        return ref != null;
-      case FlaDslPackage.INPUT_EXPRESSION__FAILURE_EXPR:
-        return failureExpr != null;
-    }
-    return super.eIsSet(featureID);
-  }
-
-} //InputExpressionImpl
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/LhsImpl.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/LhsImpl.java
deleted file mode 100644
index 5ac3bb6f42c65ba00b004026ae577839a63d805c..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/LhsImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.polarsys.chess.xtext.flaDsl.FlaDslPackage;
-import org.polarsys.chess.xtext.flaDsl.InputExpression;
-import org.polarsys.chess.xtext.flaDsl.Lhs;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Lhs</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.impl.LhsImpl#getFailures <em>Failures</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class LhsImpl extends MinimalEObjectImpl.Container implements Lhs
-{
-  /**
-   * The cached value of the '{@link #getFailures() <em>Failures</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getFailures()
-   * @generated
-   * @ordered
-   */
-  protected EList<InputExpression> failures;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected LhsImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return FlaDslPackage.Literals.LHS;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList<InputExpression> getFailures()
-  {
-    if (failures == null)
-    {
-      failures = new EObjectContainmentEList<InputExpression>(InputExpression.class, this, FlaDslPackage.LHS__FAILURES);
-    }
-    return failures;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.LHS__FAILURES:
-        return ((InternalEList<?>)getFailures()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.LHS__FAILURES:
-        return getFailures();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.LHS__FAILURES:
-        getFailures().clear();
-        getFailures().addAll((Collection<? extends InputExpression>)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.LHS__FAILURES:
-        getFailures().clear();
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.LHS__FAILURES:
-        return failures != null && !failures.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-
-} //LhsImpl
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/NoFailureDefinitionImpl.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/NoFailureDefinitionImpl.java
deleted file mode 100644
index 6d60a757b111d4d3746615e477938954bc0f9dc3..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/NoFailureDefinitionImpl.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.polarsys.chess.xtext.flaDsl.ACIDMitigation;
-import org.polarsys.chess.xtext.flaDsl.FlaDslPackage;
-import org.polarsys.chess.xtext.flaDsl.NoFailureDefinition;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>No Failure Definition</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.impl.NoFailureDefinitionImpl#getAcidMitigation <em>Acid Mitigation</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class NoFailureDefinitionImpl extends DefinitionsImpl implements NoFailureDefinition
-{
-  /**
-   * The cached value of the '{@link #getAcidMitigation() <em>Acid Mitigation</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getAcidMitigation()
-   * @generated
-   * @ordered
-   */
-  protected ACIDMitigation acidMitigation;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected NoFailureDefinitionImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return FlaDslPackage.Literals.NO_FAILURE_DEFINITION;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ACIDMitigation getAcidMitigation()
-  {
-    return acidMitigation;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetAcidMitigation(ACIDMitigation newAcidMitigation, NotificationChain msgs)
-  {
-    ACIDMitigation oldAcidMitigation = acidMitigation;
-    acidMitigation = newAcidMitigation;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FlaDslPackage.NO_FAILURE_DEFINITION__ACID_MITIGATION, oldAcidMitigation, newAcidMitigation);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setAcidMitigation(ACIDMitigation newAcidMitigation)
-  {
-    if (newAcidMitigation != acidMitigation)
-    {
-      NotificationChain msgs = null;
-      if (acidMitigation != null)
-        msgs = ((InternalEObject)acidMitigation).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FlaDslPackage.NO_FAILURE_DEFINITION__ACID_MITIGATION, null, msgs);
-      if (newAcidMitigation != null)
-        msgs = ((InternalEObject)newAcidMitigation).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FlaDslPackage.NO_FAILURE_DEFINITION__ACID_MITIGATION, null, msgs);
-      msgs = basicSetAcidMitigation(newAcidMitigation, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, FlaDslPackage.NO_FAILURE_DEFINITION__ACID_MITIGATION, newAcidMitigation, newAcidMitigation));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.NO_FAILURE_DEFINITION__ACID_MITIGATION:
-        return basicSetAcidMitigation(null, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.NO_FAILURE_DEFINITION__ACID_MITIGATION:
-        return getAcidMitigation();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.NO_FAILURE_DEFINITION__ACID_MITIGATION:
-        setAcidMitigation((ACIDMitigation)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.NO_FAILURE_DEFINITION__ACID_MITIGATION:
-        setAcidMitigation((ACIDMitigation)null);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.NO_FAILURE_DEFINITION__ACID_MITIGATION:
-        return acidMitigation != null;
-    }
-    return super.eIsSet(featureID);
-  }
-
-} //NoFailureDefinitionImpl
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/OutFailureExprImpl.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/OutFailureExprImpl.java
deleted file mode 100644
index 45d0aadfb7c0c7f934c329ea575fbc9118a39753..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/OutFailureExprImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.polarsys.chess.xtext.flaDsl.Definitions;
-import org.polarsys.chess.xtext.flaDsl.FlaDslPackage;
-import org.polarsys.chess.xtext.flaDsl.OutFailureExpr;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Out Failure Expr</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.impl.OutFailureExprImpl#getFailures <em>Failures</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class OutFailureExprImpl extends MinimalEObjectImpl.Container implements OutFailureExpr
-{
-  /**
-   * The cached value of the '{@link #getFailures() <em>Failures</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getFailures()
-   * @generated
-   * @ordered
-   */
-  protected EList<Definitions> failures;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected OutFailureExprImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return FlaDslPackage.Literals.OUT_FAILURE_EXPR;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList<Definitions> getFailures()
-  {
-    if (failures == null)
-    {
-      failures = new EObjectContainmentEList<Definitions>(Definitions.class, this, FlaDslPackage.OUT_FAILURE_EXPR__FAILURES);
-    }
-    return failures;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.OUT_FAILURE_EXPR__FAILURES:
-        return ((InternalEList<?>)getFailures()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.OUT_FAILURE_EXPR__FAILURES:
-        return getFailures();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.OUT_FAILURE_EXPR__FAILURES:
-        getFailures().clear();
-        getFailures().addAll((Collection<? extends Definitions>)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.OUT_FAILURE_EXPR__FAILURES:
-        getFailures().clear();
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.OUT_FAILURE_EXPR__FAILURES:
-        return failures != null && !failures.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-
-} //OutFailureExprImpl
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/OutputExpressionImpl.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/OutputExpressionImpl.java
deleted file mode 100644
index 773b0bdc817b57dfd8261c0e204307f0886fbce1..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/OutputExpressionImpl.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import org.eclipse.uml2.uml.Port;
-
-import org.polarsys.chess.xtext.flaDsl.FlaDslPackage;
-import org.polarsys.chess.xtext.flaDsl.OutFailureExpr;
-import org.polarsys.chess.xtext.flaDsl.OutputExpression;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Output Expression</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.impl.OutputExpressionImpl#getRef <em>Ref</em>}</li>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.impl.OutputExpressionImpl#getFailureExpr <em>Failure Expr</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class OutputExpressionImpl extends MinimalEObjectImpl.Container implements OutputExpression
-{
-  /**
-   * The cached value of the '{@link #getRef() <em>Ref</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getRef()
-   * @generated
-   * @ordered
-   */
-  protected Port ref;
-
-  /**
-   * The cached value of the '{@link #getFailureExpr() <em>Failure Expr</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getFailureExpr()
-   * @generated
-   * @ordered
-   */
-  protected OutFailureExpr failureExpr;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected OutputExpressionImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return FlaDslPackage.Literals.OUTPUT_EXPRESSION;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Port getRef()
-  {
-    if (ref != null && ref.eIsProxy())
-    {
-      InternalEObject oldRef = (InternalEObject)ref;
-      ref = (Port)eResolveProxy(oldRef);
-      if (ref != oldRef)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, FlaDslPackage.OUTPUT_EXPRESSION__REF, oldRef, ref));
-      }
-    }
-    return ref;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Port basicGetRef()
-  {
-    return ref;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setRef(Port newRef)
-  {
-    Port oldRef = ref;
-    ref = newRef;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, FlaDslPackage.OUTPUT_EXPRESSION__REF, oldRef, ref));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public OutFailureExpr getFailureExpr()
-  {
-    return failureExpr;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetFailureExpr(OutFailureExpr newFailureExpr, NotificationChain msgs)
-  {
-    OutFailureExpr oldFailureExpr = failureExpr;
-    failureExpr = newFailureExpr;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FlaDslPackage.OUTPUT_EXPRESSION__FAILURE_EXPR, oldFailureExpr, newFailureExpr);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setFailureExpr(OutFailureExpr newFailureExpr)
-  {
-    if (newFailureExpr != failureExpr)
-    {
-      NotificationChain msgs = null;
-      if (failureExpr != null)
-        msgs = ((InternalEObject)failureExpr).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FlaDslPackage.OUTPUT_EXPRESSION__FAILURE_EXPR, null, msgs);
-      if (newFailureExpr != null)
-        msgs = ((InternalEObject)newFailureExpr).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FlaDslPackage.OUTPUT_EXPRESSION__FAILURE_EXPR, null, msgs);
-      msgs = basicSetFailureExpr(newFailureExpr, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, FlaDslPackage.OUTPUT_EXPRESSION__FAILURE_EXPR, newFailureExpr, newFailureExpr));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.OUTPUT_EXPRESSION__FAILURE_EXPR:
-        return basicSetFailureExpr(null, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.OUTPUT_EXPRESSION__REF:
-        if (resolve) return getRef();
-        return basicGetRef();
-      case FlaDslPackage.OUTPUT_EXPRESSION__FAILURE_EXPR:
-        return getFailureExpr();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.OUTPUT_EXPRESSION__REF:
-        setRef((Port)newValue);
-        return;
-      case FlaDslPackage.OUTPUT_EXPRESSION__FAILURE_EXPR:
-        setFailureExpr((OutFailureExpr)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.OUTPUT_EXPRESSION__REF:
-        setRef((Port)null);
-        return;
-      case FlaDslPackage.OUTPUT_EXPRESSION__FAILURE_EXPR:
-        setFailureExpr((OutFailureExpr)null);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.OUTPUT_EXPRESSION__REF:
-        return ref != null;
-      case FlaDslPackage.OUTPUT_EXPRESSION__FAILURE_EXPR:
-        return failureExpr != null;
-    }
-    return super.eIsSet(featureID);
-  }
-
-} //OutputExpressionImpl
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/RhsImpl.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/RhsImpl.java
deleted file mode 100644
index c3498da5725707496eb874d2d24f687a5458cb9b..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/RhsImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.polarsys.chess.xtext.flaDsl.FlaDslPackage;
-import org.polarsys.chess.xtext.flaDsl.OutputExpression;
-import org.polarsys.chess.xtext.flaDsl.Rhs;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Rhs</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.impl.RhsImpl#getFailures <em>Failures</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class RhsImpl extends MinimalEObjectImpl.Container implements Rhs
-{
-  /**
-   * The cached value of the '{@link #getFailures() <em>Failures</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getFailures()
-   * @generated
-   * @ordered
-   */
-  protected EList<OutputExpression> failures;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected RhsImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return FlaDslPackage.Literals.RHS;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList<OutputExpression> getFailures()
-  {
-    if (failures == null)
-    {
-      failures = new EObjectContainmentEList<OutputExpression>(OutputExpression.class, this, FlaDslPackage.RHS__FAILURES);
-    }
-    return failures;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.RHS__FAILURES:
-        return ((InternalEList<?>)getFailures()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.RHS__FAILURES:
-        return getFailures();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.RHS__FAILURES:
-        getFailures().clear();
-        getFailures().addAll((Collection<? extends OutputExpression>)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.RHS__FAILURES:
-        getFailures().clear();
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.RHS__FAILURES:
-        return failures != null && !failures.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-
-} //RhsImpl
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/VariableDefinitionImpl.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/VariableDefinitionImpl.java
deleted file mode 100644
index a4bef18ef634b3033fa8f3f44813fd61c85dadc2..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/VariableDefinitionImpl.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.polarsys.chess.xtext.flaDsl.FlaDslPackage;
-import org.polarsys.chess.xtext.flaDsl.VariableDefinition;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Variable Definition</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.polarsys.chess.xtext.flaDsl.impl.VariableDefinitionImpl#getVariableName <em>Variable Name</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class VariableDefinitionImpl extends DefinitionsImpl implements VariableDefinition
-{
-  /**
-   * The default value of the '{@link #getVariableName() <em>Variable Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getVariableName()
-   * @generated
-   * @ordered
-   */
-  protected static final String VARIABLE_NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getVariableName() <em>Variable Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getVariableName()
-   * @generated
-   * @ordered
-   */
-  protected String variableName = VARIABLE_NAME_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected VariableDefinitionImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return FlaDslPackage.Literals.VARIABLE_DEFINITION;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getVariableName()
-  {
-    return variableName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setVariableName(String newVariableName)
-  {
-    String oldVariableName = variableName;
-    variableName = newVariableName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, FlaDslPackage.VARIABLE_DEFINITION__VARIABLE_NAME, oldVariableName, variableName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.VARIABLE_DEFINITION__VARIABLE_NAME:
-        return getVariableName();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.VARIABLE_DEFINITION__VARIABLE_NAME:
-        setVariableName((String)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.VARIABLE_DEFINITION__VARIABLE_NAME:
-        setVariableName(VARIABLE_NAME_EDEFAULT);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case FlaDslPackage.VARIABLE_DEFINITION__VARIABLE_NAME:
-        return VARIABLE_NAME_EDEFAULT == null ? variableName != null : !VARIABLE_NAME_EDEFAULT.equals(variableName);
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (variableName: ");
-    result.append(variableName);
-    result.append(')');
-    return result.toString();
-  }
-
-} //VariableDefinitionImpl
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/WildcardDefinitionImpl.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/WildcardDefinitionImpl.java
deleted file mode 100644
index a836a64339272342d65e0633f9d16fdb79a0d5f7..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/impl/WildcardDefinitionImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.polarsys.chess.xtext.flaDsl.FlaDslPackage;
-import org.polarsys.chess.xtext.flaDsl.WildcardDefinition;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Wildcard Definition</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class WildcardDefinitionImpl extends DefinitionsImpl implements WildcardDefinition
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected WildcardDefinitionImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return FlaDslPackage.Literals.WILDCARD_DEFINITION;
-  }
-
-} //WildcardDefinitionImpl
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/util/FlaDslAdapterFactory.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/util/FlaDslAdapterFactory.java
deleted file mode 100644
index 36d38aae207a36d79c3fdca1f64db2a9cd59013a..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/util/FlaDslAdapterFactory.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.polarsys.chess.xtext.flaDsl.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage
- * @generated
- */
-public class FlaDslAdapterFactory extends AdapterFactoryImpl
-{
-  /**
-   * The cached model package.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected static FlaDslPackage modelPackage;
-
-  /**
-   * Creates an instance of the adapter factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public FlaDslAdapterFactory()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = FlaDslPackage.eINSTANCE;
-    }
-  }
-
-  /**
-   * Returns whether this factory is applicable for the type of the object.
-   * <!-- begin-user-doc -->
-   * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-   * <!-- end-user-doc -->
-   * @return whether this factory is applicable for the type of the object.
-   * @generated
-   */
-  @Override
-  public boolean isFactoryForType(Object object)
-  {
-    if (object == modelPackage)
-    {
-      return true;
-    }
-    if (object instanceof EObject)
-    {
-      return ((EObject)object).eClass().getEPackage() == modelPackage;
-    }
-    return false;
-  }
-
-  /**
-   * The switch that delegates to the <code>createXXX</code> methods.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected FlaDslSwitch<Adapter> modelSwitch =
-    new FlaDslSwitch<Adapter>()
-    {
-      @Override
-      public Adapter caseBehaviour(Behaviour object)
-      {
-        return createBehaviourAdapter();
-      }
-      @Override
-      public Adapter caseExpression(Expression object)
-      {
-        return createExpressionAdapter();
-      }
-      @Override
-      public Adapter caseLhs(Lhs object)
-      {
-        return createLhsAdapter();
-      }
-      @Override
-      public Adapter caseRhs(Rhs object)
-      {
-        return createRhsAdapter();
-      }
-      @Override
-      public Adapter caseInputExpression(InputExpression object)
-      {
-        return createInputExpressionAdapter();
-      }
-      @Override
-      public Adapter caseOutputExpression(OutputExpression object)
-      {
-        return createOutputExpressionAdapter();
-      }
-      @Override
-      public Adapter caseInFailureExpr(InFailureExpr object)
-      {
-        return createInFailureExprAdapter();
-      }
-      @Override
-      public Adapter caseOutFailureExpr(OutFailureExpr object)
-      {
-        return createOutFailureExprAdapter();
-      }
-      @Override
-      public Adapter caseDefinitions(Definitions object)
-      {
-        return createDefinitionsAdapter();
-      }
-      @Override
-      public Adapter caseFailureDefinition(FailureDefinition object)
-      {
-        return createFailureDefinitionAdapter();
-      }
-      @Override
-      public Adapter caseNoFailureDefinition(NoFailureDefinition object)
-      {
-        return createNoFailureDefinitionAdapter();
-      }
-      @Override
-      public Adapter caseComplexNofailureDefinition(ComplexNofailureDefinition object)
-      {
-        return createComplexNofailureDefinitionAdapter();
-      }
-      @Override
-      public Adapter caseWildcardDefinition(WildcardDefinition object)
-      {
-        return createWildcardDefinitionAdapter();
-      }
-      @Override
-      public Adapter caseVariableDefinition(VariableDefinition object)
-      {
-        return createVariableDefinitionAdapter();
-      }
-      @Override
-      public Adapter caseACIDavoidable(ACIDavoidable object)
-      {
-        return createACIDavoidableAdapter();
-      }
-      @Override
-      public Adapter caseACIDMitigation(ACIDMitigation object)
-      {
-        return createACIDMitigationAdapter();
-      }
-      @Override
-      public Adapter defaultCase(EObject object)
-      {
-        return createEObjectAdapter();
-      }
-    };
-
-  /**
-   * Creates an adapter for the <code>target</code>.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param target the object to adapt.
-   * @return the adapter for the <code>target</code>.
-   * @generated
-   */
-  @Override
-  public Adapter createAdapter(Notifier target)
-  {
-    return modelSwitch.doSwitch((EObject)target);
-  }
-
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.polarsys.chess.xtext.flaDsl.Behaviour <em>Behaviour</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.polarsys.chess.xtext.flaDsl.Behaviour
-   * @generated
-   */
-  public Adapter createBehaviourAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.polarsys.chess.xtext.flaDsl.Expression <em>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.polarsys.chess.xtext.flaDsl.Expression
-   * @generated
-   */
-  public Adapter createExpressionAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.polarsys.chess.xtext.flaDsl.Lhs <em>Lhs</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.polarsys.chess.xtext.flaDsl.Lhs
-   * @generated
-   */
-  public Adapter createLhsAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.polarsys.chess.xtext.flaDsl.Rhs <em>Rhs</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.polarsys.chess.xtext.flaDsl.Rhs
-   * @generated
-   */
-  public Adapter createRhsAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.polarsys.chess.xtext.flaDsl.InputExpression <em>Input 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.polarsys.chess.xtext.flaDsl.InputExpression
-   * @generated
-   */
-  public Adapter createInputExpressionAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.polarsys.chess.xtext.flaDsl.OutputExpression <em>Output 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.polarsys.chess.xtext.flaDsl.OutputExpression
-   * @generated
-   */
-  public Adapter createOutputExpressionAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.polarsys.chess.xtext.flaDsl.InFailureExpr <em>In Failure Expr</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.polarsys.chess.xtext.flaDsl.InFailureExpr
-   * @generated
-   */
-  public Adapter createInFailureExprAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.polarsys.chess.xtext.flaDsl.OutFailureExpr <em>Out Failure Expr</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.polarsys.chess.xtext.flaDsl.OutFailureExpr
-   * @generated
-   */
-  public Adapter createOutFailureExprAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.polarsys.chess.xtext.flaDsl.Definitions <em>Definitions</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.polarsys.chess.xtext.flaDsl.Definitions
-   * @generated
-   */
-  public Adapter createDefinitionsAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.polarsys.chess.xtext.flaDsl.FailureDefinition <em>Failure Definition</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.polarsys.chess.xtext.flaDsl.FailureDefinition
-   * @generated
-   */
-  public Adapter createFailureDefinitionAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.polarsys.chess.xtext.flaDsl.NoFailureDefinition <em>No Failure Definition</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.polarsys.chess.xtext.flaDsl.NoFailureDefinition
-   * @generated
-   */
-  public Adapter createNoFailureDefinitionAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.polarsys.chess.xtext.flaDsl.ComplexNofailureDefinition <em>Complex Nofailure Definition</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.polarsys.chess.xtext.flaDsl.ComplexNofailureDefinition
-   * @generated
-   */
-  public Adapter createComplexNofailureDefinitionAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.polarsys.chess.xtext.flaDsl.WildcardDefinition <em>Wildcard Definition</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.polarsys.chess.xtext.flaDsl.WildcardDefinition
-   * @generated
-   */
-  public Adapter createWildcardDefinitionAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.polarsys.chess.xtext.flaDsl.VariableDefinition <em>Variable Definition</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.polarsys.chess.xtext.flaDsl.VariableDefinition
-   * @generated
-   */
-  public Adapter createVariableDefinitionAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.polarsys.chess.xtext.flaDsl.ACIDavoidable <em>ACI Davoidable</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.polarsys.chess.xtext.flaDsl.ACIDavoidable
-   * @generated
-   */
-  public Adapter createACIDavoidableAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.polarsys.chess.xtext.flaDsl.ACIDMitigation <em>ACID Mitigation</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.polarsys.chess.xtext.flaDsl.ACIDMitigation
-   * @generated
-   */
-  public Adapter createACIDMitigationAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for the default case.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @generated
-   */
-  public Adapter createEObjectAdapter()
-  {
-    return null;
-  }
-
-} //FlaDslAdapterFactory
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/util/FlaDslSwitch.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/util/FlaDslSwitch.java
deleted file mode 100644
index efc06dabc7022e3710bb68901e4610dce521b42c..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/flaDsl/util/FlaDslSwitch.java
+++ /dev/null
@@ -1,470 +0,0 @@
-/**
- */
-package org.polarsys.chess.xtext.flaDsl.util;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.util.Switch;
-
-import org.polarsys.chess.xtext.flaDsl.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.polarsys.chess.xtext.flaDsl.FlaDslPackage
- * @generated
- */
-public class FlaDslSwitch<T> extends Switch<T>
-{
-  /**
-   * The cached model package
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected static FlaDslPackage modelPackage;
-
-  /**
-   * Creates an instance of the switch.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public FlaDslSwitch()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = FlaDslPackage.eINSTANCE;
-    }
-  }
-
-  /**
-   * Checks whether this is a switch for the given package.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param ePackage the package in question.
-   * @return whether this is a switch for the given package.
-   * @generated
-   */
-  @Override
-  protected boolean isSwitchFor(EPackage ePackage)
-  {
-    return ePackage == modelPackage;
-  }
-
-  /**
-   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the first non-null result returned by a <code>caseXXX</code> call.
-   * @generated
-   */
-  @Override
-  protected T doSwitch(int classifierID, EObject theEObject)
-  {
-    switch (classifierID)
-    {
-      case FlaDslPackage.BEHAVIOUR:
-      {
-        Behaviour behaviour = (Behaviour)theEObject;
-        T result = caseBehaviour(behaviour);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case FlaDslPackage.EXPRESSION:
-      {
-        Expression expression = (Expression)theEObject;
-        T result = caseExpression(expression);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case FlaDslPackage.LHS:
-      {
-        Lhs lhs = (Lhs)theEObject;
-        T result = caseLhs(lhs);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case FlaDslPackage.RHS:
-      {
-        Rhs rhs = (Rhs)theEObject;
-        T result = caseRhs(rhs);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case FlaDslPackage.INPUT_EXPRESSION:
-      {
-        InputExpression inputExpression = (InputExpression)theEObject;
-        T result = caseInputExpression(inputExpression);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case FlaDslPackage.OUTPUT_EXPRESSION:
-      {
-        OutputExpression outputExpression = (OutputExpression)theEObject;
-        T result = caseOutputExpression(outputExpression);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case FlaDslPackage.IN_FAILURE_EXPR:
-      {
-        InFailureExpr inFailureExpr = (InFailureExpr)theEObject;
-        T result = caseInFailureExpr(inFailureExpr);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case FlaDslPackage.OUT_FAILURE_EXPR:
-      {
-        OutFailureExpr outFailureExpr = (OutFailureExpr)theEObject;
-        T result = caseOutFailureExpr(outFailureExpr);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case FlaDslPackage.DEFINITIONS:
-      {
-        Definitions definitions = (Definitions)theEObject;
-        T result = caseDefinitions(definitions);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case FlaDslPackage.FAILURE_DEFINITION:
-      {
-        FailureDefinition failureDefinition = (FailureDefinition)theEObject;
-        T result = caseFailureDefinition(failureDefinition);
-        if (result == null) result = caseDefinitions(failureDefinition);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case FlaDslPackage.NO_FAILURE_DEFINITION:
-      {
-        NoFailureDefinition noFailureDefinition = (NoFailureDefinition)theEObject;
-        T result = caseNoFailureDefinition(noFailureDefinition);
-        if (result == null) result = caseComplexNofailureDefinition(noFailureDefinition);
-        if (result == null) result = caseDefinitions(noFailureDefinition);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case FlaDslPackage.COMPLEX_NOFAILURE_DEFINITION:
-      {
-        ComplexNofailureDefinition complexNofailureDefinition = (ComplexNofailureDefinition)theEObject;
-        T result = caseComplexNofailureDefinition(complexNofailureDefinition);
-        if (result == null) result = caseDefinitions(complexNofailureDefinition);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case FlaDslPackage.WILDCARD_DEFINITION:
-      {
-        WildcardDefinition wildcardDefinition = (WildcardDefinition)theEObject;
-        T result = caseWildcardDefinition(wildcardDefinition);
-        if (result == null) result = caseDefinitions(wildcardDefinition);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case FlaDslPackage.VARIABLE_DEFINITION:
-      {
-        VariableDefinition variableDefinition = (VariableDefinition)theEObject;
-        T result = caseVariableDefinition(variableDefinition);
-        if (result == null) result = caseDefinitions(variableDefinition);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case FlaDslPackage.ACI_DAVOIDABLE:
-      {
-        ACIDavoidable aciDavoidable = (ACIDavoidable)theEObject;
-        T result = caseACIDavoidable(aciDavoidable);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case FlaDslPackage.ACID_MITIGATION:
-      {
-        ACIDMitigation acidMitigation = (ACIDMitigation)theEObject;
-        T result = caseACIDMitigation(acidMitigation);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      default: return defaultCase(theEObject);
-    }
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Behaviour</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>Behaviour</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseBehaviour(Behaviour object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>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>Expression</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseExpression(Expression object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Lhs</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>Lhs</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseLhs(Lhs object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Rhs</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>Rhs</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseRhs(Rhs object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Input 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>Input Expression</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseInputExpression(InputExpression object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Output 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>Output Expression</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseOutputExpression(OutputExpression object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>In Failure Expr</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>In Failure Expr</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseInFailureExpr(InFailureExpr object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Out Failure Expr</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>Out Failure Expr</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseOutFailureExpr(OutFailureExpr object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Definitions</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>Definitions</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseDefinitions(Definitions object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Failure Definition</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>Failure Definition</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseFailureDefinition(FailureDefinition object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>No Failure Definition</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>No Failure Definition</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseNoFailureDefinition(NoFailureDefinition object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Complex Nofailure Definition</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>Complex Nofailure Definition</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseComplexNofailureDefinition(ComplexNofailureDefinition object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Wildcard Definition</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>Wildcard Definition</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseWildcardDefinition(WildcardDefinition object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Variable Definition</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>Variable Definition</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseVariableDefinition(VariableDefinition object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>ACI Davoidable</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>ACI Davoidable</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseACIDavoidable(ACIDavoidable object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>ACID Mitigation</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>ACID Mitigation</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseACIDMitigation(ACIDMitigation object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch, but this is the last case anyway.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-   * @generated
-   */
-  @Override
-  public T defaultCase(EObject object)
-  {
-    return null;
-  }
-
-} //FlaDslSwitch
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/FlaDslAntlrTokenFileProvider.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/FlaDslAntlrTokenFileProvider.java
deleted file mode 100644
index 8e5edb3dae43081ca0619b258c6d966d78341e16..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/FlaDslAntlrTokenFileProvider.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-* generated by Xtext
-*/
-package org.polarsys.chess.xtext.parser.antlr;
-
-import java.io.InputStream;
-import org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider;
-
-public class FlaDslAntlrTokenFileProvider implements IAntlrTokenFileProvider {
-	
-	public InputStream getAntlrTokenFile() {
-		ClassLoader classLoader = getClass().getClassLoader();
-    	return classLoader.getResourceAsStream("org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.tokens");
-	}
-}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/FlaDslParser.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/FlaDslParser.java
deleted file mode 100644
index 8be1ad3ec43bb0c1ce111f25b83d132556bfd85e..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/FlaDslParser.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-* generated by Xtext
-*/
-package org.polarsys.chess.xtext.parser.antlr;
-
-import com.google.inject.Inject;
-
-import org.eclipse.xtext.parser.antlr.XtextTokenStream;
-import org.polarsys.chess.xtext.services.FlaDslGrammarAccess;
-
-public class FlaDslParser extends org.eclipse.xtext.parser.antlr.AbstractAntlrParser {
-	
-	@Inject
-	private FlaDslGrammarAccess grammarAccess;
-	
-	@Override
-	protected void setInitialHiddenTokens(XtextTokenStream tokenStream) {
-		tokenStream.setInitialHiddenTokens("RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT");
-	}
-	
-	@Override
-	protected org.polarsys.chess.xtext.parser.antlr.internal.InternalFlaDslParser createParser(XtextTokenStream stream) {
-		return new org.polarsys.chess.xtext.parser.antlr.internal.InternalFlaDslParser(stream, getGrammarAccess());
-	}
-	
-	@Override 
-	protected String getDefaultRuleName() {
-		return "Behaviour";
-	}
-	
-	public FlaDslGrammarAccess getGrammarAccess() {
-		return this.grammarAccess;
-	}
-	
-	public void setGrammarAccess(FlaDslGrammarAccess grammarAccess) {
-		this.grammarAccess = grammarAccess;
-	}
-	
-}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g
deleted file mode 100644
index 92a039a8f70e29d9c1c9444a80f19038f4160b9c..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g
+++ /dev/null
@@ -1,1437 +0,0 @@
-/*
-* generated by Xtext
-*/
-grammar InternalFlaDsl;
-
-options {
-	superClass=AbstractInternalAntlrParser;
-	
-}
-
-@lexer::header {
-package org.polarsys.chess.xtext.parser.antlr.internal;
-
-// Hack: Use our own Lexer superclass by means of import. 
-// Currently there is no other way to specify the superclass for the lexer.
-import org.eclipse.xtext.parser.antlr.Lexer;
-}
-
-@parser::header {
-package org.polarsys.chess.xtext.parser.antlr.internal; 
-
-import org.eclipse.xtext.*;
-import org.eclipse.xtext.parser.*;
-import org.eclipse.xtext.parser.impl.*;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.common.util.Enumerator;
-import org.eclipse.xtext.parser.antlr.AbstractInternalAntlrParser;
-import org.eclipse.xtext.parser.antlr.XtextTokenStream;
-import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
-import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;
-import org.polarsys.chess.xtext.services.FlaDslGrammarAccess;
-
-}
-
-@parser::members {
-
- 	private FlaDslGrammarAccess grammarAccess;
- 	
-    public InternalFlaDslParser(TokenStream input, FlaDslGrammarAccess grammarAccess) {
-        this(input);
-        this.grammarAccess = grammarAccess;
-        registerRules(grammarAccess.getGrammar());
-    }
-    
-    @Override
-    protected String getFirstRuleName() {
-    	return "Behaviour";	
-   	}
-   	
-   	@Override
-   	protected FlaDslGrammarAccess getGrammarAccess() {
-   		return grammarAccess;
-   	}
-}
-
-@rulecatch { 
-    catch (RecognitionException re) { 
-        recover(input,re); 
-        appendSkippedTokens();
-    } 
-}
-
-
-
-
-// Entry rule entryRuleBehaviour
-entryRuleBehaviour returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getBehaviourRule()); }
-	 iv_ruleBehaviour=ruleBehaviour 
-	 { $current=$iv_ruleBehaviour.current; } 
-	 EOF 
-;
-
-// Rule Behaviour
-ruleBehaviour returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getBehaviourAccess().getRulesExpressionParserRuleCall_0()); 
-	    }
-		lv_rules_0_0=ruleExpression		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getBehaviourRule());
-	        }
-       		add(
-       			$current, 
-       			"rules",
-        		lv_rules_0_0, 
-        		"Expression");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)+
-;
-
-
-
-
-
-// Entry rule entryRuleExpression
-entryRuleExpression returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getExpressionRule()); }
-	 iv_ruleExpression=ruleExpression 
-	 { $current=$iv_ruleExpression.current; } 
-	 EOF 
-;
-
-// Rule Expression
-ruleExpression returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-(	otherlv_0='FLA:' 
-    {
-    	newLeafNode(otherlv_0, grammarAccess.getExpressionAccess().getFLAKeyword_0());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getExpressionAccess().getLhsLhsParserRuleCall_1_0()); 
-	    }
-		lv_lhs_1_0=ruleLhs		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getExpressionRule());
-	        }
-       		set(
-       			$current, 
-       			"lhs",
-        		lv_lhs_1_0, 
-        		"Lhs");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)	otherlv_2='->' 
-    {
-    	newLeafNode(otherlv_2, grammarAccess.getExpressionAccess().getHyphenMinusGreaterThanSignKeyword_2());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getExpressionAccess().getRhsRhsParserRuleCall_3_0()); 
-	    }
-		lv_rhs_3_0=ruleRhs		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getExpressionRule());
-	        }
-       		set(
-       			$current, 
-       			"rhs",
-        		lv_rhs_3_0, 
-        		"Rhs");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)	otherlv_4=';' 
-    {
-    	newLeafNode(otherlv_4, grammarAccess.getExpressionAccess().getSemicolonKeyword_4());
-    }
-)
-;
-
-
-
-
-
-// Entry rule entryRuleLhs
-entryRuleLhs returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getLhsRule()); }
-	 iv_ruleLhs=ruleLhs 
-	 { $current=$iv_ruleLhs.current; } 
-	 EOF 
-;
-
-// Rule Lhs
-ruleLhs returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-(
-		{ 
-	        newCompositeNode(grammarAccess.getLhsAccess().getFailuresInputExpressionParserRuleCall_0_0()); 
-	    }
-		lv_failures_0_0=ruleInputExpression		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getLhsRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_0_0, 
-        		"InputExpression");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)(	otherlv_1=',' 
-    {
-    	newLeafNode(otherlv_1, grammarAccess.getLhsAccess().getCommaKeyword_1_0());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getLhsAccess().getFailuresInputExpressionParserRuleCall_1_1_0()); 
-	    }
-		lv_failures_2_0=ruleInputExpression		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getLhsRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_2_0, 
-        		"InputExpression");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-))*)
-;
-
-
-
-
-
-// Entry rule entryRuleRhs
-entryRuleRhs returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getRhsRule()); }
-	 iv_ruleRhs=ruleRhs 
-	 { $current=$iv_ruleRhs.current; } 
-	 EOF 
-;
-
-// Rule Rhs
-ruleRhs returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-(
-		{ 
-	        newCompositeNode(grammarAccess.getRhsAccess().getFailuresOutputExpressionParserRuleCall_0_0()); 
-	    }
-		lv_failures_0_0=ruleOutputExpression		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getRhsRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_0_0, 
-        		"OutputExpression");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)(	otherlv_1=',' 
-    {
-    	newLeafNode(otherlv_1, grammarAccess.getRhsAccess().getCommaKeyword_1_0());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getRhsAccess().getFailuresOutputExpressionParserRuleCall_1_1_0()); 
-	    }
-		lv_failures_2_0=ruleOutputExpression		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getRhsRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_2_0, 
-        		"OutputExpression");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-))*)
-;
-
-
-
-
-
-// Entry rule entryRuleInputExpression
-entryRuleInputExpression returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getInputExpressionRule()); }
-	 iv_ruleInputExpression=ruleInputExpression 
-	 { $current=$iv_ruleInputExpression.current; } 
-	 EOF 
-;
-
-// Rule InputExpression
-ruleInputExpression returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-(((
-(
-		{
-			if ($current==null) {
-	            $current = createModelElement(grammarAccess.getInputExpressionRule());
-	        }
-        }
-	otherlv_0=RULE_ID
-	{
-		newLeafNode(otherlv_0, grammarAccess.getInputExpressionAccess().getRefPortCrossReference_0_0_0()); 
-	}
-
-)
-)
-    |	otherlv_1='undefined' 
-    {
-    	newLeafNode(otherlv_1, grammarAccess.getInputExpressionAccess().getUndefinedKeyword_0_1());
-    }
-)	otherlv_2='.' 
-    {
-    	newLeafNode(otherlv_2, grammarAccess.getInputExpressionAccess().getFullStopKeyword_1());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getInputExpressionAccess().getFailureExprInFailureExprParserRuleCall_2_0()); 
-	    }
-		lv_failureExpr_3_0=ruleInFailureExpr		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getInputExpressionRule());
-	        }
-       		set(
-       			$current, 
-       			"failureExpr",
-        		lv_failureExpr_3_0, 
-        		"InFailureExpr");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-))
-;
-
-
-
-
-
-// Entry rule entryRuleOutputExpression
-entryRuleOutputExpression returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getOutputExpressionRule()); }
-	 iv_ruleOutputExpression=ruleOutputExpression 
-	 { $current=$iv_ruleOutputExpression.current; } 
-	 EOF 
-;
-
-// Rule OutputExpression
-ruleOutputExpression returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-(((
-(
-		{
-			if ($current==null) {
-	            $current = createModelElement(grammarAccess.getOutputExpressionRule());
-	        }
-        }
-	otherlv_0=RULE_ID
-	{
-		newLeafNode(otherlv_0, grammarAccess.getOutputExpressionAccess().getRefPortCrossReference_0_0_0()); 
-	}
-
-)
-)
-    |	otherlv_1='undefined' 
-    {
-    	newLeafNode(otherlv_1, grammarAccess.getOutputExpressionAccess().getUndefinedKeyword_0_1());
-    }
-)	otherlv_2='.' 
-    {
-    	newLeafNode(otherlv_2, grammarAccess.getOutputExpressionAccess().getFullStopKeyword_1());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getOutputExpressionAccess().getFailureExprOutFailureExprParserRuleCall_2_0()); 
-	    }
-		lv_failureExpr_3_0=ruleOutFailureExpr		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getOutputExpressionRule());
-	        }
-       		set(
-       			$current, 
-       			"failureExpr",
-        		lv_failureExpr_3_0, 
-        		"OutFailureExpr");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-))
-;
-
-
-
-
-
-// Entry rule entryRuleInFailureExpr
-entryRuleInFailureExpr returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getInFailureExprRule()); }
-	 iv_ruleInFailureExpr=ruleInFailureExpr 
-	 { $current=$iv_ruleInFailureExpr.current; } 
-	 EOF 
-;
-
-// Rule InFailureExpr
-ruleInFailureExpr returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-(
-		{ 
-	        newCompositeNode(grammarAccess.getInFailureExprAccess().getFailuresWildcardDefinitionParserRuleCall_0_0()); 
-	    }
-		lv_failures_0_0=ruleWildcardDefinition		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getInFailureExprRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_0_0, 
-        		"WildcardDefinition");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)
-    |(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getInFailureExprAccess().getFailuresNoFailureDefinitionParserRuleCall_1_0()); 
-	    }
-		lv_failures_1_0=ruleNoFailureDefinition		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getInFailureExprRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_1_0, 
-        		"NoFailureDefinition");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)
-    |(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getInFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_2_0()); 
-	    }
-		lv_failures_2_0=ruleFailureDefinition		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getInFailureExprRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_2_0, 
-        		"FailureDefinition");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)
-    |(	otherlv_3='{' 
-    {
-    	newLeafNode(otherlv_3, grammarAccess.getInFailureExprAccess().getLeftCurlyBracketKeyword_3_0());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getInFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_3_1_0()); 
-	    }
-		lv_failures_4_0=ruleFailureDefinition		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getInFailureExprRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_4_0, 
-        		"FailureDefinition");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)(	otherlv_5=',' 
-    {
-    	newLeafNode(otherlv_5, grammarAccess.getInFailureExprAccess().getCommaKeyword_3_2_0());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getInFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_3_2_1_0()); 
-	    }
-		lv_failures_6_0=ruleFailureDefinition		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getInFailureExprRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_6_0, 
-        		"FailureDefinition");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-))+	otherlv_7='}' 
-    {
-    	newLeafNode(otherlv_7, grammarAccess.getInFailureExprAccess().getRightCurlyBracketKeyword_3_3());
-    }
-)
-    |(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getInFailureExprAccess().getFailuresVariableDefinitionParserRuleCall_4_0()); 
-	    }
-		lv_failures_8_0=ruleVariableDefinition		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getInFailureExprRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_8_0, 
-        		"VariableDefinition");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-))
-;
-
-
-
-
-
-// Entry rule entryRuleOutFailureExpr
-entryRuleOutFailureExpr returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getOutFailureExprRule()); }
-	 iv_ruleOutFailureExpr=ruleOutFailureExpr 
-	 { $current=$iv_ruleOutFailureExpr.current; } 
-	 EOF 
-;
-
-// Rule OutFailureExpr
-ruleOutFailureExpr returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-(
-		{ 
-	        newCompositeNode(grammarAccess.getOutFailureExprAccess().getFailuresNoFailureDefinitionParserRuleCall_0_0()); 
-	    }
-		lv_failures_0_0=ruleNoFailureDefinition		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getOutFailureExprRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_0_0, 
-        		"NoFailureDefinition");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)
-    |(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getOutFailureExprAccess().getFailuresComplexNofailureDefinitionParserRuleCall_1_0()); 
-	    }
-		lv_failures_1_0=ruleComplexNofailureDefinition		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getOutFailureExprRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_1_0, 
-        		"ComplexNofailureDefinition");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)
-    |(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getOutFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_2_0()); 
-	    }
-		lv_failures_2_0=ruleFailureDefinition		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getOutFailureExprRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_2_0, 
-        		"FailureDefinition");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)
-    |(	otherlv_3='{' 
-    {
-    	newLeafNode(otherlv_3, grammarAccess.getOutFailureExprAccess().getLeftCurlyBracketKeyword_3_0());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getOutFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_3_1_0()); 
-	    }
-		lv_failures_4_0=ruleFailureDefinition		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getOutFailureExprRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_4_0, 
-        		"FailureDefinition");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)(	otherlv_5=',' 
-    {
-    	newLeafNode(otherlv_5, grammarAccess.getOutFailureExprAccess().getCommaKeyword_3_2_0());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getOutFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_3_2_1_0()); 
-	    }
-		lv_failures_6_0=ruleFailureDefinition		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getOutFailureExprRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_6_0, 
-        		"FailureDefinition");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-))+	otherlv_7='}' 
-    {
-    	newLeafNode(otherlv_7, grammarAccess.getOutFailureExprAccess().getRightCurlyBracketKeyword_3_3());
-    }
-)
-    |(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getOutFailureExprAccess().getFailuresVariableDefinitionParserRuleCall_4_0()); 
-	    }
-		lv_failures_8_0=ruleVariableDefinition		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getOutFailureExprRule());
-	        }
-       		add(
-       			$current, 
-       			"failures",
-        		lv_failures_8_0, 
-        		"VariableDefinition");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-))
-;
-
-
-
-
-
-
-
-// Entry rule entryRuleFailureDefinition
-entryRuleFailureDefinition returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getFailureDefinitionRule()); }
-	 iv_ruleFailureDefinition=ruleFailureDefinition 
-	 { $current=$iv_ruleFailureDefinition.current; } 
-	 EOF 
-;
-
-// Rule FailureDefinition
-ruleFailureDefinition returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-    {
-        $current = forceCreateModelElement(
-            grammarAccess.getFailureDefinitionAccess().getFailureDefinitionAction_0(),
-            $current);
-    }
-)(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getFailureDefinitionAccess().getTypeActualFailureTypeEnumRuleCall_1_0()); 
-	    }
-		lv_type_1_0=ruleActualFailureType		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getFailureDefinitionRule());
-	        }
-       		set(
-       			$current, 
-       			"type",
-        		lv_type_1_0, 
-        		"ActualFailureType");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)(	otherlv_2='.' 
-    {
-    	newLeafNode(otherlv_2, grammarAccess.getFailureDefinitionAccess().getFullStopKeyword_2_0());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getFailureDefinitionAccess().getAcidAvoidableACIDavoidableParserRuleCall_2_1_0()); 
-	    }
-		lv_acidAvoidable_3_0=ruleACIDavoidable		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getFailureDefinitionRule());
-	        }
-       		set(
-       			$current, 
-       			"acidAvoidable",
-        		lv_acidAvoidable_3_0, 
-        		"ACIDavoidable");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-))?)
-;
-
-
-
-
-
-// Entry rule entryRuleNoFailureDefinition
-entryRuleNoFailureDefinition returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getNoFailureDefinitionRule()); }
-	 iv_ruleNoFailureDefinition=ruleNoFailureDefinition 
-	 { $current=$iv_ruleNoFailureDefinition.current; } 
-	 EOF 
-;
-
-// Rule NoFailureDefinition
-ruleNoFailureDefinition returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-    {
-        $current = forceCreateModelElement(
-            grammarAccess.getNoFailureDefinitionAccess().getNoFailureDefinitionAction_0(),
-            $current);
-    }
-)	otherlv_1='noFailure' 
-    {
-    	newLeafNode(otherlv_1, grammarAccess.getNoFailureDefinitionAccess().getNoFailureKeyword_1());
-    }
-)
-;
-
-
-
-
-
-// Entry rule entryRuleComplexNofailureDefinition
-entryRuleComplexNofailureDefinition returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getComplexNofailureDefinitionRule()); }
-	 iv_ruleComplexNofailureDefinition=ruleComplexNofailureDefinition 
-	 { $current=$iv_ruleComplexNofailureDefinition.current; } 
-	 EOF 
-;
-
-// Rule ComplexNofailureDefinition
-ruleComplexNofailureDefinition returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-    {
-        $current = forceCreateModelElement(
-            grammarAccess.getComplexNofailureDefinitionAccess().getNoFailureDefinitionAction_0(),
-            $current);
-    }
-)	otherlv_1='noFailure' 
-    {
-    	newLeafNode(otherlv_1, grammarAccess.getComplexNofailureDefinitionAccess().getNoFailureKeyword_1());
-    }
-	otherlv_2='.' 
-    {
-    	newLeafNode(otherlv_2, grammarAccess.getComplexNofailureDefinitionAccess().getFullStopKeyword_2());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getComplexNofailureDefinitionAccess().getAcidMitigationACIDMitigationParserRuleCall_3_0()); 
-	    }
-		lv_acidMitigation_3_0=ruleACIDMitigation		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getComplexNofailureDefinitionRule());
-	        }
-       		set(
-       			$current, 
-       			"acidMitigation",
-        		lv_acidMitigation_3_0, 
-        		"ACIDMitigation");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-))
-;
-
-
-
-
-
-// Entry rule entryRuleWildcardDefinition
-entryRuleWildcardDefinition returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getWildcardDefinitionRule()); }
-	 iv_ruleWildcardDefinition=ruleWildcardDefinition 
-	 { $current=$iv_ruleWildcardDefinition.current; } 
-	 EOF 
-;
-
-// Rule WildcardDefinition
-ruleWildcardDefinition returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-    {
-        $current = forceCreateModelElement(
-            grammarAccess.getWildcardDefinitionAccess().getWildcardDefinitionAction_0(),
-            $current);
-    }
-)	otherlv_1='wildcard' 
-    {
-    	newLeafNode(otherlv_1, grammarAccess.getWildcardDefinitionAccess().getWildcardKeyword_1());
-    }
-)
-;
-
-
-
-
-
-// Entry rule entryRuleVariableDefinition
-entryRuleVariableDefinition returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getVariableDefinitionRule()); }
-	 iv_ruleVariableDefinition=ruleVariableDefinition 
-	 { $current=$iv_ruleVariableDefinition.current; } 
-	 EOF 
-;
-
-// Rule VariableDefinition
-ruleVariableDefinition returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-    {
-        $current = forceCreateModelElement(
-            grammarAccess.getVariableDefinitionAccess().getVariableDefinitionAction_0(),
-            $current);
-    }
-)(
-(
-		lv_variableName_1_0=RULE_ID
-		{
-			newLeafNode(lv_variableName_1_0, grammarAccess.getVariableDefinitionAccess().getVariableNameIDTerminalRuleCall_1_0()); 
-		}
-		{
-	        if ($current==null) {
-	            $current = createModelElement(grammarAccess.getVariableDefinitionRule());
-	        }
-       		setWithLastConsumed(
-       			$current, 
-       			"variableName",
-        		lv_variableName_1_0, 
-        		"ID");
-	    }
-
-)
-))
-;
-
-
-
-
-
-// Entry rule entryRuleACIDavoidable
-entryRuleACIDavoidable returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getACIDavoidableRule()); }
-	 iv_ruleACIDavoidable=ruleACIDavoidable 
-	 { $current=$iv_ruleACIDavoidable.current; } 
-	 EOF 
-;
-
-// Rule ACIDavoidable
-ruleACIDavoidable returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-(
-		{ 
-	        newCompositeNode(grammarAccess.getACIDavoidableAccess().getAAavoidableEnumRuleCall_0_0()); 
-	    }
-		lv_a_0_0=ruleAavoidable		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getACIDavoidableRule());
-	        }
-       		set(
-       			$current, 
-       			"a",
-        		lv_a_0_0, 
-        		"Aavoidable");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)	otherlv_1='.' 
-    {
-    	newLeafNode(otherlv_1, grammarAccess.getACIDavoidableAccess().getFullStopKeyword_1());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getACIDavoidableAccess().getCCavoidableEnumRuleCall_2_0()); 
-	    }
-		lv_c_2_0=ruleCavoidable		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getACIDavoidableRule());
-	        }
-       		set(
-       			$current, 
-       			"c",
-        		lv_c_2_0, 
-        		"Cavoidable");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)	otherlv_3='.' 
-    {
-    	newLeafNode(otherlv_3, grammarAccess.getACIDavoidableAccess().getFullStopKeyword_3());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getACIDavoidableAccess().getIIavoidableEnumRuleCall_4_0()); 
-	    }
-		lv_i_4_0=ruleIavoidable		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getACIDavoidableRule());
-	        }
-       		set(
-       			$current, 
-       			"i",
-        		lv_i_4_0, 
-        		"Iavoidable");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)	otherlv_5='.' 
-    {
-    	newLeafNode(otherlv_5, grammarAccess.getACIDavoidableAccess().getFullStopKeyword_5());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getACIDavoidableAccess().getDDavoidableEnumRuleCall_6_0()); 
-	    }
-		lv_d_6_0=ruleDavoidable		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getACIDavoidableRule());
-	        }
-       		set(
-       			$current, 
-       			"d",
-        		lv_d_6_0, 
-        		"Davoidable");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-))
-;
-
-
-
-
-
-// Entry rule entryRuleACIDMitigation
-entryRuleACIDMitigation returns [EObject current=null] 
-	:
-	{ newCompositeNode(grammarAccess.getACIDMitigationRule()); }
-	 iv_ruleACIDMitigation=ruleACIDMitigation 
-	 { $current=$iv_ruleACIDMitigation.current; } 
-	 EOF 
-;
-
-// Rule ACIDMitigation
-ruleACIDMitigation returns [EObject current=null] 
-    @init { enterRule(); 
-    }
-    @after { leaveRule(); }:
-((
-(
-		{ 
-	        newCompositeNode(grammarAccess.getACIDMitigationAccess().getAAmitigationEnumRuleCall_0_0()); 
-	    }
-		lv_a_0_0=ruleAmitigation		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getACIDMitigationRule());
-	        }
-       		set(
-       			$current, 
-       			"a",
-        		lv_a_0_0, 
-        		"Amitigation");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)	otherlv_1='.' 
-    {
-    	newLeafNode(otherlv_1, grammarAccess.getACIDMitigationAccess().getFullStopKeyword_1());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getACIDMitigationAccess().getCCmitigationEnumRuleCall_2_0()); 
-	    }
-		lv_c_2_0=ruleCmitigation		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getACIDMitigationRule());
-	        }
-       		set(
-       			$current, 
-       			"c",
-        		lv_c_2_0, 
-        		"Cmitigation");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)	otherlv_3='.' 
-    {
-    	newLeafNode(otherlv_3, grammarAccess.getACIDMitigationAccess().getFullStopKeyword_3());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getACIDMitigationAccess().getIImitigationEnumRuleCall_4_0()); 
-	    }
-		lv_i_4_0=ruleImitigation		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getACIDMitigationRule());
-	        }
-       		set(
-       			$current, 
-       			"i",
-        		lv_i_4_0, 
-        		"Imitigation");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-)	otherlv_5='.' 
-    {
-    	newLeafNode(otherlv_5, grammarAccess.getACIDMitigationAccess().getFullStopKeyword_5());
-    }
-(
-(
-		{ 
-	        newCompositeNode(grammarAccess.getACIDMitigationAccess().getDDmitigationEnumRuleCall_6_0()); 
-	    }
-		lv_d_6_0=ruleDmitigation		{
-	        if ($current==null) {
-	            $current = createModelElementForParent(grammarAccess.getACIDMitigationRule());
-	        }
-       		set(
-       			$current, 
-       			"d",
-        		lv_d_6_0, 
-        		"Dmitigation");
-	        afterParserOrEnumRuleCall();
-	    }
-
-)
-))
-;
-
-
-
-
-
-
-
-
-
-// Rule ActualFailureType
-ruleActualFailureType returns [Enumerator current=null] 
-    @init { enterRule(); }
-    @after { leaveRule(); }:
-((	enumLiteral_0='early' 
-	{
-        $current = grammarAccess.getActualFailureTypeAccess().getEARLYEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_0, grammarAccess.getActualFailureTypeAccess().getEARLYEnumLiteralDeclaration_0()); 
-    }
-)
-    |(	enumLiteral_1='late' 
-	{
-        $current = grammarAccess.getActualFailureTypeAccess().getLATEEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_1, grammarAccess.getActualFailureTypeAccess().getLATEEnumLiteralDeclaration_1()); 
-    }
-)
-    |(	enumLiteral_2='commission' 
-	{
-        $current = grammarAccess.getActualFailureTypeAccess().getCOMMISSIONEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_2, grammarAccess.getActualFailureTypeAccess().getCOMMISSIONEnumLiteralDeclaration_2()); 
-    }
-)
-    |(	enumLiteral_3='omission' 
-	{
-        $current = grammarAccess.getActualFailureTypeAccess().getOMISSIONEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_3, grammarAccess.getActualFailureTypeAccess().getOMISSIONEnumLiteralDeclaration_3()); 
-    }
-)
-    |(	enumLiteral_4='valueSubtle' 
-	{
-        $current = grammarAccess.getActualFailureTypeAccess().getVALUE_SUBTLEEnumLiteralDeclaration_4().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_4, grammarAccess.getActualFailureTypeAccess().getVALUE_SUBTLEEnumLiteralDeclaration_4()); 
-    }
-)
-    |(	enumLiteral_5='valueCoarse' 
-	{
-        $current = grammarAccess.getActualFailureTypeAccess().getVALUE_COARSEEnumLiteralDeclaration_5().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_5, grammarAccess.getActualFailureTypeAccess().getVALUE_COARSEEnumLiteralDeclaration_5()); 
-    }
-));
-
-
-
-
-
-
-
-// Rule Aavoidable
-ruleAavoidable returns [Enumerator current=null] 
-    @init { enterRule(); }
-    @after { leaveRule(); }:
-((	enumLiteral_0='incompletion' 
-	{
-        $current = grammarAccess.getAavoidableAccess().getINCOMPLETIONEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_0, grammarAccess.getAavoidableAccess().getINCOMPLETIONEnumLiteralDeclaration_0()); 
-    }
-)
-    |(	enumLiteral_1='none' 
-	{
-        $current = grammarAccess.getAavoidableAccess().getNONEEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_1, grammarAccess.getAavoidableAccess().getNONEEnumLiteralDeclaration_1()); 
-    }
-)
-    |(	enumLiteral_2='unspecified' 
-	{
-        $current = grammarAccess.getAavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_2, grammarAccess.getAavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2()); 
-    }
-));
-
-
-
-// Rule Cavoidable
-ruleCavoidable returns [Enumerator current=null] 
-    @init { enterRule(); }
-    @after { leaveRule(); }:
-((	enumLiteral_0='inconsistency' 
-	{
-        $current = grammarAccess.getCavoidableAccess().getINCONSISTENCYEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_0, grammarAccess.getCavoidableAccess().getINCONSISTENCYEnumLiteralDeclaration_0()); 
-    }
-)
-    |(	enumLiteral_1='none' 
-	{
-        $current = grammarAccess.getCavoidableAccess().getNONEEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_1, grammarAccess.getCavoidableAccess().getNONEEnumLiteralDeclaration_1()); 
-    }
-)
-    |(	enumLiteral_2='unspecified' 
-	{
-        $current = grammarAccess.getCavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_2, grammarAccess.getCavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2()); 
-    }
-));
-
-
-
-// Rule Iavoidable
-ruleIavoidable returns [Enumerator current=null] 
-    @init { enterRule(); }
-    @after { leaveRule(); }:
-((	enumLiteral_0='interference' 
-	{
-        $current = grammarAccess.getIavoidableAccess().getINTERFERENCEEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_0, grammarAccess.getIavoidableAccess().getINTERFERENCEEnumLiteralDeclaration_0()); 
-    }
-)
-    |(	enumLiteral_1='none' 
-	{
-        $current = grammarAccess.getIavoidableAccess().getNONEEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_1, grammarAccess.getIavoidableAccess().getNONEEnumLiteralDeclaration_1()); 
-    }
-)
-    |(	enumLiteral_2='unspecified' 
-	{
-        $current = grammarAccess.getIavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_2, grammarAccess.getIavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2()); 
-    }
-));
-
-
-
-// Rule Davoidable
-ruleDavoidable returns [Enumerator current=null] 
-    @init { enterRule(); }
-    @after { leaveRule(); }:
-((	enumLiteral_0='impermanence' 
-	{
-        $current = grammarAccess.getDavoidableAccess().getIMPERMANENCEEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_0, grammarAccess.getDavoidableAccess().getIMPERMANENCEEnumLiteralDeclaration_0()); 
-    }
-)
-    |(	enumLiteral_1='none' 
-	{
-        $current = grammarAccess.getDavoidableAccess().getNONEEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_1, grammarAccess.getDavoidableAccess().getNONEEnumLiteralDeclaration_1()); 
-    }
-)
-    |(	enumLiteral_2='unspecified' 
-	{
-        $current = grammarAccess.getDavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_2, grammarAccess.getDavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2()); 
-    }
-));
-
-
-
-// Rule Amitigation
-ruleAmitigation returns [Enumerator current=null] 
-    @init { enterRule(); }
-    @after { leaveRule(); }:
-((	enumLiteral_0='all_or_nothing' 
-	{
-        $current = grammarAccess.getAmitigationAccess().getALL_OR_NOTHINGEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_0, grammarAccess.getAmitigationAccess().getALL_OR_NOTHINGEnumLiteralDeclaration_0()); 
-    }
-)
-    |(	enumLiteral_1='all_or_compensation' 
-	{
-        $current = grammarAccess.getAmitigationAccess().getALL_OR_COMPENSATIONEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_1, grammarAccess.getAmitigationAccess().getALL_OR_COMPENSATIONEnumLiteralDeclaration_1()); 
-    }
-)
-    |(	enumLiteral_2='none' 
-	{
-        $current = grammarAccess.getAmitigationAccess().getNONEEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_2, grammarAccess.getAmitigationAccess().getNONEEnumLiteralDeclaration_2()); 
-    }
-)
-    |(	enumLiteral_3='unspecified' 
-	{
-        $current = grammarAccess.getAmitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_3, grammarAccess.getAmitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3()); 
-    }
-));
-
-
-
-// Rule Cmitigation
-ruleCmitigation returns [Enumerator current=null] 
-    @init { enterRule(); }
-    @after { leaveRule(); }:
-((	enumLiteral_0='full_consistency' 
-	{
-        $current = grammarAccess.getCmitigationAccess().getFULL_CONSISTENCYEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_0, grammarAccess.getCmitigationAccess().getFULL_CONSISTENCYEnumLiteralDeclaration_0()); 
-    }
-)
-    |(	enumLiteral_1='range_violation_allowed' 
-	{
-        $current = grammarAccess.getCmitigationAccess().getRANGE_VIOLATION_ALLOWEDEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_1, grammarAccess.getCmitigationAccess().getRANGE_VIOLATION_ALLOWEDEnumLiteralDeclaration_1()); 
-    }
-)
-    |(	enumLiteral_2='none' 
-	{
-        $current = grammarAccess.getCmitigationAccess().getNONEEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_2, grammarAccess.getCmitigationAccess().getNONEEnumLiteralDeclaration_2()); 
-    }
-)
-    |(	enumLiteral_3='unspecified' 
-	{
-        $current = grammarAccess.getCmitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_3, grammarAccess.getCmitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3()); 
-    }
-));
-
-
-
-// Rule Imitigation
-ruleImitigation returns [Enumerator current=null] 
-    @init { enterRule(); }
-    @after { leaveRule(); }:
-((	enumLiteral_0='serializable' 
-	{
-        $current = grammarAccess.getImitigationAccess().getSERIALIZABLEEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_0, grammarAccess.getImitigationAccess().getSERIALIZABLEEnumLiteralDeclaration_0()); 
-    }
-)
-    |(	enumLiteral_1='portable_level' 
-	{
-        $current = grammarAccess.getImitigationAccess().getPORTABLE_LEVELEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_1, grammarAccess.getImitigationAccess().getPORTABLE_LEVELEnumLiteralDeclaration_1()); 
-    }
-)
-    |(	enumLiteral_2='none' 
-	{
-        $current = grammarAccess.getImitigationAccess().getNONEEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_2, grammarAccess.getImitigationAccess().getNONEEnumLiteralDeclaration_2()); 
-    }
-)
-    |(	enumLiteral_3='unspecified' 
-	{
-        $current = grammarAccess.getImitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_3, grammarAccess.getImitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3()); 
-    }
-));
-
-
-
-// Rule Dmitigation
-ruleDmitigation returns [Enumerator current=null] 
-    @init { enterRule(); }
-    @after { leaveRule(); }:
-((	enumLiteral_0='no_loss' 
-	{
-        $current = grammarAccess.getDmitigationAccess().getNO_LOSSEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_0, grammarAccess.getDmitigationAccess().getNO_LOSSEnumLiteralDeclaration_0()); 
-    }
-)
-    |(	enumLiteral_1='partial_loss_allowed' 
-	{
-        $current = grammarAccess.getDmitigationAccess().getPARTIAL_LOSS_ALLOWEDEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_1, grammarAccess.getDmitigationAccess().getPARTIAL_LOSS_ALLOWEDEnumLiteralDeclaration_1()); 
-    }
-)
-    |(	enumLiteral_2='none' 
-	{
-        $current = grammarAccess.getDmitigationAccess().getNONEEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_2, grammarAccess.getDmitigationAccess().getNONEEnumLiteralDeclaration_2()); 
-    }
-)
-    |(	enumLiteral_3='unspecified' 
-	{
-        $current = grammarAccess.getDmitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_3, grammarAccess.getDmitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3()); 
-    }
-));
-
-
-
-RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
-
-RULE_INT : ('0'..'9')+;
-
-RULE_STRING : ('"' ('\\' .|~(('\\'|'"')))* '"'|'\'' ('\\' .|~(('\\'|'\'')))* '\'');
-
-RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
-
-RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?;
-
-RULE_WS : (' '|'\t'|'\r'|'\n')+;
-
-RULE_ANY_OTHER : .;
-
-
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.tokens b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.tokens
deleted file mode 100644
index c1e6535a13361b4550e2cba316ad87bf454451eb..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.tokens
+++ /dev/null
@@ -1,67 +0,0 @@
-','=14
-'->'=12
-'.'=16
-';'=13
-'FLA:'=11
-'all_or_compensation'=34
-'all_or_nothing'=33
-'commission'=23
-'early'=21
-'full_consistency'=35
-'impermanence'=32
-'incompletion'=27
-'inconsistency'=30
-'interference'=31
-'late'=22
-'noFailure'=19
-'no_loss'=39
-'none'=28
-'omission'=24
-'partial_loss_allowed'=40
-'portable_level'=38
-'range_violation_allowed'=36
-'serializable'=37
-'undefined'=15
-'unspecified'=29
-'valueCoarse'=26
-'valueSubtle'=25
-'wildcard'=20
-'{'=17
-'}'=18
-RULE_ANY_OTHER=10
-RULE_ID=4
-RULE_INT=5
-RULE_ML_COMMENT=7
-RULE_SL_COMMENT=8
-RULE_STRING=6
-RULE_WS=9
-T__11=11
-T__12=12
-T__13=13
-T__14=14
-T__15=15
-T__16=16
-T__17=17
-T__18=18
-T__19=19
-T__20=20
-T__21=21
-T__22=22
-T__23=23
-T__24=24
-T__25=25
-T__26=26
-T__27=27
-T__28=28
-T__29=29
-T__30=30
-T__31=31
-T__32=32
-T__33=33
-T__34=34
-T__35=35
-T__36=36
-T__37=37
-T__38=38
-T__39=39
-T__40=40
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDslLexer.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDslLexer.java
deleted file mode 100644
index c9e3ae0c01973c3a7c4a565452f5eefe1135a10a..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDslLexer.java
+++ /dev/null
@@ -1,1963 +0,0 @@
-package org.polarsys.chess.xtext.parser.antlr.internal;
-
-// Hack: Use our own Lexer superclass by means of import. 
-// Currently there is no other way to specify the superclass for the lexer.
-import org.eclipse.xtext.parser.antlr.Lexer;
-
-
-import org.antlr.runtime.*;
-import java.util.Stack;
-import java.util.List;
-import java.util.ArrayList;
-
-@SuppressWarnings("all")
-public class InternalFlaDslLexer extends Lexer {
-    public static final int T__40=40;
-    public static final int RULE_ID=4;
-    public static final int T__29=29;
-    public static final int T__28=28;
-    public static final int T__27=27;
-    public static final int T__26=26;
-    public static final int T__25=25;
-    public static final int T__24=24;
-    public static final int T__23=23;
-    public static final int T__22=22;
-    public static final int RULE_ANY_OTHER=10;
-    public static final int T__21=21;
-    public static final int T__20=20;
-    public static final int EOF=-1;
-    public static final int RULE_SL_COMMENT=8;
-    public static final int RULE_ML_COMMENT=7;
-    public static final int T__19=19;
-    public static final int T__30=30;
-    public static final int T__31=31;
-    public static final int T__32=32;
-    public static final int RULE_STRING=6;
-    public static final int T__16=16;
-    public static final int T__33=33;
-    public static final int T__15=15;
-    public static final int T__34=34;
-    public static final int T__18=18;
-    public static final int T__35=35;
-    public static final int T__17=17;
-    public static final int T__36=36;
-    public static final int T__12=12;
-    public static final int T__37=37;
-    public static final int T__11=11;
-    public static final int T__38=38;
-    public static final int T__14=14;
-    public static final int T__39=39;
-    public static final int T__13=13;
-    public static final int RULE_INT=5;
-    public static final int RULE_WS=9;
-
-    // delegates
-    // delegators
-
-    public InternalFlaDslLexer() {;} 
-    public InternalFlaDslLexer(CharStream input) {
-        this(input, new RecognizerSharedState());
-    }
-    public InternalFlaDslLexer(CharStream input, RecognizerSharedState state) {
-        super(input,state);
-
-    }
-    public String getGrammarFileName() { return "../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g"; }
-
-    // $ANTLR start "T__11"
-    public final void mT__11() throws RecognitionException {
-        try {
-            int _type = T__11;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:11:7: ( 'FLA:' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:11:9: 'FLA:'
-            {
-            match("FLA:"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__11"
-
-    // $ANTLR start "T__12"
-    public final void mT__12() throws RecognitionException {
-        try {
-            int _type = T__12;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:12:7: ( '->' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:12:9: '->'
-            {
-            match("->"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__12"
-
-    // $ANTLR start "T__13"
-    public final void mT__13() throws RecognitionException {
-        try {
-            int _type = T__13;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:13:7: ( ';' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:13:9: ';'
-            {
-            match(';'); 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__13"
-
-    // $ANTLR start "T__14"
-    public final void mT__14() throws RecognitionException {
-        try {
-            int _type = T__14;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:14:7: ( ',' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:14:9: ','
-            {
-            match(','); 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__14"
-
-    // $ANTLR start "T__15"
-    public final void mT__15() throws RecognitionException {
-        try {
-            int _type = T__15;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:15:7: ( 'undefined' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:15:9: 'undefined'
-            {
-            match("undefined"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__15"
-
-    // $ANTLR start "T__16"
-    public final void mT__16() throws RecognitionException {
-        try {
-            int _type = T__16;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:16:7: ( '.' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:16:9: '.'
-            {
-            match('.'); 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__16"
-
-    // $ANTLR start "T__17"
-    public final void mT__17() throws RecognitionException {
-        try {
-            int _type = T__17;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:17:7: ( '{' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:17:9: '{'
-            {
-            match('{'); 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__17"
-
-    // $ANTLR start "T__18"
-    public final void mT__18() throws RecognitionException {
-        try {
-            int _type = T__18;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:18:7: ( '}' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:18:9: '}'
-            {
-            match('}'); 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__18"
-
-    // $ANTLR start "T__19"
-    public final void mT__19() throws RecognitionException {
-        try {
-            int _type = T__19;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:19:7: ( 'noFailure' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:19:9: 'noFailure'
-            {
-            match("noFailure"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__19"
-
-    // $ANTLR start "T__20"
-    public final void mT__20() throws RecognitionException {
-        try {
-            int _type = T__20;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:20:7: ( 'wildcard' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:20:9: 'wildcard'
-            {
-            match("wildcard"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__20"
-
-    // $ANTLR start "T__21"
-    public final void mT__21() throws RecognitionException {
-        try {
-            int _type = T__21;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:21:7: ( 'early' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:21:9: 'early'
-            {
-            match("early"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__21"
-
-    // $ANTLR start "T__22"
-    public final void mT__22() throws RecognitionException {
-        try {
-            int _type = T__22;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:22:7: ( 'late' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:22:9: 'late'
-            {
-            match("late"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__22"
-
-    // $ANTLR start "T__23"
-    public final void mT__23() throws RecognitionException {
-        try {
-            int _type = T__23;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:23:7: ( 'commission' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:23:9: 'commission'
-            {
-            match("commission"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__23"
-
-    // $ANTLR start "T__24"
-    public final void mT__24() throws RecognitionException {
-        try {
-            int _type = T__24;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:24:7: ( 'omission' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:24:9: 'omission'
-            {
-            match("omission"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__24"
-
-    // $ANTLR start "T__25"
-    public final void mT__25() throws RecognitionException {
-        try {
-            int _type = T__25;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:25:7: ( 'valueSubtle' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:25:9: 'valueSubtle'
-            {
-            match("valueSubtle"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__25"
-
-    // $ANTLR start "T__26"
-    public final void mT__26() throws RecognitionException {
-        try {
-            int _type = T__26;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:26:7: ( 'valueCoarse' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:26:9: 'valueCoarse'
-            {
-            match("valueCoarse"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__26"
-
-    // $ANTLR start "T__27"
-    public final void mT__27() throws RecognitionException {
-        try {
-            int _type = T__27;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:27:7: ( 'incompletion' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:27:9: 'incompletion'
-            {
-            match("incompletion"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__27"
-
-    // $ANTLR start "T__28"
-    public final void mT__28() throws RecognitionException {
-        try {
-            int _type = T__28;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:28:7: ( 'none' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:28:9: 'none'
-            {
-            match("none"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__28"
-
-    // $ANTLR start "T__29"
-    public final void mT__29() throws RecognitionException {
-        try {
-            int _type = T__29;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:29:7: ( 'unspecified' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:29:9: 'unspecified'
-            {
-            match("unspecified"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__29"
-
-    // $ANTLR start "T__30"
-    public final void mT__30() throws RecognitionException {
-        try {
-            int _type = T__30;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:30:7: ( 'inconsistency' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:30:9: 'inconsistency'
-            {
-            match("inconsistency"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__30"
-
-    // $ANTLR start "T__31"
-    public final void mT__31() throws RecognitionException {
-        try {
-            int _type = T__31;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:31:7: ( 'interference' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:31:9: 'interference'
-            {
-            match("interference"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__31"
-
-    // $ANTLR start "T__32"
-    public final void mT__32() throws RecognitionException {
-        try {
-            int _type = T__32;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:32:7: ( 'impermanence' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:32:9: 'impermanence'
-            {
-            match("impermanence"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__32"
-
-    // $ANTLR start "T__33"
-    public final void mT__33() throws RecognitionException {
-        try {
-            int _type = T__33;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:33:7: ( 'all_or_nothing' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:33:9: 'all_or_nothing'
-            {
-            match("all_or_nothing"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__33"
-
-    // $ANTLR start "T__34"
-    public final void mT__34() throws RecognitionException {
-        try {
-            int _type = T__34;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:34:7: ( 'all_or_compensation' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:34:9: 'all_or_compensation'
-            {
-            match("all_or_compensation"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__34"
-
-    // $ANTLR start "T__35"
-    public final void mT__35() throws RecognitionException {
-        try {
-            int _type = T__35;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:35:7: ( 'full_consistency' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:35:9: 'full_consistency'
-            {
-            match("full_consistency"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__35"
-
-    // $ANTLR start "T__36"
-    public final void mT__36() throws RecognitionException {
-        try {
-            int _type = T__36;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:36:7: ( 'range_violation_allowed' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:36:9: 'range_violation_allowed'
-            {
-            match("range_violation_allowed"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__36"
-
-    // $ANTLR start "T__37"
-    public final void mT__37() throws RecognitionException {
-        try {
-            int _type = T__37;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:37:7: ( 'serializable' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:37:9: 'serializable'
-            {
-            match("serializable"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__37"
-
-    // $ANTLR start "T__38"
-    public final void mT__38() throws RecognitionException {
-        try {
-            int _type = T__38;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:38:7: ( 'portable_level' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:38:9: 'portable_level'
-            {
-            match("portable_level"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__38"
-
-    // $ANTLR start "T__39"
-    public final void mT__39() throws RecognitionException {
-        try {
-            int _type = T__39;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:39:7: ( 'no_loss' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:39:9: 'no_loss'
-            {
-            match("no_loss"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__39"
-
-    // $ANTLR start "T__40"
-    public final void mT__40() throws RecognitionException {
-        try {
-            int _type = T__40;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:40:7: ( 'partial_loss_allowed' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:40:9: 'partial_loss_allowed'
-            {
-            match("partial_loss_allowed"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__40"
-
-    // $ANTLR start "RULE_ID"
-    public final void mRULE_ID() throws RecognitionException {
-        try {
-            int _type = RULE_ID;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1423:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1423:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1423:11: ( '^' )?
-            int alt1=2;
-            int LA1_0 = input.LA(1);
-
-            if ( (LA1_0=='^') ) {
-                alt1=1;
-            }
-            switch (alt1) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1423:11: '^'
-                    {
-                    match('^'); 
-
-                    }
-                    break;
-
-            }
-
-            if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1423:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
-            loop2:
-            do {
-                int alt2=2;
-                int LA2_0 = input.LA(1);
-
-                if ( ((LA2_0>='0' && LA2_0<='9')||(LA2_0>='A' && LA2_0<='Z')||LA2_0=='_'||(LA2_0>='a' && LA2_0<='z')) ) {
-                    alt2=1;
-                }
-
-
-                switch (alt2) {
-            	case 1 :
-            	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:
-            	    {
-            	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
-            	        input.consume();
-
-            	    }
-            	    else {
-            	        MismatchedSetException mse = new MismatchedSetException(null,input);
-            	        recover(mse);
-            	        throw mse;}
-
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop2;
-                }
-            } while (true);
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "RULE_ID"
-
-    // $ANTLR start "RULE_INT"
-    public final void mRULE_INT() throws RecognitionException {
-        try {
-            int _type = RULE_INT;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1425:10: ( ( '0' .. '9' )+ )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1425:12: ( '0' .. '9' )+
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1425:12: ( '0' .. '9' )+
-            int cnt3=0;
-            loop3:
-            do {
-                int alt3=2;
-                int LA3_0 = input.LA(1);
-
-                if ( ((LA3_0>='0' && LA3_0<='9')) ) {
-                    alt3=1;
-                }
-
-
-                switch (alt3) {
-            	case 1 :
-            	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1425:13: '0' .. '9'
-            	    {
-            	    matchRange('0','9'); 
-
-            	    }
-            	    break;
-
-            	default :
-            	    if ( cnt3 >= 1 ) break loop3;
-                        EarlyExitException eee =
-                            new EarlyExitException(3, input);
-                        throw eee;
-                }
-                cnt3++;
-            } while (true);
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "RULE_INT"
-
-    // $ANTLR start "RULE_STRING"
-    public final void mRULE_STRING() throws RecognitionException {
-        try {
-            int _type = RULE_STRING;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1427:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1427:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1427:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
-            int alt6=2;
-            int LA6_0 = input.LA(1);
-
-            if ( (LA6_0=='\"') ) {
-                alt6=1;
-            }
-            else if ( (LA6_0=='\'') ) {
-                alt6=2;
-            }
-            else {
-                NoViableAltException nvae =
-                    new NoViableAltException("", 6, 0, input);
-
-                throw nvae;
-            }
-            switch (alt6) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1427:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
-                    {
-                    match('\"'); 
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1427:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
-                    loop4:
-                    do {
-                        int alt4=3;
-                        int LA4_0 = input.LA(1);
-
-                        if ( (LA4_0=='\\') ) {
-                            alt4=1;
-                        }
-                        else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=']' && LA4_0<='\uFFFF')) ) {
-                            alt4=2;
-                        }
-
-
-                        switch (alt4) {
-                    	case 1 :
-                    	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1427:21: '\\\\' .
-                    	    {
-                    	    match('\\'); 
-                    	    matchAny(); 
-
-                    	    }
-                    	    break;
-                    	case 2 :
-                    	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1427:28: ~ ( ( '\\\\' | '\"' ) )
-                    	    {
-                    	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
-                    	        input.consume();
-
-                    	    }
-                    	    else {
-                    	        MismatchedSetException mse = new MismatchedSetException(null,input);
-                    	        recover(mse);
-                    	        throw mse;}
-
-
-                    	    }
-                    	    break;
-
-                    	default :
-                    	    break loop4;
-                        }
-                    } while (true);
-
-                    match('\"'); 
-
-                    }
-                    break;
-                case 2 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1427:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
-                    {
-                    match('\''); 
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1427:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
-                    loop5:
-                    do {
-                        int alt5=3;
-                        int LA5_0 = input.LA(1);
-
-                        if ( (LA5_0=='\\') ) {
-                            alt5=1;
-                        }
-                        else if ( ((LA5_0>='\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=']' && LA5_0<='\uFFFF')) ) {
-                            alt5=2;
-                        }
-
-
-                        switch (alt5) {
-                    	case 1 :
-                    	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1427:54: '\\\\' .
-                    	    {
-                    	    match('\\'); 
-                    	    matchAny(); 
-
-                    	    }
-                    	    break;
-                    	case 2 :
-                    	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1427:61: ~ ( ( '\\\\' | '\\'' ) )
-                    	    {
-                    	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
-                    	        input.consume();
-
-                    	    }
-                    	    else {
-                    	        MismatchedSetException mse = new MismatchedSetException(null,input);
-                    	        recover(mse);
-                    	        throw mse;}
-
-
-                    	    }
-                    	    break;
-
-                    	default :
-                    	    break loop5;
-                        }
-                    } while (true);
-
-                    match('\''); 
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "RULE_STRING"
-
-    // $ANTLR start "RULE_ML_COMMENT"
-    public final void mRULE_ML_COMMENT() throws RecognitionException {
-        try {
-            int _type = RULE_ML_COMMENT;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1429:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1429:19: '/*' ( options {greedy=false; } : . )* '*/'
-            {
-            match("/*"); 
-
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1429:24: ( options {greedy=false; } : . )*
-            loop7:
-            do {
-                int alt7=2;
-                int LA7_0 = input.LA(1);
-
-                if ( (LA7_0=='*') ) {
-                    int LA7_1 = input.LA(2);
-
-                    if ( (LA7_1=='/') ) {
-                        alt7=2;
-                    }
-                    else if ( ((LA7_1>='\u0000' && LA7_1<='.')||(LA7_1>='0' && LA7_1<='\uFFFF')) ) {
-                        alt7=1;
-                    }
-
-
-                }
-                else if ( ((LA7_0>='\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\uFFFF')) ) {
-                    alt7=1;
-                }
-
-
-                switch (alt7) {
-            	case 1 :
-            	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1429:52: .
-            	    {
-            	    matchAny(); 
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop7;
-                }
-            } while (true);
-
-            match("*/"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "RULE_ML_COMMENT"
-
-    // $ANTLR start "RULE_SL_COMMENT"
-    public final void mRULE_SL_COMMENT() throws RecognitionException {
-        try {
-            int _type = RULE_SL_COMMENT;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1431:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1431:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
-            {
-            match("//"); 
-
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1431:24: (~ ( ( '\\n' | '\\r' ) ) )*
-            loop8:
-            do {
-                int alt8=2;
-                int LA8_0 = input.LA(1);
-
-                if ( ((LA8_0>='\u0000' && LA8_0<='\t')||(LA8_0>='\u000B' && LA8_0<='\f')||(LA8_0>='\u000E' && LA8_0<='\uFFFF')) ) {
-                    alt8=1;
-                }
-
-
-                switch (alt8) {
-            	case 1 :
-            	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1431:24: ~ ( ( '\\n' | '\\r' ) )
-            	    {
-            	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
-            	        input.consume();
-
-            	    }
-            	    else {
-            	        MismatchedSetException mse = new MismatchedSetException(null,input);
-            	        recover(mse);
-            	        throw mse;}
-
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop8;
-                }
-            } while (true);
-
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1431:40: ( ( '\\r' )? '\\n' )?
-            int alt10=2;
-            int LA10_0 = input.LA(1);
-
-            if ( (LA10_0=='\n'||LA10_0=='\r') ) {
-                alt10=1;
-            }
-            switch (alt10) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1431:41: ( '\\r' )? '\\n'
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1431:41: ( '\\r' )?
-                    int alt9=2;
-                    int LA9_0 = input.LA(1);
-
-                    if ( (LA9_0=='\r') ) {
-                        alt9=1;
-                    }
-                    switch (alt9) {
-                        case 1 :
-                            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1431:41: '\\r'
-                            {
-                            match('\r'); 
-
-                            }
-                            break;
-
-                    }
-
-                    match('\n'); 
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "RULE_SL_COMMENT"
-
-    // $ANTLR start "RULE_WS"
-    public final void mRULE_WS() throws RecognitionException {
-        try {
-            int _type = RULE_WS;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1433:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1433:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1433:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
-            int cnt11=0;
-            loop11:
-            do {
-                int alt11=2;
-                int LA11_0 = input.LA(1);
-
-                if ( ((LA11_0>='\t' && LA11_0<='\n')||LA11_0=='\r'||LA11_0==' ') ) {
-                    alt11=1;
-                }
-
-
-                switch (alt11) {
-            	case 1 :
-            	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:
-            	    {
-            	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
-            	        input.consume();
-
-            	    }
-            	    else {
-            	        MismatchedSetException mse = new MismatchedSetException(null,input);
-            	        recover(mse);
-            	        throw mse;}
-
-
-            	    }
-            	    break;
-
-            	default :
-            	    if ( cnt11 >= 1 ) break loop11;
-                        EarlyExitException eee =
-                            new EarlyExitException(11, input);
-                        throw eee;
-                }
-                cnt11++;
-            } while (true);
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "RULE_WS"
-
-    // $ANTLR start "RULE_ANY_OTHER"
-    public final void mRULE_ANY_OTHER() throws RecognitionException {
-        try {
-            int _type = RULE_ANY_OTHER;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1435:16: ( . )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1435:18: .
-            {
-            matchAny(); 
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "RULE_ANY_OTHER"
-
-    public void mTokens() throws RecognitionException {
-        // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
-        int alt12=37;
-        alt12 = dfa12.predict(input);
-        switch (alt12) {
-            case 1 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:10: T__11
-                {
-                mT__11(); 
-
-                }
-                break;
-            case 2 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:16: T__12
-                {
-                mT__12(); 
-
-                }
-                break;
-            case 3 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:22: T__13
-                {
-                mT__13(); 
-
-                }
-                break;
-            case 4 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:28: T__14
-                {
-                mT__14(); 
-
-                }
-                break;
-            case 5 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:34: T__15
-                {
-                mT__15(); 
-
-                }
-                break;
-            case 6 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:40: T__16
-                {
-                mT__16(); 
-
-                }
-                break;
-            case 7 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:46: T__17
-                {
-                mT__17(); 
-
-                }
-                break;
-            case 8 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:52: T__18
-                {
-                mT__18(); 
-
-                }
-                break;
-            case 9 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:58: T__19
-                {
-                mT__19(); 
-
-                }
-                break;
-            case 10 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:64: T__20
-                {
-                mT__20(); 
-
-                }
-                break;
-            case 11 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:70: T__21
-                {
-                mT__21(); 
-
-                }
-                break;
-            case 12 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:76: T__22
-                {
-                mT__22(); 
-
-                }
-                break;
-            case 13 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:82: T__23
-                {
-                mT__23(); 
-
-                }
-                break;
-            case 14 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:88: T__24
-                {
-                mT__24(); 
-
-                }
-                break;
-            case 15 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:94: T__25
-                {
-                mT__25(); 
-
-                }
-                break;
-            case 16 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:100: T__26
-                {
-                mT__26(); 
-
-                }
-                break;
-            case 17 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:106: T__27
-                {
-                mT__27(); 
-
-                }
-                break;
-            case 18 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:112: T__28
-                {
-                mT__28(); 
-
-                }
-                break;
-            case 19 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:118: T__29
-                {
-                mT__29(); 
-
-                }
-                break;
-            case 20 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:124: T__30
-                {
-                mT__30(); 
-
-                }
-                break;
-            case 21 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:130: T__31
-                {
-                mT__31(); 
-
-                }
-                break;
-            case 22 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:136: T__32
-                {
-                mT__32(); 
-
-                }
-                break;
-            case 23 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:142: T__33
-                {
-                mT__33(); 
-
-                }
-                break;
-            case 24 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:148: T__34
-                {
-                mT__34(); 
-
-                }
-                break;
-            case 25 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:154: T__35
-                {
-                mT__35(); 
-
-                }
-                break;
-            case 26 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:160: T__36
-                {
-                mT__36(); 
-
-                }
-                break;
-            case 27 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:166: T__37
-                {
-                mT__37(); 
-
-                }
-                break;
-            case 28 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:172: T__38
-                {
-                mT__38(); 
-
-                }
-                break;
-            case 29 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:178: T__39
-                {
-                mT__39(); 
-
-                }
-                break;
-            case 30 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:184: T__40
-                {
-                mT__40(); 
-
-                }
-                break;
-            case 31 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:190: RULE_ID
-                {
-                mRULE_ID(); 
-
-                }
-                break;
-            case 32 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:198: RULE_INT
-                {
-                mRULE_INT(); 
-
-                }
-                break;
-            case 33 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:207: RULE_STRING
-                {
-                mRULE_STRING(); 
-
-                }
-                break;
-            case 34 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:219: RULE_ML_COMMENT
-                {
-                mRULE_ML_COMMENT(); 
-
-                }
-                break;
-            case 35 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:235: RULE_SL_COMMENT
-                {
-                mRULE_SL_COMMENT(); 
-
-                }
-                break;
-            case 36 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:251: RULE_WS
-                {
-                mRULE_WS(); 
-
-                }
-                break;
-            case 37 :
-                // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1:259: RULE_ANY_OTHER
-                {
-                mRULE_ANY_OTHER(); 
-
-                }
-                break;
-
-        }
-
-    }
-
-
-    protected DFA12 dfa12 = new DFA12(this);
-    static final String DFA12_eotS =
-        "\1\uffff\1\37\1\35\2\uffff\1\37\3\uffff\15\37\1\35\2\uffff\3\35"+
-        "\2\uffff\1\37\4\uffff\1\37\3\uffff\17\37\5\uffff\25\37\1\uffff\3"+
-        "\37\1\150\3\37\1\154\17\37\1\uffff\2\37\1\177\1\uffff\22\37\1\uffff"+
-        "\21\37\1\u00a4\22\37\1\uffff\1\u00b8\1\37\1\u00ba\15\37\1\u00c8"+
-        "\1\37\1\u00ca\1\uffff\1\37\1\uffff\15\37\1\uffff\1\37\1\uffff\1"+
-        "\u00da\15\37\1\u00e8\1\uffff\1\u00e9\1\u00ea\13\37\3\uffff\1\u00f6"+
-        "\1\37\1\u00f8\1\u00f9\4\37\1\u00fe\2\37\1\uffff\1\u0101\2\uffff"+
-        "\4\37\1\uffff\2\37\1\uffff\1\u0108\3\37\1\u010c\1\37\1\uffff\3\37"+
-        "\1\uffff\2\37\1\u0113\3\37\1\uffff\5\37\1\u011c\2\37\1\uffff\1\37"+
-        "\1\u0120\1\37\1\uffff\1\37\1\u0123\1\uffff";
-    static final String DFA12_eofS =
-        "\u0124\uffff";
-    static final String DFA12_minS =
-        "\1\0\1\114\1\76\2\uffff\1\156\3\uffff\1\157\1\151\2\141\1\157\1"+
-        "\155\1\141\1\155\1\154\1\165\1\141\1\145\1\141\1\101\2\uffff\2\0"+
-        "\1\52\2\uffff\1\101\4\uffff\1\144\3\uffff\1\106\1\154\1\162\1\164"+
-        "\1\155\1\151\1\154\1\143\1\160\2\154\1\156\3\162\5\uffff\1\72\1"+
-        "\145\1\160\1\141\1\145\1\154\1\144\1\154\1\145\1\155\1\163\1\165"+
-        "\1\157\2\145\1\137\1\154\1\147\1\151\2\164\1\uffff\1\146\1\145\1"+
-        "\151\1\60\1\157\1\143\1\171\1\60\1\151\1\163\1\145\1\155\2\162\1"+
-        "\157\1\137\1\145\2\141\2\151\1\143\1\154\1\uffff\1\163\1\141\1\60"+
-        "\1\uffff\1\163\1\151\1\103\1\160\1\163\1\146\1\155\1\162\1\143\1"+
-        "\137\1\154\1\142\1\141\1\156\1\151\1\165\1\163\1\162\1\uffff\1\163"+
-        "\1\157\1\165\1\157\1\154\1\151\1\145\1\141\1\137\1\157\1\166\1\151"+
-        "\2\154\1\145\1\146\1\162\1\60\1\144\1\151\1\156\1\142\1\141\1\145"+
-        "\1\163\1\162\1\156\1\143\1\156\1\151\1\172\1\145\1\137\1\144\1\151"+
-        "\1\145\1\uffff\1\60\1\157\1\60\1\164\1\162\2\164\2\145\2\157\1\163"+
-        "\1\157\1\141\1\137\1\154\1\60\1\145\1\60\1\uffff\1\156\1\uffff\1"+
-        "\154\1\163\1\151\1\145\2\156\1\164\1\155\1\151\1\154\1\142\1\154"+
-        "\1\157\1\uffff\1\144\1\uffff\1\60\2\145\1\157\1\156\2\143\1\150"+
-        "\1\160\1\163\1\141\1\154\1\145\1\163\1\60\1\uffff\2\60\1\156\1\143"+
-        "\2\145\1\151\1\145\2\164\1\145\1\166\1\163\3\uffff\1\60\1\171\2"+
-        "\60\2\156\1\145\1\151\1\60\1\145\1\137\1\uffff\1\60\2\uffff\1\147"+
-        "\1\163\1\156\1\157\1\uffff\1\154\1\141\1\uffff\1\60\1\141\1\143"+
-        "\1\156\1\60\1\154\1\uffff\1\164\1\171\1\137\1\uffff\1\154\1\151"+
-        "\1\60\1\141\2\157\1\uffff\1\154\1\167\1\156\1\154\1\145\1\60\1\157"+
-        "\1\144\1\uffff\1\167\1\60\1\145\1\uffff\1\144\1\60\1\uffff";
-    static final String DFA12_maxS =
-        "\1\uffff\1\114\1\76\2\uffff\1\156\3\uffff\1\157\1\151\2\141\1\157"+
-        "\1\155\1\141\1\156\1\154\1\165\1\141\1\145\1\157\1\172\2\uffff\2"+
-        "\uffff\1\57\2\uffff\1\101\4\uffff\1\163\3\uffff\1\156\1\154\1\162"+
-        "\1\164\1\155\1\151\1\154\1\164\1\160\2\154\1\156\3\162\5\uffff\1"+
-        "\72\1\145\1\160\1\141\1\145\1\154\1\144\1\154\1\145\1\155\1\163"+
-        "\1\165\1\157\2\145\1\137\1\154\1\147\1\151\2\164\1\uffff\1\146\1"+
-        "\145\1\151\1\172\1\157\1\143\1\171\1\172\1\151\1\163\1\145\1\156"+
-        "\2\162\1\157\1\137\1\145\2\141\2\151\1\143\1\154\1\uffff\1\163\1"+
-        "\141\1\172\1\uffff\1\163\1\151\1\123\1\160\1\163\1\146\1\155\1\162"+
-        "\1\143\1\137\1\154\1\142\1\141\1\156\1\151\1\165\1\163\1\162\1\uffff"+
-        "\1\163\1\157\1\165\1\157\1\154\1\151\1\145\1\141\1\137\1\157\1\166"+
-        "\1\151\2\154\1\145\1\146\1\162\1\172\1\144\1\151\1\156\1\142\1\141"+
-        "\1\145\1\163\1\162\3\156\1\151\1\172\1\145\1\137\1\144\1\151\1\145"+
-        "\1\uffff\1\172\1\157\1\172\1\164\1\162\2\164\2\145\2\157\1\163\1"+
-        "\157\1\141\1\137\1\154\1\172\1\145\1\172\1\uffff\1\156\1\uffff\1"+
-        "\154\1\163\1\151\1\145\2\156\1\164\1\155\1\151\1\154\1\142\1\154"+
-        "\1\157\1\uffff\1\144\1\uffff\1\172\2\145\1\157\1\156\2\143\1\150"+
-        "\1\160\1\163\1\141\1\154\1\145\1\163\1\172\1\uffff\2\172\1\156\1"+
-        "\143\2\145\1\151\1\145\2\164\1\145\1\166\1\163\3\uffff\1\172\1\171"+
-        "\2\172\2\156\1\145\1\151\1\172\1\145\1\137\1\uffff\1\172\2\uffff"+
-        "\1\147\1\163\1\156\1\157\1\uffff\1\154\1\141\1\uffff\1\172\1\141"+
-        "\1\143\1\156\1\172\1\154\1\uffff\1\164\1\171\1\137\1\uffff\1\154"+
-        "\1\151\1\172\1\141\2\157\1\uffff\1\154\1\167\1\156\1\154\1\145\1"+
-        "\172\1\157\1\144\1\uffff\1\167\1\172\1\145\1\uffff\1\144\1\172\1"+
-        "\uffff";
-    static final String DFA12_acceptS =
-        "\3\uffff\1\3\1\4\1\uffff\1\6\1\7\1\10\16\uffff\1\37\1\40\3\uffff"+
-        "\1\44\1\45\1\uffff\1\37\1\2\1\3\1\4\1\uffff\1\6\1\7\1\10\17\uffff"+
-        "\1\40\1\41\1\42\1\43\1\44\25\uffff\1\1\27\uffff\1\22\3\uffff\1\14"+
-        "\22\uffff\1\13\44\uffff\1\35\23\uffff\1\12\1\uffff\1\16\15\uffff"+
-        "\1\5\1\uffff\1\11\17\uffff\1\15\15\uffff\1\23\1\17\1\20\13\uffff"+
-        "\1\21\1\uffff\1\25\1\26\4\uffff\1\33\2\uffff\1\24\6\uffff\1\27\3"+
-        "\uffff\1\34\6\uffff\1\31\10\uffff\1\30\3\uffff\1\36\2\uffff\1\32";
-    static final String DFA12_specialS =
-        "\1\1\30\uffff\1\2\1\0\u0109\uffff}>";
-    static final String[] DFA12_transitionS = {
-            "\11\35\2\34\2\35\1\34\22\35\1\34\1\35\1\31\4\35\1\32\4\35\1"+
-            "\4\1\2\1\6\1\33\12\30\1\35\1\3\5\35\5\27\1\1\24\27\3\35\1\26"+
-            "\1\27\1\35\1\21\1\27\1\15\1\27\1\13\1\22\2\27\1\20\2\27\1\14"+
-            "\1\27\1\11\1\16\1\25\1\27\1\23\1\24\1\27\1\5\1\17\1\12\3\27"+
-            "\1\7\1\35\1\10\uff82\35",
-            "\1\36",
-            "\1\40",
-            "",
-            "",
-            "\1\43",
-            "",
-            "",
-            "",
-            "\1\47",
-            "\1\50",
-            "\1\51",
-            "\1\52",
-            "\1\53",
-            "\1\54",
-            "\1\55",
-            "\1\57\1\56",
-            "\1\60",
-            "\1\61",
-            "\1\62",
-            "\1\63",
-            "\1\65\15\uffff\1\64",
-            "\32\37\4\uffff\1\37\1\uffff\32\37",
-            "",
-            "",
-            "\0\67",
-            "\0\67",
-            "\1\70\4\uffff\1\71",
-            "",
-            "",
-            "\1\73",
-            "",
-            "",
-            "",
-            "",
-            "\1\74\16\uffff\1\75",
-            "",
-            "",
-            "",
-            "\1\76\30\uffff\1\100\16\uffff\1\77",
-            "\1\101",
-            "\1\102",
-            "\1\103",
-            "\1\104",
-            "\1\105",
-            "\1\106",
-            "\1\107\20\uffff\1\110",
-            "\1\111",
-            "\1\112",
-            "\1\113",
-            "\1\114",
-            "\1\115",
-            "\1\116",
-            "\1\117",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "\1\120",
-            "\1\121",
-            "\1\122",
-            "\1\123",
-            "\1\124",
-            "\1\125",
-            "\1\126",
-            "\1\127",
-            "\1\130",
-            "\1\131",
-            "\1\132",
-            "\1\133",
-            "\1\134",
-            "\1\135",
-            "\1\136",
-            "\1\137",
-            "\1\140",
-            "\1\141",
-            "\1\142",
-            "\1\143",
-            "\1\144",
-            "",
-            "\1\145",
-            "\1\146",
-            "\1\147",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\151",
-            "\1\152",
-            "\1\153",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\155",
-            "\1\156",
-            "\1\157",
-            "\1\160\1\161",
-            "\1\162",
-            "\1\163",
-            "\1\164",
-            "\1\165",
-            "\1\166",
-            "\1\167",
-            "\1\170",
-            "\1\171",
-            "\1\172",
-            "\1\173",
-            "\1\174",
-            "",
-            "\1\175",
-            "\1\176",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "",
-            "\1\u0080",
-            "\1\u0081",
-            "\1\u0083\17\uffff\1\u0082",
-            "\1\u0084",
-            "\1\u0085",
-            "\1\u0086",
-            "\1\u0087",
-            "\1\u0088",
-            "\1\u0089",
-            "\1\u008a",
-            "\1\u008b",
-            "\1\u008c",
-            "\1\u008d",
-            "\1\u008e",
-            "\1\u008f",
-            "\1\u0090",
-            "\1\u0091",
-            "\1\u0092",
-            "",
-            "\1\u0093",
-            "\1\u0094",
-            "\1\u0095",
-            "\1\u0096",
-            "\1\u0097",
-            "\1\u0098",
-            "\1\u0099",
-            "\1\u009a",
-            "\1\u009b",
-            "\1\u009c",
-            "\1\u009d",
-            "\1\u009e",
-            "\1\u009f",
-            "\1\u00a0",
-            "\1\u00a1",
-            "\1\u00a2",
-            "\1\u00a3",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\u00a5",
-            "\1\u00a6",
-            "\1\u00a7",
-            "\1\u00a8",
-            "\1\u00a9",
-            "\1\u00aa",
-            "\1\u00ab",
-            "\1\u00ac",
-            "\1\u00ad",
-            "\1\u00af\12\uffff\1\u00ae",
-            "\1\u00b0",
-            "\1\u00b1",
-            "\1\u00b2",
-            "\1\u00b3",
-            "\1\u00b4",
-            "\1\u00b5",
-            "\1\u00b6",
-            "\1\u00b7",
-            "",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\u00b9",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\u00bb",
-            "\1\u00bc",
-            "\1\u00bd",
-            "\1\u00be",
-            "\1\u00bf",
-            "\1\u00c0",
-            "\1\u00c1",
-            "\1\u00c2",
-            "\1\u00c3",
-            "\1\u00c4",
-            "\1\u00c5",
-            "\1\u00c6",
-            "\1\u00c7",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\u00c9",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "",
-            "\1\u00cb",
-            "",
-            "\1\u00cc",
-            "\1\u00cd",
-            "\1\u00ce",
-            "\1\u00cf",
-            "\1\u00d0",
-            "\1\u00d1",
-            "\1\u00d2",
-            "\1\u00d3",
-            "\1\u00d4",
-            "\1\u00d5",
-            "\1\u00d6",
-            "\1\u00d7",
-            "\1\u00d8",
-            "",
-            "\1\u00d9",
-            "",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\u00db",
-            "\1\u00dc",
-            "\1\u00dd",
-            "\1\u00de",
-            "\1\u00df",
-            "\1\u00e0",
-            "\1\u00e1",
-            "\1\u00e2",
-            "\1\u00e3",
-            "\1\u00e4",
-            "\1\u00e5",
-            "\1\u00e6",
-            "\1\u00e7",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\u00eb",
-            "\1\u00ec",
-            "\1\u00ed",
-            "\1\u00ee",
-            "\1\u00ef",
-            "\1\u00f0",
-            "\1\u00f1",
-            "\1\u00f2",
-            "\1\u00f3",
-            "\1\u00f4",
-            "\1\u00f5",
-            "",
-            "",
-            "",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\u00f7",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\u00fa",
-            "\1\u00fb",
-            "\1\u00fc",
-            "\1\u00fd",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\u00ff",
-            "\1\u0100",
-            "",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "",
-            "",
-            "\1\u0102",
-            "\1\u0103",
-            "\1\u0104",
-            "\1\u0105",
-            "",
-            "\1\u0106",
-            "\1\u0107",
-            "",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\u0109",
-            "\1\u010a",
-            "\1\u010b",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\u010d",
-            "",
-            "\1\u010e",
-            "\1\u010f",
-            "\1\u0110",
-            "",
-            "\1\u0111",
-            "\1\u0112",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\u0114",
-            "\1\u0115",
-            "\1\u0116",
-            "",
-            "\1\u0117",
-            "\1\u0118",
-            "\1\u0119",
-            "\1\u011a",
-            "\1\u011b",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\u011d",
-            "\1\u011e",
-            "",
-            "\1\u011f",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            "\1\u0121",
-            "",
-            "\1\u0122",
-            "\12\37\7\uffff\32\37\4\uffff\1\37\1\uffff\32\37",
-            ""
-    };
-
-    static final short[] DFA12_eot = DFA.unpackEncodedString(DFA12_eotS);
-    static final short[] DFA12_eof = DFA.unpackEncodedString(DFA12_eofS);
-    static final char[] DFA12_min = DFA.unpackEncodedStringToUnsignedChars(DFA12_minS);
-    static final char[] DFA12_max = DFA.unpackEncodedStringToUnsignedChars(DFA12_maxS);
-    static final short[] DFA12_accept = DFA.unpackEncodedString(DFA12_acceptS);
-    static final short[] DFA12_special = DFA.unpackEncodedString(DFA12_specialS);
-    static final short[][] DFA12_transition;
-
-    static {
-        int numStates = DFA12_transitionS.length;
-        DFA12_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA12_transition[i] = DFA.unpackEncodedString(DFA12_transitionS[i]);
-        }
-    }
-
-    class DFA12 extends DFA {
-
-        public DFA12(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 12;
-            this.eot = DFA12_eot;
-            this.eof = DFA12_eof;
-            this.min = DFA12_min;
-            this.max = DFA12_max;
-            this.accept = DFA12_accept;
-            this.special = DFA12_special;
-            this.transition = DFA12_transition;
-        }
-        public String getDescription() {
-            return "1:1: Tokens : ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
-        }
-        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
-            IntStream input = _input;
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA12_26 = input.LA(1);
-
-                        s = -1;
-                        if ( ((LA12_26>='\u0000' && LA12_26<='\uFFFF')) ) {s = 55;}
-
-                        else s = 29;
-
-                        if ( s>=0 ) return s;
-                        break;
-                    case 1 : 
-                        int LA12_0 = input.LA(1);
-
-                        s = -1;
-                        if ( (LA12_0=='F') ) {s = 1;}
-
-                        else if ( (LA12_0=='-') ) {s = 2;}
-
-                        else if ( (LA12_0==';') ) {s = 3;}
-
-                        else if ( (LA12_0==',') ) {s = 4;}
-
-                        else if ( (LA12_0=='u') ) {s = 5;}
-
-                        else if ( (LA12_0=='.') ) {s = 6;}
-
-                        else if ( (LA12_0=='{') ) {s = 7;}
-
-                        else if ( (LA12_0=='}') ) {s = 8;}
-
-                        else if ( (LA12_0=='n') ) {s = 9;}
-
-                        else if ( (LA12_0=='w') ) {s = 10;}
-
-                        else if ( (LA12_0=='e') ) {s = 11;}
-
-                        else if ( (LA12_0=='l') ) {s = 12;}
-
-                        else if ( (LA12_0=='c') ) {s = 13;}
-
-                        else if ( (LA12_0=='o') ) {s = 14;}
-
-                        else if ( (LA12_0=='v') ) {s = 15;}
-
-                        else if ( (LA12_0=='i') ) {s = 16;}
-
-                        else if ( (LA12_0=='a') ) {s = 17;}
-
-                        else if ( (LA12_0=='f') ) {s = 18;}
-
-                        else if ( (LA12_0=='r') ) {s = 19;}
-
-                        else if ( (LA12_0=='s') ) {s = 20;}
-
-                        else if ( (LA12_0=='p') ) {s = 21;}
-
-                        else if ( (LA12_0=='^') ) {s = 22;}
-
-                        else if ( ((LA12_0>='A' && LA12_0<='E')||(LA12_0>='G' && LA12_0<='Z')||LA12_0=='_'||LA12_0=='b'||LA12_0=='d'||(LA12_0>='g' && LA12_0<='h')||(LA12_0>='j' && LA12_0<='k')||LA12_0=='m'||LA12_0=='q'||LA12_0=='t'||(LA12_0>='x' && LA12_0<='z')) ) {s = 23;}
-
-                        else if ( ((LA12_0>='0' && LA12_0<='9')) ) {s = 24;}
-
-                        else if ( (LA12_0=='\"') ) {s = 25;}
-
-                        else if ( (LA12_0=='\'') ) {s = 26;}
-
-                        else if ( (LA12_0=='/') ) {s = 27;}
-
-                        else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {s = 28;}
-
-                        else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||LA12_0=='!'||(LA12_0>='#' && LA12_0<='&')||(LA12_0>='(' && LA12_0<='+')||LA12_0==':'||(LA12_0>='<' && LA12_0<='@')||(LA12_0>='[' && LA12_0<=']')||LA12_0=='`'||LA12_0=='|'||(LA12_0>='~' && LA12_0<='\uFFFF')) ) {s = 29;}
-
-                        if ( s>=0 ) return s;
-                        break;
-                    case 2 : 
-                        int LA12_25 = input.LA(1);
-
-                        s = -1;
-                        if ( ((LA12_25>='\u0000' && LA12_25<='\uFFFF')) ) {s = 55;}
-
-                        else s = 29;
-
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 12, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
- 
-
-}
\ No newline at end of file
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDslParser.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDslParser.java
deleted file mode 100644
index dc706432fe03f85916c52eb17c5db90391c16f12..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDslParser.java
+++ /dev/null
@@ -1,4131 +0,0 @@
-package org.polarsys.chess.xtext.parser.antlr.internal; 
-
-import org.eclipse.xtext.*;
-import org.eclipse.xtext.parser.*;
-import org.eclipse.xtext.parser.impl.*;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.common.util.Enumerator;
-import org.eclipse.xtext.parser.antlr.AbstractInternalAntlrParser;
-import org.eclipse.xtext.parser.antlr.XtextTokenStream;
-import org.eclipse.xtext.parser.antlr.XtextTokenStream.HiddenTokens;
-import org.eclipse.xtext.parser.antlr.AntlrDatatypeRuleToken;
-import org.polarsys.chess.xtext.services.FlaDslGrammarAccess;
-
-
-
-import org.antlr.runtime.*;
-import java.util.Stack;
-import java.util.List;
-import java.util.ArrayList;
-
-@SuppressWarnings("all")
-public class InternalFlaDslParser extends AbstractInternalAntlrParser {
-    public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'FLA:'", "'->'", "';'", "','", "'undefined'", "'.'", "'{'", "'}'", "'noFailure'", "'wildcard'", "'early'", "'late'", "'commission'", "'omission'", "'valueSubtle'", "'valueCoarse'", "'incompletion'", "'none'", "'unspecified'", "'inconsistency'", "'interference'", "'impermanence'", "'all_or_nothing'", "'all_or_compensation'", "'full_consistency'", "'range_violation_allowed'", "'serializable'", "'portable_level'", "'no_loss'", "'partial_loss_allowed'"
-    };
-    public static final int RULE_ID=4;
-    public static final int T__40=40;
-    public static final int T__29=29;
-    public static final int T__28=28;
-    public static final int T__27=27;
-    public static final int T__26=26;
-    public static final int T__25=25;
-    public static final int T__24=24;
-    public static final int T__23=23;
-    public static final int T__22=22;
-    public static final int RULE_ANY_OTHER=10;
-    public static final int T__21=21;
-    public static final int T__20=20;
-    public static final int RULE_SL_COMMENT=8;
-    public static final int EOF=-1;
-    public static final int RULE_ML_COMMENT=7;
-    public static final int T__30=30;
-    public static final int T__19=19;
-    public static final int T__31=31;
-    public static final int RULE_STRING=6;
-    public static final int T__32=32;
-    public static final int T__33=33;
-    public static final int T__16=16;
-    public static final int T__34=34;
-    public static final int T__15=15;
-    public static final int T__35=35;
-    public static final int T__18=18;
-    public static final int T__36=36;
-    public static final int T__17=17;
-    public static final int T__37=37;
-    public static final int T__12=12;
-    public static final int T__38=38;
-    public static final int T__11=11;
-    public static final int T__39=39;
-    public static final int T__14=14;
-    public static final int T__13=13;
-    public static final int RULE_INT=5;
-    public static final int RULE_WS=9;
-
-    // delegates
-    // delegators
-
-
-        public InternalFlaDslParser(TokenStream input) {
-            this(input, new RecognizerSharedState());
-        }
-        public InternalFlaDslParser(TokenStream input, RecognizerSharedState state) {
-            super(input, state);
-             
-        }
-        
-
-    public String[] getTokenNames() { return InternalFlaDslParser.tokenNames; }
-    public String getGrammarFileName() { return "../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g"; }
-
-
-
-     	private FlaDslGrammarAccess grammarAccess;
-     	
-        public InternalFlaDslParser(TokenStream input, FlaDslGrammarAccess grammarAccess) {
-            this(input);
-            this.grammarAccess = grammarAccess;
-            registerRules(grammarAccess.getGrammar());
-        }
-        
-        @Override
-        protected String getFirstRuleName() {
-        	return "Behaviour";	
-       	}
-       	
-       	@Override
-       	protected FlaDslGrammarAccess getGrammarAccess() {
-       		return grammarAccess;
-       	}
-
-
-
-    // $ANTLR start "entryRuleBehaviour"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:68:1: entryRuleBehaviour returns [EObject current=null] : iv_ruleBehaviour= ruleBehaviour EOF ;
-    public final EObject entryRuleBehaviour() throws RecognitionException {
-        EObject current = null;
-
-        EObject iv_ruleBehaviour = null;
-
-
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:69:2: (iv_ruleBehaviour= ruleBehaviour EOF )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:70:2: iv_ruleBehaviour= ruleBehaviour EOF
-            {
-             newCompositeNode(grammarAccess.getBehaviourRule()); 
-            pushFollow(FOLLOW_ruleBehaviour_in_entryRuleBehaviour75);
-            iv_ruleBehaviour=ruleBehaviour();
-
-            state._fsp--;
-
-             current =iv_ruleBehaviour; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleBehaviour85); 
-
-            }
-
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "entryRuleBehaviour"
-
-
-    // $ANTLR start "ruleBehaviour"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:77:1: ruleBehaviour returns [EObject current=null] : ( (lv_rules_0_0= ruleExpression ) )+ ;
-    public final EObject ruleBehaviour() throws RecognitionException {
-        EObject current = null;
-
-        EObject lv_rules_0_0 = null;
-
-
-         enterRule(); 
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:80:28: ( ( (lv_rules_0_0= ruleExpression ) )+ )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:81:1: ( (lv_rules_0_0= ruleExpression ) )+
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:81:1: ( (lv_rules_0_0= ruleExpression ) )+
-            int cnt1=0;
-            loop1:
-            do {
-                int alt1=2;
-                int LA1_0 = input.LA(1);
-
-                if ( (LA1_0==11) ) {
-                    alt1=1;
-                }
-
-
-                switch (alt1) {
-            	case 1 :
-            	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:82:1: (lv_rules_0_0= ruleExpression )
-            	    {
-            	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:82:1: (lv_rules_0_0= ruleExpression )
-            	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:83:3: lv_rules_0_0= ruleExpression
-            	    {
-            	     
-            	    	        newCompositeNode(grammarAccess.getBehaviourAccess().getRulesExpressionParserRuleCall_0()); 
-            	    	    
-            	    pushFollow(FOLLOW_ruleExpression_in_ruleBehaviour130);
-            	    lv_rules_0_0=ruleExpression();
-
-            	    state._fsp--;
-
-
-            	    	        if (current==null) {
-            	    	            current = createModelElementForParent(grammarAccess.getBehaviourRule());
-            	    	        }
-            	           		add(
-            	           			current, 
-            	           			"rules",
-            	            		lv_rules_0_0, 
-            	            		"Expression");
-            	    	        afterParserOrEnumRuleCall();
-            	    	    
-
-            	    }
-
-
-            	    }
-            	    break;
-
-            	default :
-            	    if ( cnt1 >= 1 ) break loop1;
-                        EarlyExitException eee =
-                            new EarlyExitException(1, input);
-                        throw eee;
-                }
-                cnt1++;
-            } while (true);
-
-
-            }
-
-             leaveRule(); 
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "ruleBehaviour"
-
-
-    // $ANTLR start "entryRuleExpression"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:107:1: entryRuleExpression returns [EObject current=null] : iv_ruleExpression= ruleExpression EOF ;
-    public final EObject entryRuleExpression() throws RecognitionException {
-        EObject current = null;
-
-        EObject iv_ruleExpression = null;
-
-
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:108:2: (iv_ruleExpression= ruleExpression EOF )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:109:2: iv_ruleExpression= ruleExpression EOF
-            {
-             newCompositeNode(grammarAccess.getExpressionRule()); 
-            pushFollow(FOLLOW_ruleExpression_in_entryRuleExpression166);
-            iv_ruleExpression=ruleExpression();
-
-            state._fsp--;
-
-             current =iv_ruleExpression; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleExpression176); 
-
-            }
-
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "entryRuleExpression"
-
-
-    // $ANTLR start "ruleExpression"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:116:1: ruleExpression returns [EObject current=null] : (otherlv_0= 'FLA:' ( (lv_lhs_1_0= ruleLhs ) ) otherlv_2= '->' ( (lv_rhs_3_0= ruleRhs ) ) otherlv_4= ';' ) ;
-    public final EObject ruleExpression() throws RecognitionException {
-        EObject current = null;
-
-        Token otherlv_0=null;
-        Token otherlv_2=null;
-        Token otherlv_4=null;
-        EObject lv_lhs_1_0 = null;
-
-        EObject lv_rhs_3_0 = null;
-
-
-         enterRule(); 
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:119:28: ( (otherlv_0= 'FLA:' ( (lv_lhs_1_0= ruleLhs ) ) otherlv_2= '->' ( (lv_rhs_3_0= ruleRhs ) ) otherlv_4= ';' ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:120:1: (otherlv_0= 'FLA:' ( (lv_lhs_1_0= ruleLhs ) ) otherlv_2= '->' ( (lv_rhs_3_0= ruleRhs ) ) otherlv_4= ';' )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:120:1: (otherlv_0= 'FLA:' ( (lv_lhs_1_0= ruleLhs ) ) otherlv_2= '->' ( (lv_rhs_3_0= ruleRhs ) ) otherlv_4= ';' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:120:3: otherlv_0= 'FLA:' ( (lv_lhs_1_0= ruleLhs ) ) otherlv_2= '->' ( (lv_rhs_3_0= ruleRhs ) ) otherlv_4= ';'
-            {
-            otherlv_0=(Token)match(input,11,FOLLOW_11_in_ruleExpression213); 
-
-                	newLeafNode(otherlv_0, grammarAccess.getExpressionAccess().getFLAKeyword_0());
-                
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:124:1: ( (lv_lhs_1_0= ruleLhs ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:125:1: (lv_lhs_1_0= ruleLhs )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:125:1: (lv_lhs_1_0= ruleLhs )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:126:3: lv_lhs_1_0= ruleLhs
-            {
-             
-            	        newCompositeNode(grammarAccess.getExpressionAccess().getLhsLhsParserRuleCall_1_0()); 
-            	    
-            pushFollow(FOLLOW_ruleLhs_in_ruleExpression234);
-            lv_lhs_1_0=ruleLhs();
-
-            state._fsp--;
-
-
-            	        if (current==null) {
-            	            current = createModelElementForParent(grammarAccess.getExpressionRule());
-            	        }
-                   		set(
-                   			current, 
-                   			"lhs",
-                    		lv_lhs_1_0, 
-                    		"Lhs");
-            	        afterParserOrEnumRuleCall();
-            	    
-
-            }
-
-
-            }
-
-            otherlv_2=(Token)match(input,12,FOLLOW_12_in_ruleExpression246); 
-
-                	newLeafNode(otherlv_2, grammarAccess.getExpressionAccess().getHyphenMinusGreaterThanSignKeyword_2());
-                
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:146:1: ( (lv_rhs_3_0= ruleRhs ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:147:1: (lv_rhs_3_0= ruleRhs )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:147:1: (lv_rhs_3_0= ruleRhs )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:148:3: lv_rhs_3_0= ruleRhs
-            {
-             
-            	        newCompositeNode(grammarAccess.getExpressionAccess().getRhsRhsParserRuleCall_3_0()); 
-            	    
-            pushFollow(FOLLOW_ruleRhs_in_ruleExpression267);
-            lv_rhs_3_0=ruleRhs();
-
-            state._fsp--;
-
-
-            	        if (current==null) {
-            	            current = createModelElementForParent(grammarAccess.getExpressionRule());
-            	        }
-                   		set(
-                   			current, 
-                   			"rhs",
-                    		lv_rhs_3_0, 
-                    		"Rhs");
-            	        afterParserOrEnumRuleCall();
-            	    
-
-            }
-
-
-            }
-
-            otherlv_4=(Token)match(input,13,FOLLOW_13_in_ruleExpression279); 
-
-                	newLeafNode(otherlv_4, grammarAccess.getExpressionAccess().getSemicolonKeyword_4());
-                
-
-            }
-
-
-            }
-
-             leaveRule(); 
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "ruleExpression"
-
-
-    // $ANTLR start "entryRuleLhs"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:176:1: entryRuleLhs returns [EObject current=null] : iv_ruleLhs= ruleLhs EOF ;
-    public final EObject entryRuleLhs() throws RecognitionException {
-        EObject current = null;
-
-        EObject iv_ruleLhs = null;
-
-
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:177:2: (iv_ruleLhs= ruleLhs EOF )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:178:2: iv_ruleLhs= ruleLhs EOF
-            {
-             newCompositeNode(grammarAccess.getLhsRule()); 
-            pushFollow(FOLLOW_ruleLhs_in_entryRuleLhs315);
-            iv_ruleLhs=ruleLhs();
-
-            state._fsp--;
-
-             current =iv_ruleLhs; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleLhs325); 
-
-            }
-
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "entryRuleLhs"
-
-
-    // $ANTLR start "ruleLhs"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:185:1: ruleLhs returns [EObject current=null] : ( ( (lv_failures_0_0= ruleInputExpression ) ) (otherlv_1= ',' ( (lv_failures_2_0= ruleInputExpression ) ) )* ) ;
-    public final EObject ruleLhs() throws RecognitionException {
-        EObject current = null;
-
-        Token otherlv_1=null;
-        EObject lv_failures_0_0 = null;
-
-        EObject lv_failures_2_0 = null;
-
-
-         enterRule(); 
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:188:28: ( ( ( (lv_failures_0_0= ruleInputExpression ) ) (otherlv_1= ',' ( (lv_failures_2_0= ruleInputExpression ) ) )* ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:189:1: ( ( (lv_failures_0_0= ruleInputExpression ) ) (otherlv_1= ',' ( (lv_failures_2_0= ruleInputExpression ) ) )* )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:189:1: ( ( (lv_failures_0_0= ruleInputExpression ) ) (otherlv_1= ',' ( (lv_failures_2_0= ruleInputExpression ) ) )* )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:189:2: ( (lv_failures_0_0= ruleInputExpression ) ) (otherlv_1= ',' ( (lv_failures_2_0= ruleInputExpression ) ) )*
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:189:2: ( (lv_failures_0_0= ruleInputExpression ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:190:1: (lv_failures_0_0= ruleInputExpression )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:190:1: (lv_failures_0_0= ruleInputExpression )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:191:3: lv_failures_0_0= ruleInputExpression
-            {
-             
-            	        newCompositeNode(grammarAccess.getLhsAccess().getFailuresInputExpressionParserRuleCall_0_0()); 
-            	    
-            pushFollow(FOLLOW_ruleInputExpression_in_ruleLhs371);
-            lv_failures_0_0=ruleInputExpression();
-
-            state._fsp--;
-
-
-            	        if (current==null) {
-            	            current = createModelElementForParent(grammarAccess.getLhsRule());
-            	        }
-                   		add(
-                   			current, 
-                   			"failures",
-                    		lv_failures_0_0, 
-                    		"InputExpression");
-            	        afterParserOrEnumRuleCall();
-            	    
-
-            }
-
-
-            }
-
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:207:2: (otherlv_1= ',' ( (lv_failures_2_0= ruleInputExpression ) ) )*
-            loop2:
-            do {
-                int alt2=2;
-                int LA2_0 = input.LA(1);
-
-                if ( (LA2_0==14) ) {
-                    alt2=1;
-                }
-
-
-                switch (alt2) {
-            	case 1 :
-            	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:207:4: otherlv_1= ',' ( (lv_failures_2_0= ruleInputExpression ) )
-            	    {
-            	    otherlv_1=(Token)match(input,14,FOLLOW_14_in_ruleLhs384); 
-
-            	        	newLeafNode(otherlv_1, grammarAccess.getLhsAccess().getCommaKeyword_1_0());
-            	        
-            	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:211:1: ( (lv_failures_2_0= ruleInputExpression ) )
-            	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:212:1: (lv_failures_2_0= ruleInputExpression )
-            	    {
-            	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:212:1: (lv_failures_2_0= ruleInputExpression )
-            	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:213:3: lv_failures_2_0= ruleInputExpression
-            	    {
-            	     
-            	    	        newCompositeNode(grammarAccess.getLhsAccess().getFailuresInputExpressionParserRuleCall_1_1_0()); 
-            	    	    
-            	    pushFollow(FOLLOW_ruleInputExpression_in_ruleLhs405);
-            	    lv_failures_2_0=ruleInputExpression();
-
-            	    state._fsp--;
-
-
-            	    	        if (current==null) {
-            	    	            current = createModelElementForParent(grammarAccess.getLhsRule());
-            	    	        }
-            	           		add(
-            	           			current, 
-            	           			"failures",
-            	            		lv_failures_2_0, 
-            	            		"InputExpression");
-            	    	        afterParserOrEnumRuleCall();
-            	    	    
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop2;
-                }
-            } while (true);
-
-
-            }
-
-
-            }
-
-             leaveRule(); 
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "ruleLhs"
-
-
-    // $ANTLR start "entryRuleRhs"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:237:1: entryRuleRhs returns [EObject current=null] : iv_ruleRhs= ruleRhs EOF ;
-    public final EObject entryRuleRhs() throws RecognitionException {
-        EObject current = null;
-
-        EObject iv_ruleRhs = null;
-
-
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:238:2: (iv_ruleRhs= ruleRhs EOF )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:239:2: iv_ruleRhs= ruleRhs EOF
-            {
-             newCompositeNode(grammarAccess.getRhsRule()); 
-            pushFollow(FOLLOW_ruleRhs_in_entryRuleRhs443);
-            iv_ruleRhs=ruleRhs();
-
-            state._fsp--;
-
-             current =iv_ruleRhs; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRhs453); 
-
-            }
-
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "entryRuleRhs"
-
-
-    // $ANTLR start "ruleRhs"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:246:1: ruleRhs returns [EObject current=null] : ( ( (lv_failures_0_0= ruleOutputExpression ) ) (otherlv_1= ',' ( (lv_failures_2_0= ruleOutputExpression ) ) )* ) ;
-    public final EObject ruleRhs() throws RecognitionException {
-        EObject current = null;
-
-        Token otherlv_1=null;
-        EObject lv_failures_0_0 = null;
-
-        EObject lv_failures_2_0 = null;
-
-
-         enterRule(); 
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:249:28: ( ( ( (lv_failures_0_0= ruleOutputExpression ) ) (otherlv_1= ',' ( (lv_failures_2_0= ruleOutputExpression ) ) )* ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:250:1: ( ( (lv_failures_0_0= ruleOutputExpression ) ) (otherlv_1= ',' ( (lv_failures_2_0= ruleOutputExpression ) ) )* )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:250:1: ( ( (lv_failures_0_0= ruleOutputExpression ) ) (otherlv_1= ',' ( (lv_failures_2_0= ruleOutputExpression ) ) )* )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:250:2: ( (lv_failures_0_0= ruleOutputExpression ) ) (otherlv_1= ',' ( (lv_failures_2_0= ruleOutputExpression ) ) )*
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:250:2: ( (lv_failures_0_0= ruleOutputExpression ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:251:1: (lv_failures_0_0= ruleOutputExpression )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:251:1: (lv_failures_0_0= ruleOutputExpression )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:252:3: lv_failures_0_0= ruleOutputExpression
-            {
-             
-            	        newCompositeNode(grammarAccess.getRhsAccess().getFailuresOutputExpressionParserRuleCall_0_0()); 
-            	    
-            pushFollow(FOLLOW_ruleOutputExpression_in_ruleRhs499);
-            lv_failures_0_0=ruleOutputExpression();
-
-            state._fsp--;
-
-
-            	        if (current==null) {
-            	            current = createModelElementForParent(grammarAccess.getRhsRule());
-            	        }
-                   		add(
-                   			current, 
-                   			"failures",
-                    		lv_failures_0_0, 
-                    		"OutputExpression");
-            	        afterParserOrEnumRuleCall();
-            	    
-
-            }
-
-
-            }
-
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:268:2: (otherlv_1= ',' ( (lv_failures_2_0= ruleOutputExpression ) ) )*
-            loop3:
-            do {
-                int alt3=2;
-                int LA3_0 = input.LA(1);
-
-                if ( (LA3_0==14) ) {
-                    alt3=1;
-                }
-
-
-                switch (alt3) {
-            	case 1 :
-            	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:268:4: otherlv_1= ',' ( (lv_failures_2_0= ruleOutputExpression ) )
-            	    {
-            	    otherlv_1=(Token)match(input,14,FOLLOW_14_in_ruleRhs512); 
-
-            	        	newLeafNode(otherlv_1, grammarAccess.getRhsAccess().getCommaKeyword_1_0());
-            	        
-            	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:272:1: ( (lv_failures_2_0= ruleOutputExpression ) )
-            	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:273:1: (lv_failures_2_0= ruleOutputExpression )
-            	    {
-            	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:273:1: (lv_failures_2_0= ruleOutputExpression )
-            	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:274:3: lv_failures_2_0= ruleOutputExpression
-            	    {
-            	     
-            	    	        newCompositeNode(grammarAccess.getRhsAccess().getFailuresOutputExpressionParserRuleCall_1_1_0()); 
-            	    	    
-            	    pushFollow(FOLLOW_ruleOutputExpression_in_ruleRhs533);
-            	    lv_failures_2_0=ruleOutputExpression();
-
-            	    state._fsp--;
-
-
-            	    	        if (current==null) {
-            	    	            current = createModelElementForParent(grammarAccess.getRhsRule());
-            	    	        }
-            	           		add(
-            	           			current, 
-            	           			"failures",
-            	            		lv_failures_2_0, 
-            	            		"OutputExpression");
-            	    	        afterParserOrEnumRuleCall();
-            	    	    
-
-            	    }
-
-
-            	    }
-
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop3;
-                }
-            } while (true);
-
-
-            }
-
-
-            }
-
-             leaveRule(); 
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "ruleRhs"
-
-
-    // $ANTLR start "entryRuleInputExpression"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:298:1: entryRuleInputExpression returns [EObject current=null] : iv_ruleInputExpression= ruleInputExpression EOF ;
-    public final EObject entryRuleInputExpression() throws RecognitionException {
-        EObject current = null;
-
-        EObject iv_ruleInputExpression = null;
-
-
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:299:2: (iv_ruleInputExpression= ruleInputExpression EOF )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:300:2: iv_ruleInputExpression= ruleInputExpression EOF
-            {
-             newCompositeNode(grammarAccess.getInputExpressionRule()); 
-            pushFollow(FOLLOW_ruleInputExpression_in_entryRuleInputExpression571);
-            iv_ruleInputExpression=ruleInputExpression();
-
-            state._fsp--;
-
-             current =iv_ruleInputExpression; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInputExpression581); 
-
-            }
-
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "entryRuleInputExpression"
-
-
-    // $ANTLR start "ruleInputExpression"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:307:1: ruleInputExpression returns [EObject current=null] : ( ( ( (otherlv_0= RULE_ID ) ) | otherlv_1= 'undefined' ) otherlv_2= '.' ( (lv_failureExpr_3_0= ruleInFailureExpr ) ) ) ;
-    public final EObject ruleInputExpression() throws RecognitionException {
-        EObject current = null;
-
-        Token otherlv_0=null;
-        Token otherlv_1=null;
-        Token otherlv_2=null;
-        EObject lv_failureExpr_3_0 = null;
-
-
-         enterRule(); 
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:310:28: ( ( ( ( (otherlv_0= RULE_ID ) ) | otherlv_1= 'undefined' ) otherlv_2= '.' ( (lv_failureExpr_3_0= ruleInFailureExpr ) ) ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:311:1: ( ( ( (otherlv_0= RULE_ID ) ) | otherlv_1= 'undefined' ) otherlv_2= '.' ( (lv_failureExpr_3_0= ruleInFailureExpr ) ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:311:1: ( ( ( (otherlv_0= RULE_ID ) ) | otherlv_1= 'undefined' ) otherlv_2= '.' ( (lv_failureExpr_3_0= ruleInFailureExpr ) ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:311:2: ( ( (otherlv_0= RULE_ID ) ) | otherlv_1= 'undefined' ) otherlv_2= '.' ( (lv_failureExpr_3_0= ruleInFailureExpr ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:311:2: ( ( (otherlv_0= RULE_ID ) ) | otherlv_1= 'undefined' )
-            int alt4=2;
-            int LA4_0 = input.LA(1);
-
-            if ( (LA4_0==RULE_ID) ) {
-                alt4=1;
-            }
-            else if ( (LA4_0==15) ) {
-                alt4=2;
-            }
-            else {
-                NoViableAltException nvae =
-                    new NoViableAltException("", 4, 0, input);
-
-                throw nvae;
-            }
-            switch (alt4) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:311:3: ( (otherlv_0= RULE_ID ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:311:3: ( (otherlv_0= RULE_ID ) )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:312:1: (otherlv_0= RULE_ID )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:312:1: (otherlv_0= RULE_ID )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:313:3: otherlv_0= RULE_ID
-                    {
-
-                    			if (current==null) {
-                    	            current = createModelElement(grammarAccess.getInputExpressionRule());
-                    	        }
-                            
-                    otherlv_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleInputExpression627); 
-
-                    		newLeafNode(otherlv_0, grammarAccess.getInputExpressionAccess().getRefPortCrossReference_0_0_0()); 
-                    	
-
-                    }
-
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:325:7: otherlv_1= 'undefined'
-                    {
-                    otherlv_1=(Token)match(input,15,FOLLOW_15_in_ruleInputExpression645); 
-
-                        	newLeafNode(otherlv_1, grammarAccess.getInputExpressionAccess().getUndefinedKeyword_0_1());
-                        
-
-                    }
-                    break;
-
-            }
-
-            otherlv_2=(Token)match(input,16,FOLLOW_16_in_ruleInputExpression658); 
-
-                	newLeafNode(otherlv_2, grammarAccess.getInputExpressionAccess().getFullStopKeyword_1());
-                
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:333:1: ( (lv_failureExpr_3_0= ruleInFailureExpr ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:334:1: (lv_failureExpr_3_0= ruleInFailureExpr )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:334:1: (lv_failureExpr_3_0= ruleInFailureExpr )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:335:3: lv_failureExpr_3_0= ruleInFailureExpr
-            {
-             
-            	        newCompositeNode(grammarAccess.getInputExpressionAccess().getFailureExprInFailureExprParserRuleCall_2_0()); 
-            	    
-            pushFollow(FOLLOW_ruleInFailureExpr_in_ruleInputExpression679);
-            lv_failureExpr_3_0=ruleInFailureExpr();
-
-            state._fsp--;
-
-
-            	        if (current==null) {
-            	            current = createModelElementForParent(grammarAccess.getInputExpressionRule());
-            	        }
-                   		set(
-                   			current, 
-                   			"failureExpr",
-                    		lv_failureExpr_3_0, 
-                    		"InFailureExpr");
-            	        afterParserOrEnumRuleCall();
-            	    
-
-            }
-
-
-            }
-
-
-            }
-
-
-            }
-
-             leaveRule(); 
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "ruleInputExpression"
-
-
-    // $ANTLR start "entryRuleOutputExpression"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:359:1: entryRuleOutputExpression returns [EObject current=null] : iv_ruleOutputExpression= ruleOutputExpression EOF ;
-    public final EObject entryRuleOutputExpression() throws RecognitionException {
-        EObject current = null;
-
-        EObject iv_ruleOutputExpression = null;
-
-
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:360:2: (iv_ruleOutputExpression= ruleOutputExpression EOF )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:361:2: iv_ruleOutputExpression= ruleOutputExpression EOF
-            {
-             newCompositeNode(grammarAccess.getOutputExpressionRule()); 
-            pushFollow(FOLLOW_ruleOutputExpression_in_entryRuleOutputExpression715);
-            iv_ruleOutputExpression=ruleOutputExpression();
-
-            state._fsp--;
-
-             current =iv_ruleOutputExpression; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOutputExpression725); 
-
-            }
-
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "entryRuleOutputExpression"
-
-
-    // $ANTLR start "ruleOutputExpression"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:368:1: ruleOutputExpression returns [EObject current=null] : ( ( ( (otherlv_0= RULE_ID ) ) | otherlv_1= 'undefined' ) otherlv_2= '.' ( (lv_failureExpr_3_0= ruleOutFailureExpr ) ) ) ;
-    public final EObject ruleOutputExpression() throws RecognitionException {
-        EObject current = null;
-
-        Token otherlv_0=null;
-        Token otherlv_1=null;
-        Token otherlv_2=null;
-        EObject lv_failureExpr_3_0 = null;
-
-
-         enterRule(); 
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:371:28: ( ( ( ( (otherlv_0= RULE_ID ) ) | otherlv_1= 'undefined' ) otherlv_2= '.' ( (lv_failureExpr_3_0= ruleOutFailureExpr ) ) ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:372:1: ( ( ( (otherlv_0= RULE_ID ) ) | otherlv_1= 'undefined' ) otherlv_2= '.' ( (lv_failureExpr_3_0= ruleOutFailureExpr ) ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:372:1: ( ( ( (otherlv_0= RULE_ID ) ) | otherlv_1= 'undefined' ) otherlv_2= '.' ( (lv_failureExpr_3_0= ruleOutFailureExpr ) ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:372:2: ( ( (otherlv_0= RULE_ID ) ) | otherlv_1= 'undefined' ) otherlv_2= '.' ( (lv_failureExpr_3_0= ruleOutFailureExpr ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:372:2: ( ( (otherlv_0= RULE_ID ) ) | otherlv_1= 'undefined' )
-            int alt5=2;
-            int LA5_0 = input.LA(1);
-
-            if ( (LA5_0==RULE_ID) ) {
-                alt5=1;
-            }
-            else if ( (LA5_0==15) ) {
-                alt5=2;
-            }
-            else {
-                NoViableAltException nvae =
-                    new NoViableAltException("", 5, 0, input);
-
-                throw nvae;
-            }
-            switch (alt5) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:372:3: ( (otherlv_0= RULE_ID ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:372:3: ( (otherlv_0= RULE_ID ) )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:373:1: (otherlv_0= RULE_ID )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:373:1: (otherlv_0= RULE_ID )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:374:3: otherlv_0= RULE_ID
-                    {
-
-                    			if (current==null) {
-                    	            current = createModelElement(grammarAccess.getOutputExpressionRule());
-                    	        }
-                            
-                    otherlv_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleOutputExpression771); 
-
-                    		newLeafNode(otherlv_0, grammarAccess.getOutputExpressionAccess().getRefPortCrossReference_0_0_0()); 
-                    	
-
-                    }
-
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:386:7: otherlv_1= 'undefined'
-                    {
-                    otherlv_1=(Token)match(input,15,FOLLOW_15_in_ruleOutputExpression789); 
-
-                        	newLeafNode(otherlv_1, grammarAccess.getOutputExpressionAccess().getUndefinedKeyword_0_1());
-                        
-
-                    }
-                    break;
-
-            }
-
-            otherlv_2=(Token)match(input,16,FOLLOW_16_in_ruleOutputExpression802); 
-
-                	newLeafNode(otherlv_2, grammarAccess.getOutputExpressionAccess().getFullStopKeyword_1());
-                
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:394:1: ( (lv_failureExpr_3_0= ruleOutFailureExpr ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:395:1: (lv_failureExpr_3_0= ruleOutFailureExpr )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:395:1: (lv_failureExpr_3_0= ruleOutFailureExpr )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:396:3: lv_failureExpr_3_0= ruleOutFailureExpr
-            {
-             
-            	        newCompositeNode(grammarAccess.getOutputExpressionAccess().getFailureExprOutFailureExprParserRuleCall_2_0()); 
-            	    
-            pushFollow(FOLLOW_ruleOutFailureExpr_in_ruleOutputExpression823);
-            lv_failureExpr_3_0=ruleOutFailureExpr();
-
-            state._fsp--;
-
-
-            	        if (current==null) {
-            	            current = createModelElementForParent(grammarAccess.getOutputExpressionRule());
-            	        }
-                   		set(
-                   			current, 
-                   			"failureExpr",
-                    		lv_failureExpr_3_0, 
-                    		"OutFailureExpr");
-            	        afterParserOrEnumRuleCall();
-            	    
-
-            }
-
-
-            }
-
-
-            }
-
-
-            }
-
-             leaveRule(); 
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "ruleOutputExpression"
-
-
-    // $ANTLR start "entryRuleInFailureExpr"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:420:1: entryRuleInFailureExpr returns [EObject current=null] : iv_ruleInFailureExpr= ruleInFailureExpr EOF ;
-    public final EObject entryRuleInFailureExpr() throws RecognitionException {
-        EObject current = null;
-
-        EObject iv_ruleInFailureExpr = null;
-
-
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:421:2: (iv_ruleInFailureExpr= ruleInFailureExpr EOF )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:422:2: iv_ruleInFailureExpr= ruleInFailureExpr EOF
-            {
-             newCompositeNode(grammarAccess.getInFailureExprRule()); 
-            pushFollow(FOLLOW_ruleInFailureExpr_in_entryRuleInFailureExpr859);
-            iv_ruleInFailureExpr=ruleInFailureExpr();
-
-            state._fsp--;
-
-             current =iv_ruleInFailureExpr; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleInFailureExpr869); 
-
-            }
-
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "entryRuleInFailureExpr"
-
-
-    // $ANTLR start "ruleInFailureExpr"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:429:1: ruleInFailureExpr returns [EObject current=null] : ( ( (lv_failures_0_0= ruleWildcardDefinition ) ) | ( (lv_failures_1_0= ruleNoFailureDefinition ) ) | ( (lv_failures_2_0= ruleFailureDefinition ) ) | (otherlv_3= '{' ( (lv_failures_4_0= ruleFailureDefinition ) ) (otherlv_5= ',' ( (lv_failures_6_0= ruleFailureDefinition ) ) )+ otherlv_7= '}' ) | ( (lv_failures_8_0= ruleVariableDefinition ) ) ) ;
-    public final EObject ruleInFailureExpr() throws RecognitionException {
-        EObject current = null;
-
-        Token otherlv_3=null;
-        Token otherlv_5=null;
-        Token otherlv_7=null;
-        EObject lv_failures_0_0 = null;
-
-        EObject lv_failures_1_0 = null;
-
-        EObject lv_failures_2_0 = null;
-
-        EObject lv_failures_4_0 = null;
-
-        EObject lv_failures_6_0 = null;
-
-        EObject lv_failures_8_0 = null;
-
-
-         enterRule(); 
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:432:28: ( ( ( (lv_failures_0_0= ruleWildcardDefinition ) ) | ( (lv_failures_1_0= ruleNoFailureDefinition ) ) | ( (lv_failures_2_0= ruleFailureDefinition ) ) | (otherlv_3= '{' ( (lv_failures_4_0= ruleFailureDefinition ) ) (otherlv_5= ',' ( (lv_failures_6_0= ruleFailureDefinition ) ) )+ otherlv_7= '}' ) | ( (lv_failures_8_0= ruleVariableDefinition ) ) ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:433:1: ( ( (lv_failures_0_0= ruleWildcardDefinition ) ) | ( (lv_failures_1_0= ruleNoFailureDefinition ) ) | ( (lv_failures_2_0= ruleFailureDefinition ) ) | (otherlv_3= '{' ( (lv_failures_4_0= ruleFailureDefinition ) ) (otherlv_5= ',' ( (lv_failures_6_0= ruleFailureDefinition ) ) )+ otherlv_7= '}' ) | ( (lv_failures_8_0= ruleVariableDefinition ) ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:433:1: ( ( (lv_failures_0_0= ruleWildcardDefinition ) ) | ( (lv_failures_1_0= ruleNoFailureDefinition ) ) | ( (lv_failures_2_0= ruleFailureDefinition ) ) | (otherlv_3= '{' ( (lv_failures_4_0= ruleFailureDefinition ) ) (otherlv_5= ',' ( (lv_failures_6_0= ruleFailureDefinition ) ) )+ otherlv_7= '}' ) | ( (lv_failures_8_0= ruleVariableDefinition ) ) )
-            int alt7=5;
-            switch ( input.LA(1) ) {
-            case 20:
-                {
-                alt7=1;
-                }
-                break;
-            case 19:
-                {
-                alt7=2;
-                }
-                break;
-            case 21:
-            case 22:
-            case 23:
-            case 24:
-            case 25:
-            case 26:
-                {
-                alt7=3;
-                }
-                break;
-            case 17:
-                {
-                alt7=4;
-                }
-                break;
-            case RULE_ID:
-                {
-                alt7=5;
-                }
-                break;
-            default:
-                NoViableAltException nvae =
-                    new NoViableAltException("", 7, 0, input);
-
-                throw nvae;
-            }
-
-            switch (alt7) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:433:2: ( (lv_failures_0_0= ruleWildcardDefinition ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:433:2: ( (lv_failures_0_0= ruleWildcardDefinition ) )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:434:1: (lv_failures_0_0= ruleWildcardDefinition )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:434:1: (lv_failures_0_0= ruleWildcardDefinition )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:435:3: lv_failures_0_0= ruleWildcardDefinition
-                    {
-                     
-                    	        newCompositeNode(grammarAccess.getInFailureExprAccess().getFailuresWildcardDefinitionParserRuleCall_0_0()); 
-                    	    
-                    pushFollow(FOLLOW_ruleWildcardDefinition_in_ruleInFailureExpr915);
-                    lv_failures_0_0=ruleWildcardDefinition();
-
-                    state._fsp--;
-
-
-                    	        if (current==null) {
-                    	            current = createModelElementForParent(grammarAccess.getInFailureExprRule());
-                    	        }
-                           		add(
-                           			current, 
-                           			"failures",
-                            		lv_failures_0_0, 
-                            		"WildcardDefinition");
-                    	        afterParserOrEnumRuleCall();
-                    	    
-
-                    }
-
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:452:6: ( (lv_failures_1_0= ruleNoFailureDefinition ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:452:6: ( (lv_failures_1_0= ruleNoFailureDefinition ) )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:453:1: (lv_failures_1_0= ruleNoFailureDefinition )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:453:1: (lv_failures_1_0= ruleNoFailureDefinition )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:454:3: lv_failures_1_0= ruleNoFailureDefinition
-                    {
-                     
-                    	        newCompositeNode(grammarAccess.getInFailureExprAccess().getFailuresNoFailureDefinitionParserRuleCall_1_0()); 
-                    	    
-                    pushFollow(FOLLOW_ruleNoFailureDefinition_in_ruleInFailureExpr942);
-                    lv_failures_1_0=ruleNoFailureDefinition();
-
-                    state._fsp--;
-
-
-                    	        if (current==null) {
-                    	            current = createModelElementForParent(grammarAccess.getInFailureExprRule());
-                    	        }
-                           		add(
-                           			current, 
-                           			"failures",
-                            		lv_failures_1_0, 
-                            		"NoFailureDefinition");
-                    	        afterParserOrEnumRuleCall();
-                    	    
-
-                    }
-
-
-                    }
-
-
-                    }
-                    break;
-                case 3 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:471:6: ( (lv_failures_2_0= ruleFailureDefinition ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:471:6: ( (lv_failures_2_0= ruleFailureDefinition ) )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:472:1: (lv_failures_2_0= ruleFailureDefinition )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:472:1: (lv_failures_2_0= ruleFailureDefinition )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:473:3: lv_failures_2_0= ruleFailureDefinition
-                    {
-                     
-                    	        newCompositeNode(grammarAccess.getInFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_2_0()); 
-                    	    
-                    pushFollow(FOLLOW_ruleFailureDefinition_in_ruleInFailureExpr969);
-                    lv_failures_2_0=ruleFailureDefinition();
-
-                    state._fsp--;
-
-
-                    	        if (current==null) {
-                    	            current = createModelElementForParent(grammarAccess.getInFailureExprRule());
-                    	        }
-                           		add(
-                           			current, 
-                           			"failures",
-                            		lv_failures_2_0, 
-                            		"FailureDefinition");
-                    	        afterParserOrEnumRuleCall();
-                    	    
-
-                    }
-
-
-                    }
-
-
-                    }
-                    break;
-                case 4 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:490:6: (otherlv_3= '{' ( (lv_failures_4_0= ruleFailureDefinition ) ) (otherlv_5= ',' ( (lv_failures_6_0= ruleFailureDefinition ) ) )+ otherlv_7= '}' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:490:6: (otherlv_3= '{' ( (lv_failures_4_0= ruleFailureDefinition ) ) (otherlv_5= ',' ( (lv_failures_6_0= ruleFailureDefinition ) ) )+ otherlv_7= '}' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:490:8: otherlv_3= '{' ( (lv_failures_4_0= ruleFailureDefinition ) ) (otherlv_5= ',' ( (lv_failures_6_0= ruleFailureDefinition ) ) )+ otherlv_7= '}'
-                    {
-                    otherlv_3=(Token)match(input,17,FOLLOW_17_in_ruleInFailureExpr988); 
-
-                        	newLeafNode(otherlv_3, grammarAccess.getInFailureExprAccess().getLeftCurlyBracketKeyword_3_0());
-                        
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:494:1: ( (lv_failures_4_0= ruleFailureDefinition ) )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:495:1: (lv_failures_4_0= ruleFailureDefinition )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:495:1: (lv_failures_4_0= ruleFailureDefinition )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:496:3: lv_failures_4_0= ruleFailureDefinition
-                    {
-                     
-                    	        newCompositeNode(grammarAccess.getInFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_3_1_0()); 
-                    	    
-                    pushFollow(FOLLOW_ruleFailureDefinition_in_ruleInFailureExpr1009);
-                    lv_failures_4_0=ruleFailureDefinition();
-
-                    state._fsp--;
-
-
-                    	        if (current==null) {
-                    	            current = createModelElementForParent(grammarAccess.getInFailureExprRule());
-                    	        }
-                           		add(
-                           			current, 
-                           			"failures",
-                            		lv_failures_4_0, 
-                            		"FailureDefinition");
-                    	        afterParserOrEnumRuleCall();
-                    	    
-
-                    }
-
-
-                    }
-
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:512:2: (otherlv_5= ',' ( (lv_failures_6_0= ruleFailureDefinition ) ) )+
-                    int cnt6=0;
-                    loop6:
-                    do {
-                        int alt6=2;
-                        int LA6_0 = input.LA(1);
-
-                        if ( (LA6_0==14) ) {
-                            alt6=1;
-                        }
-
-
-                        switch (alt6) {
-                    	case 1 :
-                    	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:512:4: otherlv_5= ',' ( (lv_failures_6_0= ruleFailureDefinition ) )
-                    	    {
-                    	    otherlv_5=(Token)match(input,14,FOLLOW_14_in_ruleInFailureExpr1022); 
-
-                    	        	newLeafNode(otherlv_5, grammarAccess.getInFailureExprAccess().getCommaKeyword_3_2_0());
-                    	        
-                    	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:516:1: ( (lv_failures_6_0= ruleFailureDefinition ) )
-                    	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:517:1: (lv_failures_6_0= ruleFailureDefinition )
-                    	    {
-                    	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:517:1: (lv_failures_6_0= ruleFailureDefinition )
-                    	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:518:3: lv_failures_6_0= ruleFailureDefinition
-                    	    {
-                    	     
-                    	    	        newCompositeNode(grammarAccess.getInFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_3_2_1_0()); 
-                    	    	    
-                    	    pushFollow(FOLLOW_ruleFailureDefinition_in_ruleInFailureExpr1043);
-                    	    lv_failures_6_0=ruleFailureDefinition();
-
-                    	    state._fsp--;
-
-
-                    	    	        if (current==null) {
-                    	    	            current = createModelElementForParent(grammarAccess.getInFailureExprRule());
-                    	    	        }
-                    	           		add(
-                    	           			current, 
-                    	           			"failures",
-                    	            		lv_failures_6_0, 
-                    	            		"FailureDefinition");
-                    	    	        afterParserOrEnumRuleCall();
-                    	    	    
-
-                    	    }
-
-
-                    	    }
-
-
-                    	    }
-                    	    break;
-
-                    	default :
-                    	    if ( cnt6 >= 1 ) break loop6;
-                                EarlyExitException eee =
-                                    new EarlyExitException(6, input);
-                                throw eee;
-                        }
-                        cnt6++;
-                    } while (true);
-
-                    otherlv_7=(Token)match(input,18,FOLLOW_18_in_ruleInFailureExpr1057); 
-
-                        	newLeafNode(otherlv_7, grammarAccess.getInFailureExprAccess().getRightCurlyBracketKeyword_3_3());
-                        
-
-                    }
-
-
-                    }
-                    break;
-                case 5 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:539:6: ( (lv_failures_8_0= ruleVariableDefinition ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:539:6: ( (lv_failures_8_0= ruleVariableDefinition ) )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:540:1: (lv_failures_8_0= ruleVariableDefinition )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:540:1: (lv_failures_8_0= ruleVariableDefinition )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:541:3: lv_failures_8_0= ruleVariableDefinition
-                    {
-                     
-                    	        newCompositeNode(grammarAccess.getInFailureExprAccess().getFailuresVariableDefinitionParserRuleCall_4_0()); 
-                    	    
-                    pushFollow(FOLLOW_ruleVariableDefinition_in_ruleInFailureExpr1085);
-                    lv_failures_8_0=ruleVariableDefinition();
-
-                    state._fsp--;
-
-
-                    	        if (current==null) {
-                    	            current = createModelElementForParent(grammarAccess.getInFailureExprRule());
-                    	        }
-                           		add(
-                           			current, 
-                           			"failures",
-                            		lv_failures_8_0, 
-                            		"VariableDefinition");
-                    	        afterParserOrEnumRuleCall();
-                    	    
-
-                    }
-
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-             leaveRule(); 
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "ruleInFailureExpr"
-
-
-    // $ANTLR start "entryRuleOutFailureExpr"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:565:1: entryRuleOutFailureExpr returns [EObject current=null] : iv_ruleOutFailureExpr= ruleOutFailureExpr EOF ;
-    public final EObject entryRuleOutFailureExpr() throws RecognitionException {
-        EObject current = null;
-
-        EObject iv_ruleOutFailureExpr = null;
-
-
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:566:2: (iv_ruleOutFailureExpr= ruleOutFailureExpr EOF )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:567:2: iv_ruleOutFailureExpr= ruleOutFailureExpr EOF
-            {
-             newCompositeNode(grammarAccess.getOutFailureExprRule()); 
-            pushFollow(FOLLOW_ruleOutFailureExpr_in_entryRuleOutFailureExpr1121);
-            iv_ruleOutFailureExpr=ruleOutFailureExpr();
-
-            state._fsp--;
-
-             current =iv_ruleOutFailureExpr; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleOutFailureExpr1131); 
-
-            }
-
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "entryRuleOutFailureExpr"
-
-
-    // $ANTLR start "ruleOutFailureExpr"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:574:1: ruleOutFailureExpr returns [EObject current=null] : ( ( (lv_failures_0_0= ruleNoFailureDefinition ) ) | ( (lv_failures_1_0= ruleComplexNofailureDefinition ) ) | ( (lv_failures_2_0= ruleFailureDefinition ) ) | (otherlv_3= '{' ( (lv_failures_4_0= ruleFailureDefinition ) ) (otherlv_5= ',' ( (lv_failures_6_0= ruleFailureDefinition ) ) )+ otherlv_7= '}' ) | ( (lv_failures_8_0= ruleVariableDefinition ) ) ) ;
-    public final EObject ruleOutFailureExpr() throws RecognitionException {
-        EObject current = null;
-
-        Token otherlv_3=null;
-        Token otherlv_5=null;
-        Token otherlv_7=null;
-        EObject lv_failures_0_0 = null;
-
-        EObject lv_failures_1_0 = null;
-
-        EObject lv_failures_2_0 = null;
-
-        EObject lv_failures_4_0 = null;
-
-        EObject lv_failures_6_0 = null;
-
-        EObject lv_failures_8_0 = null;
-
-
-         enterRule(); 
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:577:28: ( ( ( (lv_failures_0_0= ruleNoFailureDefinition ) ) | ( (lv_failures_1_0= ruleComplexNofailureDefinition ) ) | ( (lv_failures_2_0= ruleFailureDefinition ) ) | (otherlv_3= '{' ( (lv_failures_4_0= ruleFailureDefinition ) ) (otherlv_5= ',' ( (lv_failures_6_0= ruleFailureDefinition ) ) )+ otherlv_7= '}' ) | ( (lv_failures_8_0= ruleVariableDefinition ) ) ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:578:1: ( ( (lv_failures_0_0= ruleNoFailureDefinition ) ) | ( (lv_failures_1_0= ruleComplexNofailureDefinition ) ) | ( (lv_failures_2_0= ruleFailureDefinition ) ) | (otherlv_3= '{' ( (lv_failures_4_0= ruleFailureDefinition ) ) (otherlv_5= ',' ( (lv_failures_6_0= ruleFailureDefinition ) ) )+ otherlv_7= '}' ) | ( (lv_failures_8_0= ruleVariableDefinition ) ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:578:1: ( ( (lv_failures_0_0= ruleNoFailureDefinition ) ) | ( (lv_failures_1_0= ruleComplexNofailureDefinition ) ) | ( (lv_failures_2_0= ruleFailureDefinition ) ) | (otherlv_3= '{' ( (lv_failures_4_0= ruleFailureDefinition ) ) (otherlv_5= ',' ( (lv_failures_6_0= ruleFailureDefinition ) ) )+ otherlv_7= '}' ) | ( (lv_failures_8_0= ruleVariableDefinition ) ) )
-            int alt9=5;
-            switch ( input.LA(1) ) {
-            case 19:
-                {
-                int LA9_1 = input.LA(2);
-
-                if ( (LA9_1==16) ) {
-                    alt9=2;
-                }
-                else if ( (LA9_1==EOF||(LA9_1>=13 && LA9_1<=14)) ) {
-                    alt9=1;
-                }
-                else {
-                    NoViableAltException nvae =
-                        new NoViableAltException("", 9, 1, input);
-
-                    throw nvae;
-                }
-                }
-                break;
-            case 21:
-            case 22:
-            case 23:
-            case 24:
-            case 25:
-            case 26:
-                {
-                alt9=3;
-                }
-                break;
-            case 17:
-                {
-                alt9=4;
-                }
-                break;
-            case RULE_ID:
-                {
-                alt9=5;
-                }
-                break;
-            default:
-                NoViableAltException nvae =
-                    new NoViableAltException("", 9, 0, input);
-
-                throw nvae;
-            }
-
-            switch (alt9) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:578:2: ( (lv_failures_0_0= ruleNoFailureDefinition ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:578:2: ( (lv_failures_0_0= ruleNoFailureDefinition ) )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:579:1: (lv_failures_0_0= ruleNoFailureDefinition )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:579:1: (lv_failures_0_0= ruleNoFailureDefinition )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:580:3: lv_failures_0_0= ruleNoFailureDefinition
-                    {
-                     
-                    	        newCompositeNode(grammarAccess.getOutFailureExprAccess().getFailuresNoFailureDefinitionParserRuleCall_0_0()); 
-                    	    
-                    pushFollow(FOLLOW_ruleNoFailureDefinition_in_ruleOutFailureExpr1177);
-                    lv_failures_0_0=ruleNoFailureDefinition();
-
-                    state._fsp--;
-
-
-                    	        if (current==null) {
-                    	            current = createModelElementForParent(grammarAccess.getOutFailureExprRule());
-                    	        }
-                           		add(
-                           			current, 
-                           			"failures",
-                            		lv_failures_0_0, 
-                            		"NoFailureDefinition");
-                    	        afterParserOrEnumRuleCall();
-                    	    
-
-                    }
-
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:597:6: ( (lv_failures_1_0= ruleComplexNofailureDefinition ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:597:6: ( (lv_failures_1_0= ruleComplexNofailureDefinition ) )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:598:1: (lv_failures_1_0= ruleComplexNofailureDefinition )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:598:1: (lv_failures_1_0= ruleComplexNofailureDefinition )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:599:3: lv_failures_1_0= ruleComplexNofailureDefinition
-                    {
-                     
-                    	        newCompositeNode(grammarAccess.getOutFailureExprAccess().getFailuresComplexNofailureDefinitionParserRuleCall_1_0()); 
-                    	    
-                    pushFollow(FOLLOW_ruleComplexNofailureDefinition_in_ruleOutFailureExpr1204);
-                    lv_failures_1_0=ruleComplexNofailureDefinition();
-
-                    state._fsp--;
-
-
-                    	        if (current==null) {
-                    	            current = createModelElementForParent(grammarAccess.getOutFailureExprRule());
-                    	        }
-                           		add(
-                           			current, 
-                           			"failures",
-                            		lv_failures_1_0, 
-                            		"ComplexNofailureDefinition");
-                    	        afterParserOrEnumRuleCall();
-                    	    
-
-                    }
-
-
-                    }
-
-
-                    }
-                    break;
-                case 3 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:616:6: ( (lv_failures_2_0= ruleFailureDefinition ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:616:6: ( (lv_failures_2_0= ruleFailureDefinition ) )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:617:1: (lv_failures_2_0= ruleFailureDefinition )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:617:1: (lv_failures_2_0= ruleFailureDefinition )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:618:3: lv_failures_2_0= ruleFailureDefinition
-                    {
-                     
-                    	        newCompositeNode(grammarAccess.getOutFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_2_0()); 
-                    	    
-                    pushFollow(FOLLOW_ruleFailureDefinition_in_ruleOutFailureExpr1231);
-                    lv_failures_2_0=ruleFailureDefinition();
-
-                    state._fsp--;
-
-
-                    	        if (current==null) {
-                    	            current = createModelElementForParent(grammarAccess.getOutFailureExprRule());
-                    	        }
-                           		add(
-                           			current, 
-                           			"failures",
-                            		lv_failures_2_0, 
-                            		"FailureDefinition");
-                    	        afterParserOrEnumRuleCall();
-                    	    
-
-                    }
-
-
-                    }
-
-
-                    }
-                    break;
-                case 4 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:635:6: (otherlv_3= '{' ( (lv_failures_4_0= ruleFailureDefinition ) ) (otherlv_5= ',' ( (lv_failures_6_0= ruleFailureDefinition ) ) )+ otherlv_7= '}' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:635:6: (otherlv_3= '{' ( (lv_failures_4_0= ruleFailureDefinition ) ) (otherlv_5= ',' ( (lv_failures_6_0= ruleFailureDefinition ) ) )+ otherlv_7= '}' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:635:8: otherlv_3= '{' ( (lv_failures_4_0= ruleFailureDefinition ) ) (otherlv_5= ',' ( (lv_failures_6_0= ruleFailureDefinition ) ) )+ otherlv_7= '}'
-                    {
-                    otherlv_3=(Token)match(input,17,FOLLOW_17_in_ruleOutFailureExpr1250); 
-
-                        	newLeafNode(otherlv_3, grammarAccess.getOutFailureExprAccess().getLeftCurlyBracketKeyword_3_0());
-                        
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:639:1: ( (lv_failures_4_0= ruleFailureDefinition ) )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:640:1: (lv_failures_4_0= ruleFailureDefinition )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:640:1: (lv_failures_4_0= ruleFailureDefinition )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:641:3: lv_failures_4_0= ruleFailureDefinition
-                    {
-                     
-                    	        newCompositeNode(grammarAccess.getOutFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_3_1_0()); 
-                    	    
-                    pushFollow(FOLLOW_ruleFailureDefinition_in_ruleOutFailureExpr1271);
-                    lv_failures_4_0=ruleFailureDefinition();
-
-                    state._fsp--;
-
-
-                    	        if (current==null) {
-                    	            current = createModelElementForParent(grammarAccess.getOutFailureExprRule());
-                    	        }
-                           		add(
-                           			current, 
-                           			"failures",
-                            		lv_failures_4_0, 
-                            		"FailureDefinition");
-                    	        afterParserOrEnumRuleCall();
-                    	    
-
-                    }
-
-
-                    }
-
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:657:2: (otherlv_5= ',' ( (lv_failures_6_0= ruleFailureDefinition ) ) )+
-                    int cnt8=0;
-                    loop8:
-                    do {
-                        int alt8=2;
-                        int LA8_0 = input.LA(1);
-
-                        if ( (LA8_0==14) ) {
-                            alt8=1;
-                        }
-
-
-                        switch (alt8) {
-                    	case 1 :
-                    	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:657:4: otherlv_5= ',' ( (lv_failures_6_0= ruleFailureDefinition ) )
-                    	    {
-                    	    otherlv_5=(Token)match(input,14,FOLLOW_14_in_ruleOutFailureExpr1284); 
-
-                    	        	newLeafNode(otherlv_5, grammarAccess.getOutFailureExprAccess().getCommaKeyword_3_2_0());
-                    	        
-                    	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:661:1: ( (lv_failures_6_0= ruleFailureDefinition ) )
-                    	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:662:1: (lv_failures_6_0= ruleFailureDefinition )
-                    	    {
-                    	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:662:1: (lv_failures_6_0= ruleFailureDefinition )
-                    	    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:663:3: lv_failures_6_0= ruleFailureDefinition
-                    	    {
-                    	     
-                    	    	        newCompositeNode(grammarAccess.getOutFailureExprAccess().getFailuresFailureDefinitionParserRuleCall_3_2_1_0()); 
-                    	    	    
-                    	    pushFollow(FOLLOW_ruleFailureDefinition_in_ruleOutFailureExpr1305);
-                    	    lv_failures_6_0=ruleFailureDefinition();
-
-                    	    state._fsp--;
-
-
-                    	    	        if (current==null) {
-                    	    	            current = createModelElementForParent(grammarAccess.getOutFailureExprRule());
-                    	    	        }
-                    	           		add(
-                    	           			current, 
-                    	           			"failures",
-                    	            		lv_failures_6_0, 
-                    	            		"FailureDefinition");
-                    	    	        afterParserOrEnumRuleCall();
-                    	    	    
-
-                    	    }
-
-
-                    	    }
-
-
-                    	    }
-                    	    break;
-
-                    	default :
-                    	    if ( cnt8 >= 1 ) break loop8;
-                                EarlyExitException eee =
-                                    new EarlyExitException(8, input);
-                                throw eee;
-                        }
-                        cnt8++;
-                    } while (true);
-
-                    otherlv_7=(Token)match(input,18,FOLLOW_18_in_ruleOutFailureExpr1319); 
-
-                        	newLeafNode(otherlv_7, grammarAccess.getOutFailureExprAccess().getRightCurlyBracketKeyword_3_3());
-                        
-
-                    }
-
-
-                    }
-                    break;
-                case 5 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:684:6: ( (lv_failures_8_0= ruleVariableDefinition ) )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:684:6: ( (lv_failures_8_0= ruleVariableDefinition ) )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:685:1: (lv_failures_8_0= ruleVariableDefinition )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:685:1: (lv_failures_8_0= ruleVariableDefinition )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:686:3: lv_failures_8_0= ruleVariableDefinition
-                    {
-                     
-                    	        newCompositeNode(grammarAccess.getOutFailureExprAccess().getFailuresVariableDefinitionParserRuleCall_4_0()); 
-                    	    
-                    pushFollow(FOLLOW_ruleVariableDefinition_in_ruleOutFailureExpr1347);
-                    lv_failures_8_0=ruleVariableDefinition();
-
-                    state._fsp--;
-
-
-                    	        if (current==null) {
-                    	            current = createModelElementForParent(grammarAccess.getOutFailureExprRule());
-                    	        }
-                           		add(
-                           			current, 
-                           			"failures",
-                            		lv_failures_8_0, 
-                            		"VariableDefinition");
-                    	        afterParserOrEnumRuleCall();
-                    	    
-
-                    }
-
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-             leaveRule(); 
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "ruleOutFailureExpr"
-
-
-    // $ANTLR start "entryRuleFailureDefinition"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:712:1: entryRuleFailureDefinition returns [EObject current=null] : iv_ruleFailureDefinition= ruleFailureDefinition EOF ;
-    public final EObject entryRuleFailureDefinition() throws RecognitionException {
-        EObject current = null;
-
-        EObject iv_ruleFailureDefinition = null;
-
-
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:713:2: (iv_ruleFailureDefinition= ruleFailureDefinition EOF )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:714:2: iv_ruleFailureDefinition= ruleFailureDefinition EOF
-            {
-             newCompositeNode(grammarAccess.getFailureDefinitionRule()); 
-            pushFollow(FOLLOW_ruleFailureDefinition_in_entryRuleFailureDefinition1385);
-            iv_ruleFailureDefinition=ruleFailureDefinition();
-
-            state._fsp--;
-
-             current =iv_ruleFailureDefinition; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleFailureDefinition1395); 
-
-            }
-
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "entryRuleFailureDefinition"
-
-
-    // $ANTLR start "ruleFailureDefinition"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:721:1: ruleFailureDefinition returns [EObject current=null] : ( () ( (lv_type_1_0= ruleActualFailureType ) ) (otherlv_2= '.' ( (lv_acidAvoidable_3_0= ruleACIDavoidable ) ) )? ) ;
-    public final EObject ruleFailureDefinition() throws RecognitionException {
-        EObject current = null;
-
-        Token otherlv_2=null;
-        Enumerator lv_type_1_0 = null;
-
-        EObject lv_acidAvoidable_3_0 = null;
-
-
-         enterRule(); 
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:724:28: ( ( () ( (lv_type_1_0= ruleActualFailureType ) ) (otherlv_2= '.' ( (lv_acidAvoidable_3_0= ruleACIDavoidable ) ) )? ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:725:1: ( () ( (lv_type_1_0= ruleActualFailureType ) ) (otherlv_2= '.' ( (lv_acidAvoidable_3_0= ruleACIDavoidable ) ) )? )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:725:1: ( () ( (lv_type_1_0= ruleActualFailureType ) ) (otherlv_2= '.' ( (lv_acidAvoidable_3_0= ruleACIDavoidable ) ) )? )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:725:2: () ( (lv_type_1_0= ruleActualFailureType ) ) (otherlv_2= '.' ( (lv_acidAvoidable_3_0= ruleACIDavoidable ) ) )?
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:725:2: ()
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:726:5: 
-            {
-
-                    current = forceCreateModelElement(
-                        grammarAccess.getFailureDefinitionAccess().getFailureDefinitionAction_0(),
-                        current);
-                
-
-            }
-
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:731:2: ( (lv_type_1_0= ruleActualFailureType ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:732:1: (lv_type_1_0= ruleActualFailureType )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:732:1: (lv_type_1_0= ruleActualFailureType )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:733:3: lv_type_1_0= ruleActualFailureType
-            {
-             
-            	        newCompositeNode(grammarAccess.getFailureDefinitionAccess().getTypeActualFailureTypeEnumRuleCall_1_0()); 
-            	    
-            pushFollow(FOLLOW_ruleActualFailureType_in_ruleFailureDefinition1450);
-            lv_type_1_0=ruleActualFailureType();
-
-            state._fsp--;
-
-
-            	        if (current==null) {
-            	            current = createModelElementForParent(grammarAccess.getFailureDefinitionRule());
-            	        }
-                   		set(
-                   			current, 
-                   			"type",
-                    		lv_type_1_0, 
-                    		"ActualFailureType");
-            	        afterParserOrEnumRuleCall();
-            	    
-
-            }
-
-
-            }
-
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:749:2: (otherlv_2= '.' ( (lv_acidAvoidable_3_0= ruleACIDavoidable ) ) )?
-            int alt10=2;
-            int LA10_0 = input.LA(1);
-
-            if ( (LA10_0==16) ) {
-                alt10=1;
-            }
-            switch (alt10) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:749:4: otherlv_2= '.' ( (lv_acidAvoidable_3_0= ruleACIDavoidable ) )
-                    {
-                    otherlv_2=(Token)match(input,16,FOLLOW_16_in_ruleFailureDefinition1463); 
-
-                        	newLeafNode(otherlv_2, grammarAccess.getFailureDefinitionAccess().getFullStopKeyword_2_0());
-                        
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:753:1: ( (lv_acidAvoidable_3_0= ruleACIDavoidable ) )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:754:1: (lv_acidAvoidable_3_0= ruleACIDavoidable )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:754:1: (lv_acidAvoidable_3_0= ruleACIDavoidable )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:755:3: lv_acidAvoidable_3_0= ruleACIDavoidable
-                    {
-                     
-                    	        newCompositeNode(grammarAccess.getFailureDefinitionAccess().getAcidAvoidableACIDavoidableParserRuleCall_2_1_0()); 
-                    	    
-                    pushFollow(FOLLOW_ruleACIDavoidable_in_ruleFailureDefinition1484);
-                    lv_acidAvoidable_3_0=ruleACIDavoidable();
-
-                    state._fsp--;
-
-
-                    	        if (current==null) {
-                    	            current = createModelElementForParent(grammarAccess.getFailureDefinitionRule());
-                    	        }
-                           		set(
-                           			current, 
-                           			"acidAvoidable",
-                            		lv_acidAvoidable_3_0, 
-                            		"ACIDavoidable");
-                    	        afterParserOrEnumRuleCall();
-                    	    
-
-                    }
-
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-
-            }
-
-             leaveRule(); 
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "ruleFailureDefinition"
-
-
-    // $ANTLR start "entryRuleNoFailureDefinition"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:779:1: entryRuleNoFailureDefinition returns [EObject current=null] : iv_ruleNoFailureDefinition= ruleNoFailureDefinition EOF ;
-    public final EObject entryRuleNoFailureDefinition() throws RecognitionException {
-        EObject current = null;
-
-        EObject iv_ruleNoFailureDefinition = null;
-
-
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:780:2: (iv_ruleNoFailureDefinition= ruleNoFailureDefinition EOF )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:781:2: iv_ruleNoFailureDefinition= ruleNoFailureDefinition EOF
-            {
-             newCompositeNode(grammarAccess.getNoFailureDefinitionRule()); 
-            pushFollow(FOLLOW_ruleNoFailureDefinition_in_entryRuleNoFailureDefinition1522);
-            iv_ruleNoFailureDefinition=ruleNoFailureDefinition();
-
-            state._fsp--;
-
-             current =iv_ruleNoFailureDefinition; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleNoFailureDefinition1532); 
-
-            }
-
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "entryRuleNoFailureDefinition"
-
-
-    // $ANTLR start "ruleNoFailureDefinition"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:788:1: ruleNoFailureDefinition returns [EObject current=null] : ( () otherlv_1= 'noFailure' ) ;
-    public final EObject ruleNoFailureDefinition() throws RecognitionException {
-        EObject current = null;
-
-        Token otherlv_1=null;
-
-         enterRule(); 
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:791:28: ( ( () otherlv_1= 'noFailure' ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:792:1: ( () otherlv_1= 'noFailure' )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:792:1: ( () otherlv_1= 'noFailure' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:792:2: () otherlv_1= 'noFailure'
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:792:2: ()
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:793:5: 
-            {
-
-                    current = forceCreateModelElement(
-                        grammarAccess.getNoFailureDefinitionAccess().getNoFailureDefinitionAction_0(),
-                        current);
-                
-
-            }
-
-            otherlv_1=(Token)match(input,19,FOLLOW_19_in_ruleNoFailureDefinition1578); 
-
-                	newLeafNode(otherlv_1, grammarAccess.getNoFailureDefinitionAccess().getNoFailureKeyword_1());
-                
-
-            }
-
-
-            }
-
-             leaveRule(); 
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "ruleNoFailureDefinition"
-
-
-    // $ANTLR start "entryRuleComplexNofailureDefinition"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:810:1: entryRuleComplexNofailureDefinition returns [EObject current=null] : iv_ruleComplexNofailureDefinition= ruleComplexNofailureDefinition EOF ;
-    public final EObject entryRuleComplexNofailureDefinition() throws RecognitionException {
-        EObject current = null;
-
-        EObject iv_ruleComplexNofailureDefinition = null;
-
-
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:811:2: (iv_ruleComplexNofailureDefinition= ruleComplexNofailureDefinition EOF )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:812:2: iv_ruleComplexNofailureDefinition= ruleComplexNofailureDefinition EOF
-            {
-             newCompositeNode(grammarAccess.getComplexNofailureDefinitionRule()); 
-            pushFollow(FOLLOW_ruleComplexNofailureDefinition_in_entryRuleComplexNofailureDefinition1614);
-            iv_ruleComplexNofailureDefinition=ruleComplexNofailureDefinition();
-
-            state._fsp--;
-
-             current =iv_ruleComplexNofailureDefinition; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleComplexNofailureDefinition1624); 
-
-            }
-
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "entryRuleComplexNofailureDefinition"
-
-
-    // $ANTLR start "ruleComplexNofailureDefinition"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:819:1: ruleComplexNofailureDefinition returns [EObject current=null] : ( () otherlv_1= 'noFailure' otherlv_2= '.' ( (lv_acidMitigation_3_0= ruleACIDMitigation ) ) ) ;
-    public final EObject ruleComplexNofailureDefinition() throws RecognitionException {
-        EObject current = null;
-
-        Token otherlv_1=null;
-        Token otherlv_2=null;
-        EObject lv_acidMitigation_3_0 = null;
-
-
-         enterRule(); 
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:822:28: ( ( () otherlv_1= 'noFailure' otherlv_2= '.' ( (lv_acidMitigation_3_0= ruleACIDMitigation ) ) ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:823:1: ( () otherlv_1= 'noFailure' otherlv_2= '.' ( (lv_acidMitigation_3_0= ruleACIDMitigation ) ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:823:1: ( () otherlv_1= 'noFailure' otherlv_2= '.' ( (lv_acidMitigation_3_0= ruleACIDMitigation ) ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:823:2: () otherlv_1= 'noFailure' otherlv_2= '.' ( (lv_acidMitigation_3_0= ruleACIDMitigation ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:823:2: ()
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:824:5: 
-            {
-
-                    current = forceCreateModelElement(
-                        grammarAccess.getComplexNofailureDefinitionAccess().getNoFailureDefinitionAction_0(),
-                        current);
-                
-
-            }
-
-            otherlv_1=(Token)match(input,19,FOLLOW_19_in_ruleComplexNofailureDefinition1670); 
-
-                	newLeafNode(otherlv_1, grammarAccess.getComplexNofailureDefinitionAccess().getNoFailureKeyword_1());
-                
-            otherlv_2=(Token)match(input,16,FOLLOW_16_in_ruleComplexNofailureDefinition1682); 
-
-                	newLeafNode(otherlv_2, grammarAccess.getComplexNofailureDefinitionAccess().getFullStopKeyword_2());
-                
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:837:1: ( (lv_acidMitigation_3_0= ruleACIDMitigation ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:838:1: (lv_acidMitigation_3_0= ruleACIDMitigation )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:838:1: (lv_acidMitigation_3_0= ruleACIDMitigation )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:839:3: lv_acidMitigation_3_0= ruleACIDMitigation
-            {
-             
-            	        newCompositeNode(grammarAccess.getComplexNofailureDefinitionAccess().getAcidMitigationACIDMitigationParserRuleCall_3_0()); 
-            	    
-            pushFollow(FOLLOW_ruleACIDMitigation_in_ruleComplexNofailureDefinition1703);
-            lv_acidMitigation_3_0=ruleACIDMitigation();
-
-            state._fsp--;
-
-
-            	        if (current==null) {
-            	            current = createModelElementForParent(grammarAccess.getComplexNofailureDefinitionRule());
-            	        }
-                   		set(
-                   			current, 
-                   			"acidMitigation",
-                    		lv_acidMitigation_3_0, 
-                    		"ACIDMitigation");
-            	        afterParserOrEnumRuleCall();
-            	    
-
-            }
-
-
-            }
-
-
-            }
-
-
-            }
-
-             leaveRule(); 
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "ruleComplexNofailureDefinition"
-
-
-    // $ANTLR start "entryRuleWildcardDefinition"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:863:1: entryRuleWildcardDefinition returns [EObject current=null] : iv_ruleWildcardDefinition= ruleWildcardDefinition EOF ;
-    public final EObject entryRuleWildcardDefinition() throws RecognitionException {
-        EObject current = null;
-
-        EObject iv_ruleWildcardDefinition = null;
-
-
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:864:2: (iv_ruleWildcardDefinition= ruleWildcardDefinition EOF )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:865:2: iv_ruleWildcardDefinition= ruleWildcardDefinition EOF
-            {
-             newCompositeNode(grammarAccess.getWildcardDefinitionRule()); 
-            pushFollow(FOLLOW_ruleWildcardDefinition_in_entryRuleWildcardDefinition1739);
-            iv_ruleWildcardDefinition=ruleWildcardDefinition();
-
-            state._fsp--;
-
-             current =iv_ruleWildcardDefinition; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleWildcardDefinition1749); 
-
-            }
-
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "entryRuleWildcardDefinition"
-
-
-    // $ANTLR start "ruleWildcardDefinition"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:872:1: ruleWildcardDefinition returns [EObject current=null] : ( () otherlv_1= 'wildcard' ) ;
-    public final EObject ruleWildcardDefinition() throws RecognitionException {
-        EObject current = null;
-
-        Token otherlv_1=null;
-
-         enterRule(); 
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:875:28: ( ( () otherlv_1= 'wildcard' ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:876:1: ( () otherlv_1= 'wildcard' )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:876:1: ( () otherlv_1= 'wildcard' )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:876:2: () otherlv_1= 'wildcard'
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:876:2: ()
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:877:5: 
-            {
-
-                    current = forceCreateModelElement(
-                        grammarAccess.getWildcardDefinitionAccess().getWildcardDefinitionAction_0(),
-                        current);
-                
-
-            }
-
-            otherlv_1=(Token)match(input,20,FOLLOW_20_in_ruleWildcardDefinition1795); 
-
-                	newLeafNode(otherlv_1, grammarAccess.getWildcardDefinitionAccess().getWildcardKeyword_1());
-                
-
-            }
-
-
-            }
-
-             leaveRule(); 
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "ruleWildcardDefinition"
-
-
-    // $ANTLR start "entryRuleVariableDefinition"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:894:1: entryRuleVariableDefinition returns [EObject current=null] : iv_ruleVariableDefinition= ruleVariableDefinition EOF ;
-    public final EObject entryRuleVariableDefinition() throws RecognitionException {
-        EObject current = null;
-
-        EObject iv_ruleVariableDefinition = null;
-
-
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:895:2: (iv_ruleVariableDefinition= ruleVariableDefinition EOF )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:896:2: iv_ruleVariableDefinition= ruleVariableDefinition EOF
-            {
-             newCompositeNode(grammarAccess.getVariableDefinitionRule()); 
-            pushFollow(FOLLOW_ruleVariableDefinition_in_entryRuleVariableDefinition1831);
-            iv_ruleVariableDefinition=ruleVariableDefinition();
-
-            state._fsp--;
-
-             current =iv_ruleVariableDefinition; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleVariableDefinition1841); 
-
-            }
-
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "entryRuleVariableDefinition"
-
-
-    // $ANTLR start "ruleVariableDefinition"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:903:1: ruleVariableDefinition returns [EObject current=null] : ( () ( (lv_variableName_1_0= RULE_ID ) ) ) ;
-    public final EObject ruleVariableDefinition() throws RecognitionException {
-        EObject current = null;
-
-        Token lv_variableName_1_0=null;
-
-         enterRule(); 
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:906:28: ( ( () ( (lv_variableName_1_0= RULE_ID ) ) ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:907:1: ( () ( (lv_variableName_1_0= RULE_ID ) ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:907:1: ( () ( (lv_variableName_1_0= RULE_ID ) ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:907:2: () ( (lv_variableName_1_0= RULE_ID ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:907:2: ()
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:908:5: 
-            {
-
-                    current = forceCreateModelElement(
-                        grammarAccess.getVariableDefinitionAccess().getVariableDefinitionAction_0(),
-                        current);
-                
-
-            }
-
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:913:2: ( (lv_variableName_1_0= RULE_ID ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:914:1: (lv_variableName_1_0= RULE_ID )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:914:1: (lv_variableName_1_0= RULE_ID )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:915:3: lv_variableName_1_0= RULE_ID
-            {
-            lv_variableName_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleVariableDefinition1892); 
-
-            			newLeafNode(lv_variableName_1_0, grammarAccess.getVariableDefinitionAccess().getVariableNameIDTerminalRuleCall_1_0()); 
-            		
-
-            	        if (current==null) {
-            	            current = createModelElement(grammarAccess.getVariableDefinitionRule());
-            	        }
-                   		setWithLastConsumed(
-                   			current, 
-                   			"variableName",
-                    		lv_variableName_1_0, 
-                    		"ID");
-            	    
-
-            }
-
-
-            }
-
-
-            }
-
-
-            }
-
-             leaveRule(); 
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "ruleVariableDefinition"
-
-
-    // $ANTLR start "entryRuleACIDavoidable"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:939:1: entryRuleACIDavoidable returns [EObject current=null] : iv_ruleACIDavoidable= ruleACIDavoidable EOF ;
-    public final EObject entryRuleACIDavoidable() throws RecognitionException {
-        EObject current = null;
-
-        EObject iv_ruleACIDavoidable = null;
-
-
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:940:2: (iv_ruleACIDavoidable= ruleACIDavoidable EOF )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:941:2: iv_ruleACIDavoidable= ruleACIDavoidable EOF
-            {
-             newCompositeNode(grammarAccess.getACIDavoidableRule()); 
-            pushFollow(FOLLOW_ruleACIDavoidable_in_entryRuleACIDavoidable1933);
-            iv_ruleACIDavoidable=ruleACIDavoidable();
-
-            state._fsp--;
-
-             current =iv_ruleACIDavoidable; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleACIDavoidable1943); 
-
-            }
-
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "entryRuleACIDavoidable"
-
-
-    // $ANTLR start "ruleACIDavoidable"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:948:1: ruleACIDavoidable returns [EObject current=null] : ( ( (lv_a_0_0= ruleAavoidable ) ) otherlv_1= '.' ( (lv_c_2_0= ruleCavoidable ) ) otherlv_3= '.' ( (lv_i_4_0= ruleIavoidable ) ) otherlv_5= '.' ( (lv_d_6_0= ruleDavoidable ) ) ) ;
-    public final EObject ruleACIDavoidable() throws RecognitionException {
-        EObject current = null;
-
-        Token otherlv_1=null;
-        Token otherlv_3=null;
-        Token otherlv_5=null;
-        Enumerator lv_a_0_0 = null;
-
-        Enumerator lv_c_2_0 = null;
-
-        Enumerator lv_i_4_0 = null;
-
-        Enumerator lv_d_6_0 = null;
-
-
-         enterRule(); 
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:951:28: ( ( ( (lv_a_0_0= ruleAavoidable ) ) otherlv_1= '.' ( (lv_c_2_0= ruleCavoidable ) ) otherlv_3= '.' ( (lv_i_4_0= ruleIavoidable ) ) otherlv_5= '.' ( (lv_d_6_0= ruleDavoidable ) ) ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:952:1: ( ( (lv_a_0_0= ruleAavoidable ) ) otherlv_1= '.' ( (lv_c_2_0= ruleCavoidable ) ) otherlv_3= '.' ( (lv_i_4_0= ruleIavoidable ) ) otherlv_5= '.' ( (lv_d_6_0= ruleDavoidable ) ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:952:1: ( ( (lv_a_0_0= ruleAavoidable ) ) otherlv_1= '.' ( (lv_c_2_0= ruleCavoidable ) ) otherlv_3= '.' ( (lv_i_4_0= ruleIavoidable ) ) otherlv_5= '.' ( (lv_d_6_0= ruleDavoidable ) ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:952:2: ( (lv_a_0_0= ruleAavoidable ) ) otherlv_1= '.' ( (lv_c_2_0= ruleCavoidable ) ) otherlv_3= '.' ( (lv_i_4_0= ruleIavoidable ) ) otherlv_5= '.' ( (lv_d_6_0= ruleDavoidable ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:952:2: ( (lv_a_0_0= ruleAavoidable ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:953:1: (lv_a_0_0= ruleAavoidable )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:953:1: (lv_a_0_0= ruleAavoidable )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:954:3: lv_a_0_0= ruleAavoidable
-            {
-             
-            	        newCompositeNode(grammarAccess.getACIDavoidableAccess().getAAavoidableEnumRuleCall_0_0()); 
-            	    
-            pushFollow(FOLLOW_ruleAavoidable_in_ruleACIDavoidable1989);
-            lv_a_0_0=ruleAavoidable();
-
-            state._fsp--;
-
-
-            	        if (current==null) {
-            	            current = createModelElementForParent(grammarAccess.getACIDavoidableRule());
-            	        }
-                   		set(
-                   			current, 
-                   			"a",
-                    		lv_a_0_0, 
-                    		"Aavoidable");
-            	        afterParserOrEnumRuleCall();
-            	    
-
-            }
-
-
-            }
-
-            otherlv_1=(Token)match(input,16,FOLLOW_16_in_ruleACIDavoidable2001); 
-
-                	newLeafNode(otherlv_1, grammarAccess.getACIDavoidableAccess().getFullStopKeyword_1());
-                
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:974:1: ( (lv_c_2_0= ruleCavoidable ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:975:1: (lv_c_2_0= ruleCavoidable )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:975:1: (lv_c_2_0= ruleCavoidable )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:976:3: lv_c_2_0= ruleCavoidable
-            {
-             
-            	        newCompositeNode(grammarAccess.getACIDavoidableAccess().getCCavoidableEnumRuleCall_2_0()); 
-            	    
-            pushFollow(FOLLOW_ruleCavoidable_in_ruleACIDavoidable2022);
-            lv_c_2_0=ruleCavoidable();
-
-            state._fsp--;
-
-
-            	        if (current==null) {
-            	            current = createModelElementForParent(grammarAccess.getACIDavoidableRule());
-            	        }
-                   		set(
-                   			current, 
-                   			"c",
-                    		lv_c_2_0, 
-                    		"Cavoidable");
-            	        afterParserOrEnumRuleCall();
-            	    
-
-            }
-
-
-            }
-
-            otherlv_3=(Token)match(input,16,FOLLOW_16_in_ruleACIDavoidable2034); 
-
-                	newLeafNode(otherlv_3, grammarAccess.getACIDavoidableAccess().getFullStopKeyword_3());
-                
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:996:1: ( (lv_i_4_0= ruleIavoidable ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:997:1: (lv_i_4_0= ruleIavoidable )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:997:1: (lv_i_4_0= ruleIavoidable )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:998:3: lv_i_4_0= ruleIavoidable
-            {
-             
-            	        newCompositeNode(grammarAccess.getACIDavoidableAccess().getIIavoidableEnumRuleCall_4_0()); 
-            	    
-            pushFollow(FOLLOW_ruleIavoidable_in_ruleACIDavoidable2055);
-            lv_i_4_0=ruleIavoidable();
-
-            state._fsp--;
-
-
-            	        if (current==null) {
-            	            current = createModelElementForParent(grammarAccess.getACIDavoidableRule());
-            	        }
-                   		set(
-                   			current, 
-                   			"i",
-                    		lv_i_4_0, 
-                    		"Iavoidable");
-            	        afterParserOrEnumRuleCall();
-            	    
-
-            }
-
-
-            }
-
-            otherlv_5=(Token)match(input,16,FOLLOW_16_in_ruleACIDavoidable2067); 
-
-                	newLeafNode(otherlv_5, grammarAccess.getACIDavoidableAccess().getFullStopKeyword_5());
-                
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1018:1: ( (lv_d_6_0= ruleDavoidable ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1019:1: (lv_d_6_0= ruleDavoidable )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1019:1: (lv_d_6_0= ruleDavoidable )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1020:3: lv_d_6_0= ruleDavoidable
-            {
-             
-            	        newCompositeNode(grammarAccess.getACIDavoidableAccess().getDDavoidableEnumRuleCall_6_0()); 
-            	    
-            pushFollow(FOLLOW_ruleDavoidable_in_ruleACIDavoidable2088);
-            lv_d_6_0=ruleDavoidable();
-
-            state._fsp--;
-
-
-            	        if (current==null) {
-            	            current = createModelElementForParent(grammarAccess.getACIDavoidableRule());
-            	        }
-                   		set(
-                   			current, 
-                   			"d",
-                    		lv_d_6_0, 
-                    		"Davoidable");
-            	        afterParserOrEnumRuleCall();
-            	    
-
-            }
-
-
-            }
-
-
-            }
-
-
-            }
-
-             leaveRule(); 
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "ruleACIDavoidable"
-
-
-    // $ANTLR start "entryRuleACIDMitigation"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1044:1: entryRuleACIDMitigation returns [EObject current=null] : iv_ruleACIDMitigation= ruleACIDMitigation EOF ;
-    public final EObject entryRuleACIDMitigation() throws RecognitionException {
-        EObject current = null;
-
-        EObject iv_ruleACIDMitigation = null;
-
-
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1045:2: (iv_ruleACIDMitigation= ruleACIDMitigation EOF )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1046:2: iv_ruleACIDMitigation= ruleACIDMitigation EOF
-            {
-             newCompositeNode(grammarAccess.getACIDMitigationRule()); 
-            pushFollow(FOLLOW_ruleACIDMitigation_in_entryRuleACIDMitigation2124);
-            iv_ruleACIDMitigation=ruleACIDMitigation();
-
-            state._fsp--;
-
-             current =iv_ruleACIDMitigation; 
-            match(input,EOF,FOLLOW_EOF_in_entryRuleACIDMitigation2134); 
-
-            }
-
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "entryRuleACIDMitigation"
-
-
-    // $ANTLR start "ruleACIDMitigation"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1053:1: ruleACIDMitigation returns [EObject current=null] : ( ( (lv_a_0_0= ruleAmitigation ) ) otherlv_1= '.' ( (lv_c_2_0= ruleCmitigation ) ) otherlv_3= '.' ( (lv_i_4_0= ruleImitigation ) ) otherlv_5= '.' ( (lv_d_6_0= ruleDmitigation ) ) ) ;
-    public final EObject ruleACIDMitigation() throws RecognitionException {
-        EObject current = null;
-
-        Token otherlv_1=null;
-        Token otherlv_3=null;
-        Token otherlv_5=null;
-        Enumerator lv_a_0_0 = null;
-
-        Enumerator lv_c_2_0 = null;
-
-        Enumerator lv_i_4_0 = null;
-
-        Enumerator lv_d_6_0 = null;
-
-
-         enterRule(); 
-            
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1056:28: ( ( ( (lv_a_0_0= ruleAmitigation ) ) otherlv_1= '.' ( (lv_c_2_0= ruleCmitigation ) ) otherlv_3= '.' ( (lv_i_4_0= ruleImitigation ) ) otherlv_5= '.' ( (lv_d_6_0= ruleDmitigation ) ) ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1057:1: ( ( (lv_a_0_0= ruleAmitigation ) ) otherlv_1= '.' ( (lv_c_2_0= ruleCmitigation ) ) otherlv_3= '.' ( (lv_i_4_0= ruleImitigation ) ) otherlv_5= '.' ( (lv_d_6_0= ruleDmitigation ) ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1057:1: ( ( (lv_a_0_0= ruleAmitigation ) ) otherlv_1= '.' ( (lv_c_2_0= ruleCmitigation ) ) otherlv_3= '.' ( (lv_i_4_0= ruleImitigation ) ) otherlv_5= '.' ( (lv_d_6_0= ruleDmitigation ) ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1057:2: ( (lv_a_0_0= ruleAmitigation ) ) otherlv_1= '.' ( (lv_c_2_0= ruleCmitigation ) ) otherlv_3= '.' ( (lv_i_4_0= ruleImitigation ) ) otherlv_5= '.' ( (lv_d_6_0= ruleDmitigation ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1057:2: ( (lv_a_0_0= ruleAmitigation ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1058:1: (lv_a_0_0= ruleAmitigation )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1058:1: (lv_a_0_0= ruleAmitigation )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1059:3: lv_a_0_0= ruleAmitigation
-            {
-             
-            	        newCompositeNode(grammarAccess.getACIDMitigationAccess().getAAmitigationEnumRuleCall_0_0()); 
-            	    
-            pushFollow(FOLLOW_ruleAmitigation_in_ruleACIDMitigation2180);
-            lv_a_0_0=ruleAmitigation();
-
-            state._fsp--;
-
-
-            	        if (current==null) {
-            	            current = createModelElementForParent(grammarAccess.getACIDMitigationRule());
-            	        }
-                   		set(
-                   			current, 
-                   			"a",
-                    		lv_a_0_0, 
-                    		"Amitigation");
-            	        afterParserOrEnumRuleCall();
-            	    
-
-            }
-
-
-            }
-
-            otherlv_1=(Token)match(input,16,FOLLOW_16_in_ruleACIDMitigation2192); 
-
-                	newLeafNode(otherlv_1, grammarAccess.getACIDMitigationAccess().getFullStopKeyword_1());
-                
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1079:1: ( (lv_c_2_0= ruleCmitigation ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1080:1: (lv_c_2_0= ruleCmitigation )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1080:1: (lv_c_2_0= ruleCmitigation )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1081:3: lv_c_2_0= ruleCmitigation
-            {
-             
-            	        newCompositeNode(grammarAccess.getACIDMitigationAccess().getCCmitigationEnumRuleCall_2_0()); 
-            	    
-            pushFollow(FOLLOW_ruleCmitigation_in_ruleACIDMitigation2213);
-            lv_c_2_0=ruleCmitigation();
-
-            state._fsp--;
-
-
-            	        if (current==null) {
-            	            current = createModelElementForParent(grammarAccess.getACIDMitigationRule());
-            	        }
-                   		set(
-                   			current, 
-                   			"c",
-                    		lv_c_2_0, 
-                    		"Cmitigation");
-            	        afterParserOrEnumRuleCall();
-            	    
-
-            }
-
-
-            }
-
-            otherlv_3=(Token)match(input,16,FOLLOW_16_in_ruleACIDMitigation2225); 
-
-                	newLeafNode(otherlv_3, grammarAccess.getACIDMitigationAccess().getFullStopKeyword_3());
-                
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1101:1: ( (lv_i_4_0= ruleImitigation ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1102:1: (lv_i_4_0= ruleImitigation )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1102:1: (lv_i_4_0= ruleImitigation )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1103:3: lv_i_4_0= ruleImitigation
-            {
-             
-            	        newCompositeNode(grammarAccess.getACIDMitigationAccess().getIImitigationEnumRuleCall_4_0()); 
-            	    
-            pushFollow(FOLLOW_ruleImitigation_in_ruleACIDMitigation2246);
-            lv_i_4_0=ruleImitigation();
-
-            state._fsp--;
-
-
-            	        if (current==null) {
-            	            current = createModelElementForParent(grammarAccess.getACIDMitigationRule());
-            	        }
-                   		set(
-                   			current, 
-                   			"i",
-                    		lv_i_4_0, 
-                    		"Imitigation");
-            	        afterParserOrEnumRuleCall();
-            	    
-
-            }
-
-
-            }
-
-            otherlv_5=(Token)match(input,16,FOLLOW_16_in_ruleACIDMitigation2258); 
-
-                	newLeafNode(otherlv_5, grammarAccess.getACIDMitigationAccess().getFullStopKeyword_5());
-                
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1123:1: ( (lv_d_6_0= ruleDmitigation ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1124:1: (lv_d_6_0= ruleDmitigation )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1124:1: (lv_d_6_0= ruleDmitigation )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1125:3: lv_d_6_0= ruleDmitigation
-            {
-             
-            	        newCompositeNode(grammarAccess.getACIDMitigationAccess().getDDmitigationEnumRuleCall_6_0()); 
-            	    
-            pushFollow(FOLLOW_ruleDmitigation_in_ruleACIDMitigation2279);
-            lv_d_6_0=ruleDmitigation();
-
-            state._fsp--;
-
-
-            	        if (current==null) {
-            	            current = createModelElementForParent(grammarAccess.getACIDMitigationRule());
-            	        }
-                   		set(
-                   			current, 
-                   			"d",
-                    		lv_d_6_0, 
-                    		"Dmitigation");
-            	        afterParserOrEnumRuleCall();
-            	    
-
-            }
-
-
-            }
-
-
-            }
-
-
-            }
-
-             leaveRule(); 
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "ruleACIDMitigation"
-
-
-    // $ANTLR start "ruleActualFailureType"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1153:1: ruleActualFailureType returns [Enumerator current=null] : ( (enumLiteral_0= 'early' ) | (enumLiteral_1= 'late' ) | (enumLiteral_2= 'commission' ) | (enumLiteral_3= 'omission' ) | (enumLiteral_4= 'valueSubtle' ) | (enumLiteral_5= 'valueCoarse' ) ) ;
-    public final Enumerator ruleActualFailureType() throws RecognitionException {
-        Enumerator current = null;
-
-        Token enumLiteral_0=null;
-        Token enumLiteral_1=null;
-        Token enumLiteral_2=null;
-        Token enumLiteral_3=null;
-        Token enumLiteral_4=null;
-        Token enumLiteral_5=null;
-
-         enterRule(); 
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1155:28: ( ( (enumLiteral_0= 'early' ) | (enumLiteral_1= 'late' ) | (enumLiteral_2= 'commission' ) | (enumLiteral_3= 'omission' ) | (enumLiteral_4= 'valueSubtle' ) | (enumLiteral_5= 'valueCoarse' ) ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1156:1: ( (enumLiteral_0= 'early' ) | (enumLiteral_1= 'late' ) | (enumLiteral_2= 'commission' ) | (enumLiteral_3= 'omission' ) | (enumLiteral_4= 'valueSubtle' ) | (enumLiteral_5= 'valueCoarse' ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1156:1: ( (enumLiteral_0= 'early' ) | (enumLiteral_1= 'late' ) | (enumLiteral_2= 'commission' ) | (enumLiteral_3= 'omission' ) | (enumLiteral_4= 'valueSubtle' ) | (enumLiteral_5= 'valueCoarse' ) )
-            int alt11=6;
-            switch ( input.LA(1) ) {
-            case 21:
-                {
-                alt11=1;
-                }
-                break;
-            case 22:
-                {
-                alt11=2;
-                }
-                break;
-            case 23:
-                {
-                alt11=3;
-                }
-                break;
-            case 24:
-                {
-                alt11=4;
-                }
-                break;
-            case 25:
-                {
-                alt11=5;
-                }
-                break;
-            case 26:
-                {
-                alt11=6;
-                }
-                break;
-            default:
-                NoViableAltException nvae =
-                    new NoViableAltException("", 11, 0, input);
-
-                throw nvae;
-            }
-
-            switch (alt11) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1156:2: (enumLiteral_0= 'early' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1156:2: (enumLiteral_0= 'early' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1156:4: enumLiteral_0= 'early'
-                    {
-                    enumLiteral_0=(Token)match(input,21,FOLLOW_21_in_ruleActualFailureType2333); 
-
-                            current = grammarAccess.getActualFailureTypeAccess().getEARLYEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_0, grammarAccess.getActualFailureTypeAccess().getEARLYEnumLiteralDeclaration_0()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1162:6: (enumLiteral_1= 'late' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1162:6: (enumLiteral_1= 'late' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1162:8: enumLiteral_1= 'late'
-                    {
-                    enumLiteral_1=(Token)match(input,22,FOLLOW_22_in_ruleActualFailureType2350); 
-
-                            current = grammarAccess.getActualFailureTypeAccess().getLATEEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_1, grammarAccess.getActualFailureTypeAccess().getLATEEnumLiteralDeclaration_1()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-                case 3 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1168:6: (enumLiteral_2= 'commission' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1168:6: (enumLiteral_2= 'commission' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1168:8: enumLiteral_2= 'commission'
-                    {
-                    enumLiteral_2=(Token)match(input,23,FOLLOW_23_in_ruleActualFailureType2367); 
-
-                            current = grammarAccess.getActualFailureTypeAccess().getCOMMISSIONEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_2, grammarAccess.getActualFailureTypeAccess().getCOMMISSIONEnumLiteralDeclaration_2()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-                case 4 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1174:6: (enumLiteral_3= 'omission' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1174:6: (enumLiteral_3= 'omission' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1174:8: enumLiteral_3= 'omission'
-                    {
-                    enumLiteral_3=(Token)match(input,24,FOLLOW_24_in_ruleActualFailureType2384); 
-
-                            current = grammarAccess.getActualFailureTypeAccess().getOMISSIONEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_3, grammarAccess.getActualFailureTypeAccess().getOMISSIONEnumLiteralDeclaration_3()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-                case 5 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1180:6: (enumLiteral_4= 'valueSubtle' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1180:6: (enumLiteral_4= 'valueSubtle' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1180:8: enumLiteral_4= 'valueSubtle'
-                    {
-                    enumLiteral_4=(Token)match(input,25,FOLLOW_25_in_ruleActualFailureType2401); 
-
-                            current = grammarAccess.getActualFailureTypeAccess().getVALUE_SUBTLEEnumLiteralDeclaration_4().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_4, grammarAccess.getActualFailureTypeAccess().getVALUE_SUBTLEEnumLiteralDeclaration_4()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-                case 6 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1186:6: (enumLiteral_5= 'valueCoarse' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1186:6: (enumLiteral_5= 'valueCoarse' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1186:8: enumLiteral_5= 'valueCoarse'
-                    {
-                    enumLiteral_5=(Token)match(input,26,FOLLOW_26_in_ruleActualFailureType2418); 
-
-                            current = grammarAccess.getActualFailureTypeAccess().getVALUE_COARSEEnumLiteralDeclaration_5().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_5, grammarAccess.getActualFailureTypeAccess().getVALUE_COARSEEnumLiteralDeclaration_5()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-             leaveRule(); 
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "ruleActualFailureType"
-
-
-    // $ANTLR start "ruleAavoidable"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1200:1: ruleAavoidable returns [Enumerator current=null] : ( (enumLiteral_0= 'incompletion' ) | (enumLiteral_1= 'none' ) | (enumLiteral_2= 'unspecified' ) ) ;
-    public final Enumerator ruleAavoidable() throws RecognitionException {
-        Enumerator current = null;
-
-        Token enumLiteral_0=null;
-        Token enumLiteral_1=null;
-        Token enumLiteral_2=null;
-
-         enterRule(); 
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1202:28: ( ( (enumLiteral_0= 'incompletion' ) | (enumLiteral_1= 'none' ) | (enumLiteral_2= 'unspecified' ) ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1203:1: ( (enumLiteral_0= 'incompletion' ) | (enumLiteral_1= 'none' ) | (enumLiteral_2= 'unspecified' ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1203:1: ( (enumLiteral_0= 'incompletion' ) | (enumLiteral_1= 'none' ) | (enumLiteral_2= 'unspecified' ) )
-            int alt12=3;
-            switch ( input.LA(1) ) {
-            case 27:
-                {
-                alt12=1;
-                }
-                break;
-            case 28:
-                {
-                alt12=2;
-                }
-                break;
-            case 29:
-                {
-                alt12=3;
-                }
-                break;
-            default:
-                NoViableAltException nvae =
-                    new NoViableAltException("", 12, 0, input);
-
-                throw nvae;
-            }
-
-            switch (alt12) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1203:2: (enumLiteral_0= 'incompletion' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1203:2: (enumLiteral_0= 'incompletion' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1203:4: enumLiteral_0= 'incompletion'
-                    {
-                    enumLiteral_0=(Token)match(input,27,FOLLOW_27_in_ruleAavoidable2467); 
-
-                            current = grammarAccess.getAavoidableAccess().getINCOMPLETIONEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_0, grammarAccess.getAavoidableAccess().getINCOMPLETIONEnumLiteralDeclaration_0()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1209:6: (enumLiteral_1= 'none' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1209:6: (enumLiteral_1= 'none' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1209:8: enumLiteral_1= 'none'
-                    {
-                    enumLiteral_1=(Token)match(input,28,FOLLOW_28_in_ruleAavoidable2484); 
-
-                            current = grammarAccess.getAavoidableAccess().getNONEEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_1, grammarAccess.getAavoidableAccess().getNONEEnumLiteralDeclaration_1()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-                case 3 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1215:6: (enumLiteral_2= 'unspecified' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1215:6: (enumLiteral_2= 'unspecified' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1215:8: enumLiteral_2= 'unspecified'
-                    {
-                    enumLiteral_2=(Token)match(input,29,FOLLOW_29_in_ruleAavoidable2501); 
-
-                            current = grammarAccess.getAavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_2, grammarAccess.getAavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-             leaveRule(); 
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "ruleAavoidable"
-
-
-    // $ANTLR start "ruleCavoidable"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1225:1: ruleCavoidable returns [Enumerator current=null] : ( (enumLiteral_0= 'inconsistency' ) | (enumLiteral_1= 'none' ) | (enumLiteral_2= 'unspecified' ) ) ;
-    public final Enumerator ruleCavoidable() throws RecognitionException {
-        Enumerator current = null;
-
-        Token enumLiteral_0=null;
-        Token enumLiteral_1=null;
-        Token enumLiteral_2=null;
-
-         enterRule(); 
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1227:28: ( ( (enumLiteral_0= 'inconsistency' ) | (enumLiteral_1= 'none' ) | (enumLiteral_2= 'unspecified' ) ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1228:1: ( (enumLiteral_0= 'inconsistency' ) | (enumLiteral_1= 'none' ) | (enumLiteral_2= 'unspecified' ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1228:1: ( (enumLiteral_0= 'inconsistency' ) | (enumLiteral_1= 'none' ) | (enumLiteral_2= 'unspecified' ) )
-            int alt13=3;
-            switch ( input.LA(1) ) {
-            case 30:
-                {
-                alt13=1;
-                }
-                break;
-            case 28:
-                {
-                alt13=2;
-                }
-                break;
-            case 29:
-                {
-                alt13=3;
-                }
-                break;
-            default:
-                NoViableAltException nvae =
-                    new NoViableAltException("", 13, 0, input);
-
-                throw nvae;
-            }
-
-            switch (alt13) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1228:2: (enumLiteral_0= 'inconsistency' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1228:2: (enumLiteral_0= 'inconsistency' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1228:4: enumLiteral_0= 'inconsistency'
-                    {
-                    enumLiteral_0=(Token)match(input,30,FOLLOW_30_in_ruleCavoidable2546); 
-
-                            current = grammarAccess.getCavoidableAccess().getINCONSISTENCYEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_0, grammarAccess.getCavoidableAccess().getINCONSISTENCYEnumLiteralDeclaration_0()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1234:6: (enumLiteral_1= 'none' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1234:6: (enumLiteral_1= 'none' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1234:8: enumLiteral_1= 'none'
-                    {
-                    enumLiteral_1=(Token)match(input,28,FOLLOW_28_in_ruleCavoidable2563); 
-
-                            current = grammarAccess.getCavoidableAccess().getNONEEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_1, grammarAccess.getCavoidableAccess().getNONEEnumLiteralDeclaration_1()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-                case 3 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1240:6: (enumLiteral_2= 'unspecified' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1240:6: (enumLiteral_2= 'unspecified' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1240:8: enumLiteral_2= 'unspecified'
-                    {
-                    enumLiteral_2=(Token)match(input,29,FOLLOW_29_in_ruleCavoidable2580); 
-
-                            current = grammarAccess.getCavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_2, grammarAccess.getCavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-             leaveRule(); 
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "ruleCavoidable"
-
-
-    // $ANTLR start "ruleIavoidable"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1250:1: ruleIavoidable returns [Enumerator current=null] : ( (enumLiteral_0= 'interference' ) | (enumLiteral_1= 'none' ) | (enumLiteral_2= 'unspecified' ) ) ;
-    public final Enumerator ruleIavoidable() throws RecognitionException {
-        Enumerator current = null;
-
-        Token enumLiteral_0=null;
-        Token enumLiteral_1=null;
-        Token enumLiteral_2=null;
-
-         enterRule(); 
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1252:28: ( ( (enumLiteral_0= 'interference' ) | (enumLiteral_1= 'none' ) | (enumLiteral_2= 'unspecified' ) ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1253:1: ( (enumLiteral_0= 'interference' ) | (enumLiteral_1= 'none' ) | (enumLiteral_2= 'unspecified' ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1253:1: ( (enumLiteral_0= 'interference' ) | (enumLiteral_1= 'none' ) | (enumLiteral_2= 'unspecified' ) )
-            int alt14=3;
-            switch ( input.LA(1) ) {
-            case 31:
-                {
-                alt14=1;
-                }
-                break;
-            case 28:
-                {
-                alt14=2;
-                }
-                break;
-            case 29:
-                {
-                alt14=3;
-                }
-                break;
-            default:
-                NoViableAltException nvae =
-                    new NoViableAltException("", 14, 0, input);
-
-                throw nvae;
-            }
-
-            switch (alt14) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1253:2: (enumLiteral_0= 'interference' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1253:2: (enumLiteral_0= 'interference' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1253:4: enumLiteral_0= 'interference'
-                    {
-                    enumLiteral_0=(Token)match(input,31,FOLLOW_31_in_ruleIavoidable2625); 
-
-                            current = grammarAccess.getIavoidableAccess().getINTERFERENCEEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_0, grammarAccess.getIavoidableAccess().getINTERFERENCEEnumLiteralDeclaration_0()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1259:6: (enumLiteral_1= 'none' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1259:6: (enumLiteral_1= 'none' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1259:8: enumLiteral_1= 'none'
-                    {
-                    enumLiteral_1=(Token)match(input,28,FOLLOW_28_in_ruleIavoidable2642); 
-
-                            current = grammarAccess.getIavoidableAccess().getNONEEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_1, grammarAccess.getIavoidableAccess().getNONEEnumLiteralDeclaration_1()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-                case 3 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1265:6: (enumLiteral_2= 'unspecified' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1265:6: (enumLiteral_2= 'unspecified' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1265:8: enumLiteral_2= 'unspecified'
-                    {
-                    enumLiteral_2=(Token)match(input,29,FOLLOW_29_in_ruleIavoidable2659); 
-
-                            current = grammarAccess.getIavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_2, grammarAccess.getIavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-             leaveRule(); 
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "ruleIavoidable"
-
-
-    // $ANTLR start "ruleDavoidable"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1275:1: ruleDavoidable returns [Enumerator current=null] : ( (enumLiteral_0= 'impermanence' ) | (enumLiteral_1= 'none' ) | (enumLiteral_2= 'unspecified' ) ) ;
-    public final Enumerator ruleDavoidable() throws RecognitionException {
-        Enumerator current = null;
-
-        Token enumLiteral_0=null;
-        Token enumLiteral_1=null;
-        Token enumLiteral_2=null;
-
-         enterRule(); 
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1277:28: ( ( (enumLiteral_0= 'impermanence' ) | (enumLiteral_1= 'none' ) | (enumLiteral_2= 'unspecified' ) ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1278:1: ( (enumLiteral_0= 'impermanence' ) | (enumLiteral_1= 'none' ) | (enumLiteral_2= 'unspecified' ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1278:1: ( (enumLiteral_0= 'impermanence' ) | (enumLiteral_1= 'none' ) | (enumLiteral_2= 'unspecified' ) )
-            int alt15=3;
-            switch ( input.LA(1) ) {
-            case 32:
-                {
-                alt15=1;
-                }
-                break;
-            case 28:
-                {
-                alt15=2;
-                }
-                break;
-            case 29:
-                {
-                alt15=3;
-                }
-                break;
-            default:
-                NoViableAltException nvae =
-                    new NoViableAltException("", 15, 0, input);
-
-                throw nvae;
-            }
-
-            switch (alt15) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1278:2: (enumLiteral_0= 'impermanence' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1278:2: (enumLiteral_0= 'impermanence' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1278:4: enumLiteral_0= 'impermanence'
-                    {
-                    enumLiteral_0=(Token)match(input,32,FOLLOW_32_in_ruleDavoidable2704); 
-
-                            current = grammarAccess.getDavoidableAccess().getIMPERMANENCEEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_0, grammarAccess.getDavoidableAccess().getIMPERMANENCEEnumLiteralDeclaration_0()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1284:6: (enumLiteral_1= 'none' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1284:6: (enumLiteral_1= 'none' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1284:8: enumLiteral_1= 'none'
-                    {
-                    enumLiteral_1=(Token)match(input,28,FOLLOW_28_in_ruleDavoidable2721); 
-
-                            current = grammarAccess.getDavoidableAccess().getNONEEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_1, grammarAccess.getDavoidableAccess().getNONEEnumLiteralDeclaration_1()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-                case 3 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1290:6: (enumLiteral_2= 'unspecified' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1290:6: (enumLiteral_2= 'unspecified' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1290:8: enumLiteral_2= 'unspecified'
-                    {
-                    enumLiteral_2=(Token)match(input,29,FOLLOW_29_in_ruleDavoidable2738); 
-
-                            current = grammarAccess.getDavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_2, grammarAccess.getDavoidableAccess().getUNSPECIFIEDEnumLiteralDeclaration_2()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-             leaveRule(); 
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "ruleDavoidable"
-
-
-    // $ANTLR start "ruleAmitigation"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1300:1: ruleAmitigation returns [Enumerator current=null] : ( (enumLiteral_0= 'all_or_nothing' ) | (enumLiteral_1= 'all_or_compensation' ) | (enumLiteral_2= 'none' ) | (enumLiteral_3= 'unspecified' ) ) ;
-    public final Enumerator ruleAmitigation() throws RecognitionException {
-        Enumerator current = null;
-
-        Token enumLiteral_0=null;
-        Token enumLiteral_1=null;
-        Token enumLiteral_2=null;
-        Token enumLiteral_3=null;
-
-         enterRule(); 
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1302:28: ( ( (enumLiteral_0= 'all_or_nothing' ) | (enumLiteral_1= 'all_or_compensation' ) | (enumLiteral_2= 'none' ) | (enumLiteral_3= 'unspecified' ) ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1303:1: ( (enumLiteral_0= 'all_or_nothing' ) | (enumLiteral_1= 'all_or_compensation' ) | (enumLiteral_2= 'none' ) | (enumLiteral_3= 'unspecified' ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1303:1: ( (enumLiteral_0= 'all_or_nothing' ) | (enumLiteral_1= 'all_or_compensation' ) | (enumLiteral_2= 'none' ) | (enumLiteral_3= 'unspecified' ) )
-            int alt16=4;
-            switch ( input.LA(1) ) {
-            case 33:
-                {
-                alt16=1;
-                }
-                break;
-            case 34:
-                {
-                alt16=2;
-                }
-                break;
-            case 28:
-                {
-                alt16=3;
-                }
-                break;
-            case 29:
-                {
-                alt16=4;
-                }
-                break;
-            default:
-                NoViableAltException nvae =
-                    new NoViableAltException("", 16, 0, input);
-
-                throw nvae;
-            }
-
-            switch (alt16) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1303:2: (enumLiteral_0= 'all_or_nothing' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1303:2: (enumLiteral_0= 'all_or_nothing' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1303:4: enumLiteral_0= 'all_or_nothing'
-                    {
-                    enumLiteral_0=(Token)match(input,33,FOLLOW_33_in_ruleAmitigation2783); 
-
-                            current = grammarAccess.getAmitigationAccess().getALL_OR_NOTHINGEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_0, grammarAccess.getAmitigationAccess().getALL_OR_NOTHINGEnumLiteralDeclaration_0()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1309:6: (enumLiteral_1= 'all_or_compensation' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1309:6: (enumLiteral_1= 'all_or_compensation' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1309:8: enumLiteral_1= 'all_or_compensation'
-                    {
-                    enumLiteral_1=(Token)match(input,34,FOLLOW_34_in_ruleAmitigation2800); 
-
-                            current = grammarAccess.getAmitigationAccess().getALL_OR_COMPENSATIONEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_1, grammarAccess.getAmitigationAccess().getALL_OR_COMPENSATIONEnumLiteralDeclaration_1()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-                case 3 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1315:6: (enumLiteral_2= 'none' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1315:6: (enumLiteral_2= 'none' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1315:8: enumLiteral_2= 'none'
-                    {
-                    enumLiteral_2=(Token)match(input,28,FOLLOW_28_in_ruleAmitigation2817); 
-
-                            current = grammarAccess.getAmitigationAccess().getNONEEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_2, grammarAccess.getAmitigationAccess().getNONEEnumLiteralDeclaration_2()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-                case 4 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1321:6: (enumLiteral_3= 'unspecified' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1321:6: (enumLiteral_3= 'unspecified' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1321:8: enumLiteral_3= 'unspecified'
-                    {
-                    enumLiteral_3=(Token)match(input,29,FOLLOW_29_in_ruleAmitigation2834); 
-
-                            current = grammarAccess.getAmitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_3, grammarAccess.getAmitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-             leaveRule(); 
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "ruleAmitigation"
-
-
-    // $ANTLR start "ruleCmitigation"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1331:1: ruleCmitigation returns [Enumerator current=null] : ( (enumLiteral_0= 'full_consistency' ) | (enumLiteral_1= 'range_violation_allowed' ) | (enumLiteral_2= 'none' ) | (enumLiteral_3= 'unspecified' ) ) ;
-    public final Enumerator ruleCmitigation() throws RecognitionException {
-        Enumerator current = null;
-
-        Token enumLiteral_0=null;
-        Token enumLiteral_1=null;
-        Token enumLiteral_2=null;
-        Token enumLiteral_3=null;
-
-         enterRule(); 
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1333:28: ( ( (enumLiteral_0= 'full_consistency' ) | (enumLiteral_1= 'range_violation_allowed' ) | (enumLiteral_2= 'none' ) | (enumLiteral_3= 'unspecified' ) ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1334:1: ( (enumLiteral_0= 'full_consistency' ) | (enumLiteral_1= 'range_violation_allowed' ) | (enumLiteral_2= 'none' ) | (enumLiteral_3= 'unspecified' ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1334:1: ( (enumLiteral_0= 'full_consistency' ) | (enumLiteral_1= 'range_violation_allowed' ) | (enumLiteral_2= 'none' ) | (enumLiteral_3= 'unspecified' ) )
-            int alt17=4;
-            switch ( input.LA(1) ) {
-            case 35:
-                {
-                alt17=1;
-                }
-                break;
-            case 36:
-                {
-                alt17=2;
-                }
-                break;
-            case 28:
-                {
-                alt17=3;
-                }
-                break;
-            case 29:
-                {
-                alt17=4;
-                }
-                break;
-            default:
-                NoViableAltException nvae =
-                    new NoViableAltException("", 17, 0, input);
-
-                throw nvae;
-            }
-
-            switch (alt17) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1334:2: (enumLiteral_0= 'full_consistency' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1334:2: (enumLiteral_0= 'full_consistency' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1334:4: enumLiteral_0= 'full_consistency'
-                    {
-                    enumLiteral_0=(Token)match(input,35,FOLLOW_35_in_ruleCmitigation2879); 
-
-                            current = grammarAccess.getCmitigationAccess().getFULL_CONSISTENCYEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_0, grammarAccess.getCmitigationAccess().getFULL_CONSISTENCYEnumLiteralDeclaration_0()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1340:6: (enumLiteral_1= 'range_violation_allowed' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1340:6: (enumLiteral_1= 'range_violation_allowed' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1340:8: enumLiteral_1= 'range_violation_allowed'
-                    {
-                    enumLiteral_1=(Token)match(input,36,FOLLOW_36_in_ruleCmitigation2896); 
-
-                            current = grammarAccess.getCmitigationAccess().getRANGE_VIOLATION_ALLOWEDEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_1, grammarAccess.getCmitigationAccess().getRANGE_VIOLATION_ALLOWEDEnumLiteralDeclaration_1()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-                case 3 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1346:6: (enumLiteral_2= 'none' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1346:6: (enumLiteral_2= 'none' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1346:8: enumLiteral_2= 'none'
-                    {
-                    enumLiteral_2=(Token)match(input,28,FOLLOW_28_in_ruleCmitigation2913); 
-
-                            current = grammarAccess.getCmitigationAccess().getNONEEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_2, grammarAccess.getCmitigationAccess().getNONEEnumLiteralDeclaration_2()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-                case 4 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1352:6: (enumLiteral_3= 'unspecified' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1352:6: (enumLiteral_3= 'unspecified' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1352:8: enumLiteral_3= 'unspecified'
-                    {
-                    enumLiteral_3=(Token)match(input,29,FOLLOW_29_in_ruleCmitigation2930); 
-
-                            current = grammarAccess.getCmitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_3, grammarAccess.getCmitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-             leaveRule(); 
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "ruleCmitigation"
-
-
-    // $ANTLR start "ruleImitigation"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1362:1: ruleImitigation returns [Enumerator current=null] : ( (enumLiteral_0= 'serializable' ) | (enumLiteral_1= 'portable_level' ) | (enumLiteral_2= 'none' ) | (enumLiteral_3= 'unspecified' ) ) ;
-    public final Enumerator ruleImitigation() throws RecognitionException {
-        Enumerator current = null;
-
-        Token enumLiteral_0=null;
-        Token enumLiteral_1=null;
-        Token enumLiteral_2=null;
-        Token enumLiteral_3=null;
-
-         enterRule(); 
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1364:28: ( ( (enumLiteral_0= 'serializable' ) | (enumLiteral_1= 'portable_level' ) | (enumLiteral_2= 'none' ) | (enumLiteral_3= 'unspecified' ) ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1365:1: ( (enumLiteral_0= 'serializable' ) | (enumLiteral_1= 'portable_level' ) | (enumLiteral_2= 'none' ) | (enumLiteral_3= 'unspecified' ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1365:1: ( (enumLiteral_0= 'serializable' ) | (enumLiteral_1= 'portable_level' ) | (enumLiteral_2= 'none' ) | (enumLiteral_3= 'unspecified' ) )
-            int alt18=4;
-            switch ( input.LA(1) ) {
-            case 37:
-                {
-                alt18=1;
-                }
-                break;
-            case 38:
-                {
-                alt18=2;
-                }
-                break;
-            case 28:
-                {
-                alt18=3;
-                }
-                break;
-            case 29:
-                {
-                alt18=4;
-                }
-                break;
-            default:
-                NoViableAltException nvae =
-                    new NoViableAltException("", 18, 0, input);
-
-                throw nvae;
-            }
-
-            switch (alt18) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1365:2: (enumLiteral_0= 'serializable' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1365:2: (enumLiteral_0= 'serializable' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1365:4: enumLiteral_0= 'serializable'
-                    {
-                    enumLiteral_0=(Token)match(input,37,FOLLOW_37_in_ruleImitigation2975); 
-
-                            current = grammarAccess.getImitigationAccess().getSERIALIZABLEEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_0, grammarAccess.getImitigationAccess().getSERIALIZABLEEnumLiteralDeclaration_0()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1371:6: (enumLiteral_1= 'portable_level' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1371:6: (enumLiteral_1= 'portable_level' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1371:8: enumLiteral_1= 'portable_level'
-                    {
-                    enumLiteral_1=(Token)match(input,38,FOLLOW_38_in_ruleImitigation2992); 
-
-                            current = grammarAccess.getImitigationAccess().getPORTABLE_LEVELEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_1, grammarAccess.getImitigationAccess().getPORTABLE_LEVELEnumLiteralDeclaration_1()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-                case 3 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1377:6: (enumLiteral_2= 'none' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1377:6: (enumLiteral_2= 'none' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1377:8: enumLiteral_2= 'none'
-                    {
-                    enumLiteral_2=(Token)match(input,28,FOLLOW_28_in_ruleImitigation3009); 
-
-                            current = grammarAccess.getImitigationAccess().getNONEEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_2, grammarAccess.getImitigationAccess().getNONEEnumLiteralDeclaration_2()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-                case 4 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1383:6: (enumLiteral_3= 'unspecified' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1383:6: (enumLiteral_3= 'unspecified' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1383:8: enumLiteral_3= 'unspecified'
-                    {
-                    enumLiteral_3=(Token)match(input,29,FOLLOW_29_in_ruleImitigation3026); 
-
-                            current = grammarAccess.getImitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_3, grammarAccess.getImitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-             leaveRule(); 
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "ruleImitigation"
-
-
-    // $ANTLR start "ruleDmitigation"
-    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1393:1: ruleDmitigation returns [Enumerator current=null] : ( (enumLiteral_0= 'no_loss' ) | (enumLiteral_1= 'partial_loss_allowed' ) | (enumLiteral_2= 'none' ) | (enumLiteral_3= 'unspecified' ) ) ;
-    public final Enumerator ruleDmitigation() throws RecognitionException {
-        Enumerator current = null;
-
-        Token enumLiteral_0=null;
-        Token enumLiteral_1=null;
-        Token enumLiteral_2=null;
-        Token enumLiteral_3=null;
-
-         enterRule(); 
-        try {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1395:28: ( ( (enumLiteral_0= 'no_loss' ) | (enumLiteral_1= 'partial_loss_allowed' ) | (enumLiteral_2= 'none' ) | (enumLiteral_3= 'unspecified' ) ) )
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1396:1: ( (enumLiteral_0= 'no_loss' ) | (enumLiteral_1= 'partial_loss_allowed' ) | (enumLiteral_2= 'none' ) | (enumLiteral_3= 'unspecified' ) )
-            {
-            // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1396:1: ( (enumLiteral_0= 'no_loss' ) | (enumLiteral_1= 'partial_loss_allowed' ) | (enumLiteral_2= 'none' ) | (enumLiteral_3= 'unspecified' ) )
-            int alt19=4;
-            switch ( input.LA(1) ) {
-            case 39:
-                {
-                alt19=1;
-                }
-                break;
-            case 40:
-                {
-                alt19=2;
-                }
-                break;
-            case 28:
-                {
-                alt19=3;
-                }
-                break;
-            case 29:
-                {
-                alt19=4;
-                }
-                break;
-            default:
-                NoViableAltException nvae =
-                    new NoViableAltException("", 19, 0, input);
-
-                throw nvae;
-            }
-
-            switch (alt19) {
-                case 1 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1396:2: (enumLiteral_0= 'no_loss' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1396:2: (enumLiteral_0= 'no_loss' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1396:4: enumLiteral_0= 'no_loss'
-                    {
-                    enumLiteral_0=(Token)match(input,39,FOLLOW_39_in_ruleDmitigation3071); 
-
-                            current = grammarAccess.getDmitigationAccess().getNO_LOSSEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_0, grammarAccess.getDmitigationAccess().getNO_LOSSEnumLiteralDeclaration_0()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1402:6: (enumLiteral_1= 'partial_loss_allowed' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1402:6: (enumLiteral_1= 'partial_loss_allowed' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1402:8: enumLiteral_1= 'partial_loss_allowed'
-                    {
-                    enumLiteral_1=(Token)match(input,40,FOLLOW_40_in_ruleDmitigation3088); 
-
-                            current = grammarAccess.getDmitigationAccess().getPARTIAL_LOSS_ALLOWEDEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_1, grammarAccess.getDmitigationAccess().getPARTIAL_LOSS_ALLOWEDEnumLiteralDeclaration_1()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-                case 3 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1408:6: (enumLiteral_2= 'none' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1408:6: (enumLiteral_2= 'none' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1408:8: enumLiteral_2= 'none'
-                    {
-                    enumLiteral_2=(Token)match(input,28,FOLLOW_28_in_ruleDmitigation3105); 
-
-                            current = grammarAccess.getDmitigationAccess().getNONEEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_2, grammarAccess.getDmitigationAccess().getNONEEnumLiteralDeclaration_2()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-                case 4 :
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1414:6: (enumLiteral_3= 'unspecified' )
-                    {
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1414:6: (enumLiteral_3= 'unspecified' )
-                    // ../org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/parser/antlr/internal/InternalFlaDsl.g:1414:8: enumLiteral_3= 'unspecified'
-                    {
-                    enumLiteral_3=(Token)match(input,29,FOLLOW_29_in_ruleDmitigation3122); 
-
-                            current = grammarAccess.getDmitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
-                            newLeafNode(enumLiteral_3, grammarAccess.getDmitigationAccess().getUNSPECIFIEDEnumLiteralDeclaration_3()); 
-                        
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-
-
-            }
-
-             leaveRule(); 
-        }
-         
-            catch (RecognitionException re) { 
-                recover(input,re); 
-                appendSkippedTokens();
-            } 
-        finally {
-        }
-        return current;
-    }
-    // $ANTLR end "ruleDmitigation"
-
-    // Delegated rules
-
-
- 
-
-    public static final BitSet FOLLOW_ruleBehaviour_in_entryRuleBehaviour75 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleBehaviour85 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleExpression_in_ruleBehaviour130 = new BitSet(new long[]{0x0000000000000802L});
-    public static final BitSet FOLLOW_ruleExpression_in_entryRuleExpression166 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleExpression176 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_11_in_ruleExpression213 = new BitSet(new long[]{0x0000000000008010L});
-    public static final BitSet FOLLOW_ruleLhs_in_ruleExpression234 = new BitSet(new long[]{0x0000000000001000L});
-    public static final BitSet FOLLOW_12_in_ruleExpression246 = new BitSet(new long[]{0x0000000000008010L});
-    public static final BitSet FOLLOW_ruleRhs_in_ruleExpression267 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_13_in_ruleExpression279 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleLhs_in_entryRuleLhs315 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleLhs325 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInputExpression_in_ruleLhs371 = new BitSet(new long[]{0x0000000000004002L});
-    public static final BitSet FOLLOW_14_in_ruleLhs384 = new BitSet(new long[]{0x0000000000008010L});
-    public static final BitSet FOLLOW_ruleInputExpression_in_ruleLhs405 = new BitSet(new long[]{0x0000000000004002L});
-    public static final BitSet FOLLOW_ruleRhs_in_entryRuleRhs443 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRhs453 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOutputExpression_in_ruleRhs499 = new BitSet(new long[]{0x0000000000004002L});
-    public static final BitSet FOLLOW_14_in_ruleRhs512 = new BitSet(new long[]{0x0000000000008010L});
-    public static final BitSet FOLLOW_ruleOutputExpression_in_ruleRhs533 = new BitSet(new long[]{0x0000000000004002L});
-    public static final BitSet FOLLOW_ruleInputExpression_in_entryRuleInputExpression571 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInputExpression581 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleInputExpression627 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_15_in_ruleInputExpression645 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleInputExpression658 = new BitSet(new long[]{0x0000000007FA0010L});
-    public static final BitSet FOLLOW_ruleInFailureExpr_in_ruleInputExpression679 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOutputExpression_in_entryRuleOutputExpression715 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOutputExpression725 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleOutputExpression771 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_15_in_ruleOutputExpression789 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleOutputExpression802 = new BitSet(new long[]{0x0000000007FA0010L});
-    public static final BitSet FOLLOW_ruleOutFailureExpr_in_ruleOutputExpression823 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleInFailureExpr_in_entryRuleInFailureExpr859 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleInFailureExpr869 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleWildcardDefinition_in_ruleInFailureExpr915 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNoFailureDefinition_in_ruleInFailureExpr942 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFailureDefinition_in_ruleInFailureExpr969 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_ruleInFailureExpr988 = new BitSet(new long[]{0x0000000007E00000L});
-    public static final BitSet FOLLOW_ruleFailureDefinition_in_ruleInFailureExpr1009 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_14_in_ruleInFailureExpr1022 = new BitSet(new long[]{0x0000000007E00000L});
-    public static final BitSet FOLLOW_ruleFailureDefinition_in_ruleInFailureExpr1043 = new BitSet(new long[]{0x0000000000044000L});
-    public static final BitSet FOLLOW_18_in_ruleInFailureExpr1057 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleVariableDefinition_in_ruleInFailureExpr1085 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleOutFailureExpr_in_entryRuleOutFailureExpr1121 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleOutFailureExpr1131 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNoFailureDefinition_in_ruleOutFailureExpr1177 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleComplexNofailureDefinition_in_ruleOutFailureExpr1204 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFailureDefinition_in_ruleOutFailureExpr1231 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_ruleOutFailureExpr1250 = new BitSet(new long[]{0x0000000007E00000L});
-    public static final BitSet FOLLOW_ruleFailureDefinition_in_ruleOutFailureExpr1271 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_14_in_ruleOutFailureExpr1284 = new BitSet(new long[]{0x0000000007E00000L});
-    public static final BitSet FOLLOW_ruleFailureDefinition_in_ruleOutFailureExpr1305 = new BitSet(new long[]{0x0000000000044000L});
-    public static final BitSet FOLLOW_18_in_ruleOutFailureExpr1319 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleVariableDefinition_in_ruleOutFailureExpr1347 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleFailureDefinition_in_entryRuleFailureDefinition1385 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleFailureDefinition1395 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleActualFailureType_in_ruleFailureDefinition1450 = new BitSet(new long[]{0x0000000000010002L});
-    public static final BitSet FOLLOW_16_in_ruleFailureDefinition1463 = new BitSet(new long[]{0x0000000038000000L});
-    public static final BitSet FOLLOW_ruleACIDavoidable_in_ruleFailureDefinition1484 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNoFailureDefinition_in_entryRuleNoFailureDefinition1522 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleNoFailureDefinition1532 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_ruleNoFailureDefinition1578 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleComplexNofailureDefinition_in_entryRuleComplexNofailureDefinition1614 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleComplexNofailureDefinition1624 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_19_in_ruleComplexNofailureDefinition1670 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleComplexNofailureDefinition1682 = new BitSet(new long[]{0x0000000630000000L});
-    public static final BitSet FOLLOW_ruleACIDMitigation_in_ruleComplexNofailureDefinition1703 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleWildcardDefinition_in_entryRuleWildcardDefinition1739 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleWildcardDefinition1749 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_ruleWildcardDefinition1795 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleVariableDefinition_in_entryRuleVariableDefinition1831 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleVariableDefinition1841 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleVariableDefinition1892 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleACIDavoidable_in_entryRuleACIDavoidable1933 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleACIDavoidable1943 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAavoidable_in_ruleACIDavoidable1989 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleACIDavoidable2001 = new BitSet(new long[]{0x0000000070000000L});
-    public static final BitSet FOLLOW_ruleCavoidable_in_ruleACIDavoidable2022 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleACIDavoidable2034 = new BitSet(new long[]{0x00000000B0000000L});
-    public static final BitSet FOLLOW_ruleIavoidable_in_ruleACIDavoidable2055 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleACIDavoidable2067 = new BitSet(new long[]{0x0000000130000000L});
-    public static final BitSet FOLLOW_ruleDavoidable_in_ruleACIDavoidable2088 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleACIDMitigation_in_entryRuleACIDMitigation2124 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleACIDMitigation2134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleAmitigation_in_ruleACIDMitigation2180 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleACIDMitigation2192 = new BitSet(new long[]{0x0000001830000000L});
-    public static final BitSet FOLLOW_ruleCmitigation_in_ruleACIDMitigation2213 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleACIDMitigation2225 = new BitSet(new long[]{0x0000006030000000L});
-    public static final BitSet FOLLOW_ruleImitigation_in_ruleACIDMitigation2246 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_16_in_ruleACIDMitigation2258 = new BitSet(new long[]{0x0000018030000000L});
-    public static final BitSet FOLLOW_ruleDmitigation_in_ruleACIDMitigation2279 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_ruleActualFailureType2333 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_ruleActualFailureType2350 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_ruleActualFailureType2367 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_24_in_ruleActualFailureType2384 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_25_in_ruleActualFailureType2401 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_ruleActualFailureType2418 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_ruleAavoidable2467 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_ruleAavoidable2484 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_ruleAavoidable2501 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_ruleCavoidable2546 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_ruleCavoidable2563 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_ruleCavoidable2580 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_ruleIavoidable2625 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_ruleIavoidable2642 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_ruleIavoidable2659 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_ruleDavoidable2704 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_ruleDavoidable2721 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_ruleDavoidable2738 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_33_in_ruleAmitigation2783 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_ruleAmitigation2800 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_ruleAmitigation2817 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_ruleAmitigation2834 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_35_in_ruleCmitigation2879 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_ruleCmitigation2896 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_ruleCmitigation2913 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_ruleCmitigation2930 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_ruleImitigation2975 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_38_in_ruleImitigation2992 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_ruleImitigation3009 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_ruleImitigation3026 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_ruleDmitigation3071 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_ruleDmitigation3088 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_ruleDmitigation3105 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_ruleDmitigation3122 = new BitSet(new long[]{0x0000000000000002L});
-
-}
\ No newline at end of file
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/serializer/FlaDslSemanticSequencer.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/serializer/FlaDslSemanticSequencer.java
deleted file mode 100644
index 8f30363b49dbc314b0ed733b84ce0b6f8af79c32..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/serializer/FlaDslSemanticSequencer.java
+++ /dev/null
@@ -1,338 +0,0 @@
-package org.polarsys.chess.xtext.serializer;
-
-import com.google.inject.Inject;
-import com.google.inject.Provider;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.xtext.serializer.acceptor.ISemanticSequenceAcceptor;
-import org.eclipse.xtext.serializer.acceptor.SequenceFeeder;
-import org.eclipse.xtext.serializer.diagnostic.ISemanticSequencerDiagnosticProvider;
-import org.eclipse.xtext.serializer.diagnostic.ISerializationDiagnostic.Acceptor;
-import org.eclipse.xtext.serializer.sequencer.AbstractDelegatingSemanticSequencer;
-import org.eclipse.xtext.serializer.sequencer.GenericSequencer;
-import org.eclipse.xtext.serializer.sequencer.ISemanticNodeProvider.INodesForEObjectProvider;
-import org.eclipse.xtext.serializer.sequencer.ISemanticSequencer;
-import org.eclipse.xtext.serializer.sequencer.ITransientValueService;
-import org.eclipse.xtext.serializer.sequencer.ITransientValueService.ValueTransient;
-import org.polarsys.chess.xtext.flaDsl.ACIDMitigation;
-import org.polarsys.chess.xtext.flaDsl.ACIDavoidable;
-import org.polarsys.chess.xtext.flaDsl.Behaviour;
-import org.polarsys.chess.xtext.flaDsl.Expression;
-import org.polarsys.chess.xtext.flaDsl.FailureDefinition;
-import org.polarsys.chess.xtext.flaDsl.FlaDslPackage;
-import org.polarsys.chess.xtext.flaDsl.InFailureExpr;
-import org.polarsys.chess.xtext.flaDsl.InputExpression;
-import org.polarsys.chess.xtext.flaDsl.Lhs;
-import org.polarsys.chess.xtext.flaDsl.NoFailureDefinition;
-import org.polarsys.chess.xtext.flaDsl.OutFailureExpr;
-import org.polarsys.chess.xtext.flaDsl.OutputExpression;
-import org.polarsys.chess.xtext.flaDsl.Rhs;
-import org.polarsys.chess.xtext.flaDsl.VariableDefinition;
-import org.polarsys.chess.xtext.flaDsl.WildcardDefinition;
-import org.polarsys.chess.xtext.services.FlaDslGrammarAccess;
-
-@SuppressWarnings("all")
-public class FlaDslSemanticSequencer extends AbstractDelegatingSemanticSequencer {
-
-	@Inject
-	private FlaDslGrammarAccess grammarAccess;
-	
-	public void createSequence(EObject context, EObject semanticObject) {
-		if(semanticObject.eClass().getEPackage() == FlaDslPackage.eINSTANCE) switch(semanticObject.eClass().getClassifierID()) {
-			case FlaDslPackage.ACID_MITIGATION:
-				if(context == grammarAccess.getACIDMitigationRule()) {
-					sequence_ACIDMitigation(context, (ACIDMitigation) semanticObject); 
-					return; 
-				}
-				else break;
-			case FlaDslPackage.ACI_DAVOIDABLE:
-				if(context == grammarAccess.getACIDavoidableRule()) {
-					sequence_ACIDavoidable(context, (ACIDavoidable) semanticObject); 
-					return; 
-				}
-				else break;
-			case FlaDslPackage.BEHAVIOUR:
-				if(context == grammarAccess.getBehaviourRule()) {
-					sequence_Behaviour(context, (Behaviour) semanticObject); 
-					return; 
-				}
-				else break;
-			case FlaDslPackage.EXPRESSION:
-				if(context == grammarAccess.getExpressionRule()) {
-					sequence_Expression(context, (Expression) semanticObject); 
-					return; 
-				}
-				else break;
-			case FlaDslPackage.FAILURE_DEFINITION:
-				if(context == grammarAccess.getDefinitionsRule() ||
-				   context == grammarAccess.getFailureDefinitionRule()) {
-					sequence_FailureDefinition(context, (FailureDefinition) semanticObject); 
-					return; 
-				}
-				else break;
-			case FlaDslPackage.IN_FAILURE_EXPR:
-				if(context == grammarAccess.getInFailureExprRule()) {
-					sequence_InFailureExpr(context, (InFailureExpr) semanticObject); 
-					return; 
-				}
-				else break;
-			case FlaDslPackage.INPUT_EXPRESSION:
-				if(context == grammarAccess.getInputExpressionRule()) {
-					sequence_InputExpression(context, (InputExpression) semanticObject); 
-					return; 
-				}
-				else break;
-			case FlaDslPackage.LHS:
-				if(context == grammarAccess.getLhsRule()) {
-					sequence_Lhs(context, (Lhs) semanticObject); 
-					return; 
-				}
-				else break;
-			case FlaDslPackage.NO_FAILURE_DEFINITION:
-				if(context == grammarAccess.getComplexNofailureDefinitionRule() ||
-				   context == grammarAccess.getDefinitionsRule()) {
-					sequence_ComplexNofailureDefinition(context, (NoFailureDefinition) semanticObject); 
-					return; 
-				}
-				else if(context == grammarAccess.getNoFailureDefinitionRule()) {
-					sequence_NoFailureDefinition(context, (NoFailureDefinition) semanticObject); 
-					return; 
-				}
-				else break;
-			case FlaDslPackage.OUT_FAILURE_EXPR:
-				if(context == grammarAccess.getOutFailureExprRule()) {
-					sequence_OutFailureExpr(context, (OutFailureExpr) semanticObject); 
-					return; 
-				}
-				else break;
-			case FlaDslPackage.OUTPUT_EXPRESSION:
-				if(context == grammarAccess.getOutputExpressionRule()) {
-					sequence_OutputExpression(context, (OutputExpression) semanticObject); 
-					return; 
-				}
-				else break;
-			case FlaDslPackage.RHS:
-				if(context == grammarAccess.getRhsRule()) {
-					sequence_Rhs(context, (Rhs) semanticObject); 
-					return; 
-				}
-				else break;
-			case FlaDslPackage.VARIABLE_DEFINITION:
-				if(context == grammarAccess.getDefinitionsRule() ||
-				   context == grammarAccess.getVariableDefinitionRule()) {
-					sequence_VariableDefinition(context, (VariableDefinition) semanticObject); 
-					return; 
-				}
-				else break;
-			case FlaDslPackage.WILDCARD_DEFINITION:
-				if(context == grammarAccess.getDefinitionsRule() ||
-				   context == grammarAccess.getWildcardDefinitionRule()) {
-					sequence_WildcardDefinition(context, (WildcardDefinition) semanticObject); 
-					return; 
-				}
-				else break;
-			}
-		if (errorAcceptor != null) errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
-	}
-	
-	/**
-	 * Constraint:
-	 *     (a=Amitigation c=Cmitigation i=Imitigation d=Dmitigation)
-	 */
-	protected void sequence_ACIDMitigation(EObject context, ACIDMitigation semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, FlaDslPackage.Literals.ACID_MITIGATION__A) == ValueTransient.YES)
-				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FlaDslPackage.Literals.ACID_MITIGATION__A));
-			if(transientValues.isValueTransient(semanticObject, FlaDslPackage.Literals.ACID_MITIGATION__C) == ValueTransient.YES)
-				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FlaDslPackage.Literals.ACID_MITIGATION__C));
-			if(transientValues.isValueTransient(semanticObject, FlaDslPackage.Literals.ACID_MITIGATION__I) == ValueTransient.YES)
-				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FlaDslPackage.Literals.ACID_MITIGATION__I));
-			if(transientValues.isValueTransient(semanticObject, FlaDslPackage.Literals.ACID_MITIGATION__D) == ValueTransient.YES)
-				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FlaDslPackage.Literals.ACID_MITIGATION__D));
-		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-		feeder.accept(grammarAccess.getACIDMitigationAccess().getAAmitigationEnumRuleCall_0_0(), semanticObject.getA());
-		feeder.accept(grammarAccess.getACIDMitigationAccess().getCCmitigationEnumRuleCall_2_0(), semanticObject.getC());
-		feeder.accept(grammarAccess.getACIDMitigationAccess().getIImitigationEnumRuleCall_4_0(), semanticObject.getI());
-		feeder.accept(grammarAccess.getACIDMitigationAccess().getDDmitigationEnumRuleCall_6_0(), semanticObject.getD());
-		feeder.finish();
-	}
-	
-	
-	/**
-	 * Constraint:
-	 *     (a=Aavoidable c=Cavoidable i=Iavoidable d=Davoidable)
-	 */
-	protected void sequence_ACIDavoidable(EObject context, ACIDavoidable semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, FlaDslPackage.Literals.ACI_DAVOIDABLE__A) == ValueTransient.YES)
-				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FlaDslPackage.Literals.ACI_DAVOIDABLE__A));
-			if(transientValues.isValueTransient(semanticObject, FlaDslPackage.Literals.ACI_DAVOIDABLE__C) == ValueTransient.YES)
-				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FlaDslPackage.Literals.ACI_DAVOIDABLE__C));
-			if(transientValues.isValueTransient(semanticObject, FlaDslPackage.Literals.ACI_DAVOIDABLE__I) == ValueTransient.YES)
-				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FlaDslPackage.Literals.ACI_DAVOIDABLE__I));
-			if(transientValues.isValueTransient(semanticObject, FlaDslPackage.Literals.ACI_DAVOIDABLE__D) == ValueTransient.YES)
-				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FlaDslPackage.Literals.ACI_DAVOIDABLE__D));
-		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-		feeder.accept(grammarAccess.getACIDavoidableAccess().getAAavoidableEnumRuleCall_0_0(), semanticObject.getA());
-		feeder.accept(grammarAccess.getACIDavoidableAccess().getCCavoidableEnumRuleCall_2_0(), semanticObject.getC());
-		feeder.accept(grammarAccess.getACIDavoidableAccess().getIIavoidableEnumRuleCall_4_0(), semanticObject.getI());
-		feeder.accept(grammarAccess.getACIDavoidableAccess().getDDavoidableEnumRuleCall_6_0(), semanticObject.getD());
-		feeder.finish();
-	}
-	
-	
-	/**
-	 * Constraint:
-	 *     rules+=Expression+
-	 */
-	protected void sequence_Behaviour(EObject context, Behaviour semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-	
-	
-	/**
-	 * Constraint:
-	 *     acidMitigation=ACIDMitigation
-	 */
-	protected void sequence_ComplexNofailureDefinition(EObject context, NoFailureDefinition semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, FlaDslPackage.Literals.NO_FAILURE_DEFINITION__ACID_MITIGATION) == ValueTransient.YES)
-				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FlaDslPackage.Literals.NO_FAILURE_DEFINITION__ACID_MITIGATION));
-		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-		feeder.accept(grammarAccess.getComplexNofailureDefinitionAccess().getAcidMitigationACIDMitigationParserRuleCall_3_0(), semanticObject.getAcidMitigation());
-		feeder.finish();
-	}
-	
-	
-	/**
-	 * Constraint:
-	 *     (lhs=Lhs rhs=Rhs)
-	 */
-	protected void sequence_Expression(EObject context, Expression semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, FlaDslPackage.Literals.EXPRESSION__LHS) == ValueTransient.YES)
-				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FlaDslPackage.Literals.EXPRESSION__LHS));
-			if(transientValues.isValueTransient(semanticObject, FlaDslPackage.Literals.EXPRESSION__RHS) == ValueTransient.YES)
-				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FlaDslPackage.Literals.EXPRESSION__RHS));
-		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-		feeder.accept(grammarAccess.getExpressionAccess().getLhsLhsParserRuleCall_1_0(), semanticObject.getLhs());
-		feeder.accept(grammarAccess.getExpressionAccess().getRhsRhsParserRuleCall_3_0(), semanticObject.getRhs());
-		feeder.finish();
-	}
-	
-	
-	/**
-	 * Constraint:
-	 *     (type=ActualFailureType acidAvoidable=ACIDavoidable?)
-	 */
-	protected void sequence_FailureDefinition(EObject context, FailureDefinition semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-	
-	
-	/**
-	 * Constraint:
-	 *     (
-	 *         failures+=WildcardDefinition | 
-	 *         failures+=NoFailureDefinition | 
-	 *         failures+=FailureDefinition | 
-	 *         (failures+=FailureDefinition failures+=FailureDefinition+) | 
-	 *         failures+=VariableDefinition
-	 *     )
-	 */
-	protected void sequence_InFailureExpr(EObject context, InFailureExpr semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-	
-	
-	/**
-	 * Constraint:
-	 *     (ref=[Port|ID]? failureExpr=InFailureExpr)
-	 */
-	protected void sequence_InputExpression(EObject context, InputExpression semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-	
-	
-	/**
-	 * Constraint:
-	 *     (failures+=InputExpression failures+=InputExpression*)
-	 */
-	protected void sequence_Lhs(EObject context, Lhs semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-	
-	
-	/**
-	 * Constraint:
-	 *     {NoFailureDefinition}
-	 */
-	protected void sequence_NoFailureDefinition(EObject context, NoFailureDefinition semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-	
-	
-	/**
-	 * Constraint:
-	 *     (
-	 *         failures+=NoFailureDefinition | 
-	 *         failures+=ComplexNofailureDefinition | 
-	 *         failures+=FailureDefinition | 
-	 *         (failures+=FailureDefinition failures+=FailureDefinition+) | 
-	 *         failures+=VariableDefinition
-	 *     )
-	 */
-	protected void sequence_OutFailureExpr(EObject context, OutFailureExpr semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-	
-	
-	/**
-	 * Constraint:
-	 *     (ref=[Port|ID]? failureExpr=OutFailureExpr)
-	 */
-	protected void sequence_OutputExpression(EObject context, OutputExpression semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-	
-	
-	/**
-	 * Constraint:
-	 *     (failures+=OutputExpression failures+=OutputExpression*)
-	 */
-	protected void sequence_Rhs(EObject context, Rhs semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-	
-	
-	/**
-	 * Constraint:
-	 *     variableName=ID
-	 */
-	protected void sequence_VariableDefinition(EObject context, VariableDefinition semanticObject) {
-		if(errorAcceptor != null) {
-			if(transientValues.isValueTransient(semanticObject, FlaDslPackage.Literals.VARIABLE_DEFINITION__VARIABLE_NAME) == ValueTransient.YES)
-				errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, FlaDslPackage.Literals.VARIABLE_DEFINITION__VARIABLE_NAME));
-		}
-		INodesForEObjectProvider nodes = createNodeProvider(semanticObject);
-		SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);
-		feeder.accept(grammarAccess.getVariableDefinitionAccess().getVariableNameIDTerminalRuleCall_1_0(), semanticObject.getVariableName());
-		feeder.finish();
-	}
-	
-	
-	/**
-	 * Constraint:
-	 *     {WildcardDefinition}
-	 */
-	protected void sequence_WildcardDefinition(EObject context, WildcardDefinition semanticObject) {
-		genericSequencer.createSequence(context, semanticObject);
-	}
-}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/serializer/FlaDslSyntacticSequencer.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/serializer/FlaDslSyntacticSequencer.java
deleted file mode 100644
index 25fde998ee6f826406576a2ac1f07391c66b6a00..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/serializer/FlaDslSyntacticSequencer.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.polarsys.chess.xtext.serializer;
-
-import com.google.inject.Inject;
-import java.util.List;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.xtext.IGrammarAccess;
-import org.eclipse.xtext.RuleCall;
-import org.eclipse.xtext.nodemodel.INode;
-import org.eclipse.xtext.serializer.analysis.GrammarAlias.AbstractElementAlias;
-import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynTransition;
-import org.eclipse.xtext.serializer.sequencer.AbstractSyntacticSequencer;
-import org.polarsys.chess.xtext.services.FlaDslGrammarAccess;
-
-@SuppressWarnings("all")
-public class FlaDslSyntacticSequencer extends AbstractSyntacticSequencer {
-
-	protected FlaDslGrammarAccess grammarAccess;
-	
-	@Inject
-	protected void init(IGrammarAccess access) {
-		grammarAccess = (FlaDslGrammarAccess) access;
-	}
-	
-	@Override
-	protected String getUnassignedRuleCallToken(EObject semanticObject, RuleCall ruleCall, INode node) {
-		return "";
-	}
-	
-	
-	@Override
-	protected void emitUnassignedTokens(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) {
-		if (transition.getAmbiguousSyntaxes().isEmpty()) return;
-		List<INode> transitionNodes = collectNodes(fromNode, toNode);
-		for (AbstractElementAlias syntax : transition.getAmbiguousSyntaxes()) {
-			List<INode> syntaxNodes = getNodesFor(transitionNodes, syntax);
-			acceptNodes(getLastNavigableState(), syntaxNodes);
-		}
-	}
-
-}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/services/FlaDslGrammarAccess.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/services/FlaDslGrammarAccess.java
deleted file mode 100644
index 98567073fa942d1dce4c29efd17fef78b105f057..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/services/FlaDslGrammarAccess.java
+++ /dev/null
@@ -1,1656 +0,0 @@
-/*
-* generated by Xtext
-*/
-package org.polarsys.chess.xtext.services;
-
-import com.google.inject.Singleton;
-import com.google.inject.Inject;
-
-import java.util.List;
-
-import org.eclipse.xtext.*;
-import org.eclipse.xtext.service.GrammarProvider;
-import org.eclipse.xtext.service.AbstractElementFinder.*;
-
-import org.eclipse.xtext.common.services.TerminalsGrammarAccess;
-
-@Singleton
-public class FlaDslGrammarAccess extends AbstractGrammarElementFinder {
-	
-	
-	public class BehaviourElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Behaviour");
-		private final Assignment cRulesAssignment = (Assignment)rule.eContents().get(1);
-		private final RuleCall cRulesExpressionParserRuleCall_0 = (RuleCall)cRulesAssignment.eContents().get(0);
-		
-		/// *
-		// * FLA Grammar
-		// * / Behaviour:
-		//	rules+=Expression+;
-		public ParserRule getRule() { return rule; }
-
-		//rules+=Expression+
-		public Assignment getRulesAssignment() { return cRulesAssignment; }
-
-		//Expression
-		public RuleCall getRulesExpressionParserRuleCall_0() { return cRulesExpressionParserRuleCall_0; }
-	}
-
-	public class ExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Expression");
-		private final Group cGroup = (Group)rule.eContents().get(1);
-		private final Keyword cFLAKeyword_0 = (Keyword)cGroup.eContents().get(0);
-		private final Assignment cLhsAssignment_1 = (Assignment)cGroup.eContents().get(1);
-		private final RuleCall cLhsLhsParserRuleCall_1_0 = (RuleCall)cLhsAssignment_1.eContents().get(0);
-		private final Keyword cHyphenMinusGreaterThanSignKeyword_2 = (Keyword)cGroup.eContents().get(2);
-		private final Assignment cRhsAssignment_3 = (Assignment)cGroup.eContents().get(3);
-		private final RuleCall cRhsRhsParserRuleCall_3_0 = (RuleCall)cRhsAssignment_3.eContents().get(0);
-		private final Keyword cSemicolonKeyword_4 = (Keyword)cGroup.eContents().get(4);
-		
-		//Expression:
-		//	"FLA:" lhs=Lhs "->" rhs=Rhs ";";
-		public ParserRule getRule() { return rule; }
-
-		//"FLA:" lhs=Lhs "->" rhs=Rhs ";"
-		public Group getGroup() { return cGroup; }
-
-		//"FLA:"
-		public Keyword getFLAKeyword_0() { return cFLAKeyword_0; }
-
-		//lhs=Lhs
-		public Assignment getLhsAssignment_1() { return cLhsAssignment_1; }
-
-		//Lhs
-		public RuleCall getLhsLhsParserRuleCall_1_0() { return cLhsLhsParserRuleCall_1_0; }
-
-		//"->"
-		public Keyword getHyphenMinusGreaterThanSignKeyword_2() { return cHyphenMinusGreaterThanSignKeyword_2; }
-
-		//rhs=Rhs
-		public Assignment getRhsAssignment_3() { return cRhsAssignment_3; }
-
-		//Rhs
-		public RuleCall getRhsRhsParserRuleCall_3_0() { return cRhsRhsParserRuleCall_3_0; }
-
-		//";"
-		public Keyword getSemicolonKeyword_4() { return cSemicolonKeyword_4; }
-	}
-
-	public class LhsElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Lhs");
-		private final Group cGroup = (Group)rule.eContents().get(1);
-		private final Assignment cFailuresAssignment_0 = (Assignment)cGroup.eContents().get(0);
-		private final RuleCall cFailuresInputExpressionParserRuleCall_0_0 = (RuleCall)cFailuresAssignment_0.eContents().get(0);
-		private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
-		private final Keyword cCommaKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);
-		private final Assignment cFailuresAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1);
-		private final RuleCall cFailuresInputExpressionParserRuleCall_1_1_0 = (RuleCall)cFailuresAssignment_1_1.eContents().get(0);
-		
-		//Lhs:
-		//	failures+=InputExpression ("," failures+=InputExpression)*;
-		public ParserRule getRule() { return rule; }
-
-		//failures+=InputExpression ("," failures+=InputExpression)*
-		public Group getGroup() { return cGroup; }
-
-		//failures+=InputExpression
-		public Assignment getFailuresAssignment_0() { return cFailuresAssignment_0; }
-
-		//InputExpression
-		public RuleCall getFailuresInputExpressionParserRuleCall_0_0() { return cFailuresInputExpressionParserRuleCall_0_0; }
-
-		//("," failures+=InputExpression)*
-		public Group getGroup_1() { return cGroup_1; }
-
-		//","
-		public Keyword getCommaKeyword_1_0() { return cCommaKeyword_1_0; }
-
-		//failures+=InputExpression
-		public Assignment getFailuresAssignment_1_1() { return cFailuresAssignment_1_1; }
-
-		//InputExpression
-		public RuleCall getFailuresInputExpressionParserRuleCall_1_1_0() { return cFailuresInputExpressionParserRuleCall_1_1_0; }
-	}
-
-	public class RhsElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Rhs");
-		private final Group cGroup = (Group)rule.eContents().get(1);
-		private final Assignment cFailuresAssignment_0 = (Assignment)cGroup.eContents().get(0);
-		private final RuleCall cFailuresOutputExpressionParserRuleCall_0_0 = (RuleCall)cFailuresAssignment_0.eContents().get(0);
-		private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
-		private final Keyword cCommaKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);
-		private final Assignment cFailuresAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1);
-		private final RuleCall cFailuresOutputExpressionParserRuleCall_1_1_0 = (RuleCall)cFailuresAssignment_1_1.eContents().get(0);
-		
-		//Rhs:
-		//	failures+=OutputExpression ("," failures+=OutputExpression)*;
-		public ParserRule getRule() { return rule; }
-
-		//failures+=OutputExpression ("," failures+=OutputExpression)*
-		public Group getGroup() { return cGroup; }
-
-		//failures+=OutputExpression
-		public Assignment getFailuresAssignment_0() { return cFailuresAssignment_0; }
-
-		//OutputExpression
-		public RuleCall getFailuresOutputExpressionParserRuleCall_0_0() { return cFailuresOutputExpressionParserRuleCall_0_0; }
-
-		//("," failures+=OutputExpression)*
-		public Group getGroup_1() { return cGroup_1; }
-
-		//","
-		public Keyword getCommaKeyword_1_0() { return cCommaKeyword_1_0; }
-
-		//failures+=OutputExpression
-		public Assignment getFailuresAssignment_1_1() { return cFailuresAssignment_1_1; }
-
-		//OutputExpression
-		public RuleCall getFailuresOutputExpressionParserRuleCall_1_1_0() { return cFailuresOutputExpressionParserRuleCall_1_1_0; }
-	}
-
-	public class InputExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "InputExpression");
-		private final Group cGroup = (Group)rule.eContents().get(1);
-		private final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);
-		private final Assignment cRefAssignment_0_0 = (Assignment)cAlternatives_0.eContents().get(0);
-		private final CrossReference cRefPortCrossReference_0_0_0 = (CrossReference)cRefAssignment_0_0.eContents().get(0);
-		private final RuleCall cRefPortIDTerminalRuleCall_0_0_0_1 = (RuleCall)cRefPortCrossReference_0_0_0.eContents().get(1);
-		private final Keyword cUndefinedKeyword_0_1 = (Keyword)cAlternatives_0.eContents().get(1);
-		private final Keyword cFullStopKeyword_1 = (Keyword)cGroup.eContents().get(1);
-		private final Assignment cFailureExprAssignment_2 = (Assignment)cGroup.eContents().get(2);
-		private final RuleCall cFailureExprInFailureExprParserRuleCall_2_0 = (RuleCall)cFailureExprAssignment_2.eContents().get(0);
-		
-		//InputExpression:
-		//	(ref=[uml::Port] | "undefined") "." failureExpr=InFailureExpr;
-		public ParserRule getRule() { return rule; }
-
-		//(ref=[uml::Port] | "undefined") "." failureExpr=InFailureExpr
-		public Group getGroup() { return cGroup; }
-
-		//ref=[uml::Port] | "undefined"
-		public Alternatives getAlternatives_0() { return cAlternatives_0; }
-
-		//ref=[uml::Port]
-		public Assignment getRefAssignment_0_0() { return cRefAssignment_0_0; }
-
-		//[uml::Port]
-		public CrossReference getRefPortCrossReference_0_0_0() { return cRefPortCrossReference_0_0_0; }
-
-		//ID
-		public RuleCall getRefPortIDTerminalRuleCall_0_0_0_1() { return cRefPortIDTerminalRuleCall_0_0_0_1; }
-
-		//"undefined"
-		public Keyword getUndefinedKeyword_0_1() { return cUndefinedKeyword_0_1; }
-
-		//"."
-		public Keyword getFullStopKeyword_1() { return cFullStopKeyword_1; }
-
-		//failureExpr=InFailureExpr
-		public Assignment getFailureExprAssignment_2() { return cFailureExprAssignment_2; }
-
-		//InFailureExpr
-		public RuleCall getFailureExprInFailureExprParserRuleCall_2_0() { return cFailureExprInFailureExprParserRuleCall_2_0; }
-	}
-
-	public class OutputExpressionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "OutputExpression");
-		private final Group cGroup = (Group)rule.eContents().get(1);
-		private final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);
-		private final Assignment cRefAssignment_0_0 = (Assignment)cAlternatives_0.eContents().get(0);
-		private final CrossReference cRefPortCrossReference_0_0_0 = (CrossReference)cRefAssignment_0_0.eContents().get(0);
-		private final RuleCall cRefPortIDTerminalRuleCall_0_0_0_1 = (RuleCall)cRefPortCrossReference_0_0_0.eContents().get(1);
-		private final Keyword cUndefinedKeyword_0_1 = (Keyword)cAlternatives_0.eContents().get(1);
-		private final Keyword cFullStopKeyword_1 = (Keyword)cGroup.eContents().get(1);
-		private final Assignment cFailureExprAssignment_2 = (Assignment)cGroup.eContents().get(2);
-		private final RuleCall cFailureExprOutFailureExprParserRuleCall_2_0 = (RuleCall)cFailureExprAssignment_2.eContents().get(0);
-		
-		//OutputExpression:
-		//	(ref=[uml::Port] | "undefined") "." failureExpr=OutFailureExpr;
-		public ParserRule getRule() { return rule; }
-
-		//(ref=[uml::Port] | "undefined") "." failureExpr=OutFailureExpr
-		public Group getGroup() { return cGroup; }
-
-		//ref=[uml::Port] | "undefined"
-		public Alternatives getAlternatives_0() { return cAlternatives_0; }
-
-		//ref=[uml::Port]
-		public Assignment getRefAssignment_0_0() { return cRefAssignment_0_0; }
-
-		//[uml::Port]
-		public CrossReference getRefPortCrossReference_0_0_0() { return cRefPortCrossReference_0_0_0; }
-
-		//ID
-		public RuleCall getRefPortIDTerminalRuleCall_0_0_0_1() { return cRefPortIDTerminalRuleCall_0_0_0_1; }
-
-		//"undefined"
-		public Keyword getUndefinedKeyword_0_1() { return cUndefinedKeyword_0_1; }
-
-		//"."
-		public Keyword getFullStopKeyword_1() { return cFullStopKeyword_1; }
-
-		//failureExpr=OutFailureExpr
-		public Assignment getFailureExprAssignment_2() { return cFailureExprAssignment_2; }
-
-		//OutFailureExpr
-		public RuleCall getFailureExprOutFailureExprParserRuleCall_2_0() { return cFailureExprOutFailureExprParserRuleCall_2_0; }
-	}
-
-	public class InFailureExprElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "InFailureExpr");
-		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
-		private final Assignment cFailuresAssignment_0 = (Assignment)cAlternatives.eContents().get(0);
-		private final RuleCall cFailuresWildcardDefinitionParserRuleCall_0_0 = (RuleCall)cFailuresAssignment_0.eContents().get(0);
-		private final Assignment cFailuresAssignment_1 = (Assignment)cAlternatives.eContents().get(1);
-		private final RuleCall cFailuresNoFailureDefinitionParserRuleCall_1_0 = (RuleCall)cFailuresAssignment_1.eContents().get(0);
-		private final Assignment cFailuresAssignment_2 = (Assignment)cAlternatives.eContents().get(2);
-		private final RuleCall cFailuresFailureDefinitionParserRuleCall_2_0 = (RuleCall)cFailuresAssignment_2.eContents().get(0);
-		private final Group cGroup_3 = (Group)cAlternatives.eContents().get(3);
-		private final Keyword cLeftCurlyBracketKeyword_3_0 = (Keyword)cGroup_3.eContents().get(0);
-		private final Assignment cFailuresAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);
-		private final RuleCall cFailuresFailureDefinitionParserRuleCall_3_1_0 = (RuleCall)cFailuresAssignment_3_1.eContents().get(0);
-		private final Group cGroup_3_2 = (Group)cGroup_3.eContents().get(2);
-		private final Keyword cCommaKeyword_3_2_0 = (Keyword)cGroup_3_2.eContents().get(0);
-		private final Assignment cFailuresAssignment_3_2_1 = (Assignment)cGroup_3_2.eContents().get(1);
-		private final RuleCall cFailuresFailureDefinitionParserRuleCall_3_2_1_0 = (RuleCall)cFailuresAssignment_3_2_1.eContents().get(0);
-		private final Keyword cRightCurlyBracketKeyword_3_3 = (Keyword)cGroup_3.eContents().get(3);
-		private final Assignment cFailuresAssignment_4 = (Assignment)cAlternatives.eContents().get(4);
-		private final RuleCall cFailuresVariableDefinitionParserRuleCall_4_0 = (RuleCall)cFailuresAssignment_4.eContents().get(0);
-		
-		//InFailureExpr:
-		//	failures+=WildcardDefinition | failures+=NoFailureDefinition | failures+=FailureDefinition | "{"
-		//	failures+=FailureDefinition ("," failures+=FailureDefinition)+ "}" | failures+=VariableDefinition;
-		public ParserRule getRule() { return rule; }
-
-		//failures+=WildcardDefinition | failures+=NoFailureDefinition | failures+=FailureDefinition | "{"
-		//failures+=FailureDefinition ("," failures+=FailureDefinition)+ "}" | failures+=VariableDefinition
-		public Alternatives getAlternatives() { return cAlternatives; }
-
-		//failures+=WildcardDefinition
-		public Assignment getFailuresAssignment_0() { return cFailuresAssignment_0; }
-
-		//WildcardDefinition
-		public RuleCall getFailuresWildcardDefinitionParserRuleCall_0_0() { return cFailuresWildcardDefinitionParserRuleCall_0_0; }
-
-		//failures+=NoFailureDefinition
-		public Assignment getFailuresAssignment_1() { return cFailuresAssignment_1; }
-
-		//NoFailureDefinition
-		public RuleCall getFailuresNoFailureDefinitionParserRuleCall_1_0() { return cFailuresNoFailureDefinitionParserRuleCall_1_0; }
-
-		//failures+=FailureDefinition
-		public Assignment getFailuresAssignment_2() { return cFailuresAssignment_2; }
-
-		//FailureDefinition
-		public RuleCall getFailuresFailureDefinitionParserRuleCall_2_0() { return cFailuresFailureDefinitionParserRuleCall_2_0; }
-
-		//"{" failures+=FailureDefinition ("," failures+=FailureDefinition)+ "}"
-		public Group getGroup_3() { return cGroup_3; }
-
-		//"{"
-		public Keyword getLeftCurlyBracketKeyword_3_0() { return cLeftCurlyBracketKeyword_3_0; }
-
-		//failures+=FailureDefinition
-		public Assignment getFailuresAssignment_3_1() { return cFailuresAssignment_3_1; }
-
-		//FailureDefinition
-		public RuleCall getFailuresFailureDefinitionParserRuleCall_3_1_0() { return cFailuresFailureDefinitionParserRuleCall_3_1_0; }
-
-		//("," failures+=FailureDefinition)+
-		public Group getGroup_3_2() { return cGroup_3_2; }
-
-		//","
-		public Keyword getCommaKeyword_3_2_0() { return cCommaKeyword_3_2_0; }
-
-		//failures+=FailureDefinition
-		public Assignment getFailuresAssignment_3_2_1() { return cFailuresAssignment_3_2_1; }
-
-		//FailureDefinition
-		public RuleCall getFailuresFailureDefinitionParserRuleCall_3_2_1_0() { return cFailuresFailureDefinitionParserRuleCall_3_2_1_0; }
-
-		//"}"
-		public Keyword getRightCurlyBracketKeyword_3_3() { return cRightCurlyBracketKeyword_3_3; }
-
-		//failures+=VariableDefinition
-		public Assignment getFailuresAssignment_4() { return cFailuresAssignment_4; }
-
-		//VariableDefinition
-		public RuleCall getFailuresVariableDefinitionParserRuleCall_4_0() { return cFailuresVariableDefinitionParserRuleCall_4_0; }
-	}
-
-	public class OutFailureExprElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "OutFailureExpr");
-		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
-		private final Assignment cFailuresAssignment_0 = (Assignment)cAlternatives.eContents().get(0);
-		private final RuleCall cFailuresNoFailureDefinitionParserRuleCall_0_0 = (RuleCall)cFailuresAssignment_0.eContents().get(0);
-		private final Assignment cFailuresAssignment_1 = (Assignment)cAlternatives.eContents().get(1);
-		private final RuleCall cFailuresComplexNofailureDefinitionParserRuleCall_1_0 = (RuleCall)cFailuresAssignment_1.eContents().get(0);
-		private final Assignment cFailuresAssignment_2 = (Assignment)cAlternatives.eContents().get(2);
-		private final RuleCall cFailuresFailureDefinitionParserRuleCall_2_0 = (RuleCall)cFailuresAssignment_2.eContents().get(0);
-		private final Group cGroup_3 = (Group)cAlternatives.eContents().get(3);
-		private final Keyword cLeftCurlyBracketKeyword_3_0 = (Keyword)cGroup_3.eContents().get(0);
-		private final Assignment cFailuresAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);
-		private final RuleCall cFailuresFailureDefinitionParserRuleCall_3_1_0 = (RuleCall)cFailuresAssignment_3_1.eContents().get(0);
-		private final Group cGroup_3_2 = (Group)cGroup_3.eContents().get(2);
-		private final Keyword cCommaKeyword_3_2_0 = (Keyword)cGroup_3_2.eContents().get(0);
-		private final Assignment cFailuresAssignment_3_2_1 = (Assignment)cGroup_3_2.eContents().get(1);
-		private final RuleCall cFailuresFailureDefinitionParserRuleCall_3_2_1_0 = (RuleCall)cFailuresAssignment_3_2_1.eContents().get(0);
-		private final Keyword cRightCurlyBracketKeyword_3_3 = (Keyword)cGroup_3.eContents().get(3);
-		private final Assignment cFailuresAssignment_4 = (Assignment)cAlternatives.eContents().get(4);
-		private final RuleCall cFailuresVariableDefinitionParserRuleCall_4_0 = (RuleCall)cFailuresAssignment_4.eContents().get(0);
-		
-		//OutFailureExpr:
-		//	failures+=NoFailureDefinition | failures+=ComplexNofailureDefinition | failures+=FailureDefinition | "{"
-		//	failures+=FailureDefinition ("," failures+=FailureDefinition)+ "}" | failures+=VariableDefinition;
-		public ParserRule getRule() { return rule; }
-
-		//failures+=NoFailureDefinition | failures+=ComplexNofailureDefinition | failures+=FailureDefinition | "{"
-		//failures+=FailureDefinition ("," failures+=FailureDefinition)+ "}" | failures+=VariableDefinition
-		public Alternatives getAlternatives() { return cAlternatives; }
-
-		//failures+=NoFailureDefinition
-		public Assignment getFailuresAssignment_0() { return cFailuresAssignment_0; }
-
-		//NoFailureDefinition
-		public RuleCall getFailuresNoFailureDefinitionParserRuleCall_0_0() { return cFailuresNoFailureDefinitionParserRuleCall_0_0; }
-
-		//failures+=ComplexNofailureDefinition
-		public Assignment getFailuresAssignment_1() { return cFailuresAssignment_1; }
-
-		//ComplexNofailureDefinition
-		public RuleCall getFailuresComplexNofailureDefinitionParserRuleCall_1_0() { return cFailuresComplexNofailureDefinitionParserRuleCall_1_0; }
-
-		//failures+=FailureDefinition
-		public Assignment getFailuresAssignment_2() { return cFailuresAssignment_2; }
-
-		//FailureDefinition
-		public RuleCall getFailuresFailureDefinitionParserRuleCall_2_0() { return cFailuresFailureDefinitionParserRuleCall_2_0; }
-
-		//"{" failures+=FailureDefinition ("," failures+=FailureDefinition)+ "}"
-		public Group getGroup_3() { return cGroup_3; }
-
-		//"{"
-		public Keyword getLeftCurlyBracketKeyword_3_0() { return cLeftCurlyBracketKeyword_3_0; }
-
-		//failures+=FailureDefinition
-		public Assignment getFailuresAssignment_3_1() { return cFailuresAssignment_3_1; }
-
-		//FailureDefinition
-		public RuleCall getFailuresFailureDefinitionParserRuleCall_3_1_0() { return cFailuresFailureDefinitionParserRuleCall_3_1_0; }
-
-		//("," failures+=FailureDefinition)+
-		public Group getGroup_3_2() { return cGroup_3_2; }
-
-		//","
-		public Keyword getCommaKeyword_3_2_0() { return cCommaKeyword_3_2_0; }
-
-		//failures+=FailureDefinition
-		public Assignment getFailuresAssignment_3_2_1() { return cFailuresAssignment_3_2_1; }
-
-		//FailureDefinition
-		public RuleCall getFailuresFailureDefinitionParserRuleCall_3_2_1_0() { return cFailuresFailureDefinitionParserRuleCall_3_2_1_0; }
-
-		//"}"
-		public Keyword getRightCurlyBracketKeyword_3_3() { return cRightCurlyBracketKeyword_3_3; }
-
-		//failures+=VariableDefinition
-		public Assignment getFailuresAssignment_4() { return cFailuresAssignment_4; }
-
-		//VariableDefinition
-		public RuleCall getFailuresVariableDefinitionParserRuleCall_4_0() { return cFailuresVariableDefinitionParserRuleCall_4_0; }
-	}
-
-	public class DefinitionsElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Definitions");
-		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
-		private final RuleCall cFailureDefinitionParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
-		private final RuleCall cNoFailureDefinitionParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
-		private final RuleCall cComplexNofailureDefinitionParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2);
-		private final RuleCall cWildcardDefinitionParserRuleCall_3 = (RuleCall)cAlternatives.eContents().get(3);
-		private final RuleCall cVariableDefinitionParserRuleCall_4 = (RuleCall)cAlternatives.eContents().get(4);
-		
-		//Definitions:
-		//	FailureDefinition | NoFailureDefinition | ComplexNofailureDefinition | WildcardDefinition | VariableDefinition;
-		public ParserRule getRule() { return rule; }
-
-		//FailureDefinition | NoFailureDefinition | ComplexNofailureDefinition | WildcardDefinition | VariableDefinition
-		public Alternatives getAlternatives() { return cAlternatives; }
-
-		//FailureDefinition
-		public RuleCall getFailureDefinitionParserRuleCall_0() { return cFailureDefinitionParserRuleCall_0; }
-
-		//NoFailureDefinition
-		public RuleCall getNoFailureDefinitionParserRuleCall_1() { return cNoFailureDefinitionParserRuleCall_1; }
-
-		//ComplexNofailureDefinition
-		public RuleCall getComplexNofailureDefinitionParserRuleCall_2() { return cComplexNofailureDefinitionParserRuleCall_2; }
-
-		//WildcardDefinition
-		public RuleCall getWildcardDefinitionParserRuleCall_3() { return cWildcardDefinitionParserRuleCall_3; }
-
-		//VariableDefinition
-		public RuleCall getVariableDefinitionParserRuleCall_4() { return cVariableDefinitionParserRuleCall_4; }
-	}
-
-	public class FailureDefinitionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "FailureDefinition");
-		private final Group cGroup = (Group)rule.eContents().get(1);
-		private final Action cFailureDefinitionAction_0 = (Action)cGroup.eContents().get(0);
-		private final Assignment cTypeAssignment_1 = (Assignment)cGroup.eContents().get(1);
-		private final RuleCall cTypeActualFailureTypeEnumRuleCall_1_0 = (RuleCall)cTypeAssignment_1.eContents().get(0);
-		private final Group cGroup_2 = (Group)cGroup.eContents().get(2);
-		private final Keyword cFullStopKeyword_2_0 = (Keyword)cGroup_2.eContents().get(0);
-		private final Assignment cAcidAvoidableAssignment_2_1 = (Assignment)cGroup_2.eContents().get(1);
-		private final RuleCall cAcidAvoidableACIDavoidableParserRuleCall_2_1_0 = (RuleCall)cAcidAvoidableAssignment_2_1.eContents().get(0);
-		
-		//FailureDefinition:
-		//	{FailureDefinition} type=ActualFailureType ("." acidAvoidable=ACIDavoidable)?;
-		public ParserRule getRule() { return rule; }
-
-		//{FailureDefinition} type=ActualFailureType ("." acidAvoidable=ACIDavoidable)?
-		public Group getGroup() { return cGroup; }
-
-		//{FailureDefinition}
-		public Action getFailureDefinitionAction_0() { return cFailureDefinitionAction_0; }
-
-		//type=ActualFailureType
-		public Assignment getTypeAssignment_1() { return cTypeAssignment_1; }
-
-		//ActualFailureType
-		public RuleCall getTypeActualFailureTypeEnumRuleCall_1_0() { return cTypeActualFailureTypeEnumRuleCall_1_0; }
-
-		//("." acidAvoidable=ACIDavoidable)?
-		public Group getGroup_2() { return cGroup_2; }
-
-		//"."
-		public Keyword getFullStopKeyword_2_0() { return cFullStopKeyword_2_0; }
-
-		//acidAvoidable=ACIDavoidable
-		public Assignment getAcidAvoidableAssignment_2_1() { return cAcidAvoidableAssignment_2_1; }
-
-		//ACIDavoidable
-		public RuleCall getAcidAvoidableACIDavoidableParserRuleCall_2_1_0() { return cAcidAvoidableACIDavoidableParserRuleCall_2_1_0; }
-	}
-
-	public class NoFailureDefinitionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "NoFailureDefinition");
-		private final Group cGroup = (Group)rule.eContents().get(1);
-		private final Action cNoFailureDefinitionAction_0 = (Action)cGroup.eContents().get(0);
-		private final Keyword cNoFailureKeyword_1 = (Keyword)cGroup.eContents().get(1);
-		
-		//NoFailureDefinition:
-		//	{NoFailureDefinition} "noFailure";
-		public ParserRule getRule() { return rule; }
-
-		//{NoFailureDefinition} "noFailure"
-		public Group getGroup() { return cGroup; }
-
-		//{NoFailureDefinition}
-		public Action getNoFailureDefinitionAction_0() { return cNoFailureDefinitionAction_0; }
-
-		//"noFailure"
-		public Keyword getNoFailureKeyword_1() { return cNoFailureKeyword_1; }
-	}
-
-	public class ComplexNofailureDefinitionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ComplexNofailureDefinition");
-		private final Group cGroup = (Group)rule.eContents().get(1);
-		private final Action cNoFailureDefinitionAction_0 = (Action)cGroup.eContents().get(0);
-		private final Keyword cNoFailureKeyword_1 = (Keyword)cGroup.eContents().get(1);
-		private final Keyword cFullStopKeyword_2 = (Keyword)cGroup.eContents().get(2);
-		private final Assignment cAcidMitigationAssignment_3 = (Assignment)cGroup.eContents().get(3);
-		private final RuleCall cAcidMitigationACIDMitigationParserRuleCall_3_0 = (RuleCall)cAcidMitigationAssignment_3.eContents().get(0);
-		
-		//ComplexNofailureDefinition:
-		//	{NoFailureDefinition} "noFailure" "." acidMitigation=ACIDMitigation;
-		public ParserRule getRule() { return rule; }
-
-		//{NoFailureDefinition} "noFailure" "." acidMitigation=ACIDMitigation
-		public Group getGroup() { return cGroup; }
-
-		//{NoFailureDefinition}
-		public Action getNoFailureDefinitionAction_0() { return cNoFailureDefinitionAction_0; }
-
-		//"noFailure"
-		public Keyword getNoFailureKeyword_1() { return cNoFailureKeyword_1; }
-
-		//"."
-		public Keyword getFullStopKeyword_2() { return cFullStopKeyword_2; }
-
-		//acidMitigation=ACIDMitigation
-		public Assignment getAcidMitigationAssignment_3() { return cAcidMitigationAssignment_3; }
-
-		//ACIDMitigation
-		public RuleCall getAcidMitigationACIDMitigationParserRuleCall_3_0() { return cAcidMitigationACIDMitigationParserRuleCall_3_0; }
-	}
-
-	public class WildcardDefinitionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "WildcardDefinition");
-		private final Group cGroup = (Group)rule.eContents().get(1);
-		private final Action cWildcardDefinitionAction_0 = (Action)cGroup.eContents().get(0);
-		private final Keyword cWildcardKeyword_1 = (Keyword)cGroup.eContents().get(1);
-		
-		//WildcardDefinition:
-		//	{WildcardDefinition} "wildcard";
-		public ParserRule getRule() { return rule; }
-
-		//{WildcardDefinition} "wildcard"
-		public Group getGroup() { return cGroup; }
-
-		//{WildcardDefinition}
-		public Action getWildcardDefinitionAction_0() { return cWildcardDefinitionAction_0; }
-
-		//"wildcard"
-		public Keyword getWildcardKeyword_1() { return cWildcardKeyword_1; }
-	}
-
-	public class VariableDefinitionElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "VariableDefinition");
-		private final Group cGroup = (Group)rule.eContents().get(1);
-		private final Action cVariableDefinitionAction_0 = (Action)cGroup.eContents().get(0);
-		private final Assignment cVariableNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
-		private final RuleCall cVariableNameIDTerminalRuleCall_1_0 = (RuleCall)cVariableNameAssignment_1.eContents().get(0);
-		
-		//VariableDefinition:
-		//	{VariableDefinition} variableName=ID;
-		public ParserRule getRule() { return rule; }
-
-		//{VariableDefinition} variableName=ID
-		public Group getGroup() { return cGroup; }
-
-		//{VariableDefinition}
-		public Action getVariableDefinitionAction_0() { return cVariableDefinitionAction_0; }
-
-		//variableName=ID
-		public Assignment getVariableNameAssignment_1() { return cVariableNameAssignment_1; }
-
-		//ID
-		public RuleCall getVariableNameIDTerminalRuleCall_1_0() { return cVariableNameIDTerminalRuleCall_1_0; }
-	}
-
-	public class ACIDavoidableElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ACIDavoidable");
-		private final Group cGroup = (Group)rule.eContents().get(1);
-		private final Assignment cAAssignment_0 = (Assignment)cGroup.eContents().get(0);
-		private final RuleCall cAAavoidableEnumRuleCall_0_0 = (RuleCall)cAAssignment_0.eContents().get(0);
-		private final Keyword cFullStopKeyword_1 = (Keyword)cGroup.eContents().get(1);
-		private final Assignment cCAssignment_2 = (Assignment)cGroup.eContents().get(2);
-		private final RuleCall cCCavoidableEnumRuleCall_2_0 = (RuleCall)cCAssignment_2.eContents().get(0);
-		private final Keyword cFullStopKeyword_3 = (Keyword)cGroup.eContents().get(3);
-		private final Assignment cIAssignment_4 = (Assignment)cGroup.eContents().get(4);
-		private final RuleCall cIIavoidableEnumRuleCall_4_0 = (RuleCall)cIAssignment_4.eContents().get(0);
-		private final Keyword cFullStopKeyword_5 = (Keyword)cGroup.eContents().get(5);
-		private final Assignment cDAssignment_6 = (Assignment)cGroup.eContents().get(6);
-		private final RuleCall cDDavoidableEnumRuleCall_6_0 = (RuleCall)cDAssignment_6.eContents().get(0);
-		
-		//ACIDavoidable:
-		//	a=Aavoidable "." c=Cavoidable "." i=Iavoidable "." d=Davoidable;
-		public ParserRule getRule() { return rule; }
-
-		//a=Aavoidable "." c=Cavoidable "." i=Iavoidable "." d=Davoidable
-		public Group getGroup() { return cGroup; }
-
-		//a=Aavoidable
-		public Assignment getAAssignment_0() { return cAAssignment_0; }
-
-		//Aavoidable
-		public RuleCall getAAavoidableEnumRuleCall_0_0() { return cAAavoidableEnumRuleCall_0_0; }
-
-		//"."
-		public Keyword getFullStopKeyword_1() { return cFullStopKeyword_1; }
-
-		//c=Cavoidable
-		public Assignment getCAssignment_2() { return cCAssignment_2; }
-
-		//Cavoidable
-		public RuleCall getCCavoidableEnumRuleCall_2_0() { return cCCavoidableEnumRuleCall_2_0; }
-
-		//"."
-		public Keyword getFullStopKeyword_3() { return cFullStopKeyword_3; }
-
-		//i=Iavoidable
-		public Assignment getIAssignment_4() { return cIAssignment_4; }
-
-		//Iavoidable
-		public RuleCall getIIavoidableEnumRuleCall_4_0() { return cIIavoidableEnumRuleCall_4_0; }
-
-		//"."
-		public Keyword getFullStopKeyword_5() { return cFullStopKeyword_5; }
-
-		//d=Davoidable
-		public Assignment getDAssignment_6() { return cDAssignment_6; }
-
-		//Davoidable
-		public RuleCall getDDavoidableEnumRuleCall_6_0() { return cDDavoidableEnumRuleCall_6_0; }
-	}
-
-	public class ACIDMitigationElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ACIDMitigation");
-		private final Group cGroup = (Group)rule.eContents().get(1);
-		private final Assignment cAAssignment_0 = (Assignment)cGroup.eContents().get(0);
-		private final RuleCall cAAmitigationEnumRuleCall_0_0 = (RuleCall)cAAssignment_0.eContents().get(0);
-		private final Keyword cFullStopKeyword_1 = (Keyword)cGroup.eContents().get(1);
-		private final Assignment cCAssignment_2 = (Assignment)cGroup.eContents().get(2);
-		private final RuleCall cCCmitigationEnumRuleCall_2_0 = (RuleCall)cCAssignment_2.eContents().get(0);
-		private final Keyword cFullStopKeyword_3 = (Keyword)cGroup.eContents().get(3);
-		private final Assignment cIAssignment_4 = (Assignment)cGroup.eContents().get(4);
-		private final RuleCall cIImitigationEnumRuleCall_4_0 = (RuleCall)cIAssignment_4.eContents().get(0);
-		private final Keyword cFullStopKeyword_5 = (Keyword)cGroup.eContents().get(5);
-		private final Assignment cDAssignment_6 = (Assignment)cGroup.eContents().get(6);
-		private final RuleCall cDDmitigationEnumRuleCall_6_0 = (RuleCall)cDAssignment_6.eContents().get(0);
-		
-		//ACIDMitigation:
-		//	a=Amitigation "." c=Cmitigation "." i=Imitigation "." d=Dmitigation;
-		public ParserRule getRule() { return rule; }
-
-		//a=Amitigation "." c=Cmitigation "." i=Imitigation "." d=Dmitigation
-		public Group getGroup() { return cGroup; }
-
-		//a=Amitigation
-		public Assignment getAAssignment_0() { return cAAssignment_0; }
-
-		//Amitigation
-		public RuleCall getAAmitigationEnumRuleCall_0_0() { return cAAmitigationEnumRuleCall_0_0; }
-
-		//"."
-		public Keyword getFullStopKeyword_1() { return cFullStopKeyword_1; }
-
-		//c=Cmitigation
-		public Assignment getCAssignment_2() { return cCAssignment_2; }
-
-		//Cmitigation
-		public RuleCall getCCmitigationEnumRuleCall_2_0() { return cCCmitigationEnumRuleCall_2_0; }
-
-		//"."
-		public Keyword getFullStopKeyword_3() { return cFullStopKeyword_3; }
-
-		//i=Imitigation
-		public Assignment getIAssignment_4() { return cIAssignment_4; }
-
-		//Imitigation
-		public RuleCall getIImitigationEnumRuleCall_4_0() { return cIImitigationEnumRuleCall_4_0; }
-
-		//"."
-		public Keyword getFullStopKeyword_5() { return cFullStopKeyword_5; }
-
-		//d=Dmitigation
-		public Assignment getDAssignment_6() { return cDAssignment_6; }
-
-		//Dmitigation
-		public RuleCall getDDmitigationEnumRuleCall_6_0() { return cDDmitigationEnumRuleCall_6_0; }
-	}
-
-	public class FQNElements extends AbstractParserRuleElementFinder {
-		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "FQN");
-		private final Group cGroup = (Group)rule.eContents().get(1);
-		private final RuleCall cIDTerminalRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
-		private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
-		private final Keyword cColonColonKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);
-		private final RuleCall cIDTerminalRuleCall_1_1 = (RuleCall)cGroup_1.eContents().get(1);
-		
-		/// *
-		// * Additional rule to refer UML elements in a Model
-		// * / FQN returns ecore::EString:
-		//	ID ("::" ID)*;
-		public ParserRule getRule() { return rule; }
-
-		//ID ("::" ID)*
-		public Group getGroup() { return cGroup; }
-
-		//ID
-		public RuleCall getIDTerminalRuleCall_0() { return cIDTerminalRuleCall_0; }
-
-		//("::" ID)*
-		public Group getGroup_1() { return cGroup_1; }
-
-		//"::"
-		public Keyword getColonColonKeyword_1_0() { return cColonColonKeyword_1_0; }
-
-		//ID
-		public RuleCall getIDTerminalRuleCall_1_1() { return cIDTerminalRuleCall_1_1; }
-	}
-	
-	
-	public class FailureTypeElements extends AbstractEnumRuleElementFinder {
-		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "FailureType");
-		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
-		private final EnumLiteralDeclaration cNO_FAILUREEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
-		private final Keyword cNO_FAILURENoFailureKeyword_0_0 = (Keyword)cNO_FAILUREEnumLiteralDeclaration_0.eContents().get(0);
-		private final EnumLiteralDeclaration cEARLYEnumLiteralDeclaration_1 = (EnumLiteralDeclaration)cAlternatives.eContents().get(1);
-		private final Keyword cEARLYEarlyKeyword_1_0 = (Keyword)cEARLYEnumLiteralDeclaration_1.eContents().get(0);
-		private final EnumLiteralDeclaration cLATEEnumLiteralDeclaration_2 = (EnumLiteralDeclaration)cAlternatives.eContents().get(2);
-		private final Keyword cLATELateKeyword_2_0 = (Keyword)cLATEEnumLiteralDeclaration_2.eContents().get(0);
-		private final EnumLiteralDeclaration cCOMMISSIONEnumLiteralDeclaration_3 = (EnumLiteralDeclaration)cAlternatives.eContents().get(3);
-		private final Keyword cCOMMISSIONCommissionKeyword_3_0 = (Keyword)cCOMMISSIONEnumLiteralDeclaration_3.eContents().get(0);
-		private final EnumLiteralDeclaration cOMISSIONEnumLiteralDeclaration_4 = (EnumLiteralDeclaration)cAlternatives.eContents().get(4);
-		private final Keyword cOMISSIONOmissionKeyword_4_0 = (Keyword)cOMISSIONEnumLiteralDeclaration_4.eContents().get(0);
-		private final EnumLiteralDeclaration cVALUE_SUBTLEEnumLiteralDeclaration_5 = (EnumLiteralDeclaration)cAlternatives.eContents().get(5);
-		private final Keyword cVALUE_SUBTLEValueSubtleKeyword_5_0 = (Keyword)cVALUE_SUBTLEEnumLiteralDeclaration_5.eContents().get(0);
-		private final EnumLiteralDeclaration cVALUE_COARSEEnumLiteralDeclaration_6 = (EnumLiteralDeclaration)cAlternatives.eContents().get(6);
-		private final Keyword cVALUE_COARSEValueCoarseKeyword_6_0 = (Keyword)cVALUE_COARSEEnumLiteralDeclaration_6.eContents().get(0);
-		private final EnumLiteralDeclaration cWILDCARDEnumLiteralDeclaration_7 = (EnumLiteralDeclaration)cAlternatives.eContents().get(7);
-		private final Keyword cWILDCARDWildcardKeyword_7_0 = (Keyword)cWILDCARDEnumLiteralDeclaration_7.eContents().get(0);
-		private final EnumLiteralDeclaration cVARIABLEEnumLiteralDeclaration_8 = (EnumLiteralDeclaration)cAlternatives.eContents().get(8);
-		private final Keyword cVARIABLEVariableKeyword_8_0 = (Keyword)cVARIABLEEnumLiteralDeclaration_8.eContents().get(0);
-		
-		//enum FailureType:
-		//	NO_FAILURE="noFailure" | EARLY="early" | LATE="late" | COMMISSION="commission" | OMISSION="omission" |
-		//	VALUE_SUBTLE="valueSubtle" | VALUE_COARSE="valueCoarse" | WILDCARD="wildcard" | VARIABLE="variable";
-		public EnumRule getRule() { return rule; }
-
-		//NO_FAILURE="noFailure" | EARLY="early" | LATE="late" | COMMISSION="commission" | OMISSION="omission" |
-		//VALUE_SUBTLE="valueSubtle" | VALUE_COARSE="valueCoarse" | WILDCARD="wildcard" | VARIABLE="variable"
-		public Alternatives getAlternatives() { return cAlternatives; }
-
-		//NO_FAILURE="noFailure"
-		public EnumLiteralDeclaration getNO_FAILUREEnumLiteralDeclaration_0() { return cNO_FAILUREEnumLiteralDeclaration_0; }
-
-		//"noFailure"
-		public Keyword getNO_FAILURENoFailureKeyword_0_0() { return cNO_FAILURENoFailureKeyword_0_0; }
-
-		//EARLY="early"
-		public EnumLiteralDeclaration getEARLYEnumLiteralDeclaration_1() { return cEARLYEnumLiteralDeclaration_1; }
-
-		//"early"
-		public Keyword getEARLYEarlyKeyword_1_0() { return cEARLYEarlyKeyword_1_0; }
-
-		//LATE="late"
-		public EnumLiteralDeclaration getLATEEnumLiteralDeclaration_2() { return cLATEEnumLiteralDeclaration_2; }
-
-		//"late"
-		public Keyword getLATELateKeyword_2_0() { return cLATELateKeyword_2_0; }
-
-		//COMMISSION="commission"
-		public EnumLiteralDeclaration getCOMMISSIONEnumLiteralDeclaration_3() { return cCOMMISSIONEnumLiteralDeclaration_3; }
-
-		//"commission"
-		public Keyword getCOMMISSIONCommissionKeyword_3_0() { return cCOMMISSIONCommissionKeyword_3_0; }
-
-		//OMISSION="omission"
-		public EnumLiteralDeclaration getOMISSIONEnumLiteralDeclaration_4() { return cOMISSIONEnumLiteralDeclaration_4; }
-
-		//"omission"
-		public Keyword getOMISSIONOmissionKeyword_4_0() { return cOMISSIONOmissionKeyword_4_0; }
-
-		//VALUE_SUBTLE="valueSubtle"
-		public EnumLiteralDeclaration getVALUE_SUBTLEEnumLiteralDeclaration_5() { return cVALUE_SUBTLEEnumLiteralDeclaration_5; }
-
-		//"valueSubtle"
-		public Keyword getVALUE_SUBTLEValueSubtleKeyword_5_0() { return cVALUE_SUBTLEValueSubtleKeyword_5_0; }
-
-		//VALUE_COARSE="valueCoarse"
-		public EnumLiteralDeclaration getVALUE_COARSEEnumLiteralDeclaration_6() { return cVALUE_COARSEEnumLiteralDeclaration_6; }
-
-		//"valueCoarse"
-		public Keyword getVALUE_COARSEValueCoarseKeyword_6_0() { return cVALUE_COARSEValueCoarseKeyword_6_0; }
-
-		//WILDCARD="wildcard"
-		public EnumLiteralDeclaration getWILDCARDEnumLiteralDeclaration_7() { return cWILDCARDEnumLiteralDeclaration_7; }
-
-		//"wildcard"
-		public Keyword getWILDCARDWildcardKeyword_7_0() { return cWILDCARDWildcardKeyword_7_0; }
-
-		//VARIABLE="variable"
-		public EnumLiteralDeclaration getVARIABLEEnumLiteralDeclaration_8() { return cVARIABLEEnumLiteralDeclaration_8; }
-
-		//"variable"
-		public Keyword getVARIABLEVariableKeyword_8_0() { return cVARIABLEVariableKeyword_8_0; }
-	}
-
-	public class ActualFailureTypeElements extends AbstractEnumRuleElementFinder {
-		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "ActualFailureType");
-		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
-		private final EnumLiteralDeclaration cEARLYEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
-		private final Keyword cEARLYEarlyKeyword_0_0 = (Keyword)cEARLYEnumLiteralDeclaration_0.eContents().get(0);
-		private final EnumLiteralDeclaration cLATEEnumLiteralDeclaration_1 = (EnumLiteralDeclaration)cAlternatives.eContents().get(1);
-		private final Keyword cLATELateKeyword_1_0 = (Keyword)cLATEEnumLiteralDeclaration_1.eContents().get(0);
-		private final EnumLiteralDeclaration cCOMMISSIONEnumLiteralDeclaration_2 = (EnumLiteralDeclaration)cAlternatives.eContents().get(2);
-		private final Keyword cCOMMISSIONCommissionKeyword_2_0 = (Keyword)cCOMMISSIONEnumLiteralDeclaration_2.eContents().get(0);
-		private final EnumLiteralDeclaration cOMISSIONEnumLiteralDeclaration_3 = (EnumLiteralDeclaration)cAlternatives.eContents().get(3);
-		private final Keyword cOMISSIONOmissionKeyword_3_0 = (Keyword)cOMISSIONEnumLiteralDeclaration_3.eContents().get(0);
-		private final EnumLiteralDeclaration cVALUE_SUBTLEEnumLiteralDeclaration_4 = (EnumLiteralDeclaration)cAlternatives.eContents().get(4);
-		private final Keyword cVALUE_SUBTLEValueSubtleKeyword_4_0 = (Keyword)cVALUE_SUBTLEEnumLiteralDeclaration_4.eContents().get(0);
-		private final EnumLiteralDeclaration cVALUE_COARSEEnumLiteralDeclaration_5 = (EnumLiteralDeclaration)cAlternatives.eContents().get(5);
-		private final Keyword cVALUE_COARSEValueCoarseKeyword_5_0 = (Keyword)cVALUE_COARSEEnumLiteralDeclaration_5.eContents().get(0);
-		
-		//enum ActualFailureType returns FailureType:
-		//	EARLY="early" | LATE="late" | COMMISSION="commission" | OMISSION="omission" | VALUE_SUBTLE="valueSubtle" |
-		//	VALUE_COARSE="valueCoarse";
-		public EnumRule getRule() { return rule; }
-
-		//EARLY="early" | LATE="late" | COMMISSION="commission" | OMISSION="omission" | VALUE_SUBTLE="valueSubtle" |
-		//VALUE_COARSE="valueCoarse"
-		public Alternatives getAlternatives() { return cAlternatives; }
-
-		//EARLY="early"
-		public EnumLiteralDeclaration getEARLYEnumLiteralDeclaration_0() { return cEARLYEnumLiteralDeclaration_0; }
-
-		//"early"
-		public Keyword getEARLYEarlyKeyword_0_0() { return cEARLYEarlyKeyword_0_0; }
-
-		//LATE="late"
-		public EnumLiteralDeclaration getLATEEnumLiteralDeclaration_1() { return cLATEEnumLiteralDeclaration_1; }
-
-		//"late"
-		public Keyword getLATELateKeyword_1_0() { return cLATELateKeyword_1_0; }
-
-		//COMMISSION="commission"
-		public EnumLiteralDeclaration getCOMMISSIONEnumLiteralDeclaration_2() { return cCOMMISSIONEnumLiteralDeclaration_2; }
-
-		//"commission"
-		public Keyword getCOMMISSIONCommissionKeyword_2_0() { return cCOMMISSIONCommissionKeyword_2_0; }
-
-		//OMISSION="omission"
-		public EnumLiteralDeclaration getOMISSIONEnumLiteralDeclaration_3() { return cOMISSIONEnumLiteralDeclaration_3; }
-
-		//"omission"
-		public Keyword getOMISSIONOmissionKeyword_3_0() { return cOMISSIONOmissionKeyword_3_0; }
-
-		//VALUE_SUBTLE="valueSubtle"
-		public EnumLiteralDeclaration getVALUE_SUBTLEEnumLiteralDeclaration_4() { return cVALUE_SUBTLEEnumLiteralDeclaration_4; }
-
-		//"valueSubtle"
-		public Keyword getVALUE_SUBTLEValueSubtleKeyword_4_0() { return cVALUE_SUBTLEValueSubtleKeyword_4_0; }
-
-		//VALUE_COARSE="valueCoarse"
-		public EnumLiteralDeclaration getVALUE_COARSEEnumLiteralDeclaration_5() { return cVALUE_COARSEEnumLiteralDeclaration_5; }
-
-		//"valueCoarse"
-		public Keyword getVALUE_COARSEValueCoarseKeyword_5_0() { return cVALUE_COARSEValueCoarseKeyword_5_0; }
-	}
-
-	public class NoFailureTypeElements extends AbstractEnumRuleElementFinder {
-		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "NoFailureType");
-		private final EnumLiteralDeclaration cNO_FAILUREEnumLiteralDeclaration = (EnumLiteralDeclaration)rule.eContents().get(1);
-		private final Keyword cNO_FAILURENoFailureKeyword_0 = (Keyword)cNO_FAILUREEnumLiteralDeclaration.eContents().get(0);
-		
-		//enum NoFailureType returns FailureType:
-		//	NO_FAILURE="noFailure";
-		public EnumRule getRule() { return rule; }
-
-		//NO_FAILURE="noFailure"
-		public EnumLiteralDeclaration getNO_FAILUREEnumLiteralDeclaration() { return cNO_FAILUREEnumLiteralDeclaration; }
-
-		//"noFailure"
-		public Keyword getNO_FAILURENoFailureKeyword_0() { return cNO_FAILURENoFailureKeyword_0; }
-	}
-
-	public class WildcardElements extends AbstractEnumRuleElementFinder {
-		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "Wildcard");
-		private final EnumLiteralDeclaration cWILDCARDEnumLiteralDeclaration = (EnumLiteralDeclaration)rule.eContents().get(1);
-		private final Keyword cWILDCARDWildcardKeyword_0 = (Keyword)cWILDCARDEnumLiteralDeclaration.eContents().get(0);
-		
-		//enum Wildcard returns FailureType:
-		//	WILDCARD="wildcard";
-		public EnumRule getRule() { return rule; }
-
-		//WILDCARD="wildcard"
-		public EnumLiteralDeclaration getWILDCARDEnumLiteralDeclaration() { return cWILDCARDEnumLiteralDeclaration; }
-
-		//"wildcard"
-		public Keyword getWILDCARDWildcardKeyword_0() { return cWILDCARDWildcardKeyword_0; }
-	}
-
-	public class AavoidableElements extends AbstractEnumRuleElementFinder {
-		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "Aavoidable");
-		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
-		private final EnumLiteralDeclaration cINCOMPLETIONEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
-		private final Keyword cINCOMPLETIONIncompletionKeyword_0_0 = (Keyword)cINCOMPLETIONEnumLiteralDeclaration_0.eContents().get(0);
-		private final EnumLiteralDeclaration cNONEEnumLiteralDeclaration_1 = (EnumLiteralDeclaration)cAlternatives.eContents().get(1);
-		private final Keyword cNONENoneKeyword_1_0 = (Keyword)cNONEEnumLiteralDeclaration_1.eContents().get(0);
-		private final EnumLiteralDeclaration cUNSPECIFIEDEnumLiteralDeclaration_2 = (EnumLiteralDeclaration)cAlternatives.eContents().get(2);
-		private final Keyword cUNSPECIFIEDUnspecifiedKeyword_2_0 = (Keyword)cUNSPECIFIEDEnumLiteralDeclaration_2.eContents().get(0);
-		
-		//enum Aavoidable:
-		//	INCOMPLETION="incompletion" | NONE="none" | UNSPECIFIED="unspecified";
-		public EnumRule getRule() { return rule; }
-
-		//INCOMPLETION="incompletion" | NONE="none" | UNSPECIFIED="unspecified"
-		public Alternatives getAlternatives() { return cAlternatives; }
-
-		//INCOMPLETION="incompletion"
-		public EnumLiteralDeclaration getINCOMPLETIONEnumLiteralDeclaration_0() { return cINCOMPLETIONEnumLiteralDeclaration_0; }
-
-		//"incompletion"
-		public Keyword getINCOMPLETIONIncompletionKeyword_0_0() { return cINCOMPLETIONIncompletionKeyword_0_0; }
-
-		//NONE="none"
-		public EnumLiteralDeclaration getNONEEnumLiteralDeclaration_1() { return cNONEEnumLiteralDeclaration_1; }
-
-		//"none"
-		public Keyword getNONENoneKeyword_1_0() { return cNONENoneKeyword_1_0; }
-
-		//UNSPECIFIED="unspecified"
-		public EnumLiteralDeclaration getUNSPECIFIEDEnumLiteralDeclaration_2() { return cUNSPECIFIEDEnumLiteralDeclaration_2; }
-
-		//"unspecified"
-		public Keyword getUNSPECIFIEDUnspecifiedKeyword_2_0() { return cUNSPECIFIEDUnspecifiedKeyword_2_0; }
-	}
-
-	public class CavoidableElements extends AbstractEnumRuleElementFinder {
-		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "Cavoidable");
-		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
-		private final EnumLiteralDeclaration cINCONSISTENCYEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
-		private final Keyword cINCONSISTENCYInconsistencyKeyword_0_0 = (Keyword)cINCONSISTENCYEnumLiteralDeclaration_0.eContents().get(0);
-		private final EnumLiteralDeclaration cNONEEnumLiteralDeclaration_1 = (EnumLiteralDeclaration)cAlternatives.eContents().get(1);
-		private final Keyword cNONENoneKeyword_1_0 = (Keyword)cNONEEnumLiteralDeclaration_1.eContents().get(0);
-		private final EnumLiteralDeclaration cUNSPECIFIEDEnumLiteralDeclaration_2 = (EnumLiteralDeclaration)cAlternatives.eContents().get(2);
-		private final Keyword cUNSPECIFIEDUnspecifiedKeyword_2_0 = (Keyword)cUNSPECIFIEDEnumLiteralDeclaration_2.eContents().get(0);
-		
-		//enum Cavoidable:
-		//	INCONSISTENCY="inconsistency" | NONE="none" | UNSPECIFIED="unspecified";
-		public EnumRule getRule() { return rule; }
-
-		//INCONSISTENCY="inconsistency" | NONE="none" | UNSPECIFIED="unspecified"
-		public Alternatives getAlternatives() { return cAlternatives; }
-
-		//INCONSISTENCY="inconsistency"
-		public EnumLiteralDeclaration getINCONSISTENCYEnumLiteralDeclaration_0() { return cINCONSISTENCYEnumLiteralDeclaration_0; }
-
-		//"inconsistency"
-		public Keyword getINCONSISTENCYInconsistencyKeyword_0_0() { return cINCONSISTENCYInconsistencyKeyword_0_0; }
-
-		//NONE="none"
-		public EnumLiteralDeclaration getNONEEnumLiteralDeclaration_1() { return cNONEEnumLiteralDeclaration_1; }
-
-		//"none"
-		public Keyword getNONENoneKeyword_1_0() { return cNONENoneKeyword_1_0; }
-
-		//UNSPECIFIED="unspecified"
-		public EnumLiteralDeclaration getUNSPECIFIEDEnumLiteralDeclaration_2() { return cUNSPECIFIEDEnumLiteralDeclaration_2; }
-
-		//"unspecified"
-		public Keyword getUNSPECIFIEDUnspecifiedKeyword_2_0() { return cUNSPECIFIEDUnspecifiedKeyword_2_0; }
-	}
-
-	public class IavoidableElements extends AbstractEnumRuleElementFinder {
-		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "Iavoidable");
-		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
-		private final EnumLiteralDeclaration cINTERFERENCEEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
-		private final Keyword cINTERFERENCEInterferenceKeyword_0_0 = (Keyword)cINTERFERENCEEnumLiteralDeclaration_0.eContents().get(0);
-		private final EnumLiteralDeclaration cNONEEnumLiteralDeclaration_1 = (EnumLiteralDeclaration)cAlternatives.eContents().get(1);
-		private final Keyword cNONENoneKeyword_1_0 = (Keyword)cNONEEnumLiteralDeclaration_1.eContents().get(0);
-		private final EnumLiteralDeclaration cUNSPECIFIEDEnumLiteralDeclaration_2 = (EnumLiteralDeclaration)cAlternatives.eContents().get(2);
-		private final Keyword cUNSPECIFIEDUnspecifiedKeyword_2_0 = (Keyword)cUNSPECIFIEDEnumLiteralDeclaration_2.eContents().get(0);
-		
-		//enum Iavoidable:
-		//	INTERFERENCE="interference" | NONE="none" | UNSPECIFIED="unspecified";
-		public EnumRule getRule() { return rule; }
-
-		//INTERFERENCE="interference" | NONE="none" | UNSPECIFIED="unspecified"
-		public Alternatives getAlternatives() { return cAlternatives; }
-
-		//INTERFERENCE="interference"
-		public EnumLiteralDeclaration getINTERFERENCEEnumLiteralDeclaration_0() { return cINTERFERENCEEnumLiteralDeclaration_0; }
-
-		//"interference"
-		public Keyword getINTERFERENCEInterferenceKeyword_0_0() { return cINTERFERENCEInterferenceKeyword_0_0; }
-
-		//NONE="none"
-		public EnumLiteralDeclaration getNONEEnumLiteralDeclaration_1() { return cNONEEnumLiteralDeclaration_1; }
-
-		//"none"
-		public Keyword getNONENoneKeyword_1_0() { return cNONENoneKeyword_1_0; }
-
-		//UNSPECIFIED="unspecified"
-		public EnumLiteralDeclaration getUNSPECIFIEDEnumLiteralDeclaration_2() { return cUNSPECIFIEDEnumLiteralDeclaration_2; }
-
-		//"unspecified"
-		public Keyword getUNSPECIFIEDUnspecifiedKeyword_2_0() { return cUNSPECIFIEDUnspecifiedKeyword_2_0; }
-	}
-
-	public class DavoidableElements extends AbstractEnumRuleElementFinder {
-		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "Davoidable");
-		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
-		private final EnumLiteralDeclaration cIMPERMANENCEEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
-		private final Keyword cIMPERMANENCEImpermanenceKeyword_0_0 = (Keyword)cIMPERMANENCEEnumLiteralDeclaration_0.eContents().get(0);
-		private final EnumLiteralDeclaration cNONEEnumLiteralDeclaration_1 = (EnumLiteralDeclaration)cAlternatives.eContents().get(1);
-		private final Keyword cNONENoneKeyword_1_0 = (Keyword)cNONEEnumLiteralDeclaration_1.eContents().get(0);
-		private final EnumLiteralDeclaration cUNSPECIFIEDEnumLiteralDeclaration_2 = (EnumLiteralDeclaration)cAlternatives.eContents().get(2);
-		private final Keyword cUNSPECIFIEDUnspecifiedKeyword_2_0 = (Keyword)cUNSPECIFIEDEnumLiteralDeclaration_2.eContents().get(0);
-		
-		//enum Davoidable:
-		//	IMPERMANENCE="impermanence" | NONE="none" | UNSPECIFIED="unspecified";
-		public EnumRule getRule() { return rule; }
-
-		//IMPERMANENCE="impermanence" | NONE="none" | UNSPECIFIED="unspecified"
-		public Alternatives getAlternatives() { return cAlternatives; }
-
-		//IMPERMANENCE="impermanence"
-		public EnumLiteralDeclaration getIMPERMANENCEEnumLiteralDeclaration_0() { return cIMPERMANENCEEnumLiteralDeclaration_0; }
-
-		//"impermanence"
-		public Keyword getIMPERMANENCEImpermanenceKeyword_0_0() { return cIMPERMANENCEImpermanenceKeyword_0_0; }
-
-		//NONE="none"
-		public EnumLiteralDeclaration getNONEEnumLiteralDeclaration_1() { return cNONEEnumLiteralDeclaration_1; }
-
-		//"none"
-		public Keyword getNONENoneKeyword_1_0() { return cNONENoneKeyword_1_0; }
-
-		//UNSPECIFIED="unspecified"
-		public EnumLiteralDeclaration getUNSPECIFIEDEnumLiteralDeclaration_2() { return cUNSPECIFIEDEnumLiteralDeclaration_2; }
-
-		//"unspecified"
-		public Keyword getUNSPECIFIEDUnspecifiedKeyword_2_0() { return cUNSPECIFIEDUnspecifiedKeyword_2_0; }
-	}
-
-	public class AmitigationElements extends AbstractEnumRuleElementFinder {
-		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "Amitigation");
-		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
-		private final EnumLiteralDeclaration cALL_OR_NOTHINGEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
-		private final Keyword cALL_OR_NOTHINGAll_or_nothingKeyword_0_0 = (Keyword)cALL_OR_NOTHINGEnumLiteralDeclaration_0.eContents().get(0);
-		private final EnumLiteralDeclaration cALL_OR_COMPENSATIONEnumLiteralDeclaration_1 = (EnumLiteralDeclaration)cAlternatives.eContents().get(1);
-		private final Keyword cALL_OR_COMPENSATIONAll_or_compensationKeyword_1_0 = (Keyword)cALL_OR_COMPENSATIONEnumLiteralDeclaration_1.eContents().get(0);
-		private final EnumLiteralDeclaration cNONEEnumLiteralDeclaration_2 = (EnumLiteralDeclaration)cAlternatives.eContents().get(2);
-		private final Keyword cNONENoneKeyword_2_0 = (Keyword)cNONEEnumLiteralDeclaration_2.eContents().get(0);
-		private final EnumLiteralDeclaration cUNSPECIFIEDEnumLiteralDeclaration_3 = (EnumLiteralDeclaration)cAlternatives.eContents().get(3);
-		private final Keyword cUNSPECIFIEDUnspecifiedKeyword_3_0 = (Keyword)cUNSPECIFIEDEnumLiteralDeclaration_3.eContents().get(0);
-		
-		//enum Amitigation:
-		//	ALL_OR_NOTHING="all_or_nothing" | ALL_OR_COMPENSATION="all_or_compensation" | NONE="none" |
-		//	UNSPECIFIED="unspecified";
-		public EnumRule getRule() { return rule; }
-
-		//ALL_OR_NOTHING="all_or_nothing" | ALL_OR_COMPENSATION="all_or_compensation" | NONE="none" | UNSPECIFIED="unspecified"
-		public Alternatives getAlternatives() { return cAlternatives; }
-
-		//ALL_OR_NOTHING="all_or_nothing"
-		public EnumLiteralDeclaration getALL_OR_NOTHINGEnumLiteralDeclaration_0() { return cALL_OR_NOTHINGEnumLiteralDeclaration_0; }
-
-		//"all_or_nothing"
-		public Keyword getALL_OR_NOTHINGAll_or_nothingKeyword_0_0() { return cALL_OR_NOTHINGAll_or_nothingKeyword_0_0; }
-
-		//ALL_OR_COMPENSATION="all_or_compensation"
-		public EnumLiteralDeclaration getALL_OR_COMPENSATIONEnumLiteralDeclaration_1() { return cALL_OR_COMPENSATIONEnumLiteralDeclaration_1; }
-
-		//"all_or_compensation"
-		public Keyword getALL_OR_COMPENSATIONAll_or_compensationKeyword_1_0() { return cALL_OR_COMPENSATIONAll_or_compensationKeyword_1_0; }
-
-		//NONE="none"
-		public EnumLiteralDeclaration getNONEEnumLiteralDeclaration_2() { return cNONEEnumLiteralDeclaration_2; }
-
-		//"none"
-		public Keyword getNONENoneKeyword_2_0() { return cNONENoneKeyword_2_0; }
-
-		//UNSPECIFIED="unspecified"
-		public EnumLiteralDeclaration getUNSPECIFIEDEnumLiteralDeclaration_3() { return cUNSPECIFIEDEnumLiteralDeclaration_3; }
-
-		//"unspecified"
-		public Keyword getUNSPECIFIEDUnspecifiedKeyword_3_0() { return cUNSPECIFIEDUnspecifiedKeyword_3_0; }
-	}
-
-	public class CmitigationElements extends AbstractEnumRuleElementFinder {
-		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "Cmitigation");
-		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
-		private final EnumLiteralDeclaration cFULL_CONSISTENCYEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
-		private final Keyword cFULL_CONSISTENCYFull_consistencyKeyword_0_0 = (Keyword)cFULL_CONSISTENCYEnumLiteralDeclaration_0.eContents().get(0);
-		private final EnumLiteralDeclaration cRANGE_VIOLATION_ALLOWEDEnumLiteralDeclaration_1 = (EnumLiteralDeclaration)cAlternatives.eContents().get(1);
-		private final Keyword cRANGE_VIOLATION_ALLOWEDRange_violation_allowedKeyword_1_0 = (Keyword)cRANGE_VIOLATION_ALLOWEDEnumLiteralDeclaration_1.eContents().get(0);
-		private final EnumLiteralDeclaration cNONEEnumLiteralDeclaration_2 = (EnumLiteralDeclaration)cAlternatives.eContents().get(2);
-		private final Keyword cNONENoneKeyword_2_0 = (Keyword)cNONEEnumLiteralDeclaration_2.eContents().get(0);
-		private final EnumLiteralDeclaration cUNSPECIFIEDEnumLiteralDeclaration_3 = (EnumLiteralDeclaration)cAlternatives.eContents().get(3);
-		private final Keyword cUNSPECIFIEDUnspecifiedKeyword_3_0 = (Keyword)cUNSPECIFIEDEnumLiteralDeclaration_3.eContents().get(0);
-		
-		//enum Cmitigation:
-		//	FULL_CONSISTENCY="full_consistency" | RANGE_VIOLATION_ALLOWED="range_violation_allowed" | NONE="none" |
-		//	UNSPECIFIED="unspecified";
-		public EnumRule getRule() { return rule; }
-
-		//FULL_CONSISTENCY="full_consistency" | RANGE_VIOLATION_ALLOWED="range_violation_allowed" | NONE="none" |
-		//UNSPECIFIED="unspecified"
-		public Alternatives getAlternatives() { return cAlternatives; }
-
-		//FULL_CONSISTENCY="full_consistency"
-		public EnumLiteralDeclaration getFULL_CONSISTENCYEnumLiteralDeclaration_0() { return cFULL_CONSISTENCYEnumLiteralDeclaration_0; }
-
-		//"full_consistency"
-		public Keyword getFULL_CONSISTENCYFull_consistencyKeyword_0_0() { return cFULL_CONSISTENCYFull_consistencyKeyword_0_0; }
-
-		//RANGE_VIOLATION_ALLOWED="range_violation_allowed"
-		public EnumLiteralDeclaration getRANGE_VIOLATION_ALLOWEDEnumLiteralDeclaration_1() { return cRANGE_VIOLATION_ALLOWEDEnumLiteralDeclaration_1; }
-
-		//"range_violation_allowed"
-		public Keyword getRANGE_VIOLATION_ALLOWEDRange_violation_allowedKeyword_1_0() { return cRANGE_VIOLATION_ALLOWEDRange_violation_allowedKeyword_1_0; }
-
-		//NONE="none"
-		public EnumLiteralDeclaration getNONEEnumLiteralDeclaration_2() { return cNONEEnumLiteralDeclaration_2; }
-
-		//"none"
-		public Keyword getNONENoneKeyword_2_0() { return cNONENoneKeyword_2_0; }
-
-		//UNSPECIFIED="unspecified"
-		public EnumLiteralDeclaration getUNSPECIFIEDEnumLiteralDeclaration_3() { return cUNSPECIFIEDEnumLiteralDeclaration_3; }
-
-		//"unspecified"
-		public Keyword getUNSPECIFIEDUnspecifiedKeyword_3_0() { return cUNSPECIFIEDUnspecifiedKeyword_3_0; }
-	}
-
-	public class ImitigationElements extends AbstractEnumRuleElementFinder {
-		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "Imitigation");
-		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
-		private final EnumLiteralDeclaration cSERIALIZABLEEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
-		private final Keyword cSERIALIZABLESerializableKeyword_0_0 = (Keyword)cSERIALIZABLEEnumLiteralDeclaration_0.eContents().get(0);
-		private final EnumLiteralDeclaration cPORTABLE_LEVELEnumLiteralDeclaration_1 = (EnumLiteralDeclaration)cAlternatives.eContents().get(1);
-		private final Keyword cPORTABLE_LEVELPortable_levelKeyword_1_0 = (Keyword)cPORTABLE_LEVELEnumLiteralDeclaration_1.eContents().get(0);
-		private final EnumLiteralDeclaration cNONEEnumLiteralDeclaration_2 = (EnumLiteralDeclaration)cAlternatives.eContents().get(2);
-		private final Keyword cNONENoneKeyword_2_0 = (Keyword)cNONEEnumLiteralDeclaration_2.eContents().get(0);
-		private final EnumLiteralDeclaration cUNSPECIFIEDEnumLiteralDeclaration_3 = (EnumLiteralDeclaration)cAlternatives.eContents().get(3);
-		private final Keyword cUNSPECIFIEDUnspecifiedKeyword_3_0 = (Keyword)cUNSPECIFIEDEnumLiteralDeclaration_3.eContents().get(0);
-		
-		//enum Imitigation:
-		//	SERIALIZABLE="serializable" | PORTABLE_LEVEL="portable_level" | NONE="none" | UNSPECIFIED="unspecified";
-		public EnumRule getRule() { return rule; }
-
-		//SERIALIZABLE="serializable" | PORTABLE_LEVEL="portable_level" | NONE="none" | UNSPECIFIED="unspecified"
-		public Alternatives getAlternatives() { return cAlternatives; }
-
-		//SERIALIZABLE="serializable"
-		public EnumLiteralDeclaration getSERIALIZABLEEnumLiteralDeclaration_0() { return cSERIALIZABLEEnumLiteralDeclaration_0; }
-
-		//"serializable"
-		public Keyword getSERIALIZABLESerializableKeyword_0_0() { return cSERIALIZABLESerializableKeyword_0_0; }
-
-		//PORTABLE_LEVEL="portable_level"
-		public EnumLiteralDeclaration getPORTABLE_LEVELEnumLiteralDeclaration_1() { return cPORTABLE_LEVELEnumLiteralDeclaration_1; }
-
-		//"portable_level"
-		public Keyword getPORTABLE_LEVELPortable_levelKeyword_1_0() { return cPORTABLE_LEVELPortable_levelKeyword_1_0; }
-
-		//NONE="none"
-		public EnumLiteralDeclaration getNONEEnumLiteralDeclaration_2() { return cNONEEnumLiteralDeclaration_2; }
-
-		//"none"
-		public Keyword getNONENoneKeyword_2_0() { return cNONENoneKeyword_2_0; }
-
-		//UNSPECIFIED="unspecified"
-		public EnumLiteralDeclaration getUNSPECIFIEDEnumLiteralDeclaration_3() { return cUNSPECIFIEDEnumLiteralDeclaration_3; }
-
-		//"unspecified"
-		public Keyword getUNSPECIFIEDUnspecifiedKeyword_3_0() { return cUNSPECIFIEDUnspecifiedKeyword_3_0; }
-	}
-
-	public class DmitigationElements extends AbstractEnumRuleElementFinder {
-		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "Dmitigation");
-		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
-		private final EnumLiteralDeclaration cNO_LOSSEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
-		private final Keyword cNO_LOSSNo_lossKeyword_0_0 = (Keyword)cNO_LOSSEnumLiteralDeclaration_0.eContents().get(0);
-		private final EnumLiteralDeclaration cPARTIAL_LOSS_ALLOWEDEnumLiteralDeclaration_1 = (EnumLiteralDeclaration)cAlternatives.eContents().get(1);
-		private final Keyword cPARTIAL_LOSS_ALLOWEDPartial_loss_allowedKeyword_1_0 = (Keyword)cPARTIAL_LOSS_ALLOWEDEnumLiteralDeclaration_1.eContents().get(0);
-		private final EnumLiteralDeclaration cNONEEnumLiteralDeclaration_2 = (EnumLiteralDeclaration)cAlternatives.eContents().get(2);
-		private final Keyword cNONENoneKeyword_2_0 = (Keyword)cNONEEnumLiteralDeclaration_2.eContents().get(0);
-		private final EnumLiteralDeclaration cUNSPECIFIEDEnumLiteralDeclaration_3 = (EnumLiteralDeclaration)cAlternatives.eContents().get(3);
-		private final Keyword cUNSPECIFIEDUnspecifiedKeyword_3_0 = (Keyword)cUNSPECIFIEDEnumLiteralDeclaration_3.eContents().get(0);
-		
-		//enum Dmitigation:
-		//	NO_LOSS="no_loss" | PARTIAL_LOSS_ALLOWED="partial_loss_allowed" | NONE="none" | UNSPECIFIED="unspecified";
-		public EnumRule getRule() { return rule; }
-
-		//NO_LOSS="no_loss" | PARTIAL_LOSS_ALLOWED="partial_loss_allowed" | NONE="none" | UNSPECIFIED="unspecified"
-		public Alternatives getAlternatives() { return cAlternatives; }
-
-		//NO_LOSS="no_loss"
-		public EnumLiteralDeclaration getNO_LOSSEnumLiteralDeclaration_0() { return cNO_LOSSEnumLiteralDeclaration_0; }
-
-		//"no_loss"
-		public Keyword getNO_LOSSNo_lossKeyword_0_0() { return cNO_LOSSNo_lossKeyword_0_0; }
-
-		//PARTIAL_LOSS_ALLOWED="partial_loss_allowed"
-		public EnumLiteralDeclaration getPARTIAL_LOSS_ALLOWEDEnumLiteralDeclaration_1() { return cPARTIAL_LOSS_ALLOWEDEnumLiteralDeclaration_1; }
-
-		//"partial_loss_allowed"
-		public Keyword getPARTIAL_LOSS_ALLOWEDPartial_loss_allowedKeyword_1_0() { return cPARTIAL_LOSS_ALLOWEDPartial_loss_allowedKeyword_1_0; }
-
-		//NONE="none"
-		public EnumLiteralDeclaration getNONEEnumLiteralDeclaration_2() { return cNONEEnumLiteralDeclaration_2; }
-
-		//"none"
-		public Keyword getNONENoneKeyword_2_0() { return cNONENoneKeyword_2_0; }
-
-		//UNSPECIFIED="unspecified"
-		public EnumLiteralDeclaration getUNSPECIFIEDEnumLiteralDeclaration_3() { return cUNSPECIFIEDEnumLiteralDeclaration_3; }
-
-		//"unspecified"
-		public Keyword getUNSPECIFIEDUnspecifiedKeyword_3_0() { return cUNSPECIFIEDUnspecifiedKeyword_3_0; }
-	}
-	
-	private final BehaviourElements pBehaviour;
-	private final ExpressionElements pExpression;
-	private final LhsElements pLhs;
-	private final RhsElements pRhs;
-	private final InputExpressionElements pInputExpression;
-	private final OutputExpressionElements pOutputExpression;
-	private final InFailureExprElements pInFailureExpr;
-	private final OutFailureExprElements pOutFailureExpr;
-	private final DefinitionsElements pDefinitions;
-	private final FailureDefinitionElements pFailureDefinition;
-	private final NoFailureDefinitionElements pNoFailureDefinition;
-	private final ComplexNofailureDefinitionElements pComplexNofailureDefinition;
-	private final WildcardDefinitionElements pWildcardDefinition;
-	private final VariableDefinitionElements pVariableDefinition;
-	private final FailureTypeElements unknownRuleFailureType;
-	private final ActualFailureTypeElements unknownRuleActualFailureType;
-	private final NoFailureTypeElements unknownRuleNoFailureType;
-	private final WildcardElements unknownRuleWildcard;
-	private final ACIDavoidableElements pACIDavoidable;
-	private final AavoidableElements unknownRuleAavoidable;
-	private final CavoidableElements unknownRuleCavoidable;
-	private final IavoidableElements unknownRuleIavoidable;
-	private final DavoidableElements unknownRuleDavoidable;
-	private final ACIDMitigationElements pACIDMitigation;
-	private final AmitigationElements unknownRuleAmitigation;
-	private final CmitigationElements unknownRuleCmitigation;
-	private final ImitigationElements unknownRuleImitigation;
-	private final DmitigationElements unknownRuleDmitigation;
-	private final FQNElements pFQN;
-	
-	private final Grammar grammar;
-
-	private final TerminalsGrammarAccess gaTerminals;
-
-	@Inject
-	public FlaDslGrammarAccess(GrammarProvider grammarProvider,
-		TerminalsGrammarAccess gaTerminals) {
-		this.grammar = internalFindGrammar(grammarProvider);
-		this.gaTerminals = gaTerminals;
-		this.pBehaviour = new BehaviourElements();
-		this.pExpression = new ExpressionElements();
-		this.pLhs = new LhsElements();
-		this.pRhs = new RhsElements();
-		this.pInputExpression = new InputExpressionElements();
-		this.pOutputExpression = new OutputExpressionElements();
-		this.pInFailureExpr = new InFailureExprElements();
-		this.pOutFailureExpr = new OutFailureExprElements();
-		this.pDefinitions = new DefinitionsElements();
-		this.pFailureDefinition = new FailureDefinitionElements();
-		this.pNoFailureDefinition = new NoFailureDefinitionElements();
-		this.pComplexNofailureDefinition = new ComplexNofailureDefinitionElements();
-		this.pWildcardDefinition = new WildcardDefinitionElements();
-		this.pVariableDefinition = new VariableDefinitionElements();
-		this.unknownRuleFailureType = new FailureTypeElements();
-		this.unknownRuleActualFailureType = new ActualFailureTypeElements();
-		this.unknownRuleNoFailureType = new NoFailureTypeElements();
-		this.unknownRuleWildcard = new WildcardElements();
-		this.pACIDavoidable = new ACIDavoidableElements();
-		this.unknownRuleAavoidable = new AavoidableElements();
-		this.unknownRuleCavoidable = new CavoidableElements();
-		this.unknownRuleIavoidable = new IavoidableElements();
-		this.unknownRuleDavoidable = new DavoidableElements();
-		this.pACIDMitigation = new ACIDMitigationElements();
-		this.unknownRuleAmitigation = new AmitigationElements();
-		this.unknownRuleCmitigation = new CmitigationElements();
-		this.unknownRuleImitigation = new ImitigationElements();
-		this.unknownRuleDmitigation = new DmitigationElements();
-		this.pFQN = new FQNElements();
-	}
-	
-	protected Grammar internalFindGrammar(GrammarProvider grammarProvider) {
-		Grammar grammar = grammarProvider.getGrammar(this);
-		while (grammar != null) {
-			if ("org.polarsys.chess.xtext.FlaDsl".equals(grammar.getName())) {
-				return grammar;
-			}
-			List<Grammar> grammars = grammar.getUsedGrammars();
-			if (!grammars.isEmpty()) {
-				grammar = grammars.iterator().next();
-			} else {
-				return null;
-			}
-		}
-		return grammar;
-	}
-	
-	
-	public Grammar getGrammar() {
-		return grammar;
-	}
-	
-
-	public TerminalsGrammarAccess getTerminalsGrammarAccess() {
-		return gaTerminals;
-	}
-
-	
-	/// *
-	// * FLA Grammar
-	// * / Behaviour:
-	//	rules+=Expression+;
-	public BehaviourElements getBehaviourAccess() {
-		return pBehaviour;
-	}
-	
-	public ParserRule getBehaviourRule() {
-		return getBehaviourAccess().getRule();
-	}
-
-	//Expression:
-	//	"FLA:" lhs=Lhs "->" rhs=Rhs ";";
-	public ExpressionElements getExpressionAccess() {
-		return pExpression;
-	}
-	
-	public ParserRule getExpressionRule() {
-		return getExpressionAccess().getRule();
-	}
-
-	//Lhs:
-	//	failures+=InputExpression ("," failures+=InputExpression)*;
-	public LhsElements getLhsAccess() {
-		return pLhs;
-	}
-	
-	public ParserRule getLhsRule() {
-		return getLhsAccess().getRule();
-	}
-
-	//Rhs:
-	//	failures+=OutputExpression ("," failures+=OutputExpression)*;
-	public RhsElements getRhsAccess() {
-		return pRhs;
-	}
-	
-	public ParserRule getRhsRule() {
-		return getRhsAccess().getRule();
-	}
-
-	//InputExpression:
-	//	(ref=[uml::Port] | "undefined") "." failureExpr=InFailureExpr;
-	public InputExpressionElements getInputExpressionAccess() {
-		return pInputExpression;
-	}
-	
-	public ParserRule getInputExpressionRule() {
-		return getInputExpressionAccess().getRule();
-	}
-
-	//OutputExpression:
-	//	(ref=[uml::Port] | "undefined") "." failureExpr=OutFailureExpr;
-	public OutputExpressionElements getOutputExpressionAccess() {
-		return pOutputExpression;
-	}
-	
-	public ParserRule getOutputExpressionRule() {
-		return getOutputExpressionAccess().getRule();
-	}
-
-	//InFailureExpr:
-	//	failures+=WildcardDefinition | failures+=NoFailureDefinition | failures+=FailureDefinition | "{"
-	//	failures+=FailureDefinition ("," failures+=FailureDefinition)+ "}" | failures+=VariableDefinition;
-	public InFailureExprElements getInFailureExprAccess() {
-		return pInFailureExpr;
-	}
-	
-	public ParserRule getInFailureExprRule() {
-		return getInFailureExprAccess().getRule();
-	}
-
-	//OutFailureExpr:
-	//	failures+=NoFailureDefinition | failures+=ComplexNofailureDefinition | failures+=FailureDefinition | "{"
-	//	failures+=FailureDefinition ("," failures+=FailureDefinition)+ "}" | failures+=VariableDefinition;
-	public OutFailureExprElements getOutFailureExprAccess() {
-		return pOutFailureExpr;
-	}
-	
-	public ParserRule getOutFailureExprRule() {
-		return getOutFailureExprAccess().getRule();
-	}
-
-	//Definitions:
-	//	FailureDefinition | NoFailureDefinition | ComplexNofailureDefinition | WildcardDefinition | VariableDefinition;
-	public DefinitionsElements getDefinitionsAccess() {
-		return pDefinitions;
-	}
-	
-	public ParserRule getDefinitionsRule() {
-		return getDefinitionsAccess().getRule();
-	}
-
-	//FailureDefinition:
-	//	{FailureDefinition} type=ActualFailureType ("." acidAvoidable=ACIDavoidable)?;
-	public FailureDefinitionElements getFailureDefinitionAccess() {
-		return pFailureDefinition;
-	}
-	
-	public ParserRule getFailureDefinitionRule() {
-		return getFailureDefinitionAccess().getRule();
-	}
-
-	//NoFailureDefinition:
-	//	{NoFailureDefinition} "noFailure";
-	public NoFailureDefinitionElements getNoFailureDefinitionAccess() {
-		return pNoFailureDefinition;
-	}
-	
-	public ParserRule getNoFailureDefinitionRule() {
-		return getNoFailureDefinitionAccess().getRule();
-	}
-
-	//ComplexNofailureDefinition:
-	//	{NoFailureDefinition} "noFailure" "." acidMitigation=ACIDMitigation;
-	public ComplexNofailureDefinitionElements getComplexNofailureDefinitionAccess() {
-		return pComplexNofailureDefinition;
-	}
-	
-	public ParserRule getComplexNofailureDefinitionRule() {
-		return getComplexNofailureDefinitionAccess().getRule();
-	}
-
-	//WildcardDefinition:
-	//	{WildcardDefinition} "wildcard";
-	public WildcardDefinitionElements getWildcardDefinitionAccess() {
-		return pWildcardDefinition;
-	}
-	
-	public ParserRule getWildcardDefinitionRule() {
-		return getWildcardDefinitionAccess().getRule();
-	}
-
-	//VariableDefinition:
-	//	{VariableDefinition} variableName=ID;
-	public VariableDefinitionElements getVariableDefinitionAccess() {
-		return pVariableDefinition;
-	}
-	
-	public ParserRule getVariableDefinitionRule() {
-		return getVariableDefinitionAccess().getRule();
-	}
-
-	//enum FailureType:
-	//	NO_FAILURE="noFailure" | EARLY="early" | LATE="late" | COMMISSION="commission" | OMISSION="omission" |
-	//	VALUE_SUBTLE="valueSubtle" | VALUE_COARSE="valueCoarse" | WILDCARD="wildcard" | VARIABLE="variable";
-	public FailureTypeElements getFailureTypeAccess() {
-		return unknownRuleFailureType;
-	}
-	
-	public EnumRule getFailureTypeRule() {
-		return getFailureTypeAccess().getRule();
-	}
-
-	//enum ActualFailureType returns FailureType:
-	//	EARLY="early" | LATE="late" | COMMISSION="commission" | OMISSION="omission" | VALUE_SUBTLE="valueSubtle" |
-	//	VALUE_COARSE="valueCoarse";
-	public ActualFailureTypeElements getActualFailureTypeAccess() {
-		return unknownRuleActualFailureType;
-	}
-	
-	public EnumRule getActualFailureTypeRule() {
-		return getActualFailureTypeAccess().getRule();
-	}
-
-	//enum NoFailureType returns FailureType:
-	//	NO_FAILURE="noFailure";
-	public NoFailureTypeElements getNoFailureTypeAccess() {
-		return unknownRuleNoFailureType;
-	}
-	
-	public EnumRule getNoFailureTypeRule() {
-		return getNoFailureTypeAccess().getRule();
-	}
-
-	//enum Wildcard returns FailureType:
-	//	WILDCARD="wildcard";
-	public WildcardElements getWildcardAccess() {
-		return unknownRuleWildcard;
-	}
-	
-	public EnumRule getWildcardRule() {
-		return getWildcardAccess().getRule();
-	}
-
-	//ACIDavoidable:
-	//	a=Aavoidable "." c=Cavoidable "." i=Iavoidable "." d=Davoidable;
-	public ACIDavoidableElements getACIDavoidableAccess() {
-		return pACIDavoidable;
-	}
-	
-	public ParserRule getACIDavoidableRule() {
-		return getACIDavoidableAccess().getRule();
-	}
-
-	//enum Aavoidable:
-	//	INCOMPLETION="incompletion" | NONE="none" | UNSPECIFIED="unspecified";
-	public AavoidableElements getAavoidableAccess() {
-		return unknownRuleAavoidable;
-	}
-	
-	public EnumRule getAavoidableRule() {
-		return getAavoidableAccess().getRule();
-	}
-
-	//enum Cavoidable:
-	//	INCONSISTENCY="inconsistency" | NONE="none" | UNSPECIFIED="unspecified";
-	public CavoidableElements getCavoidableAccess() {
-		return unknownRuleCavoidable;
-	}
-	
-	public EnumRule getCavoidableRule() {
-		return getCavoidableAccess().getRule();
-	}
-
-	//enum Iavoidable:
-	//	INTERFERENCE="interference" | NONE="none" | UNSPECIFIED="unspecified";
-	public IavoidableElements getIavoidableAccess() {
-		return unknownRuleIavoidable;
-	}
-	
-	public EnumRule getIavoidableRule() {
-		return getIavoidableAccess().getRule();
-	}
-
-	//enum Davoidable:
-	//	IMPERMANENCE="impermanence" | NONE="none" | UNSPECIFIED="unspecified";
-	public DavoidableElements getDavoidableAccess() {
-		return unknownRuleDavoidable;
-	}
-	
-	public EnumRule getDavoidableRule() {
-		return getDavoidableAccess().getRule();
-	}
-
-	//ACIDMitigation:
-	//	a=Amitigation "." c=Cmitigation "." i=Imitigation "." d=Dmitigation;
-	public ACIDMitigationElements getACIDMitigationAccess() {
-		return pACIDMitigation;
-	}
-	
-	public ParserRule getACIDMitigationRule() {
-		return getACIDMitigationAccess().getRule();
-	}
-
-	//enum Amitigation:
-	//	ALL_OR_NOTHING="all_or_nothing" | ALL_OR_COMPENSATION="all_or_compensation" | NONE="none" |
-	//	UNSPECIFIED="unspecified";
-	public AmitigationElements getAmitigationAccess() {
-		return unknownRuleAmitigation;
-	}
-	
-	public EnumRule getAmitigationRule() {
-		return getAmitigationAccess().getRule();
-	}
-
-	//enum Cmitigation:
-	//	FULL_CONSISTENCY="full_consistency" | RANGE_VIOLATION_ALLOWED="range_violation_allowed" | NONE="none" |
-	//	UNSPECIFIED="unspecified";
-	public CmitigationElements getCmitigationAccess() {
-		return unknownRuleCmitigation;
-	}
-	
-	public EnumRule getCmitigationRule() {
-		return getCmitigationAccess().getRule();
-	}
-
-	//enum Imitigation:
-	//	SERIALIZABLE="serializable" | PORTABLE_LEVEL="portable_level" | NONE="none" | UNSPECIFIED="unspecified";
-	public ImitigationElements getImitigationAccess() {
-		return unknownRuleImitigation;
-	}
-	
-	public EnumRule getImitigationRule() {
-		return getImitigationAccess().getRule();
-	}
-
-	//enum Dmitigation:
-	//	NO_LOSS="no_loss" | PARTIAL_LOSS_ALLOWED="partial_loss_allowed" | NONE="none" | UNSPECIFIED="unspecified";
-	public DmitigationElements getDmitigationAccess() {
-		return unknownRuleDmitigation;
-	}
-	
-	public EnumRule getDmitigationRule() {
-		return getDmitigationAccess().getRule();
-	}
-
-	/// *
-	// * Additional rule to refer UML elements in a Model
-	// * / FQN returns ecore::EString:
-	//	ID ("::" ID)*;
-	public FQNElements getFQNAccess() {
-		return pFQN;
-	}
-	
-	public ParserRule getFQNRule() {
-		return getFQNAccess().getRule();
-	}
-
-	//terminal ID:
-	//	"^"? ("a".."z" | "A".."Z" | "_") ("a".."z" | "A".."Z" | "_" | "0".."9")*;
-	public TerminalRule getIDRule() {
-		return gaTerminals.getIDRule();
-	} 
-
-	//terminal INT returns ecore::EInt:
-	//	"0".."9"+;
-	public TerminalRule getINTRule() {
-		return gaTerminals.getINTRule();
-	} 
-
-	//terminal STRING:
-	//	"\"" ("\\" . / * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\""))* "\"" | "\'" ("\\" .
-	//	/ * 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' * / | !("\\" | "\'"))* "\'";
-	public TerminalRule getSTRINGRule() {
-		return gaTerminals.getSTRINGRule();
-	} 
-
-	//terminal ML_COMMENT:
-	//	"/ *"->"* /";
-	public TerminalRule getML_COMMENTRule() {
-		return gaTerminals.getML_COMMENTRule();
-	} 
-
-	//terminal SL_COMMENT:
-	//	"//" !("\n" | "\r")* ("\r"? "\n")?;
-	public TerminalRule getSL_COMMENTRule() {
-		return gaTerminals.getSL_COMMENTRule();
-	} 
-
-	//terminal WS:
-	//	(" " | "\t" | "\r" | "\n")+;
-	public TerminalRule getWSRule() {
-		return gaTerminals.getWSRule();
-	} 
-
-	//terminal ANY_OTHER:
-	//	.;
-	public TerminalRule getANY_OTHERRule() {
-		return gaTerminals.getANY_OTHERRule();
-	} 
-}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/validation/AbstractFlaDslValidator.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/validation/AbstractFlaDslValidator.java
deleted file mode 100644
index 1c43c4267a986967974836bb90427b0e3976650a..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src-gen/org/polarsys/chess/xtext/validation/AbstractFlaDslValidator.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * generated by Xtext
- */
-package org.polarsys.chess.xtext.validation;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.xtext.validation.ComposedChecks;
-
-@ComposedChecks(validators= {org.eclipse.xtext.validation.ImportUriValidator.class})
-public class AbstractFlaDslValidator extends org.eclipse.xtext.validation.AbstractDeclarativeValidator {
-
-	@Override
-	protected List<EPackage> getEPackages() {
-	    List<EPackage> result = new ArrayList<EPackage>();
-	    result.add(org.polarsys.chess.xtext.flaDsl.FlaDslPackage.eINSTANCE);
-		return result;
-	}
-}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/GenerateFlaDsl.mwe2 b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/GenerateFlaDsl.mwe2
index a4fc28d75b21db3e2f41181f59e3239b1c003d21..8db7ad144b16478ba98f84070df0b34f43f6917e 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/GenerateFlaDsl.mwe2
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/GenerateFlaDsl.mwe2
@@ -62,7 +62,7 @@ Workflow {
 		
  		uriMap = {
             from = "platform:/plugin/org.eclipse.uml2.codegen.ecore/model/GenModel.genmodel"
-            to = "platform:/resource/org.eclipse.uml2.codegen.ecore/model/GenModel.genmodel"
+            to = "platform:/resource/org.eclipse.uml2.codegen.ecore/model/GenModel.genmodel" 
         }
         
         uriMap = {
@@ -85,6 +85,7 @@ Workflow {
         registerGenModelFile = "platform:/resource/org.eclipse.uml2.types/model/Types.genmodel"
 	 	registerGenModelFile = "platform:/resource/org.eclipse.uml2.uml/model/UML.genmodel"
         registerGenModelFile = "platform:/resource/org.eclipse.uml2.codegen.ecore/model/GenModel.genmodel"
+        
 	}
     
     component = DirectoryCleaner {
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/formatting/.FlaDslFormatter.xtendbin b/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/formatting/.FlaDslFormatter.xtendbin
deleted file mode 100644
index bbd50bc14f9a266552f409f3e9c1565d632a445c..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/formatting/.FlaDslFormatter.xtendbin and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/formatting/.gitignore b/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/formatting/.gitignore
deleted file mode 100644
index 599582e0a4377ba9d0e1916dc8306b4f042e7a50..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/formatting/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.FlaDslFormatter.java._trace
-/.FlaDslFormatter.xtendbin
-/FlaDslFormatter.java
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/formatting/FlaDslFormatter.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/formatting/FlaDslFormatter.java
deleted file mode 100644
index a2b2fbbc3be996af433bf701e4be58597a20ea27..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/formatting/FlaDslFormatter.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * generated by Xtext
- */
-package org.polarsys.chess.xtext.formatting;
-
-import org.eclipse.xtext.formatting.impl.AbstractDeclarativeFormatter;
-import org.eclipse.xtext.formatting.impl.FormattingConfig;
-
-/**
- * This class contains custom formatting declarations.
- * 
- * See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#formatting
- * on how and when to use it.
- * 
- * Also see {@link org.eclipse.xtext.xtext.XtextFormattingTokenSerializer} as an example
- */
-@SuppressWarnings("all")
-public class FlaDslFormatter extends AbstractDeclarativeFormatter {
-  @Override
-  protected void configureFormatting(final FormattingConfig c) {
-  }
-}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/generator/.FlaDslGenerator.xtendbin b/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/generator/.FlaDslGenerator.xtendbin
deleted file mode 100644
index bb8b2ffa1cd125d5368ddb9e7f78838f660960a1..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/generator/.FlaDslGenerator.xtendbin and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/generator/.gitignore b/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/generator/.gitignore
deleted file mode 100644
index e54c9e0e2d04344888516c7af4665c719695c5fe..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/generator/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.FlaDslGenerator.java._trace
-/.FlaDslGenerator.xtendbin
-/FlaDslGenerator.java
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/generator/FlaDslGenerator.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/generator/FlaDslGenerator.java
deleted file mode 100644
index cca1642b56f8bfee46a53a35e3c678da59dbd96b..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/generator/FlaDslGenerator.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * generated by Xtext
- */
-package org.polarsys.chess.xtext.generator;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.xtext.generator.IFileSystemAccess;
-import org.eclipse.xtext.generator.IGenerator;
-
-/**
- * Generates code from your model files on save.
- * 
- * See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#code-generation
- */
-@SuppressWarnings("all")
-public class FlaDslGenerator implements IGenerator {
-  @Override
-  public void doGenerate(final Resource resource, final IFileSystemAccess fsa) {
-  }
-}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/scoping/.FlaDslScopeProvider.xtendbin b/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/scoping/.FlaDslScopeProvider.xtendbin
deleted file mode 100644
index dedca94bd159a1d01eca79aae7a02e0b94ff722f..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/scoping/.FlaDslScopeProvider.xtendbin and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/scoping/.gitignore b/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/scoping/.gitignore
deleted file mode 100644
index 5e9b15c6b73e5c88df7460efc55fbcb7c08466c0..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/scoping/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.FlaDslScopeProvider.java._trace
-/.FlaDslScopeProvider.xtendbin
-/FlaDslScopeProvider.java
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/scoping/FlaDslScopeProvider.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/scoping/FlaDslScopeProvider.java
deleted file mode 100644
index 78016b19d1d240d28a8c75751efdb23394324403..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/scoping/FlaDslScopeProvider.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * generated by Xtext
- */
-package org.polarsys.chess.xtext.scoping;
-
-import com.google.common.base.Objects;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.uml2.uml.Classifier;
-import org.eclipse.uml2.uml.EncapsulatedClassifier;
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.xtext.scoping.IScope;
-import org.eclipse.xtext.scoping.Scopes;
-import org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider;
-import org.polarsys.chess.chessmlprofile.Dependability.FailurePropagation.FLABehavior;
-import org.polarsys.chess.chessmlprofile.Dependability.FailurePropagation.FPTC;
-import org.polarsys.chess.xtext.global.utils.XtextUtils;
-
-/**
- * This class contains custom scoping description.
- * 
- * See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#scoping
- * on how and when to use it.
- */
-@SuppressWarnings("all")
-public class FlaDslScopeProvider extends AbstractDeclarativeScopeProvider {
-  private EncapsulatedClassifier contextComponent;
-  
-  public FlaDslScopeProvider() {
-    final Object contextElement = XtextUtils.getContextElement();
-    if ((contextElement instanceof FPTC)) {
-      this.contextComponent = ((FPTC) contextElement).getBase_Component();
-    } else {
-      if ((contextElement instanceof FLABehavior)) {
-        org.eclipse.uml2.uml.Class _base_Class = ((FLABehavior) contextElement).getBase_Class();
-        boolean _notEquals = (!Objects.equal(_base_Class, null));
-        if (_notEquals) {
-          org.eclipse.uml2.uml.Class _base_Class_1 = ((FLABehavior) contextElement).getBase_Class();
-          this.contextComponent = ((EncapsulatedClassifier) _base_Class_1);
-        } else {
-          InstanceSpecification _base_InstanceSpecification = ((FLABehavior) contextElement).getBase_InstanceSpecification();
-          boolean _notEquals_1 = (!Objects.equal(_base_InstanceSpecification, null));
-          if (_notEquals_1) {
-            Classifier _get = ((FLABehavior) contextElement).getBase_InstanceSpecification().getClassifiers().get(0);
-            this.contextComponent = ((EncapsulatedClassifier) _get);
-          }
-        }
-      }
-    }
-  }
-  
-  /**
-   * def IScope scope_InputExpression_ref(InputExpression inExpr, EReference ref){
-   * 
-   * val ports = contextComponent.ownedPorts
-   * 
-   * //ports.forEach[println((it as Port).qualifiedName)]
-   * 
-   * //		val scope = delegateGetScope(inExpr, ref)
-   * //
-   * //		val filter = [IEObjectDescription descr | ports.contains(descr.EObjectOrProxy as Port)]
-   * //
-   * //		new FilteringScope(scope, filter);
-   * 
-   * return Scopes.scopeFor(ports)
-   * }
-   */
-  @Override
-  public IScope getScope(final EObject context, final EReference reference) {
-    final EList<Port> ports = this.contextComponent.getOwnedPorts();
-    return Scopes.scopeFor(ports);
-  }
-}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/validation/.FlaDslValidator.xtendbin b/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/validation/.FlaDslValidator.xtendbin
deleted file mode 100644
index b4cda87e2c392f7f79922e9067d52a5d89189cc6..0000000000000000000000000000000000000000
Binary files a/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/validation/.FlaDslValidator.xtendbin and /dev/null differ
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/validation/.gitignore b/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/validation/.gitignore
deleted file mode 100644
index 7311c130584a59ac9333b6922e8852ad511212f5..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/validation/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.FlaDslValidator.java._trace
-/.FlaDslValidator.xtendbin
-/FlaDslValidator.java
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/validation/FlaDslValidator.java b/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/validation/FlaDslValidator.java
deleted file mode 100644
index 1d15b4e32f0864b6a4e8272ae60d76576afd9b9f..0000000000000000000000000000000000000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/xtend-gen/org/polarsys/chess/xtext/validation/FlaDslValidator.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * generated by Xtext
- */
-package org.polarsys.chess.xtext.validation;
-
-import org.polarsys.chess.xtext.validation.AbstractFlaDslValidator;
-
-/**
- * This class contains custom validation rules.
- * 
- * See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#validation
- */
-@SuppressWarnings("all")
-public class FlaDslValidator extends AbstractFlaDslValidator {
-}
diff --git a/plugins/org.polarsys.chess.OSSImporter/.gitignore b/plugins/org.polarsys.chess.OSSImporter/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/org.polarsys.chess.OSSImporter/.gitignore
+++ b/plugins/org.polarsys.chess.OSSImporter/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/org.polarsys.chess.OSSImporter/.project b/plugins/org.polarsys.chess.OSSImporter/.project
index 42f74f29c7f9129274b7cd8118a75a387a9e7894..e27cb3ed9d040274ec7701db64ca30e04c6341d8 100644
--- a/plugins/org.polarsys.chess.OSSImporter/.project
+++ b/plugins/org.polarsys.chess.OSSImporter/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/org.polarsys.chess.OSSImporter/.settings/org.eclipse.core.resources.prefs b/plugins/org.polarsys.chess.OSSImporter/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.polarsys.chess.OSSImporter/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.polarsys.chess.OSSImporter/.settings/org.eclipse.m2e.core.prefs b/plugins/org.polarsys.chess.OSSImporter/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.polarsys.chess.OSSImporter/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.polarsys.chess.OSSImporter/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.polarsys.chess.OSSImporter/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/org.polarsys.chess.OSSImporter/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/org.polarsys.chess.OSSImporter/META-INF/MANIFEST.MF b/plugins/org.polarsys.chess.OSSImporter/META-INF/MANIFEST.MF
index c3f504ccf292638545f4e572e6afaefcacb9c5cc..e1a270ce3209aa889ced294310a651497d265752 100644
--- a/plugins/org.polarsys.chess.OSSImporter/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.chess.OSSImporter/META-INF/MANIFEST.MF
@@ -13,14 +13,14 @@ Require-Bundle: eu.fbk.eclipse.standardtools.ModelTranslatorToOcra;bundle-versio
  eu.fbk.tools.editor.contract,
  org.polarsys.chess.service;bundle-version="0.11.0",
  org.eclipse.papyrus.infra.gmfdiag.css,
- org.eclipse.papyrus.sysml.diagram.internalblock,
  org.eclipse.papyrus.sysml.service.types;bundle-version="1.2.0",
  org.eclipse.papyrus.views.modelexplorer,
  eu.fbk.eclipse.standardtools.xtextService,
  org.polarsys.chess.diagram.ui,
  eu.fbk.eclipse.standardtools.diagram.ui,
  org.eclipse.papyrus.infra.services.navigation,
- org.eclipse.papyrus.infra.services.viewersearch
+ org.eclipse.papyrus.infra.services.viewersearch,
+ org.eclipse.papyrus.sysml.diagram.internalblock
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.inject,
  org.apache.log4j;version="1.2.15",
diff --git a/plugins/org.polarsys.chess.OSSImporter/build.properties b/plugins/org.polarsys.chess.OSSImporter/build.properties
index caaec514ba877b82792437cca4694c6742df99ac..eade967131e04f32729272b3f6f79d4a30093ec8 100644
--- a/plugins/org.polarsys.chess.OSSImporter/build.properties
+++ b/plugins/org.polarsys.chess.OSSImporter/build.properties
@@ -3,5 +3,4 @@ output.. = bin/
 bin.includes = plugin.xml,\
                META-INF/,\
                .,\
-               icons/,\
-               contexts.xml
+               icons/
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.OSSImporter/pom.xml b/plugins/org.polarsys.chess.OSSImporter/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0fd5e9ad5b50ca8f24ab376003614819790676bd
--- /dev/null
+++ b/plugins/org.polarsys.chess.OSSImporter/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.OSSImporter</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/commands/ImportOSSFileCommand.java b/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/commands/ImportOSSFileCommand.java
index 88d86e91f90e3efd9c03fc5e2b85c13fa60d999d..4a9c9ca1636d88eec641e550cd1bf936d3247914 100644
--- a/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/commands/ImportOSSFileCommand.java
+++ b/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/commands/ImportOSSFileCommand.java
@@ -253,8 +253,7 @@ public class ImportOSSFileCommand extends AbstractJobCommand implements IHandler
 		final Set<String> modifiedDiagrams = new HashSet<String>(); 
 
 		// Update all the diagrams of the model
-		final CHESSDiagramsGeneratorService chessDiagramsGeneratorService = CHESSDiagramsGeneratorService.getInstance(
-				CHESSInternalBlockDiagramModel.getInstance(), CHESSBlockDefinitionDiagramModel.getInstance());
+		final CHESSDiagramsGeneratorService chessDiagramsGeneratorService = CHESSDiagramsGeneratorService.getInstance();//CHESSInternalBlockDiagramModel.getInstance(), CHESSBlockDefinitionDiagramModel.getInstance()
 		final Collection<Diagram> chessDiagrams = chessDiagramsGeneratorService.getDiagrams();
 		final Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
 
diff --git a/plugins/org.polarsys.chess.cdo.feature/pom.xml b/plugins/org.polarsys.chess.cdo.feature/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9fa05469b4b48210a07d2e7f7d538a6875836c24
--- /dev/null
+++ b/plugins/org.polarsys.chess.cdo.feature/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>CHESS</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
+  <groupId>org.polarsys.chess</groupId>
+  <artifactId>org.polarsys.chess.cdo.feature</artifactId>
+  <version>0.9.0-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.cdo/.classpath b/plugins/org.polarsys.chess.cdo/.classpath
index 098194ca4b7d8f45177f94e735506ae3a26b5c94..eca7bdba8f03f22510b7980a94dbfe10c16c0901 100644
--- a/plugins/org.polarsys.chess.cdo/.classpath
+++ b/plugins/org.polarsys.chess.cdo/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.polarsys.chess.cdo/.gitignore b/plugins/org.polarsys.chess.cdo/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/org.polarsys.chess.cdo/.gitignore
+++ b/plugins/org.polarsys.chess.cdo/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/org.polarsys.chess.cdo/.project b/plugins/org.polarsys.chess.cdo/.project
index 71e0a3492018a6c27ff09df54f6560166b88ce4f..3bd52e03068da297fa5842d76cbe5cebe0c04702 100644
--- a/plugins/org.polarsys.chess.cdo/.project
+++ b/plugins/org.polarsys.chess.cdo/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/org.polarsys.chess.cdo/.settings/org.eclipse.core.resources.prefs b/plugins/org.polarsys.chess.cdo/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.polarsys.chess.cdo/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.polarsys.chess.cdo/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.chess.cdo/.settings/org.eclipse.jdt.core.prefs
index f08be2b06c48e52bf988430f0c33b1b7cbfc8581..b3aa6d60f949605f08329318930a15b48638ec53 100644
--- a/plugins/org.polarsys.chess.cdo/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.polarsys.chess.cdo/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/plugins/org.polarsys.chess.cdo/.settings/org.eclipse.m2e.core.prefs b/plugins/org.polarsys.chess.cdo/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.polarsys.chess.cdo/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.polarsys.chess.cdo/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.polarsys.chess.cdo/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/org.polarsys.chess.cdo/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/org.polarsys.chess.cdo/META-INF/MANIFEST.MF b/plugins/org.polarsys.chess.cdo/META-INF/MANIFEST.MF
index 07903525e0eca94cc3676b60cb3dfabb7b0a32bf..a6f1e50e67999184c2cae2aed30bb72eb8ba199c 100644
--- a/plugins/org.polarsys.chess.cdo/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.chess.cdo/META-INF/MANIFEST.MF
@@ -27,7 +27,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Intecs
 Export-Package: org.polarsys.chess.cdo,
  org.polarsys.chess.cdo.wizards
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Name: CHESS CDO Integration
 Bundle-Activator: org.polarsys.chess.cdo.Activator
 Import-Package: org.eclipse.emf.cdo.dawn.preferences
diff --git a/plugins/org.polarsys.chess.cdo/build.properties b/plugins/org.polarsys.chess.cdo/build.properties
index 92ba4c54284e327eec03faa6aa7966a49223aed6..abb1a08068526e0b728d78594f2ab1e0149cc759 100644
--- a/plugins/org.polarsys.chess.cdo/build.properties
+++ b/plugins/org.polarsys.chess.cdo/build.properties
@@ -2,7 +2,6 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.properties,\
                about.html,\
                plugin.xml,\
                icons/
diff --git a/plugins/org.polarsys.chess.cdo/pom.xml b/plugins/org.polarsys.chess.cdo/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4eaa339e450c8136116c3ae3b6a84bac4e8b9348
--- /dev/null
+++ b/plugins/org.polarsys.chess.cdo/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.cdo</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.chessmlprofile/.classpath b/plugins/org.polarsys.chess.chessmlprofile/.classpath
index ed0d3c73410a785c31011749923483dd6f038361..82d0c735065e3ce35997c3c0658f9b574ed58b64 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/.classpath
+++ b/plugins/org.polarsys.chess.chessmlprofile/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.polarsys.chess.chessmlprofile/.gitignore b/plugins/org.polarsys.chess.chessmlprofile/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/.gitignore
+++ b/plugins/org.polarsys.chess.chessmlprofile/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/.project b/plugins/org.polarsys.chess.chessmlprofile/.project
index 2a13ef9124739ede87888a6cb25b63bc4dd0cfcd..fc83add1a72f00aad57f6e887d3f65f0858e0f8a 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/.project
+++ b/plugins/org.polarsys.chess.chessmlprofile/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/org.polarsys.chess.chessmlprofile/.settings/org.eclipse.core.resources.prefs b/plugins/org.polarsys.chess.chessmlprofile/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.polarsys.chess.chessmlprofile/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.polarsys.chess.chessmlprofile/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.chess.chessmlprofile/.settings/org.eclipse.jdt.core.prefs
index 3f457a04f1d07150e9b023918a4794a9bb4cf4f7..0c68a61dca867ceb49e79d2402935261ec3e3809 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.polarsys.chess.chessmlprofile/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Wed Apr 27 11:46:59 CEST 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/org.polarsys.chess.chessmlprofile/.settings/org.eclipse.m2e.core.prefs b/plugins/org.polarsys.chess.chessmlprofile/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.polarsys.chess.chessmlprofile/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.polarsys.chess.chessmlprofile/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.polarsys.chess.chessmlprofile/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/org.polarsys.chess.chessmlprofile/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/org.polarsys.chess.chessmlprofile/META-INF/MANIFEST.MF b/plugins/org.polarsys.chess.chessmlprofile/META-INF/MANIFEST.MF
index c540df0ca9615c60ba24c9049237b322cb358719..d38471a26153775f0ee4258bfd20241e77753c0d 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.chess.chessmlprofile/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CHESS ML profile plug-in (Incubation)
 Bundle-SymbolicName: org.polarsys.chess.chessmlprofile;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Polarsys CHESS Project
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui.workbench,
  org.eclipse.emf.common,
diff --git a/plugins/org.polarsys.chess.chessmlprofile/META-INF/myprofile.ecore b/plugins/org.polarsys.chess.chessmlprofile/META-INF/myprofile.ecore
deleted file mode 100644
index 7685426cd961efd3575a05f4b0884c3eb17821b4..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.chessmlprofile/META-INF/myprofile.ecore
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="myprofile"
-    nsURI="http://www.myprofile" nsPrefix="myprofile">
-  <eClassifiers xsi:type="ecore:EClass" name="Stereotype0">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="base_Class" ordered="false"
-        lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Class"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="myAtt" ordered="false"
-        lowerBound="1" eType="ecore:EClass ../model/MARTE_Library.ecore#//BasicNFP_Types/NFP_Real"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/org.polarsys.chess.chessmlprofile/META-INF/myprofile.genmodel b/plugins/org.polarsys.chess.chessmlprofile/META-INF/myprofile.genmodel
deleted file mode 100644
index 63e0d80ebfd45a7e9a5e6ec032d115cc0ebe261f..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.chessmlprofile/META-INF/myprofile.genmodel
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel 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:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel" modelDirectory="/org.polarsys.chess.chessmlprofile/src"
-    modelPluginID="org.polarsys.chess.chessmlprofile" modelName="Myprofile" importerID="org.eclipse.uml2.uml.ecore.importer"
-    complianceLevel="5.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../model/MARTE.genmodel#//MARTE_Library platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml">
-  <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/importer/org.eclipse.uml2.uml.ecore.importer">
-    <details key="ECORE_TAGGED_VALUES" value="PROCESS"/>
-    <details key="UNION_PROPERTIES" value="REPORT"/>
-    <details key="DUPLICATE_FEATURES" value="DISCARD"/>
-    <details key="SUBSETTING_PROPERTIES" value="REPORT"/>
-    <details key="COMMENTS" value="PROCESS"/>
-    <details key="DUPLICATE_FEATURE_INHERITANCE" value="DISCARD"/>
-    <details key="DUPLICATE_OPERATIONS" value="DISCARD"/>
-    <details key="INVARIANT_CONSTRAINTS" value="PROCESS"/>
-    <details key="REDEFINING_PROPERTIES" value="REPORT"/>
-    <details key="ANNOTATION_DETAILS" value="PROCESS"/>
-    <details key="DUPLICATE_OPERATION_INHERITANCE" value="DISCARD"/>
-    <details key="REDEFINING_OPERATIONS" value="REPORT"/>
-    <details key="DERIVED_FEATURES" value="PROCESS"/>
-    <details key="OPERATION_BODIES" value="IGNORE"/>
-    <details key="CAMEL_CASE_NAMES" value="IGNORE"/>
-    <details key="SUPER_CLASS_ORDER" value="PROCESS"/>
-  </genAnnotations>
-  <foreignModel>../model/myprofile.profile.uml</foreignModel>
-  <genPackages xsi:type="genmodel:GenPackage" prefix="myprofile" resource="XML" disposableProviderFactory="true"
-      ecorePackage="myprofile.ecore#/">
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="myprofile.ecore#//Stereotype0">
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference myprofile.ecore#//Stereotype0/base_Class"/>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute myprofile.ecore#//Stereotype0/myAtt"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.polarsys.chess.chessmlprofile/build.properties b/plugins/org.polarsys.chess.chessmlprofile/build.properties
index eaf81201ae2774b02d9c39185de09b633bdff3e3..b72912f43f0edd2fc14c9ac9fd1e2d31f99c97f2 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/build.properties
+++ b/plugins/org.polarsys.chess.chessmlprofile/build.properties
@@ -17,16 +17,11 @@ bin.includes = .,\
                plugin.xml,\
                plugin.properties,\
                icons/,\
-               library/,\
-               readme.txt,\
                build.properties,\
                palettes/,\
-               doc/,\
                .classpath
 jars.compile.order = .
 source.. = src/
 output.. = bin/
 src.includes = icons/,\
-               library/,\
-               model/,\
-               readme.txt
+               model/
diff --git a/plugins/org.polarsys.chess.chessmlprofile/pom.xml b/plugins/org.polarsys.chess.chessmlprofile/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c6712af36fd8aea4ebd3f9e81dd5e0b5f54ec97a
--- /dev/null
+++ b/plugins/org.polarsys.chess.chessmlprofile/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.chessmlprofile</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.cleanCExporter/.gitignore b/plugins/org.polarsys.chess.cleanCExporter/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/org.polarsys.chess.cleanCExporter/.gitignore
+++ b/plugins/org.polarsys.chess.cleanCExporter/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/org.polarsys.chess.cleanCExporter/.project b/plugins/org.polarsys.chess.cleanCExporter/.project
index a5e3622df2f89a37cecdce35508bfc995a64e535..3eda606caf5ab1bffe4ab451b20f5d03ae66825b 100644
--- a/plugins/org.polarsys.chess.cleanCExporter/.project
+++ b/plugins/org.polarsys.chess.cleanCExporter/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/org.polarsys.chess.cleanCExporter/.settings/org.eclipse.core.resources.prefs b/plugins/org.polarsys.chess.cleanCExporter/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.polarsys.chess.cleanCExporter/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.polarsys.chess.cleanCExporter/.settings/org.eclipse.m2e.core.prefs b/plugins/org.polarsys.chess.cleanCExporter/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.polarsys.chess.cleanCExporter/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.polarsys.chess.cleanCExporter/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.polarsys.chess.cleanCExporter/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/org.polarsys.chess.cleanCExporter/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/org.polarsys.chess.cleanCExporter/pom.xml b/plugins/org.polarsys.chess.cleanCExporter/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4231190cc5a9d592069de64008fb0f38d8c0d1f1
--- /dev/null
+++ b/plugins/org.polarsys.chess.cleanCExporter/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.cleanCExporter</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.codegen.ada/.classpath b/plugins/org.polarsys.chess.codegen.ada/.classpath
index ad32c83a7885b8953a938b41df3b4fd4fe1aae01..eca7bdba8f03f22510b7980a94dbfe10c16c0901 100644
--- a/plugins/org.polarsys.chess.codegen.ada/.classpath
+++ b/plugins/org.polarsys.chess.codegen.ada/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.polarsys.chess.codegen.ada/.gitignore b/plugins/org.polarsys.chess.codegen.ada/.gitignore
index 6f3797035889c72aea3beb9983f6fa8fbb14896e..53641bd2aa2be50fb0fd7f75748f11b6e79f1cba 100644
--- a/plugins/org.polarsys.chess.codegen.ada/.gitignore
+++ b/plugins/org.polarsys.chess.codegen.ada/.gitignore
@@ -1,2 +1,3 @@
 /bin/
 /tasks/
+/target/
diff --git a/plugins/org.polarsys.chess.codegen.ada/.project b/plugins/org.polarsys.chess.codegen.ada/.project
index 0fc2f6724c26f8aac83be9ad3d8ea4cb8f3c9e14..17e3609d15dc5fe1374cf426b2018788620cbc77 100644
--- a/plugins/org.polarsys.chess.codegen.ada/.project
+++ b/plugins/org.polarsys.chess.codegen.ada/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -41,8 +46,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.acceleo.ide.ui.acceleoNature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
diff --git a/plugins/org.polarsys.chess.codegen.ada/.settings/org.eclipse.core.resources.prefs b/plugins/org.polarsys.chess.codegen.ada/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.polarsys.chess.codegen.ada/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.polarsys.chess.codegen.ada/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.chess.codegen.ada/.settings/org.eclipse.jdt.core.prefs
index 29fdd3dc0dbd3580b0a999e53d52349f4121fa30..0c68a61dca867ceb49e79d2402935261ec3e3809 100644
--- a/plugins/org.polarsys.chess.codegen.ada/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.polarsys.chess.codegen.ada/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Thu Dec 08 10:05:47 CET 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/org.polarsys.chess.codegen.ada/.settings/org.eclipse.m2e.core.prefs b/plugins/org.polarsys.chess.codegen.ada/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.polarsys.chess.codegen.ada/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.polarsys.chess.codegen.ada/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.polarsys.chess.codegen.ada/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/org.polarsys.chess.codegen.ada/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/org.polarsys.chess.codegen.ada/META-INF/MANIFEST.MF b/plugins/org.polarsys.chess.codegen.ada/META-INF/MANIFEST.MF
index 17ab80c3981ffed7e8f6b8c06fb50cae0fd23ad2..e06da346a78a20b12cbd372f2ef83bcf0d5832cb 100644
--- a/plugins/org.polarsys.chess.codegen.ada/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.chess.codegen.ada/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Ada infrastructural code generator plug-in (Incubation)
 Bundle-SymbolicName: org.polarsys.chess.codegen.ada;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.polarsys.chess.codegen.ada.Activator
 Bundle-Vendor: Polarsys CHESS Project
 Require-Bundle: org.eclipse.core.runtime,
@@ -35,7 +35,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.polarsys.chess.monitoring,
  org.polarsys.chess.multicore,
  org.eclipse.emf.transaction
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Eclipse-LazyStart: true
 Export-Package: org.polarsys.chess.codegen.ada,
diff --git a/plugins/org.polarsys.chess.codegen.ada/build.properties b/plugins/org.polarsys.chess.codegen.ada/build.properties
index 205227685b6e349c284f7fe596287884c8ffafb5..4adc4f6f24dc1c7c232d4d7cea8d5d7110e04b96 100644
--- a/plugins/org.polarsys.chess.codegen.ada/build.properties
+++ b/plugins/org.polarsys.chess.codegen.ada/build.properties
@@ -14,11 +14,9 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                src-lib/,\
-               license/,\
                Version.txt,\
                build.acceleo,\
                build.properties,\
                tasks/
 customBuildCallbacks = build.acceleo
-src.includes = license/,\
-               src-lib/
+src.includes =    src-lib/
diff --git a/plugins/org.polarsys.chess.codegen.ada/pom.xml b/plugins/org.polarsys.chess.codegen.ada/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cfc7b27207af6f496396b73c3387becad3567342
--- /dev/null
+++ b/plugins/org.polarsys.chess.codegen.ada/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.codegen.ada</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.codegen.ada/tasks/generateInfrastructure.xml b/plugins/org.polarsys.chess.codegen.ada/tasks/generateInfrastructure.xml
index 691685057e113d890cfbfcd9d26b013541d16285..b6058aa1631f4b52192b5f7c69daa5168c99d8f4 100644
--- a/plugins/org.polarsys.chess.codegen.ada/tasks/generateInfrastructure.xml
+++ b/plugins/org.polarsys.chess.codegen.ada/tasks/generateInfrastructure.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project default="generateInfrastructure" name="org.polarsys.chess.codegen.ada">
+<<<<<<< HEAD
     <property name="ECLIPSE_HOME" value="../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515"/>
     <property name="ECLIPSE_WORKSPACE" value="../../../../../Programmi/PolarsysCHESS-Neon-win32-x86_64_20190515/workspace"/>
+=======
+    <property name="ECLIPSE_HOME" value="../../../../../Eclipse/eclipse"/>
+    <property name="ECLIPSE_WORKSPACE" value="../../../../../Workspaces/FirstConfig/ws"/>
+>>>>>>> refs/remotes/origin/master
 
     <!-- The classpath with only the dependencies used by the project -->
     <path id="org.polarsys.chess.codegen.ada.libraryclasspath">
@@ -27,7 +32,10 @@
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.runtime_3.12.0.v20160606-1342.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/javax.inject_1.0.0.v20091030.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi_3.11.3.v20170209-1843.jar"/>
+<<<<<<< HEAD
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.fx.osgi_2.4.0.201605100504.jar"/>
+=======
+>>>>>>> refs/remotes/origin/master
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi.compatibility.state_1.0.200.v20160504-1419.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.common_3.8.0.v20160509-1230.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.jobs_3.8.0.v20160509-0411.jar"/>
@@ -53,7 +61,15 @@
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.engine_3.6.6.201610060831.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen.ecore_2.12.0.v20160526-0356.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen_2.11.0.v20160526-0356.jar"/>
+<<<<<<< HEAD
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.3.201810170111.jar"/>
+=======
+<<<<<<< HEAD
+        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.3.201903050251.jar"/>
+=======
+        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.2.0.201703081153.jar"/>
+>>>>>>> branch 'master' of git@gitlab.fbk.eu:CPS_Design/CHESS.git
+>>>>>>> refs/remotes/origin/master
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.commands_3.8.1.v20161221-1651.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.resources_3.11.1.v20161107-2032.jar"/>
         <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core_2.1.1.201703080851.jar"/>
diff --git a/plugins/org.polarsys.chess.commands/.classpath b/plugins/org.polarsys.chess.commands/.classpath
index ad32c83a7885b8953a938b41df3b4fd4fe1aae01..eca7bdba8f03f22510b7980a94dbfe10c16c0901 100644
--- a/plugins/org.polarsys.chess.commands/.classpath
+++ b/plugins/org.polarsys.chess.commands/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.polarsys.chess.commands/.gitignore b/plugins/org.polarsys.chess.commands/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/org.polarsys.chess.commands/.gitignore
+++ b/plugins/org.polarsys.chess.commands/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/org.polarsys.chess.commands/.project b/plugins/org.polarsys.chess.commands/.project
index 254cf03835c3aac2c3b14ad4b99c5bd3593e886c..13d5afcb51c0e5348b84fa037f84f0b1d8737a32 100644
--- a/plugins/org.polarsys.chess.commands/.project
+++ b/plugins/org.polarsys.chess.commands/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -21,14 +26,15 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.polarsys.chess.commands/.settings/org.eclipse.core.resources.prefs b/plugins/org.polarsys.chess.commands/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.polarsys.chess.commands/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.polarsys.chess.commands/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.chess.commands/.settings/org.eclipse.jdt.core.prefs
index 044ef7ad98d0dc6abddef8d16e81b3c27ae2fe6f..0c68a61dca867ceb49e79d2402935261ec3e3809 100644
--- a/plugins/org.polarsys.chess.commands/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.polarsys.chess.commands/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Tue Oct 05 10:28:34 CEST 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/org.polarsys.chess.commands/.settings/org.eclipse.m2e.core.prefs b/plugins/org.polarsys.chess.commands/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.polarsys.chess.commands/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.polarsys.chess.commands/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.polarsys.chess.commands/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/org.polarsys.chess.commands/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/org.polarsys.chess.commands/META-INF/MANIFEST.MF b/plugins/org.polarsys.chess.commands/META-INF/MANIFEST.MF
index b92eacbae645515f1611831537decd6169363073..10b3b3e3d285e5da01bdefd6d600ed235acd2701 100644
--- a/plugins/org.polarsys.chess.commands/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.chess.commands/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CHESS Commands plug-in (Incubation)
 Bundle-SymbolicName: org.polarsys.chess.commands;singleton:=true
-Bundle-Version: 0.10.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.polarsys.chess.commands.Activator
 Bundle-Vendor: Polarsys CHESS Project
 Require-Bundle: org.eclipse.ui.ide;bundle-version="3.10.0",
@@ -34,6 +34,6 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="3.10.0",
  org.polarsys.chess.m2m,
  org.eclipse.papyrus.emf.facet.custom.metamodel,
  org.eclipse.papyrus.sysml
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.polarsys.chess.commands
diff --git a/plugins/org.polarsys.chess.commands/build.properties b/plugins/org.polarsys.chess.commands/build.properties
index dd68934621145cfefede576fcfa5b2f174868a7b..5d738a6fa7e721a04ff14dc35dec1d80e2cb67f2 100644
--- a/plugins/org.polarsys.chess.commands/build.properties
+++ b/plugins/org.polarsys.chess.commands/build.properties
@@ -4,7 +4,5 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                build.properties,\
-               transformations/,\
-               metamodels/,\
                about.html,\
                resources/
diff --git a/plugins/org.polarsys.chess.commands/pom.xml b/plugins/org.polarsys.chess.commands/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..05a6aa6728ff1916285255676292f27dd92664ac
--- /dev/null
+++ b/plugins/org.polarsys.chess.commands/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.commands</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.constraints.constraintEditor/.gitignore b/plugins/org.polarsys.chess.constraints.constraintEditor/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/org.polarsys.chess.constraints.constraintEditor/.gitignore
+++ b/plugins/org.polarsys.chess.constraints.constraintEditor/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/org.polarsys.chess.constraints.constraintEditor/.project b/plugins/org.polarsys.chess.constraints.constraintEditor/.project
index 3d12c92a12e5607b0a3fb625f425ee82a126aae8..6c23c31bea2565c4f7a46bcadbbed6e35f6e0511 100644
--- a/plugins/org.polarsys.chess.constraints.constraintEditor/.project
+++ b/plugins/org.polarsys.chess.constraints.constraintEditor/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/org.polarsys.chess.constraints.constraintEditor/.settings/org.eclipse.core.resources.prefs b/plugins/org.polarsys.chess.constraints.constraintEditor/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.polarsys.chess.constraints.constraintEditor/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.polarsys.chess.constraints.constraintEditor/.settings/org.eclipse.m2e.core.prefs b/plugins/org.polarsys.chess.constraints.constraintEditor/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.polarsys.chess.constraints.constraintEditor/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.polarsys.chess.constraints.constraintEditor/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.polarsys.chess.constraints.constraintEditor/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/org.polarsys.chess.constraints.constraintEditor/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/org.polarsys.chess.constraints.constraintEditor/pom.xml b/plugins/org.polarsys.chess.constraints.constraintEditor/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6a456de52559ca4761e5c615c78ebeba73f058c4
--- /dev/null
+++ b/plugins/org.polarsys.chess.constraints.constraintEditor/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.constraints.constraintEditor</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.core/.classpath b/plugins/org.polarsys.chess.core/.classpath
index a9a4e6981f7d0d73f22ca136b54109471f73e04c..6514158ef1f063768ecdbccd18783f081f44caf1 100644
--- a/plugins/org.polarsys.chess.core/.classpath
+++ b/plugins/org.polarsys.chess.core/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry excluding="it/unipd/chess/constraint/ExampleConstraintsLib.java" kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.polarsys.chess.core/.gitignore b/plugins/org.polarsys.chess.core/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/org.polarsys.chess.core/.gitignore
+++ b/plugins/org.polarsys.chess.core/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/org.polarsys.chess.core/.project b/plugins/org.polarsys.chess.core/.project
index 8bd8be99fc5b9918da8db346386c9defe80ed9f4..0651d877d3a61e7bad413bc1dbea7f73743f15b7 100644
--- a/plugins/org.polarsys.chess.core/.project
+++ b/plugins/org.polarsys.chess.core/.project
@@ -30,8 +30,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>com.jutils.lint4j.core.Nature</nature>
diff --git a/plugins/org.polarsys.chess.core/.settings/org.eclipse.core.resources.prefs b/plugins/org.polarsys.chess.core/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.polarsys.chess.core/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.polarsys.chess.core/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.chess.core/.settings/org.eclipse.jdt.core.prefs
index c537b63063ce6052bdc49c5fd0745b078f162c90..0c68a61dca867ceb49e79d2402935261ec3e3809 100644
--- a/plugins/org.polarsys.chess.core/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.polarsys.chess.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/org.polarsys.chess.core/.settings/org.eclipse.m2e.core.prefs b/plugins/org.polarsys.chess.core/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.polarsys.chess.core/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.polarsys.chess.core/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.polarsys.chess.core/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/org.polarsys.chess.core/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/org.polarsys.chess.core/META-INF/MANIFEST.MF b/plugins/org.polarsys.chess.core/META-INF/MANIFEST.MF
index 2649f443e24d5c9c5c4840da26dac5a431a1615e..5cee156ae6c0dbffb9a71e52bfc95d8e12841d97 100644
--- a/plugins/org.polarsys.chess.core/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.chess.core/META-INF/MANIFEST.MF
@@ -2,15 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.chess.core;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.polarsys.chess.core.Activator
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: javax.xml.bind,
  org.polarsys.chess.core,
  org.polarsys.chess.core.constraint;uses:="org.eclipse.core.runtime,org.eclipse.emf.common.notify",
  org.polarsys.chess.core.extensionpoint,
  org.polarsys.chess.core.internal.extensionpoint,
+ org.polarsys.chess.core.internal.util,
  org.polarsys.chess.core.internal.views.permissions,
  org.polarsys.chess.core.natures;uses:="org.eclipse.core.resources",
  org.polarsys.chess.core.notifications;uses:="org.eclipse.papyrus.ui.toolbox.notification",
diff --git a/plugins/org.polarsys.chess.core/pom.xml b/plugins/org.polarsys.chess.core/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..33bd4aa18616779e4fa2aaada506e706beb7353e
--- /dev/null
+++ b/plugins/org.polarsys.chess.core/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.core</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.diagram.ui/.gitignore b/plugins/org.polarsys.chess.diagram.ui/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/org.polarsys.chess.diagram.ui/.gitignore
+++ b/plugins/org.polarsys.chess.diagram.ui/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/org.polarsys.chess.diagram.ui/.project b/plugins/org.polarsys.chess.diagram.ui/.project
index 047cc4ddf74c37db62b63004e403a4938193aeed..53dad6991c5a100de4248964fdb6426ac1208fc2 100644
--- a/plugins/org.polarsys.chess.diagram.ui/.project
+++ b/plugins/org.polarsys.chess.diagram.ui/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/org.polarsys.chess.diagram.ui/.settings/org.eclipse.core.resources.prefs b/plugins/org.polarsys.chess.diagram.ui/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.polarsys.chess.diagram.ui/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.polarsys.chess.diagram.ui/.settings/org.eclipse.m2e.core.prefs b/plugins/org.polarsys.chess.diagram.ui/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.polarsys.chess.diagram.ui/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.polarsys.chess.diagram.ui/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.polarsys.chess.diagram.ui/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/org.polarsys.chess.diagram.ui/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/org.polarsys.chess.diagram.ui/pom.xml b/plugins/org.polarsys.chess.diagram.ui/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..46b78403c236ba60c93c426121c42435081f8ea2
--- /dev/null
+++ b/plugins/org.polarsys.chess.diagram.ui/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.diagram.ui</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/commands/GenerateDocumentCommand.java b/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/commands/GenerateDocumentCommand.java
index 93ae4044e41e8db3b9353340b61bbfcdb2bd24a3..99dfea9e0b6c4302ed0783aef9a724df8fceebcc 100644
--- a/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/commands/GenerateDocumentCommand.java
+++ b/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/commands/GenerateDocumentCommand.java
@@ -57,7 +57,7 @@ public class GenerateDocumentCommand extends AbstractJobCommand {
 	private ExportDialogUtils exportDialogUtils = ExportDialogUtils.getInstance();
 	private DialogUtils dialogUtils = DialogUtils.getInstance();
 	private CHESSDiagramsGeneratorService chessDiagramsGeneratorService = CHESSDiagramsGeneratorService
-			.getInstance(CHESSInternalBlockDiagramModel.getInstance(), CHESSBlockDefinitionDiagramModel.getInstance());
+			.getInstance();//CHESSInternalBlockDiagramModel.getInstance(), CHESSBlockDefinitionDiagramModel.getInstance()
 	private DirectoryUtil directoryUtils = DirectoryUtil.getInstance();
 
 	private DocumentGeneratorServiceFromOssModel documentGeneratorService;
diff --git a/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/services/CHESSDiagramsGeneratorService.java b/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/services/CHESSDiagramsGeneratorService.java
index bd691503dc04c3d55df1a909b3a42af7d5a5caee..b901189fcec34daaca82fec21b2dca5d3e989b14 100644
--- a/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/services/CHESSDiagramsGeneratorService.java
+++ b/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/services/CHESSDiagramsGeneratorService.java
@@ -53,13 +53,13 @@ public class CHESSDiagramsGeneratorService {
 
 	private static final Logger logger = Logger.getLogger(CHESSDiagramsGeneratorService.class);
 
-	public static CHESSDiagramsGeneratorService getInstance(AbstractInternalBlockDiagramModel ibdModel,
-			AbstractBlockDefinitionDiagramModel bddModel) {
-		if (instance == null) {
-			instance = new CHESSDiagramsGeneratorService(ibdModel, bddModel);
-		}
-		return instance;
-	}
+//	public static CHESSDiagramsGeneratorService getInstance(AbstractInternalBlockDiagramModel ibdModel,
+//			AbstractBlockDefinitionDiagramModel bddModel) {
+//		if (instance == null) {
+//			instance = new CHESSDiagramsGeneratorService(ibdModel, bddModel);
+//		}
+//		return instance;
+//	}
 
 	public static CHESSDiagramsGeneratorService getInstance() {
 		if (instance == null) {
@@ -72,12 +72,12 @@ public class CHESSDiagramsGeneratorService {
 		super();
 	}
 	
-	public CHESSDiagramsGeneratorService(AbstractInternalBlockDiagramModel ibdModel,
-			AbstractBlockDefinitionDiagramModel bddModel) {
-		super();
-//		ibdGeneratorService = InternalBlockDiagramGeneratorService.getInstance(ibdModel);
-//		bddGeneratorService = BlockDefinitionDiagramGeneratorService.getInstance(bddModel);
-	}
+//	public CHESSDiagramsGeneratorService(AbstractInternalBlockDiagramModel ibdModel,
+//			AbstractBlockDefinitionDiagramModel bddModel) {
+//		super();
+////		ibdGeneratorService = InternalBlockDiagramGeneratorService.getInstance(ibdModel);
+////		bddGeneratorService = BlockDefinitionDiagramGeneratorService.getInstance(bddModel);
+//	}
 
 //	private InternalBlockDiagramGeneratorService ibdGeneratorService;
 //	private BlockDefinitionDiagramGeneratorService bddGeneratorService;
diff --git a/plugins/org.polarsys.chess.diagramsCreator/.gitignore b/plugins/org.polarsys.chess.diagramsCreator/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/.gitignore
+++ b/plugins/org.polarsys.chess.diagramsCreator/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/org.polarsys.chess.diagramsCreator/.project b/plugins/org.polarsys.chess.diagramsCreator/.project
index 641a6c62874665ab0485368b5c0cb2bff17c8a00..b3519b8e185f52b1a9d5dbf945dba8484af864a7 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/.project
+++ b/plugins/org.polarsys.chess.diagramsCreator/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/org.polarsys.chess.diagramsCreator/.settings/org.eclipse.core.resources.prefs b/plugins/org.polarsys.chess.diagramsCreator/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.polarsys.chess.diagramsCreator/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.polarsys.chess.diagramsCreator/.settings/org.eclipse.m2e.core.prefs b/plugins/org.polarsys.chess.diagramsCreator/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.polarsys.chess.diagramsCreator/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.polarsys.chess.diagramsCreator/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.polarsys.chess.diagramsCreator/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/org.polarsys.chess.diagramsCreator/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/org.polarsys.chess.diagramsCreator/META-INF/MANIFEST.MF b/plugins/org.polarsys.chess.diagramsCreator/META-INF/MANIFEST.MF
index 48c8acca9fa3f1c6e9988497420c81fc195a92e1..d068b11b9fd6bc84ba9ed1449373370388f894a3 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.chess.diagramsCreator/META-INF/MANIFEST.MF
@@ -27,13 +27,21 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.papyrus.uml.diagram.statemachine,
  org.eclipse.emf.common,
  org.eclipse.emf.ecore,
- org.polarsys.chess.diagram.ui,
- eu.fbk.eclipse.standardtools.diagram.ui,
  org.eclipse.papyrus.infra.viewpoints.configuration,
  org.eclipse.papyrus.uml.diagram.common,
  org.eclipse.papyrus.uml.tools,
- org.eclipse.emf.transaction
+ org.eclipse.emf.transaction,
+ org.eclipse.papyrus.infra.services.openelement,
+ org.eclipse.elk.alg.disco,
+ org.eclipse.elk.alg.force,
+ org.eclipse.elk.alg.graphviz.dot,
+ org.eclipse.elk.alg.graphviz.layouter,
+ org.eclipse.elk.alg.mrtree,
+ org.eclipse.elk.alg.radial,
+ org.eclipse.elk.alg.spore
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Fondazione Bruno Kessler
 Import-Package: org.apache.log4j
-Export-Package: org.polarsys.chess.diagramsCreator.actions
+Export-Package: org.polarsys.chess.diagramsCreator.actions,
+ org.polarsys.chess.diagramsCreator.commands,
+ org.polarsys.chess.diagramsCreator.utils
diff --git a/plugins/org.polarsys.chess.diagramsCreator/pom.xml b/plugins/org.polarsys.chess.diagramsCreator/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..846e3d60ee742f50be56ed1afe1ecc1003598355
--- /dev/null
+++ b/plugins/org.polarsys.chess.diagramsCreator/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.diagramsCreator</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/actions/ShowBDDElementsAction.java b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/actions/ShowBDDElementsAction.java
index 8f2f39f619e2d0739f301a78eaad7f4e5603e3fa..3e800cbd8cf6f84734a87f0db24ec247d394c6b1 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/actions/ShowBDDElementsAction.java
+++ b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/actions/ShowBDDElementsAction.java
@@ -52,6 +52,7 @@ import org.eclipse.ui.PlatformUI;
 import org.eclipse.uml2.uml.Association;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Constraint;
+import org.eclipse.uml2.uml.Dependency;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.LiteralString;
 import org.eclipse.uml2.uml.Operation;
@@ -59,6 +60,7 @@ import org.eclipse.uml2.uml.Package;
 import org.eclipse.uml2.uml.Property;
 import org.polarsys.chess.contracts.profile.chesscontract.util.ContractEntityUtil;
 import org.polarsys.chess.contracts.profile.chesscontract.util.EntityUtil;
+import org.polarsys.chess.diagramsCreator.utils.DiagramUtils;
 import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
 
 /**
@@ -74,7 +76,7 @@ public class ShowBDDElementsAction extends ShowHideContentsAction {
 	
 	private final EntityUtil entityUtil = EntityUtil.getInstance();
 	private final ContractEntityUtil contractEntityUtil = ContractEntityUtil.getInstance();
-
+	private final DiagramUtils diagramUtils = DiagramUtils.getInstance();
 	/** Selection of all the possible elements. */
 	private List<Object> selection;
 	
@@ -128,7 +130,7 @@ public class ShowBDDElementsAction extends ShowHideContentsAction {
 	 * @param position position is used to try to distribute the drop
 	 * @return the Command to display the element
 	 */
-	private Command showElementIn(EObject elementToShow, DiagramEditor activeEditor, EditPart editPart, int position) {
+	/*private Command showElementIn(EObject elementToShow, DiagramEditor activeEditor, EditPart editPart, int position) {
 		
 		if (elementToShow instanceof Element) {
 			DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();
@@ -143,7 +145,7 @@ public class ShowBDDElementsAction extends ShowHideContentsAction {
 			}
 		}
 		return null;
-	}
+	}*/
 
 	/**
 	 * Adds a BDD diagram to the given block.
@@ -434,17 +436,33 @@ public class ShowBDDElementsAction extends ShowHideContentsAction {
 		return null;
 	}
 	
+	/**
+	 * Fills the diagram with graphical components in the list without showing their content.
+	 * @param diagram
+	 * @param elementsByRef list of elements that should be displayed
+	 */
+	public void populateDiagramByReferenceWithEmptyBlocks(Diagram diagram, EList<Element> elementsByRef)
+	{
+		populateDiagram(diagram, elementsByRef, true);
+	}
+	
+
 	/**
 	 * Fills the diagram with graphical components.
 	 * @param diagram
-	 * @param elementsToDisplay list of elements that should be displayed
 	 */
-	public void populateDiagram(Diagram diagram) {
+	public void populateDiagram(Diagram diagram)
+	{
+		populateDiagram(diagram, null, false);
+	}
+	
+	
+	private void populateDiagram(Diagram diagram, EList<Element> elements, boolean useElements) {
 		final Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
 		
 		// Get the EditPart associated to the diagram
 		final IGraphicalEditPart diagramEP = OffscreenEditPartFactory.getInstance().createDiagramEditPart(diagram, shell);
-		
+		final TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(diagram);
 		// Get the EditorPart and the active editor
 		IEditorPart editorPart =  PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
 		IEditorPart activeEditor = ((PapyrusMultiDiagramEditor) editorPart).getActiveEditor();
@@ -452,22 +470,35 @@ public class ShowBDDElementsAction extends ShowHideContentsAction {
 
 		Package pkg = (Package) diagramEP.resolveSemanticElement();
 		EList<Element> packageChildren = pkg.getOwnedElements();
+
+		//if is wanted to use blocks from different packages overwrite the local elements
+		if (useElements) {
+			packageChildren = elements;
+		}
 		
-		CompoundCommand completeCmd = new CompoundCommand("Show Elements Command");
+		List<EditPart> childrenList = diagramUtils.findAllChildren(diagramEP);
+		
+		//CompoundCommand completeCmd = new CompoundCommand("Show Elements Command");
 
+		ArrayList<EObject> blocksToDisplay = new ArrayList<EObject>(); 
+		
 		// First loop to draw Block elements and contracts
 		for (Element element : packageChildren) {
-			if (entityUtil.isBlock(element)) {
+			if (entityUtil.isBlock(element) || element instanceof Package) {
 				logger.debug("calling showElementIn for element = " + element);
-				Command cmd = showElementIn(element, (DiagramEditor) activeEditor, diagramEP, 1); 
-				completeCmd.add(cmd);
+				blocksToDisplay.add(element);
+				//Command cmd = showElementIn(element, (DiagramEditor) activeEditor, diagramEP, 1); 
+				//completeCmd.add(cmd);
 			}
 		}
 		
+		if(!blocksToDisplay.isEmpty()){
+		Command showBlocksCmd = diagramUtils.showElementsIn(blocksToDisplay, (DiagramEditor) activeEditor, diagramEP, childrenList, new Point(100, 100));
+		//completeCmd.add(showBlocksCmd);
 		// Execute the commands
-		final TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(diagram);
-		domain.getCommandStack().execute(new GEFtoEMFCommandWrapper(completeCmd));
-
+		
+		domain.getCommandStack().execute(new GEFtoEMFCommandWrapper(showBlocksCmd));
+		}
 		// Resize the graphical elements, passing a void list of blocks to avoid
 		resizeElements(diagramEP, new BasicEList<Class>());
 
@@ -503,21 +534,28 @@ public class ShowBDDElementsAction extends ShowHideContentsAction {
 		
 		// Create a new command, dispose doesn't work...
 //		completeCmd.dispose();
-		completeCmd = new CompoundCommand("Show Elements Command");
+		//completeCmd = new CompoundCommand("Show Elements Command");
 
+		ArrayList<EObject> associationsToDisplay = new ArrayList<EObject>(); 
 		// Second loop to draw Associations
 		for (Element element : packageChildren) {
-			if (element instanceof Association) {
+			if (element instanceof Association || element instanceof Dependency) {
 				logger.debug("calling showElementIn for Association = " + element);
-				final Command cmd = showElementIn(element, (DiagramEditor) activeEditor, diagramEP, 1);
+				associationsToDisplay.add(element);
+				/*final Command cmd = showElementIn(element, (DiagramEditor) activeEditor, diagramEP, 1);
 				if (cmd != null && cmd.canExecute()) {
-					completeCmd.add(cmd);
-				}
+					completeCmd.add(cmd);					
+				}*/
 			}
 		}
 		
+		if(!associationsToDisplay.isEmpty()){
+		Command showAssociationsCmd = diagramUtils.showElementsIn(associationsToDisplay, (DiagramEditor) activeEditor, diagramEP, childrenList, new Point(100, 100));
+		//completeCmd.add(showAssociationsCmd);
+		
 		// Execute the commands
-		domain.getCommandStack().execute(new GEFtoEMFCommandWrapper(completeCmd));
+		domain.getCommandStack().execute(new GEFtoEMFCommandWrapper(showAssociationsCmd));
+		}
 	}
 	
 	/**
@@ -559,7 +597,9 @@ public class ShowBDDElementsAction extends ShowHideContentsAction {
 				pkg = displayedBlocks.get(0).getNearestPackage();
 			}
 		}
-				
+		
+		List<EditPart> childrenList = diagramUtils.findAllChildren(diagramEditPart);
+		
 		// All the existing elements in the package
 		final EList<Element> existingElements = pkg.getOwnedElements();
 		
@@ -576,7 +616,7 @@ public class ShowBDDElementsAction extends ShowHideContentsAction {
 					logger.debug("block is not present in diagram");
 					missingBlocks.add(element);
 				}
-			} else if (element instanceof Association) {
+			} else if (element instanceof Association || element instanceof Dependency) {
 				if (displayedAssociations.contains(element)) {
 					logger.debug("association already present in diagram");
 				} else {
@@ -586,26 +626,27 @@ public class ShowBDDElementsAction extends ShowHideContentsAction {
 			}
 		}
 
+		ArrayList<EObject> blocksToDisplay = new ArrayList<EObject>(); 
 		// Create a compound command to display missing blocks
-		CompoundCommand completeCmd = new CompoundCommand("Show Blocks Command");
-		int index = 0;
+		//CompoundCommand completeCmd = new CompoundCommand("Show Blocks Command");
+		//int index = 0;
 		for (Element element : missingBlocks) {
 			logger.debug("block missing in the diagram = " + element);
-			final Command cmd = showElementIn(element, (DiagramEditor) activeEditor, diagramEditPart, index++);
-			try {
-				if (cmd.canExecute()) {
-					completeCmd.add(cmd);
-				}
-			} catch (Exception e) {
-				System.err.println("Problems in displaying blocks");
-			}
+			blocksToDisplay.add(element);			
 		}
 
+		final TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(editorPart);
+		if(!blocksToDisplay.isEmpty()){
+		Command showBlocksCmd = diagramUtils.showElementsIn(blocksToDisplay, (DiagramEditor) activeEditor, diagramEditPart, childrenList, new Point(100, 100));
+		//completeCmd.add(showBlocksCmd);
+		domain.getCommandStack().execute(new GEFtoEMFCommandWrapper(showBlocksCmd));
+		}
+		
 		// Execute the commands to display blocks
-		if (completeCmd.size() > 0) {
+		/*if (completeCmd.size() > 0) {
 			isDiagramChanged = true;
 			completeCmd.execute();
-		}
+		}*/
 		
 		// Resize the blocks, only if not already displayed
 		resizeElements(diagramEditPart, displayedBlocks);
@@ -639,30 +680,30 @@ public class ShowBDDElementsAction extends ShowHideContentsAction {
 			// Execute the commands
 			if (command.size() > 0) {
 				isDiagramChanged = true;
-				final TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(diagramEditPart.getNotationView());
-				domain.getCommandStack().execute(new GEFtoEMFCommandWrapper(command));
+				final TransactionalEditingDomain notationDomain = TransactionUtil.getEditingDomain(diagramEditPart.getNotationView());
+				notationDomain.getCommandStack().execute(new GEFtoEMFCommandWrapper(command));
 			}
 		}
 
+		ArrayList<EObject> associationsToDisplay = new ArrayList<EObject>(); 
 		// Create a compound command to display missing associations
-		completeCmd = new CompoundCommand("Show Associations Command");	
+		//completeCmd = new CompoundCommand("Show Associations Command");	
 		for (Element element : missingAssociations) {
 			logger.debug("association missing in the diagram = " + element);
-			final Command cmd = showElementIn(element, (DiagramEditor) activeEditor, diagramEditPart, 0); 
-			try {
-				if (cmd.canExecute()) {
-					completeCmd.add(cmd);
-				}
-			} catch (Exception e) {
-				logger.error("Problems in displaying associations");
-			}
+			associationsToDisplay.add(element);			
 		}
 		
+		if(!associationsToDisplay.isEmpty()){
+		Command showAssociationsCmd = diagramUtils.showElementsIn(associationsToDisplay, (DiagramEditor) activeEditor, diagramEditPart, childrenList, new Point(100, 100));
+		//final TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(diagramEditPart);
+		domain.getCommandStack().execute(new GEFtoEMFCommandWrapper(showAssociationsCmd));
+		//completeCmd.add(showAssociationsCmd);
+		}
 		// Execute the commands to display associations
-		if (completeCmd.size() > 0) {
+		/*if (completeCmd.size() > 0) {
 			isDiagramChanged = true;
 			completeCmd.execute();
-		}
+		}*/
 		return isDiagramChanged;
 	}
 	
diff --git a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/actions/ShowSMDElementsAction.java b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/actions/ShowSMDElementsAction.java
index a6433ae37bd44d39c360f902adc52227a86f8fc7..1d552fe0ae393e1f8755ecd3eaeb37cff8c424c8 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/actions/ShowSMDElementsAction.java
+++ b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/actions/ShowSMDElementsAction.java
@@ -29,22 +29,18 @@ import org.eclipse.gef.commands.CompoundCommand;
 import org.eclipse.gmf.runtime.diagram.ui.OffscreenEditPartFactory;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
 import org.eclipse.gmf.runtime.notation.Bounds;
 import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;
 import org.eclipse.papyrus.editor.PapyrusMultiDiagramEditor;
-import org.eclipse.papyrus.infra.gmfdiag.css.CSSConnectorImpl;
 import org.eclipse.papyrus.infra.gmfdiag.css.CSSShapeImpl;
 import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram;
 import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
 import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
-import org.eclipse.papyrus.uml.diagram.common.util.CrossReferencerUtil;
 import org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part.CustomStateEditPart;
 import org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part.CustomTransitionEditPart;
 import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Constraint;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.FinalState;
 import org.eclipse.uml2.uml.Pseudostate;
@@ -55,15 +51,18 @@ import org.eclipse.uml2.uml.Transition;
 import org.eclipse.uml2.uml.UMLPackage;
 import org.eclipse.uml2.uml.Vertex;
 import org.polarsys.chess.contracts.profile.chesscontract.util.EntityUtil;
-import org.polarsys.chess.diagram.ui.docGenerators.CHESSBlockDefinitionDiagramModel;
-import org.polarsys.chess.diagram.ui.docGenerators.CHESSInternalBlockDiagramModel;
-import org.polarsys.chess.diagram.ui.services.CHESSDiagramsGeneratorService;
+//import org.polarsys.chess.diagram.ui.docGenerators.CHESSBlockDefinitionDiagramModel;
+//import org.polarsys.chess.diagram.ui.docGenerators.CHESSInternalBlockDiagramModel;
+//import org.polarsys.chess.diagram.ui.services.CHESSDiagramsGeneratorService;
+import org.polarsys.chess.diagramsCreator.utils.DiagramUtils;
+
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.PlatformUI;
 
 /**
  * This class creates an State Machine Diagram and populates it with elements.
+ * 
  * @author cristofo
  *
  */
@@ -74,15 +73,16 @@ public class ShowSMDElementsAction {
 	private static final int HEIGHT = 50;
 
 	private final EntityUtil entityUtil = EntityUtil.getInstance();
-
+	private final DiagramUtils diagramUtils = DiagramUtils.getInstance();
 	/** Logger for messages */
 	private static final Logger logger = Logger.getLogger(ShowSMDElementsAction.class);
-	
+
 	/** The instance of this class */
 	private static ShowSMDElementsAction classInstance;
-	
+
 	/**
 	 * Gets an instance of the class if already present, or a new one if not.
+	 * 
 	 * @return the instance of this class
 	 */
 	public static ShowSMDElementsAction getInstance() {
@@ -94,20 +94,23 @@ public class ShowSMDElementsAction {
 
 	/**
 	 * Returns the list of diagrams in the model.
+	 * 
 	 * @return the list of diagrams
 	 */
 	private Set<Diagram> getDiagramsList() {
-		final CHESSDiagramsGeneratorService chessDiagramsGeneratorService = 
-				CHESSDiagramsGeneratorService.getInstance(CHESSInternalBlockDiagramModel.getInstance(), 
-						CHESSBlockDefinitionDiagramModel.getInstance());
-		final Set<Diagram> chessDiagrams = (Set<Diagram>) chessDiagramsGeneratorService.getDiagrams();
+	//	final CHESSDiagramsGeneratorService chessDiagramsGeneratorService = CHESSDiagramsGeneratorService.getInstance(
+	//			CHESSInternalBlockDiagramModel.getInstance(), CHESSBlockDefinitionDiagramModel.getInstance());
+		final Set<Diagram> chessDiagrams = (Set<Diagram>) DiagramUtils.getInstance().getDiagrams();
 		return chessDiagrams;
 	}
-	
+
 	/**
 	 * Returns the diagram that is new in the postList.
-	 * @param preList the initial list of diagrams
-	 * @param postList the updated list of diagrams
+	 * 
+	 * @param preList
+	 *            the initial list of diagrams
+	 * @param postList
+	 *            the updated list of diagrams
 	 * @return the newly created diagram
 	 */
 	private Diagram getNewDiagram(Set<Diagram> preList, Set<Diagram> postList) {
@@ -116,11 +119,13 @@ public class ShowSMDElementsAction {
 			return postList.iterator().next();
 		}
 		return null;
-	}	
+	}
 
 	/**
 	 * Adds a SM diagram to the given block.
-	 * @param owner the selected state machine
+	 * 
+	 * @param owner
+	 *            the selected state machine
 	 */
 	public Diagram addSMD(Class owner) {
 
@@ -132,7 +137,7 @@ public class ShowSMDElementsAction {
 			}
 			data.add(proto);
 		}
-		
+
 		// Loop on the prototypes to find the State Machine Diagram
 		ViewPrototype smdViewPrototype = null;
 		for (ViewPrototype viewPrototype : data) {
@@ -141,51 +146,57 @@ public class ShowSMDElementsAction {
 				break;
 			}
 		}
-		
+
 		// Get the list of diagrams before creating the new one
 		final Set<Diagram> preList = getDiagramsList();
-		
+
 		// Instantiate the diagram
 		smdViewPrototype.instantiateOn(owner, ((Class) owner.getOwner()).getName() + "_SMD");
-		
+
 		// Get the new list of diagrams
 		final Set<Diagram> postList = getDiagramsList();
 
 		// Retrieve the last created diagram
 		final Diagram diag = getNewDiagram(preList, postList);
-				
-//		// This should work...
-//		CreationCommandDescriptor creationCommandDescriptor = 
-//				getCreation("org.eclipse.papyrus.uml.diagram.statemachine.CreationCommand", data);
-//		diag = creationCommandDescriptor.getCommand().createDiagram(modelSet, owner, "myDiag");
-//		System.out.println("diag2 = " + diag);
-//		
-//		// This should work too...
-//		final CreateStateMachineDiagramCommand command = new CreateStateMachineDiagramCommand();
-//		diag = command.createDiagram(modelSet, owner, owner.getName() + "_SMD2");
-//		System.out.println("diag3 = " + diag);
+
+		// // This should work...
+		// CreationCommandDescriptor creationCommandDescriptor =
+		// getCreation("org.eclipse.papyrus.uml.diagram.statemachine.CreationCommand",
+		// data);
+		// diag = creationCommandDescriptor.getCommand().createDiagram(modelSet,
+		// owner, "myDiag");
+		// System.out.println("diag2 = " + diag);
+		//
+		// // This should work too...
+		// final CreateStateMachineDiagramCommand command = new
+		// CreateStateMachineDiagramCommand();
+		// diag = command.createDiagram(modelSet, owner, owner.getName() +
+		// "_SMD2");
+		// System.out.println("diag3 = " + diag);
 
 		return diag;
 	}
-	
+
 	/**
 	 * Computes the ideal size for the element, depending on its features.
-	 * @param element the Element to analyze
+	 * 
+	 * @param element
+	 *            the Element to analyze
 	 * @return an array with ideal dimensions
 	 */
 	private int[] getSize(State state) {
 		int width = 0;
 		int maxLength = 0;
 		final int[] size = new int[2];
-		
+
 		maxLength = state.getName().length();
 
-		// Empirical values 
-//		width = (int) Math.round(140 + (5.4 * maxLength));
+		// Empirical values
+		// width = (int) Math.round(140 + (5.4 * maxLength));
 		width = (int) Math.round((10 * maxLength));
-		
-//		logger.debug("Element width = " + width);
-		
+
+		// logger.debug("Element width = " + width);
+
 		if (width < MIN_WIDTH) {
 			size[0] = MIN_WIDTH;
 		} else if (width > MAX_WIDTH) {
@@ -194,21 +205,24 @@ public class ShowSMDElementsAction {
 			size[0] = width;
 		}
 		size[1] = HEIGHT;
-
+		
 		return size;
 	}
 
 	/**
 	 * Resizes the states.
-	 * @param diagramEP the diagram EditPart
-	 * @param displayedStates the states already displayed
+	 * 
+	 * @param diagramEP
+	 *            the diagram EditPart
+	 * @param displayedStates
+	 *            the states already displayed
 	 */
-	private void resizeStates(IGraphicalEditPart diagramEP, EList<State> displayedStates) {
+	private void resizeStates(IGraphicalEditPart diagramEP, EList<State> displayedStates,TransactionalEditingDomain domain) {
 
 		// Get all the edit parts of the diagram and loop on them
-		final List<EditPart> childrenEPs = findAllChildren(diagramEP);
-		
-		final TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(diagramEP.getNotationView());
+		final List<EditPart> childrenEPs = diagramUtils.findAllChildren(diagramEP);
+
+		//final TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(diagramEP.getNotationView());
 		domain.getCommandStack().execute(new RecordingCommand(domain) {
 
 			@Override
@@ -220,8 +234,10 @@ public class ShowSMDElementsAction {
 
 						if (semanticElement instanceof State && !displayedStates.contains(semanticElement)) {
 
-							// Enlarge the component but don't position it, arrange will do it later
+							// Enlarge the component but don't position it,
+							// arrange will do it later
 							if (childView instanceof CSSShapeImpl) {
+								//logger.debug("resizeState");
 								final CSSShapeImpl viewShape = (CSSShapeImpl) childView;
 								final Bounds layout = (Bounds) viewShape.getLayoutConstraint();
 
@@ -237,13 +253,13 @@ public class ShowSMDElementsAction {
 	}
 
 	/**
-	 * Tries to create some components in the model.
-	 * JUST FOR TESTING PURPOSES
+	 * Tries to create some components in the model. JUST FOR TESTING PURPOSES
+	 * 
 	 * @param diagram
 	 */
 	public void addComponents(Diagram diagram) {
 		EObject element = diagram.getElement();
-		
+
 		TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(diagram);
 		domain.getCommandStack().execute(new RecordingCommand(domain) {
 
@@ -258,118 +274,149 @@ public class ShowSMDElementsAction {
 
 					// Create a new transition
 					final Transition transition = region.createTransition(null);
-					
+
 					// Create the guard
 					final String formalPropertyText = "MyGuardBody";
 					final String language = "cleanC";
-					entityUtil.createTransitionGuard(transition, null, formalPropertyText, language); 
+					entityUtil.createTransitionGuard(transition, null, formalPropertyText, language);
 
 					// Create the effect
 					final String effectText = "MyEffectBody;";
 					entityUtil.createTransitionEffect(transition, null, effectText, language);
-					
+
 					// Create the vertices for the transition
-					final Vertex source = region.createSubvertex("myOriginState", UMLPackage.eINSTANCE.getPseudostate());
+					final Vertex source = region.createSubvertex("myOriginState",
+							UMLPackage.eINSTANCE.getPseudostate());
 					final Vertex target = region.createSubvertex("myTargetState", UMLPackage.eINSTANCE.getState());
-					
+
 					// Set vertices on the transition
 					transition.setSource(source);
 					transition.setTarget(target);
 				}
 			}
-		});		
+		});
 	}
-	
+
 	/**
 	 * Fills the diagram with graphical components.
+	 * 
 	 * @param diagram
 	 */
 	public void populateDiagram(Diagram diagram) {
+
 		final Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
 
 		// The EditPart associated to the diagram
-		final IGraphicalEditPart diagramEP = OffscreenEditPartFactory.getInstance().createDiagramEditPart(diagram, shell);
+		final IGraphicalEditPart diagramEP = OffscreenEditPartFactory.getInstance().createDiagramEditPart(diagram,
+				shell);
 
 		// Get the EditorPart and the active editor
-		final IEditorPart editorPart = 
-				PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+		final IEditorPart editorPart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
+				.getActiveEditor();
 		final IEditorPart activeEditor = ((PapyrusMultiDiagramEditor) editorPart).getActiveEditor();
 		logger.debug("activeEditor = " + activeEditor);
 
-		// Get the main EditPart 
+		// Get the main EditPart
 		final IGraphicalEditPart selectedElementEP = (IGraphicalEditPart) diagramEP.getChildren().get(0);
 		logger.debug("\n\nselectedElement EditPart = " + selectedElementEP + "\n\n");
-		
+
 		// Get the state machine and its elements
 		final StateMachine stateMachine = (StateMachine) selectedElementEP.resolveSemanticElement();
 		EList<Element> stateMachineElements = stateMachine.allOwnedElements();
-		
+
+		List<EditPart> childrenList = diagramUtils.findAllChildren(diagramEP);
+		ArrayList<EObject> statesToDisplay = new ArrayList<EObject>();
+		ArrayList<EObject> transitionsToDisplay = new ArrayList<EObject>();
 		// First loop to draw states
-		CompoundCommand completeCmd = new CompoundCommand("Show Elements Command");
-		int index = 0;
+		// CompoundCommand completeCmd = new CompoundCommand("Show Elements
+		// Command");
+		// int index = 0;
 		for (Element element : stateMachineElements) {
 			if (element instanceof State || element instanceof Pseudostate || element instanceof FinalState) {
-				logger.debug("calling showElementIn for element = " + element);
-				Command cmd = showElementIn(element, (DiagramEditor) activeEditor, diagramEP, ++index);
-				completeCmd.add(cmd);
+				//logger.debug("calling showElementIn for state = " + element);
+				// Command cmd = showElementIn(element, (DiagramEditor)
+				// activeEditor, diagramEP, ++index,childrenList);
+				// completeCmd.add(cmd);
+				statesToDisplay.add(element);
+			} else if (element instanceof Transition) {
+				transitionsToDisplay.add(element);
 			}
 		}
-		
+
+		Command showStatesCmd = diagramUtils.showElementsIn(statesToDisplay, (DiagramEditor) activeEditor, diagramEP, childrenList,
+				new Point(100, 100));
+		// completeCmd.add(showStatesCmd);
+
 		// Execute the commands
 		final TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(diagram);
-		domain.getCommandStack().execute(new GEFtoEMFCommandWrapper(completeCmd));
-		
+		domain.getCommandStack().execute(new GEFtoEMFCommandWrapper(showStatesCmd));
+		//diagramEP.getDiagramEditDomain().getDiagramCommandStack().execute(showStatesCmd);
 		// Resize the states, passing an empty list of states to avoid
-		resizeStates(diagramEP, new BasicEList<State>());
-		
-		// Second loop to draw other elements
-		completeCmd = new CompoundCommand("Show Transitions Command");
-		for (Element element : stateMachineElements) {
-			if (!(element instanceof State) && !(element instanceof Pseudostate) && 
-					!(element instanceof FinalState) && !(element instanceof Constraint)) {
-				logger.debug("calling showElementIn for element = " + element);
-				Command cmd = showElementIn(element, (DiagramEditor) activeEditor, diagramEP, 1);
-				completeCmd.add(cmd);
-			}
-		}
-		
-		// Execute the commands
-		domain.getCommandStack().execute(new GEFtoEMFCommandWrapper(completeCmd));
+		resizeStates(diagramEP, new BasicEList<State>(),domain);
+		Command showTransitionsCmd = diagramUtils.showElementsIn(transitionsToDisplay, (DiagramEditor) activeEditor, diagramEP,
+				childrenList, new Point(200, 200));
+		domain.getCommandStack().execute(new GEFtoEMFCommandWrapper(showTransitionsCmd));
+
+		//resizeStates(diagramEP, new BasicEList<State>(),domain);
+		//diagramEP.getDiagramEditDomain().getDiagramCommandStack()
+		//.execute(showTransitionsCmd);
 	}
-	
+
+	/*private void test(Diagram diagram, ArrayList<EObject> elementsToDisplay, IGraphicalEditPart diagramEP) {
+		final TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(diagram);
+		DiagramDragDropEditPolicy dragCommand = new DiagramDragDropEditPolicy();
+		DropObjectsRequest dropRequest = new DropObjectsRequest();
+		ArrayList<Element> list = new ArrayList<Element>();
+		list.add((Element) elementsToDisplay.get(0));
+		dropRequest.setObjects(list);
+		dropRequest.setLocation(new Point(100, 100));
+		dragCommand.setHost(diagramEP);
+		Command drCmd = dragCommand.getDropObjectsCommand(dropRequest);
+		domain.getCommandStack().execute(new GEFtoEMFCommandWrapper(drCmd));
+	}*/
+
 	/**
-	 * Refreshes the given diagram, adding components present in the model but not yet visualized.
-	 * @param diagram the diagram to refresh
+	 * Refreshes the given diagram, adding components present in the model but
+	 * not yet visualized.
+	 * 
+	 * @param diagram
+	 *            the diagram to refresh
 	 */
 	public void refreshDiagram(Diagram diagram) {
+		logger.debug("refreshDiagram " + diagram.getName());
+
 		final Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-		final IGraphicalEditPart diagramEditPart = OffscreenEditPartFactory.getInstance()
-				.createDiagramEditPart(diagram, shell);
-		
+		final IGraphicalEditPart diagramEditPart = OffscreenEditPartFactory.getInstance().createDiagramEditPart(diagram,
+				shell);
+
 		// Get the EditorPart and the active editor
-		final IEditorPart editorPart =  PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+		final IEditorPart editorPart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
+				.getActiveEditor();
 		final IEditorPart activeEditor = ((PapyrusMultiDiagramEditor) editorPart).getActiveEditor();
-		
+
 		// Get all the EditParts of the diagram
 		final Map<?, ?> elements = diagramEditPart.getViewer().getEditPartRegistry();
 		final Object[] editParts = elements.values().toArray();
 
 		final EList<State> displayedStates = new BasicEList<State>();
 		final EList<Transition> displayedTransitions = new BasicEList<Transition>();
-		
+
+		// EList<EObject> elementsToDisplay = new BasicEList<EObject>();
+
 		// Loop on all the editparts to collect the displayed elements
 		for (int i = 0; i < editParts.length; i++) {
 			if (editParts[i] instanceof CustomStateEditPart) {
 				displayedStates.add((State) ((CustomStateEditPart) editParts[i]).resolveSemanticElement());
 			} else if (editParts[i] instanceof CustomTransitionEditPart) {
-				displayedTransitions.add((Transition) ((CustomTransitionEditPart) editParts[i]).resolveSemanticElement());
+				displayedTransitions
+						.add((Transition) ((CustomTransitionEditPart) editParts[i]).resolveSemanticElement());
 			}
 		}
-		
-		// Get the main EditPart 
+
+		// Get the main EditPart
 		final IGraphicalEditPart selectedElementEP = (IGraphicalEditPart) diagramEditPart.getChildren().get(0);
 		logger.debug("\n\nselectedElement EditPart = " + selectedElementEP + "\n\n");
-		
+
 		// Get the state machine and its elements
 		final StateMachine stateMachine = (StateMachine) selectedElementEP.resolveSemanticElement();
 		EList<Element> stateMachineElements = stateMachine.allOwnedElements();
@@ -377,10 +424,10 @@ public class ShowSMDElementsAction {
 		// All the blocks and associations that are not displayed
 		final EList<Element> missingStates = new BasicEList<Element>();
 		final EList<Element> missingTransitions = new BasicEList<Element>();
-		
+
 		// Loop on the elements to find those not displayed
 		for (Element element : stateMachineElements) {
-			if (element instanceof State) {				
+			if (element instanceof State) {
 				if (displayedStates.contains(element)) {
 					logger.debug("state already present in diagram: " + element);
 				} else {
@@ -396,95 +443,51 @@ public class ShowSMDElementsAction {
 				}
 			}
 		}
-		
+
+		List<EditPart> childrenList = diagramUtils.findAllChildren(diagramEditPart);
+
 		// First loop to draw states
 		CompoundCommand completeCmd = new CompoundCommand("Show Elements Command");
 		int index = 0;
 		for (Element element : missingStates) {
 			logger.debug("calling showElementIn for element = " + element);
-			Command cmd = showElementIn(element, (DiagramEditor) activeEditor, diagramEditPart, ++index);
+
+			Command cmd = diagramUtils.showElementIn(element, (DiagramEditor) activeEditor, diagramEditPart, ++index, childrenList);
+			// elementsToDisplay.add(element);
 			completeCmd.add(cmd);
 		}
-		
+
 		// Execute the commands
 		final TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(diagram);
 		domain.getCommandStack().execute(new GEFtoEMFCommandWrapper(completeCmd));
-		
+
 		// Resize the states
-		resizeStates(diagramEditPart, displayedStates);
-		
+		resizeStates(diagramEditPart, displayedStates,domain);
+
 		// Second loop to draw other elements
 		completeCmd = new CompoundCommand("Show Transitions Command");
 		for (Element element : missingTransitions) {
 			logger.debug("calling showElementIn for element = " + element);
-			Command cmd = showElementIn(element, (DiagramEditor) activeEditor, diagramEditPart, 1);
-			completeCmd.add(cmd);		
+			Command cmd = diagramUtils.showElementIn(element, (DiagramEditor) activeEditor, diagramEditPart, 1, childrenList);
+			// elementsToDisplay.add(element);
+			completeCmd.add(cmd);
 		}
-		
+
+		/*
+		 * Command cmd = showElementsIn(elementsToDisplay, (DiagramEditor)
+		 * activeEditor, diagramEditPart); logger.debug("cmd: "+cmd);
+		 * CompoundCommand completeCmd = new
+		 * CompoundCommand("Show Elements Command"); completeCmd.add(cmd);
+		 */
 		// Execute the commands
 		domain.getCommandStack().execute(new GEFtoEMFCommandWrapper(completeCmd));
-	}
-	
-// The following code has been inspired by org.eclipse.papyrus.diagramtemplate.launcher.DiagramTemplateLauncher	
-	/**
-	 * Util method used to find all the children of a certain editpart.
-	 * @param list the children found recursively
-	 * @param root the root editpart to start the search from
-	 */
-	@SuppressWarnings("unchecked")
-	protected List<EditPart> findAllChildren(EditPart root) {
-		List<EditPart> list = new ArrayList<EditPart>();
-		list.addAll(root.getChildren());
-		for (Object editPart : root.getChildren()) {
-			if (editPart instanceof EditPart) {
-				list.addAll(findAllChildren((EditPart) editPart));
-			}
-		}
-		return list;
-	}
 
-	/**
-	 * Tries to show an Element in an EditPart.
-	 * @param elementToShow the Element to show
-	 * @param activeEditor the editor corresponding to the editPart
-	 * @param editPart the EditPart to show the Element in
-	 * @param position position is used to try to distribute the drop
-	 * @return the Command to display the element
-	 */
-	protected Command showElementIn(EObject elementToShow, DiagramEditor activeEditor, EditPart editPart, int position) {
-		if (elementToShow instanceof Element) {
-			DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();
-			ArrayList<Element> list = new ArrayList<Element>();
-			list.add((Element) elementToShow);
-			dropObjectsRequest.setObjects(list);
-			dropObjectsRequest.setLocation(new Point(100 * position, 100 * position));
-			Command commandDrop = editPart.getCommand(dropObjectsRequest);
-
-			boolean processChildren = false;
-			if (commandDrop == null) {
-				processChildren = true;
-			} else {
-				if (commandDrop.canExecute()) {
-					return commandDrop;
-				} else {
-					processChildren = true;
-				}
-			}
+		// Resize the states, passing an empty list of states to avoid
+		// resizeStates(diagramEditPart, new BasicEList<State>());
+	}
 
-			if (processChildren) {				
-				List<EditPart> childrenList = findAllChildren(editPart);
-				for (Object child : childrenList) {
-					if (child instanceof EditPart) {
-						Command commandDropChild = ((EditPart) child).getCommand(dropObjectsRequest);
-						if (commandDropChild != null) {
-							if (commandDropChild.canExecute()) {
-								return commandDropChild;
-							}
-						}
-					}
-				}
-			}
-		}
-		return null;
-	}	
+	// The following code has been inspired by
+	// org.eclipse.papyrus.diagramtemplate.launcher.DiagramTemplateLauncher
+	
+	
 }
diff --git a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/utils/DiagramUtils.java b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/utils/DiagramUtils.java
new file mode 100644
index 0000000000000000000000000000000000000000..1e7dc6364d685d03c0d844558b8cf5a91e2db497
--- /dev/null
+++ b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/utils/DiagramUtils.java
@@ -0,0 +1,654 @@
+package org.polarsys.chess.diagramsCreator.utils;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.log4j.Logger;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.elk.alg.layered.options.LayeredOptions;
+import org.eclipse.elk.alg.layered.options.LayeringStrategy;
+import org.eclipse.elk.core.math.KVector;
+import org.eclipse.elk.core.options.CoreOptions;
+import org.eclipse.elk.core.options.Direction;
+import org.eclipse.elk.core.options.HierarchyHandling;
+import org.eclipse.elk.core.options.SizeConstraint;
+import org.eclipse.elk.core.options.SizeOptions;
+import org.eclipse.elk.core.service.DiagramLayoutEngine;
+import org.eclipse.elk.core.service.DiagramLayoutEngine.Parameters;
+import org.eclipse.elk.graph.ElkNode;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;
+import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
+import org.eclipse.papyrus.infra.services.openelement.service.OpenElementService;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.edit.part.CustomRegionCompartmentEditPart;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IPerspectiveDescriptor;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.StateMachine;
+import org.polarsys.chess.diagramsCreator.actions.ShowBDDElementsAction;
+import org.polarsys.chess.diagramsCreator.actions.ShowSMDElementsAction;
+import org.polarsys.chess.diagramsCreator.actions.ShowBDDElementsAction.DisplayableElement;
+
+
+
+public class DiagramUtils {
+	private final static String STMD = "PapyrusUMLStateMachineDiagram";
+	private final static String BDD = "BlockDefinition";
+	final private static String IBD = "InternalBlock";
+	private static final Logger logger = Logger.getLogger(DiagramUtils.class);
+	
+	private static DiagramUtils diagramUtils;
+	
+	public static DiagramUtils getInstance(){
+		if(diagramUtils == null){
+			diagramUtils = new DiagramUtils();
+		}
+		return diagramUtils;
+	}
+	
+	/**
+	 * Tries to show an Element in an EditPart.
+	 * @param elementToShow the Element to show
+	 * @param activeEditor the editor corresponding to the editPart
+	 * @param editPart the EditPart to show the Element in
+	 * @param position position is used to try to distribute the drop
+	 * @return the Command to display the element
+	 */
+	/*public static Command showElementIn(EObject elementToShow, DiagramEditor activeEditor, EditPart editPart, int position) {
+		
+		if (elementToShow instanceof Element) {
+			DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();
+			ArrayList<Element> list = new ArrayList<Element>();
+			list.add((Element) elementToShow);
+			dropObjectsRequest.setObjects(list);
+			dropObjectsRequest.setLocation(new Point(20, 100 * position));
+			Command cmd = editPart.getCommand(dropObjectsRequest);
+
+			if (cmd != null && cmd.canExecute()) {
+				return cmd;
+			}
+		}
+		return null;
+	}
+	*/
+	
+	/**
+	 * Tries to show an Element in an EditPart.
+	 * 
+	 * @param elementToShow
+	 *            the Element to show
+	 * @param activeEditor
+	 *            the editor corresponding to the editPart
+	 * @param editPart
+	 *            the EditPart to show the Element in
+	 * @param position
+	 *            position is used to try to distribute the drop
+	 * @return the Command to display the element
+	 */
+	//FIXME replace this method with showElementsIn
+	public Command showElementIn(EObject elementToShow, DiagramEditor activeEditor, EditPart editPart, int position,
+			List<EditPart> childrenList) {
+		if (elementToShow instanceof Element) {
+			DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();
+			ArrayList<Element> list = new ArrayList<Element>();
+			list.add((Element) elementToShow);
+			dropObjectsRequest.setObjects(list);
+			dropObjectsRequest.setLocation(new Point(100 * position, 100 * position));
+			Command commandDrop = editPart.getCommand(dropObjectsRequest);
+
+			boolean processChildren = false;
+			if (commandDrop == null) {
+				processChildren = true;
+			} else {
+				if (commandDrop.canExecute()) {
+					return commandDrop;
+				} else {
+					processChildren = true;
+				}
+			}
+
+			if (processChildren) {
+				// List<EditPart> childrenList = findAllChildren(editPart);
+				for (Object child : childrenList) {
+					if (child instanceof CustomRegionCompartmentEditPart) {
+						Command commandDropChild = ((EditPart) child).getCommand(dropObjectsRequest);
+						if (commandDropChild != null) {
+							if (commandDropChild.canExecute()) {
+								return commandDropChild;
+							}
+						}
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	public Command showElementsIn(ArrayList<EObject> elementsToDisplay, DiagramEditor activeEditor, EditPart editPart,
+			List<EditPart> childrenList, Point pos) {
+
+		DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();
+		ArrayList<Element> list = new ArrayList<Element>();
+
+		for (EObject elementToShow : elementsToDisplay) {
+
+			if (elementToShow instanceof Element) {
+
+				list.add((Element) elementToShow);
+
+			}
+		}
+
+		dropObjectsRequest.setObjects(list);
+		dropObjectsRequest.setLocation(pos);
+		Command commandDrop = editPart.getCommand(dropObjectsRequest);
+
+		boolean processChildren = false;
+		if (commandDrop == null) {
+			processChildren = true;
+		} else {
+			if (commandDrop.canExecute()) {
+				return commandDrop;
+			} else {
+				processChildren = true;
+			}
+		}
+
+		if (processChildren) {
+			// List<EditPart> childrenList = findAllChildren(editPart);
+			for (Object child : childrenList) {
+				if (child instanceof EditPart) {
+					Command commandDropChild = ((EditPart) child).getCommand(dropObjectsRequest);
+					if (commandDropChild != null) {
+						if (commandDropChild.canExecute()) {
+							return commandDropChild;
+						}
+					}
+				}
+			}
+		}
+
+		return null;
+	}
+	
+	/**
+	 * Util method used to find all the children of a certain editpart.
+	 * 
+	 * @param list
+	 *            the children found recursively
+	 * @param root
+	 *            the root editpart to start the search from
+	 */
+	@SuppressWarnings("unchecked")
+	public List<EditPart> findAllChildren(EditPart root) {
+		List<EditPart> list = new ArrayList<EditPart>();
+		list.addAll(root.getChildren());
+		for (Object editPart : root.getChildren()) {
+			if (editPart instanceof EditPart) {
+				list.addAll(findAllChildren((EditPart) editPart));
+			}
+		}
+		return list;
+	}
+	public void createOrRefreshStateMachineDiagram(Diagram stateMachineDiagram,StateMachine stateMachine,
+			boolean rearrangeDiagramLayout, ExecutionEvent event) {
+
+		// Switch to the Papyrus perspective
+		final IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+		final IPerspectiveDescriptor descriptor = window.getWorkbench().getPerspectiveRegistry()
+				.findPerspectiveWithId("org.eclipse.papyrus.infra.core.perspective");
+		window.getActivePage().setPerspective(descriptor);
+
+		
+
+		final ShowSMDElementsAction smdAction = ShowSMDElementsAction.getInstance();
+		if (stateMachineDiagram != null) {
+			smdAction.refreshDiagram(stateMachineDiagram);
+		} else {
+			stateMachineDiagram = smdAction.addSMD(stateMachine);
+			smdAction.populateDiagram(stateMachineDiagram);
+		}
+
+		if (rearrangeDiagramLayout) {
+			rearrangeDiagramLayout(event);
+		}
+
+	}
+
+	
+	
+	public void createOrRefreshBDDDiagramByReferenceWithEmptyBlocks(Diagram blockDefinitionDiagram, Package pkg, ExecutionEvent event,
+			EList<Element> elementsByRef,boolean rearrangeDiagramLayout) throws Exception {
+
+		// Creation of an action to handle the BDD diagrams
+		final ShowBDDElementsAction bddAction = ShowBDDElementsAction.getInstance();
+
+		if (blockDefinitionDiagram != null) {
+			bddAction.refreshDiagram(blockDefinitionDiagram);
+		} else {
+			try {
+				blockDefinitionDiagram = bddAction.addBDD(pkg);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			bddAction.populateDiagramByReferenceWithEmptyBlocks(blockDefinitionDiagram, elementsByRef);
+		}
+
+		if (rearrangeDiagramLayout) {
+			rearrangeDiagramLayout(event, getParams());
+		}
+	}
+	
+	public void createOrRefreshBDDDiagram(Diagram blockDefinitionDiagram, Package pkg, ExecutionEvent event,
+			boolean rearrangeDiagramLayout) throws Exception {
+
+		createOrRefreshBDD(blockDefinitionDiagram, pkg);
+
+		if (rearrangeDiagramLayout) {
+			rearrangeDiagramLayout(event);
+		}
+	}
+
+	public void createOrRefreshBDDDiagram(Diagram blockDefinitionDiagram, Package pkg, ExecutionEvent event,
+		boolean rearrangeDiagramLayout, Parameters param) throws Exception {
+
+		createOrRefreshBDD(blockDefinitionDiagram, pkg);
+		
+		if (rearrangeDiagramLayout) {
+			rearrangeDiagramLayout(event, param);
+		}
+	}
+	
+	private void createOrRefreshBDD(Diagram blockDefinitionDiagram, Package pkg)
+	{
+		// Creation of an action to handle the BDD diagrams
+		final ShowBDDElementsAction bddAction = ShowBDDElementsAction.getInstance();
+
+		// Define which elements should be displayed in the diagram
+		final Set<DisplayableElement> elementsToDisplay = new HashSet<DisplayableElement>();
+		elementsToDisplay.add(DisplayableElement.OPERATION);
+		elementsToDisplay.add(DisplayableElement.PROPERTY);
+		bddAction.setDisplayableElement(elementsToDisplay);
+
+		if (blockDefinitionDiagram != null) {
+			bddAction.refreshDiagram(blockDefinitionDiagram);
+		} else {
+			try {
+				logger.debug("pkg.eResource(): "+pkg.eResource());
+				blockDefinitionDiagram = bddAction.addBDD(pkg);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			bddAction.populateDiagram(blockDefinitionDiagram);
+		}
+
+	}
+	
+	public void rearrangeDiagramLayout(ExecutionEvent event) {	
+		rearrangeDiagramLayout(event, null);		
+	}
+	
+	public void rearrangeDiagramLayout(ExecutionEvent event, Parameters params) {
+		// Call the Eclipse Layout Kernel engine
+		final IEditorPart editorPart = HandlerUtil.getActiveEditor(event);
+		IEditorPart nestedEditor = null;
+		if (editorPart instanceof IMultiDiagramEditor) {
+			nestedEditor = ((IMultiDiagramEditor) editorPart).getActiveEditor();
+		}
+
+		if (nestedEditor instanceof DiagramEditor) {
+			final Object diagramPart = null;
+	        if (params == null)
+	        {
+				final boolean zoomToFit = false;
+				DiagramLayoutEngine.invokeLayout(nestedEditor, diagramPart, false, false, false, zoomToFit);
+	        }
+	        else
+	        {
+	        	DiagramLayoutEngine.invokeLayout(editorPart, diagramPart, params);
+	        }
+
+		}
+	}
+	
+	
+	/**
+	 * Returns the parameters to apply to the auto layout function
+	 * @return
+	 */
+	private Parameters getParams(){
+		DiagramLayoutEngine.Parameters params = new DiagramLayoutEngine.Parameters();
+
+		params.getGlobalSettings()
+
+		.setProperty(CoreOptions.ANIMATE, true)
+		.setProperty(CoreOptions.LAYOUT_ANCESTORS, false)
+		.setProperty(CoreOptions.NODE_SIZE_MINIMUM, new KVector(300d, 300d))
+		.setProperty(CoreOptions.NODE_SIZE_CONSTRAINTS, SizeConstraint.minimumSize())
+		.setProperty(CoreOptions.HIERARCHY_HANDLING, HierarchyHandling.INCLUDE_CHILDREN)
+		.setProperty(CoreOptions.NODE_SIZE_OPTIONS, EnumSet.of(SizeOptions.DEFAULT_MINIMUM_SIZE))
+		.setProperty(CoreOptions.PROGRESS_BAR, false)
+		//.setProperty(CoreOptions.ZOOM_TO_FIT, true)
+		.setProperty(CoreOptions.ALGORITHM, "org.eclipse.elk.layered.layered")
+		;
+
+		params.addLayoutRun().configure(ElkNode.class)
+
+
+		.setProperty(LayeredOptions.SPACING_NODE_NODE, 10d)
+		.setProperty(LayeredOptions.DIRECTION, Direction.DOWN)
+		.setProperty(LayeredOptions.EDGE_THICKNESS, 10d)
+		.setProperty(LayeredOptions.LAYERING_STRATEGY, LayeringStrategy.NETWORK_SIMPLEX)
+		.setProperty(LayeredOptions.NODE_SIZE_MINIMUM, new KVector(150d, 150d))
+		.setProperty(LayeredOptions.NODE_SIZE_CONSTRAINTS, SizeConstraint.minimumSize())
+		.setProperty(LayeredOptions.NODE_SIZE_OPTIONS, EnumSet.of(SizeOptions.DEFAULT_MINIMUM_SIZE));
+		
+		return params;
+	}
+			
+	public void createOrUpdateBDDClassesAndTypesDiagrams(ExecutionEvent event, Package classesPkg, Package typesPkg, boolean arrangeLayout) throws Exception{
+	
+		// Retrieve the block definition diagrams, if already present
+				final Collection<Diagram> diagrams = getDiagrams();
+				Diagram classesBlockDefinitionDiagram = getBDD(diagrams, classesPkg);
+				Diagram typesBlockDefinitionDiagram = getBDD(diagrams, typesPkg);
+		
+		createOrRefreshBDDDiagram(classesBlockDefinitionDiagram, classesPkg, event, arrangeLayout);
+		createOrRefreshBDDDiagram(typesBlockDefinitionDiagram, typesPkg, event, arrangeLayout);
+	}
+	
+	public void createOrUpdateBDDClassesAndTypesDiagrams2(ExecutionEvent event, Package classesPkg, Package typesPkg){
+		// Retrieve the classes and types packages built before
+		//final Package classesPkg = rfiAccEntityUtil.createOrReturnClassesPackage(systemViewPkg);
+		//final Package typesPkg = rfiAccEntityUtil.createOrReturnTypesPackage(systemViewPkg);
+
+		// Creation of an action to handle the BDD diagrams
+		final ShowBDDElementsAction bddAction = ShowBDDElementsAction.getInstance();
+
+		// Retrieve the block definition diagrams, if already present
+		final Collection<Diagram> diagrams = getDiagrams();
+		Diagram classesBlockDefinitionDiagram = getBDD(diagrams, classesPkg);
+		Diagram typesBlockDefinitionDiagram = getBDD(diagrams, typesPkg);
+
+		// Define which elements should be displayed in the diagrams
+		final Set<DisplayableElement> elementsToDisplay = new HashSet<DisplayableElement>();
+		elementsToDisplay.add(DisplayableElement.OPERATION);
+		elementsToDisplay.add(DisplayableElement.PROPERTY);
+		bddAction.setDisplayableElement(elementsToDisplay);
+
+//		
+//		try {
+//			IPageManager manager = ServiceUtilsForHandlers.getInstance().getIPageManager(event);
+//			
+//			System.out.println("page manager = " + manager);
+//			for (Object obj : manager.allPages()) {
+//				System.out.println("all page = " + obj);
+//			}
+//			
+//		} catch (ServiceException e1) {
+//			e1.printStackTrace();
+//		}
+//		
+//		
+//		
+//		
+//		
+//		IWorkbenchPage page;
+//		IEditorPart editor;
+//		page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+//		System.out.println("\n1 active page = " + page);
+//		
+//		for(IEditorReference ref : page.getEditorReferences()) {
+//			System.out.println("IEditorReference name = " + ref.getName());
+//			System.out.println("IEditorReference editor = " + ref.getEditor(false));
+//		}
+//		
+//		editor = page.getActiveEditor();
+//		System.out.println("\n1 active editor = " + editor);
+//		if (editor instanceof IMultiDiagramEditor) {
+//			editor = ((IMultiDiagramEditor) editor).getActiveEditor();
+//			System.out.println("\n1 editor = " + editor);
+//		}
+//
+//		try {
+//			IPageManager manager = ServiceUtilsForEObject.getInstance().getIPageManager(classesPkg);
+//			
+//			System.out.println("page manager = " + manager);
+//			for (Object obj : manager.allPages()) {
+//				System.out.println("all page = " + obj);
+//			}
+//
+//			
+//		} catch (ServiceException e1) {
+//			e1.printStackTrace();
+//		}
+
+		
+		
+
+		
+		
+		{
+
+			// Create the types BDD if needed, or refresh it
+			if (typesBlockDefinitionDiagram != null) {
+				bddAction.refreshDiagram(typesBlockDefinitionDiagram);
+			} else {					
+				try {
+					typesBlockDefinitionDiagram = bddAction.addBDD(typesPkg);
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+				bddAction.populateDiagram(typesBlockDefinitionDiagram);
+			}
+
+			// Run a thread to layout the diagram
+			(new LayoutThread(event)).start();
+		}
+
+//		page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+//		System.out.println("\n2 active page = " + page);
+//		editor = page.getActiveEditor();
+//		System.out.println("\n2 active editor = " + editor);
+//		if (editor instanceof IMultiDiagramEditor) {
+//			editor = ((IMultiDiagramEditor) editor).getActiveEditor();
+//			System.out.println("\n2 editor = " + editor);
+//			System.out.println("\n2 editor title = " + ((IMultiDiagramEditor) editor).getTitle());
+//		}
+//
+//		//TODO: continuare nel guardare quali sono gli editor disponibili e vedere se riesco ad attivarne altri
+//		
+//		
+		{
+			// Create the classes BDD if needed, or refresh it
+			if (classesBlockDefinitionDiagram != null) {
+				bddAction.refreshDiagram(classesBlockDefinitionDiagram);
+			} else {					
+				try {
+					classesBlockDefinitionDiagram = bddAction.addBDD(classesPkg);
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+				bddAction.populateDiagram(classesBlockDefinitionDiagram);
+			}
+			
+			// Run a thread to layout the diagram
+			(new LayoutThread(event)).start();
+			
+		}
+//
+//		page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+//		System.out.println("\n3 active page = " + page);
+//		editor = page.getActiveEditor();
+//		System.out.println("\n3 active editor = " + editor);
+//		if (editor instanceof IMultiDiagramEditor) {
+//			editor = ((IMultiDiagramEditor) editor).getActiveEditor();
+//			System.out.println("\n3 editor = " + editor);
+//			System.out.println("\n3 editor title = " + ((IMultiDiagramEditor) editor).getTitle());
+//		}
+	}
+	
+
+	/**
+	 * Simple thread to call the layout of the diagram.
+	 */
+	private class LayoutThread extends Thread {
+		IEditorPart editorPart;
+		public LayoutThread(ExecutionEvent event) {
+			editorPart = HandlerUtil.getActiveEditor(event);
+		}
+		
+		@Override
+		public void run() {
+
+			// Call the Eclipse Layout Kernel engine        			
+			if (editorPart instanceof IMultiDiagramEditor) {
+				editorPart = ((IMultiDiagramEditor) editorPart).getActiveEditor();
+			}
+			
+			if (editorPart instanceof DiagramEditor) {
+				final Object diagramPart = null;
+				final boolean zoomToFit = false;
+
+				// Call the layout, twice for better results
+				DiagramLayoutEngine.invokeLayout(editorPart, diagramPart, false, false, false, zoomToFit);
+				DiagramLayoutEngine.invokeLayout(editorPart, diagramPart, false, false, false, zoomToFit);
+			}
+		}
+	}
+
+	
+	
+	/**
+	 * Returns the block definition diagram associated to the given element, if
+	 * any.
+	 * 
+	 * @param diagrams
+	 *            the list of diagrams
+	 * @param element
+	 *            the owning element
+	 * @return the diagram, if any
+	 */
+	public Diagram getBDD(Collection<Diagram> diagrams, EObject element) {
+		for (Diagram diagram : diagrams) {
+			if (isBDD(diagram) && diagram.getElement() == element) {
+				return diagram;
+			}
+		}
+		return null;
+	}
+	
+	
+	public boolean isBDD(Diagram diagram){
+		return diagram.getType().equals(BDD);
+	}
+	/**
+	 * Returns the state machine diagram associated to the given element, if
+	 * any.
+	 * 
+	 * @param diagrams
+	 *            the list of diagrams
+	 * @param element
+	 *            the owning element
+	 * @return the diagram, if any
+	 */
+	public Diagram getSMD(Collection<Diagram> diagrams, EObject element) {
+		for (Diagram diagram : diagrams) {
+			if (diagram.getType().equals(STMD) && diagram.getElement() == element) {
+				return diagram;
+			}
+		}
+		return null;
+	}
+	
+	public void openAndLayoutDiagram(ExecutionEvent event, Diagram diagram) throws Exception{
+		IEditorPart editorPart = HandlerUtil.getActiveEditor(event);
+
+		OpenElementService openService = ((IMultiDiagramEditor) editorPart).getServicesRegistry()
+				.getService(OpenElementService.class);
+		openService.openElement(diagram);
+		Object diagramPart = null;
+		final boolean zoomToFit = false;
+		DiagramLayoutEngine.invokeLayout(editorPart, diagramPart, false, false, false, zoomToFit);
+	}
+	
+	public Collection<Diagram> getDiagrams() {
+
+		NotationModel notationModel = NotationUtils.getNotationModel();
+		Set<Diagram> diagrams = getChessDiagrams(notationModel.getResources());
+//		System.out.println("diagrams");
+//		for (Diagram c : diagrams) {
+//			System.out.println(c);
+//		}
+		return diagrams;
+
+	}
+
+	public Set<Diagram> getDiagrams(Set<Resource> resources) {
+
+		Set<Diagram> diagrams = new HashSet<Diagram>();
+
+		for (Resource current : resources) {
+			for (EObject element : current.getContents()) {
+				if (element instanceof Diagram) {
+					diagrams.add((Diagram) element);
+				}
+			}
+		}
+
+		return diagrams;
+	}
+
+	private Set<Diagram> getChessDiagrams(Set<Resource> resources) {
+		Set<Diagram> diagrams = new HashSet<Diagram>();
+
+		for (Resource current : resources) {
+			for (EObject element : current.getContents()) {
+				if (element instanceof Diagram) {
+					Diagram diagram = (Diagram) element;
+//					System.out.println("diagram type: " + diagram.getType());
+
+					if (isBDD(diagram) || 
+							isIBD(diagram) ||
+							isSMD(diagram)) {
+						diagrams.add((Diagram) element);
+					}
+				}
+			}
+		}
+
+		return diagrams;
+	}
+	
+	
+	public boolean isIBD(Diagram diagram) {
+		if (diagram.getType().compareTo(IBD) == 0) {
+			return true;
+		}
+		return false;
+	}
+
+	public boolean isSMD(Diagram diagram) {
+		if (diagram.getType().compareTo(STMD) == 0) {
+			return true;
+		}
+		return false;
+	}
+}
diff --git a/plugins/org.polarsys.chess.discovery/.classpath b/plugins/org.polarsys.chess.discovery/.classpath
index 64c5e31b7a264082f4c1dfdabb8097de820e66ce..eca7bdba8f03f22510b7980a94dbfe10c16c0901 100644
--- a/plugins/org.polarsys.chess.discovery/.classpath
+++ b/plugins/org.polarsys.chess.discovery/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.polarsys.chess.discovery/.gitignore b/plugins/org.polarsys.chess.discovery/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/org.polarsys.chess.discovery/.gitignore
+++ b/plugins/org.polarsys.chess.discovery/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/org.polarsys.chess.discovery/.project b/plugins/org.polarsys.chess.discovery/.project
index d7a32dff67a4393e1ebd2e6728414d781f25ae8e..0ccd8f609906bced3e7f0564a9b2ce3460a03390 100644
--- a/plugins/org.polarsys.chess.discovery/.project
+++ b/plugins/org.polarsys.chess.discovery/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/org.polarsys.chess.discovery/.settings/org.eclipse.core.resources.prefs b/plugins/org.polarsys.chess.discovery/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.polarsys.chess.discovery/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.polarsys.chess.discovery/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.chess.discovery/.settings/org.eclipse.jdt.core.prefs
index af0f20f97a598059679538f6f24e72359673d0be..0c68a61dca867ceb49e79d2402935261ec3e3809 100644
--- a/plugins/org.polarsys.chess.discovery/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.polarsys.chess.discovery/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/org.polarsys.chess.discovery/.settings/org.eclipse.m2e.core.prefs b/plugins/org.polarsys.chess.discovery/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.polarsys.chess.discovery/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.polarsys.chess.discovery/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.polarsys.chess.discovery/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/org.polarsys.chess.discovery/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/org.polarsys.chess.discovery/META-INF/MANIFEST.MF b/plugins/org.polarsys.chess.discovery/META-INF/MANIFEST.MF
index 7d1531e368a87e5d83c57739d5a38b08a459db12..cf431022bb7e928e687df22f8828c82565fda397 100644
--- a/plugins/org.polarsys.chess.discovery/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.chess.discovery/META-INF/MANIFEST.MF
@@ -7,11 +7,11 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.8.0",
  org.eclipse.papyrus.infra.discovery
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-Activator: org.polarsys.chess.discovery.Activator
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.polarsys.chess.discovery;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 
diff --git a/plugins/org.polarsys.chess.discovery/pom.xml b/plugins/org.polarsys.chess.discovery/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fd64d135f6b8182c1ce31dfa3e5048efff4d4c8e
--- /dev/null
+++ b/plugins/org.polarsys.chess.discovery/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.discovery</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.extra.site/pom.xml b/plugins/org.polarsys.chess.extra.site/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3c4214c2bcf1ce44d3f6615d0f7697b562367f62
--- /dev/null
+++ b/plugins/org.polarsys.chess.extra.site/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>CHESS</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
+  <groupId>org.polarsys.chess</groupId>
+  <artifactId>org.polarsys.chess.extra.site</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>eclipse-update-site</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.feature/pom.xml b/plugins/org.polarsys.chess.feature/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8d85446f30e00ca1c7c9c5dc33b089e19e319dd0
--- /dev/null
+++ b/plugins/org.polarsys.chess.feature/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>CHESS</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
+  <groupId>org.polarsys.chess</groupId>
+  <artifactId>org.polarsys.chess.feature</artifactId>
+  <version>0.10.0-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.functionBehaviors.functionBehaviorEditor/.gitignore b/plugins/org.polarsys.chess.functionBehaviors.functionBehaviorEditor/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/org.polarsys.chess.functionBehaviors.functionBehaviorEditor/.gitignore
+++ b/plugins/org.polarsys.chess.functionBehaviors.functionBehaviorEditor/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/org.polarsys.chess.functionBehaviors.functionBehaviorEditor/.project b/plugins/org.polarsys.chess.functionBehaviors.functionBehaviorEditor/.project
index 80aa76d5b249bcff285a99617589ecf956f00ff1..ca7478e4402fab7ea8b54d4cc703056a9206ba4e 100644
--- a/plugins/org.polarsys.chess.functionBehaviors.functionBehaviorEditor/.project
+++ b/plugins/org.polarsys.chess.functionBehaviors.functionBehaviorEditor/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/org.polarsys.chess.functionBehaviors.functionBehaviorEditor/.settings/org.eclipse.core.resources.prefs b/plugins/org.polarsys.chess.functionBehaviors.functionBehaviorEditor/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.polarsys.chess.functionBehaviors.functionBehaviorEditor/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.polarsys.chess.functionBehaviors.functionBehaviorEditor/.settings/org.eclipse.m2e.core.prefs b/plugins/org.polarsys.chess.functionBehaviors.functionBehaviorEditor/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.polarsys.chess.functionBehaviors.functionBehaviorEditor/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.polarsys.chess.functionBehaviors.functionBehaviorEditor/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.polarsys.chess.functionBehaviors.functionBehaviorEditor/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/org.polarsys.chess.functionBehaviors.functionBehaviorEditor/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/org.polarsys.chess.functionBehaviors.functionBehaviorEditor/pom.xml b/plugins/org.polarsys.chess.functionBehaviors.functionBehaviorEditor/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..61ede70a2cefa91163789f96a098e8ea26effc4d
--- /dev/null
+++ b/plugins/org.polarsys.chess.functionBehaviors.functionBehaviorEditor/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.functionBehaviors.functionBehaviorEditor</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.instance.view/.classpath b/plugins/org.polarsys.chess.instance.view/.classpath
index d25c08a5c33ee6abd0044546ab9438718a087488..eca7bdba8f03f22510b7980a94dbfe10c16c0901 100644
--- a/plugins/org.polarsys.chess.instance.view/.classpath
+++ b/plugins/org.polarsys.chess.instance.view/.classpath
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="src" path="src-gen/"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.polarsys.chess.instance.view/.gitignore b/plugins/org.polarsys.chess.instance.view/.gitignore
index ba077a4031add5b3a04384f8b9cfc414efbf47dd..0e37a66309998e47dff64b8c1ad9cf8307b237a0 100644
--- a/plugins/org.polarsys.chess.instance.view/.gitignore
+++ b/plugins/org.polarsys.chess.instance.view/.gitignore
@@ -1 +1,2 @@
 bin
+/src-gen/
diff --git a/plugins/org.polarsys.chess.instance.view/.project b/plugins/org.polarsys.chess.instance.view/.project
index 278dff695433011aafafea6102743b93ac48da8a..946baaa346911ac1a158dbe129453d8780950751 100644
--- a/plugins/org.polarsys.chess.instance.view/.project
+++ b/plugins/org.polarsys.chess.instance.view/.project
@@ -30,8 +30,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
diff --git a/plugins/org.polarsys.chess.instance.view/.settings/org.eclipse.core.resources.prefs b/plugins/org.polarsys.chess.instance.view/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.polarsys.chess.instance.view/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.polarsys.chess.instance.view/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.chess.instance.view/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..0c68a61dca867ceb49e79d2402935261ec3e3809
--- /dev/null
+++ b/plugins/org.polarsys.chess.instance.view/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/org.polarsys.chess.instance.view/.settings/org.eclipse.m2e.core.prefs b/plugins/org.polarsys.chess.instance.view/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.polarsys.chess.instance.view/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.polarsys.chess.instance.view/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.polarsys.chess.instance.view/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/org.polarsys.chess.instance.view/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/org.polarsys.chess.instance.view/META-INF/MANIFEST.MF b/plugins/org.polarsys.chess.instance.view/META-INF/MANIFEST.MF
index 2424c7d94169c16841362ede76f8b4d5c6a06fd2..1b9e7fdf8d13efcffb27dc6b32c6ec4f8d9094b8 100644
--- a/plugins/org.polarsys.chess.instance.view/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.chess.instance.view/META-INF/MANIFEST.MF
@@ -2,10 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF-IncQuery Instance View for CHESS
 Bundle-SymbolicName: org.polarsys.chess.instance.view;singleton:=true
-Bundle-Version: 0.0.1.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Budapest University of Technology and Economics
-Export-Package: org.polarsys.chess.instance.view,
- org.polarsys.chess.instance.view.util
+Export-Package: org.polarsys.chess.instance.view
 Require-Bundle: org.eclipse.papyrus.marte.static.profile,
  org.polarsys.chess.chessmlprofile,
  org.eclipse.uml2.uml,
@@ -29,7 +28,7 @@ Require-Bundle: org.eclipse.papyrus.marte.static.profile,
  org.eclipse.viatra.query.runtime;bundle-version="1.7.2",
  org.eclipse.viatra.query.tooling.ui;bundle-version="1.7.2",
  org.eclipse.viatra.addon.viewers.runtime;bundle-version="0.17.2"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.apache.log4j,
  org.polarsys.chess.core.util,
  org.polarsys.chess.core.util.uml,
diff --git a/plugins/org.polarsys.chess.instance.view/build.properties b/plugins/org.polarsys.chess.instance.view/build.properties
index 6e00103c8411ebe9c7c74ef12251bee6613e296b..25ed2cf3185c73e22f042354512180ae5272f9b6 100644
--- a/plugins/org.polarsys.chess.instance.view/build.properties
+++ b/plugins/org.polarsys.chess.instance.view/build.properties
@@ -1,6 +1,5 @@
 bin.includes = META-INF/,\
                .,\
                plugin.xml
-source.. = src/,\
-           src-gen/
+source.. = src/
 output.. = bin/
diff --git a/plugins/org.polarsys.chess.instance.view/pom.xml b/plugins/org.polarsys.chess.instance.view/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..92ceeb266edd37e9e7806bbaa59021e4be4f4fd0
--- /dev/null
+++ b/plugins/org.polarsys.chess.instance.view/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.instance.view</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildCHRTSpecItemMatch.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildCHRTSpecItemMatch.java._trace
deleted file mode 100644
index 5d2b6f1d980e262f4c4a450ca35b42b22c7b72bd..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildCHRTSpecItemMatch.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildCHRTSpecItemMatcher.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildCHRTSpecItemMatcher.java._trace
deleted file mode 100644
index 8f6e32bce8247d1e9e1bf1fc08817c8e12642c2c..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildCHRTSpecItemMatcher.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildCHRTSpecMatch.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildCHRTSpecMatch.java._trace
deleted file mode 100644
index b3683743ece9fd69918952ee39ce9e71e639f087..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildCHRTSpecMatch.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildCHRTSpecMatcher.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildCHRTSpecMatcher.java._trace
deleted file mode 100644
index 56dc337835c3bbf7d7fcae7267c395bb772aae43..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildCHRTSpecMatcher.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPortSlotsMatch.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPortSlotsMatch.java._trace
deleted file mode 100644
index 1d3e887ddece712d2b05ab4b03d26f29bdb643ae..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPortSlotsMatch.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPortSlotsMatcher.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPortSlotsMatcher.java._trace
deleted file mode 100644
index 62e5fca49e643b30e1c10bb1d981d6e5e3c05eca..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPortSlotsMatcher.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPortSlotsOperationItemMatch.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPortSlotsOperationItemMatch.java._trace
deleted file mode 100644
index 58685abce688e2bdcfe441dfd80a8c7a6c7fa56f..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPortSlotsOperationItemMatch.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPortSlotsOperationItemMatcher.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPortSlotsOperationItemMatcher.java._trace
deleted file mode 100644
index c96d4c34c1f6e943e2cf28fa72e507b564f41419..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPortSlotsOperationItemMatcher.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPortSlotsOperationMatch.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPortSlotsOperationMatch.java._trace
deleted file mode 100644
index 96e4c218275cc1a5308001d2725556ab5b671b2c..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPortSlotsOperationMatch.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPortSlotsOperationMatcher.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPortSlotsOperationMatcher.java._trace
deleted file mode 100644
index 697909e5062d09746d95e75fd4580b0ed775d995..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPortSlotsOperationMatcher.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPrivCHRTSpecItemMatch.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPrivCHRTSpecItemMatch.java._trace
deleted file mode 100644
index 70c329bae096af9dfe567c8709f500efec1e6f4e..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPrivCHRTSpecItemMatch.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPrivCHRTSpecItemMatcher.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPrivCHRTSpecItemMatcher.java._trace
deleted file mode 100644
index 5854b44607b166e5f7f3167b261816bb4bbbc692..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPrivCHRTSpecItemMatcher.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPrivCHRTSpecMatch.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPrivCHRTSpecMatch.java._trace
deleted file mode 100644
index 9a3958b7a55950e51d5ddb4fa93ee8eaa82a36cc..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPrivCHRTSpecMatch.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPrivCHRTSpecMatcher.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPrivCHRTSpecMatcher.java._trace
deleted file mode 100644
index f11bae2ace09faf3e6c822c1cfde35ec98c26e6b..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPrivCHRTSpecMatcher.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPrivateOperationsMatch.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPrivateOperationsMatch.java._trace
deleted file mode 100644
index 84cfb4ffa396173b9a6704435db2001551eed115..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPrivateOperationsMatch.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPrivateOperationsMatcher.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPrivateOperationsMatcher.java._trace
deleted file mode 100644
index fc63ba5634d80956c95c9c94c3bb7a689839151f..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.ChildPrivateOperationsMatcher.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.SwSystemCHGaResourcePlatformMatch.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.SwSystemCHGaResourcePlatformMatch.java._trace
deleted file mode 100644
index 60ec0eea0fa6525c1b1c28a88ebc9449dadfb23c..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.SwSystemCHGaResourcePlatformMatch.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.SwSystemCHGaResourcePlatformMatcher.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.SwSystemCHGaResourcePlatformMatcher.java._trace
deleted file mode 100644
index e22601951096dfc210e110f613811bbef7cd49e4..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.SwSystemCHGaResourcePlatformMatcher.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.SwSystemChild2ItemMatch.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.SwSystemChild2ItemMatch.java._trace
deleted file mode 100644
index 387b7d80a255bd76b2fd388bf1e5b7a7c0f04ed6..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.SwSystemChild2ItemMatch.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.SwSystemChild2ItemMatcher.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.SwSystemChild2ItemMatcher.java._trace
deleted file mode 100644
index f58aa64aae8e72893c6f9d79b46953b30922f943..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.SwSystemChild2ItemMatcher.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.SwSystemChild2Match.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.SwSystemChild2Match.java._trace
deleted file mode 100644
index 88846c201c729a304bd71bb72a84464ab79bb92d..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.SwSystemChild2Match.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.SwSystemChild2Matcher.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.SwSystemChild2Matcher.java._trace
deleted file mode 100644
index 3952702cbc66fcd5d5dbd286b0ab8e3d441f8604..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.SwSystemChild2Matcher.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.SwSystemRootMatch.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.SwSystemRootMatch.java._trace
deleted file mode 100644
index a20d15e45560d80580b781aa013aa99f29de3e59..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.SwSystemRootMatch.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.SwSystemRootMatcher.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.SwSystemRootMatcher.java._trace
deleted file mode 100644
index 395af7d06e587d6e24595e54c8321b682e92e4fa..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.SwSystemRootMatcher.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.View.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.View.java._trace
deleted file mode 100644
index 8d24bac3752974ab5fb6970c65e25b060c7018c7..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.View.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.gitignore b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.gitignore
deleted file mode 100644
index d3f5a12faa99758192ecc4ed3fc22c9249232e86..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildCHRTSpecItemMatch.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildCHRTSpecItemMatch.java
deleted file mode 100644
index df790b31f3b0bef43d03efd4276139f6cbdc9ab5..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildCHRTSpecItemMatch.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.viatra.query.runtime.api.IPatternMatch;
-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.polarsys.chess.instance.view.util.ChildCHRTSpecItemQuerySpecification;
-
-/**
- * Pattern-specific match representation of the org.polarsys.chess.instance.view.childCHRTSpecItem pattern,
- * to be used in conjunction with {@link ChildCHRTSpecItemMatcher}.
- * 
- * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
- * Each instance is a (possibly partial) substitution of pattern parameters,
- * usable to represent a match of the pattern in the result of a query,
- * or to specify the bound (fixed) input parameters when issuing a query.
- * 
- * @see ChildCHRTSpecItemMatcher
- *  @see ChildCHRTSpecItemProcessor
- * 
- */
-@SuppressWarnings("all")
-public abstract class ChildCHRTSpecItemMatch extends BasePatternMatch {
-  private Comment fChrtspecComment;
-  
-  private static List<String> parameterNames = makeImmutableList("chrtspecComment");
-  
-  private ChildCHRTSpecItemMatch(final Comment pChrtspecComment) {
-    this.fChrtspecComment = pChrtspecComment;
-  }
-  
-  @Override
-  public Object get(final String parameterName) {
-    if ("chrtspecComment".equals(parameterName)) return this.fChrtspecComment;
-    return null;
-  }
-  
-  public Comment getChrtspecComment() {
-    return this.fChrtspecComment;
-  }
-  
-  @Override
-  public boolean set(final String parameterName, final Object newValue) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    if ("chrtspecComment".equals(parameterName) ) {
-        this.fChrtspecComment = (Comment) newValue;
-        return true;
-    }
-    return false;
-  }
-  
-  public void setChrtspecComment(final Comment pChrtspecComment) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    this.fChrtspecComment = pChrtspecComment;
-  }
-  
-  @Override
-  public String patternName() {
-    return "org.polarsys.chess.instance.view.childCHRTSpecItem";
-  }
-  
-  @Override
-  public List<String> parameterNames() {
-    return ChildCHRTSpecItemMatch.parameterNames;
-  }
-  
-  @Override
-  public Object[] toArray() {
-    return new Object[]{fChrtspecComment};
-  }
-  
-  @Override
-  public ChildCHRTSpecItemMatch toImmutable() {
-    return isMutable() ? newMatch(fChrtspecComment) : this;
-  }
-  
-  @Override
-  public String prettyPrint() {
-    StringBuilder result = new StringBuilder();
-    result.append("\"chrtspecComment\"=" + prettyPrintValue(fChrtspecComment));
-    return result.toString();
-  }
-  
-  @Override
-  public int hashCode() {
-    return Objects.hash(fChrtspecComment);
-  }
-  
-  @Override
-  public boolean equals(final Object obj) {
-    if (this == obj)
-        return true;
-    if (obj == null) {
-        return false;
-    }
-    if ((obj instanceof ChildCHRTSpecItemMatch)) {
-        ChildCHRTSpecItemMatch other = (ChildCHRTSpecItemMatch) obj;
-        return Objects.equals(fChrtspecComment, other.fChrtspecComment);
-    } else {
-        // this should be infrequent
-        if (!(obj instanceof IPatternMatch)) {
-            return false;
-        }
-        IPatternMatch otherSig  = (IPatternMatch) obj;
-        return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
-    }
-  }
-  
-  @Override
-  public ChildCHRTSpecItemQuerySpecification specification() {
-    try {
-        return ChildCHRTSpecItemQuerySpecification.instance();
-    } catch (ViatraQueryException ex) {
-         // This cannot happen, as the match object can only be instantiated if the query specification exists
-         throw new IllegalStateException (ex);
-    }
-  }
-  
-  /**
-   * Returns an empty, mutable match.
-   * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-   * 
-   * @return the empty match.
-   * 
-   */
-  public static ChildCHRTSpecItemMatch newEmptyMatch() {
-    return new Mutable(null);
-  }
-  
-  /**
-   * Returns a mutable (partial) match.
-   * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-   * 
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @return the new, mutable (partial) match object.
-   * 
-   */
-  public static ChildCHRTSpecItemMatch newMutableMatch(final Comment pChrtspecComment) {
-    return new Mutable(pChrtspecComment);
-  }
-  
-  /**
-   * Returns a new (partial) match.
-   * This can be used e.g. to call the matcher with a partial match.
-   * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @return the (partial) match object.
-   * 
-   */
-  public static ChildCHRTSpecItemMatch newMatch(final Comment pChrtspecComment) {
-    return new Immutable(pChrtspecComment);
-  }
-  
-  private static final class Mutable extends ChildCHRTSpecItemMatch {
-    Mutable(final Comment pChrtspecComment) {
-      super(pChrtspecComment);
-    }
-    
-    @Override
-    public boolean isMutable() {
-      return true;
-    }
-  }
-  
-  private static final class Immutable extends ChildCHRTSpecItemMatch {
-    Immutable(final Comment pChrtspecComment) {
-      super(pChrtspecComment);
-    }
-    
-    @Override
-    public boolean isMutable() {
-      return false;
-    }
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildCHRTSpecItemMatcher.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildCHRTSpecItemMatcher.java
deleted file mode 100644
index 6e730c8013ba9fda326767cb22116b8533c6d1ab..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildCHRTSpecItemMatcher.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import org.apache.log4j.Logger;
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.viatra.query.runtime.api.IMatchProcessor;
-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import org.polarsys.chess.instance.view.ChildCHRTSpecItemMatch;
-import org.polarsys.chess.instance.view.util.ChildCHRTSpecItemQuerySpecification;
-
-/**
- * Generated pattern matcher API of the org.polarsys.chess.instance.view.childCHRTSpecItem pattern,
- * providing pattern-specific query methods.
- * 
- * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
- * e.g. in conjunction with {@link ViatraQueryEngine#on(Notifier)}.
- * 
- * <p>Matches of the pattern will be represented as {@link ChildCHRTSpecItemMatch}.
- * 
- * <p>Original source:
- * <code><pre>
- * {@literal @}Item(item = chrtspecComment, hierarchy = "child", label = "CHRtSpecification")
- * pattern childCHRTSpecItem(chrtspecComment) {
- * 	//find childPortSlotsOperation(slot, operation, _);
- * 	find childCHRTSpec(chrtspecComment, _);
- * }
- * </pre></code>
- * 
- * @see ChildCHRTSpecItemMatch
- *  @see ChildCHRTSpecItemProcessor
- * @see ChildCHRTSpecItemQuerySpecification
- * 
- */
-@SuppressWarnings("all")
-public class ChildCHRTSpecItemMatcher extends BaseMatcher<ChildCHRTSpecItemMatch> {
-  /**
-   * Initializes the pattern matcher within an existing VIATRA Query engine.
-   * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-   * The match set will be incrementally refreshed upon updates.
-   * @param engine the existing VIATRA Query engine in which this matcher will be created.
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * 
-   */
-  public static ChildCHRTSpecItemMatcher on(final ViatraQueryEngine engine) throws ViatraQueryException {
-    // check if matcher already exists
-    ChildCHRTSpecItemMatcher matcher = engine.getExistingMatcher(querySpecification());
-    if (matcher == null) {
-        matcher = (ChildCHRTSpecItemMatcher)engine.getMatcher(querySpecification());
-    }
-    return matcher;
-  }
-  
-  /**
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * @return an initialized matcher
-   * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
-   * 
-   */
-  public static ChildCHRTSpecItemMatcher create() throws ViatraQueryException {
-    return new ChildCHRTSpecItemMatcher();
-  }
-  
-  private final static int POSITION_CHRTSPECCOMMENT = 0;
-  
-  private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(ChildCHRTSpecItemMatcher.class);
-  
-  /**
-   * Initializes the pattern matcher within an existing VIATRA Query engine.
-   * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-   * The match set will be incrementally refreshed upon updates.
-   * @param engine the existing VIATRA Query engine in which this matcher will be created.
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * 
-   */
-  private ChildCHRTSpecItemMatcher() throws ViatraQueryException {
-    super(querySpecification());
-  }
-  
-  /**
-   * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @return matches represented as a ChildCHRTSpecItemMatch object.
-   * 
-   */
-  public Collection<ChildCHRTSpecItemMatch> getAllMatches(final Comment pChrtspecComment) {
-    return rawGetAllMatches(new Object[]{pChrtspecComment});
-  }
-  
-  /**
-   * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-   * Neither determinism nor randomness of selection is guaranteed.
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @return a match represented as a ChildCHRTSpecItemMatch object, or null if no match is found.
-   * 
-   */
-  public ChildCHRTSpecItemMatch getOneArbitraryMatch(final Comment pChrtspecComment) {
-    return rawGetOneArbitraryMatch(new Object[]{pChrtspecComment});
-  }
-  
-  /**
-   * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
-   * under any possible substitution of the unspecified parameters (if any).
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @return true if the input is a valid (partial) match of the pattern.
-   * 
-   */
-  public boolean hasMatch(final Comment pChrtspecComment) {
-    return rawHasMatch(new Object[]{pChrtspecComment});
-  }
-  
-  /**
-   * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @return the number of pattern matches found.
-   * 
-   */
-  public int countMatches(final Comment pChrtspecComment) {
-    return rawCountMatches(new Object[]{pChrtspecComment});
-  }
-  
-  /**
-   * Executes the given processor on each match of the pattern that conforms to the given fixed values of some parameters.
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @param processor the action that will process each pattern match.
-   * 
-   */
-  public void forEachMatch(final Comment pChrtspecComment, final IMatchProcessor<? super ChildCHRTSpecItemMatch> processor) {
-    rawForEachMatch(new Object[]{pChrtspecComment}, processor);
-  }
-  
-  /**
-   * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-   * Neither determinism nor randomness of selection is guaranteed.
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @param processor the action that will process the selected match.
-   * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
-   * 
-   */
-  public boolean forOneArbitraryMatch(final Comment pChrtspecComment, final IMatchProcessor<? super ChildCHRTSpecItemMatch> processor) {
-    return rawForOneArbitraryMatch(new Object[]{pChrtspecComment}, processor);
-  }
-  
-  /**
-   * Returns a new (partial) match.
-   * This can be used e.g. to call the matcher with a partial match.
-   * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @return the (partial) match object.
-   * 
-   */
-  public ChildCHRTSpecItemMatch newMatch(final Comment pChrtspecComment) {
-    return ChildCHRTSpecItemMatch.newMatch(pChrtspecComment);
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for chrtspecComment.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  protected Set<Comment> rawAccumulateAllValuesOfchrtspecComment(final Object[] parameters) {
-    Set<Comment> results = new HashSet<Comment>();
-    rawAccumulateAllValues(POSITION_CHRTSPECCOMMENT, parameters, results);
-    return results;
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for chrtspecComment.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<Comment> getAllValuesOfchrtspecComment() {
-    return rawAccumulateAllValuesOfchrtspecComment(emptyArray());
-  }
-  
-  @Override
-  protected ChildCHRTSpecItemMatch tupleToMatch(final Tuple t) {
-    try {
-        return ChildCHRTSpecItemMatch.newMatch((Comment) t.get(POSITION_CHRTSPECCOMMENT));
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in tuple not properly typed!",e);
-        return null;
-    }
-  }
-  
-  @Override
-  protected ChildCHRTSpecItemMatch arrayToMatch(final Object[] match) {
-    try {
-        return ChildCHRTSpecItemMatch.newMatch((Comment) match[POSITION_CHRTSPECCOMMENT]);
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in array not properly typed!",e);
-        return null;
-    }
-  }
-  
-  @Override
-  protected ChildCHRTSpecItemMatch arrayToMatchMutable(final Object[] match) {
-    try {
-        return ChildCHRTSpecItemMatch.newMutableMatch((Comment) match[POSITION_CHRTSPECCOMMENT]);
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in array not properly typed!",e);
-        return null;
-    }
-  }
-  
-  /**
-   * @return the singleton instance of the query specification of this pattern
-   * @throws ViatraQueryException if the pattern definition could not be loaded
-   * 
-   */
-  public static IQuerySpecification<ChildCHRTSpecItemMatcher> querySpecification() throws ViatraQueryException {
-    return ChildCHRTSpecItemQuerySpecification.instance();
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildCHRTSpecMatch.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildCHRTSpecMatch.java
deleted file mode 100644
index a9e7b26ceed6c9be4d62260f987706b212fadf1c..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildCHRTSpecMatch.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import org.eclipse.uml2.uml.BehavioralFeature;
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.viatra.query.runtime.api.IPatternMatch;
-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.polarsys.chess.instance.view.util.ChildCHRTSpecQuerySpecification;
-
-/**
- * Pattern-specific match representation of the org.polarsys.chess.instance.view.childCHRTSpec pattern,
- * to be used in conjunction with {@link ChildCHRTSpecMatcher}.
- * 
- * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
- * Each instance is a (possibly partial) substitution of pattern parameters,
- * usable to represent a match of the pattern in the result of a query,
- * or to specify the bound (fixed) input parameters when issuing a query.
- * 
- * @see ChildCHRTSpecMatcher
- *  @see ChildCHRTSpecProcessor
- * 
- */
-@SuppressWarnings("all")
-public abstract class ChildCHRTSpecMatch extends BasePatternMatch {
-  private Comment fChrtspecComment;
-  
-  private BehavioralFeature fOperation;
-  
-  private static List<String> parameterNames = makeImmutableList("chrtspecComment", "operation");
-  
-  private ChildCHRTSpecMatch(final Comment pChrtspecComment, final BehavioralFeature pOperation) {
-    this.fChrtspecComment = pChrtspecComment;
-    this.fOperation = pOperation;
-  }
-  
-  @Override
-  public Object get(final String parameterName) {
-    if ("chrtspecComment".equals(parameterName)) return this.fChrtspecComment;
-    if ("operation".equals(parameterName)) return this.fOperation;
-    return null;
-  }
-  
-  public Comment getChrtspecComment() {
-    return this.fChrtspecComment;
-  }
-  
-  public BehavioralFeature getOperation() {
-    return this.fOperation;
-  }
-  
-  @Override
-  public boolean set(final String parameterName, final Object newValue) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    if ("chrtspecComment".equals(parameterName) ) {
-        this.fChrtspecComment = (Comment) newValue;
-        return true;
-    }
-    if ("operation".equals(parameterName) ) {
-        this.fOperation = (BehavioralFeature) newValue;
-        return true;
-    }
-    return false;
-  }
-  
-  public void setChrtspecComment(final Comment pChrtspecComment) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    this.fChrtspecComment = pChrtspecComment;
-  }
-  
-  public void setOperation(final BehavioralFeature pOperation) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    this.fOperation = pOperation;
-  }
-  
-  @Override
-  public String patternName() {
-    return "org.polarsys.chess.instance.view.childCHRTSpec";
-  }
-  
-  @Override
-  public List<String> parameterNames() {
-    return ChildCHRTSpecMatch.parameterNames;
-  }
-  
-  @Override
-  public Object[] toArray() {
-    return new Object[]{fChrtspecComment, fOperation};
-  }
-  
-  @Override
-  public ChildCHRTSpecMatch toImmutable() {
-    return isMutable() ? newMatch(fChrtspecComment, fOperation) : this;
-  }
-  
-  @Override
-  public String prettyPrint() {
-    StringBuilder result = new StringBuilder();
-    result.append("\"chrtspecComment\"=" + prettyPrintValue(fChrtspecComment) + ", ");
-    result.append("\"operation\"=" + prettyPrintValue(fOperation));
-    return result.toString();
-  }
-  
-  @Override
-  public int hashCode() {
-    return Objects.hash(fChrtspecComment, fOperation);
-  }
-  
-  @Override
-  public boolean equals(final Object obj) {
-    if (this == obj)
-        return true;
-    if (obj == null) {
-        return false;
-    }
-    if ((obj instanceof ChildCHRTSpecMatch)) {
-        ChildCHRTSpecMatch other = (ChildCHRTSpecMatch) obj;
-        return Objects.equals(fChrtspecComment, other.fChrtspecComment) && Objects.equals(fOperation, other.fOperation);
-    } else {
-        // this should be infrequent
-        if (!(obj instanceof IPatternMatch)) {
-            return false;
-        }
-        IPatternMatch otherSig  = (IPatternMatch) obj;
-        return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
-    }
-  }
-  
-  @Override
-  public ChildCHRTSpecQuerySpecification specification() {
-    try {
-        return ChildCHRTSpecQuerySpecification.instance();
-    } catch (ViatraQueryException ex) {
-         // This cannot happen, as the match object can only be instantiated if the query specification exists
-         throw new IllegalStateException (ex);
-    }
-  }
-  
-  /**
-   * Returns an empty, mutable match.
-   * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-   * 
-   * @return the empty match.
-   * 
-   */
-  public static ChildCHRTSpecMatch newEmptyMatch() {
-    return new Mutable(null, null);
-  }
-  
-  /**
-   * Returns a mutable (partial) match.
-   * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-   * 
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @param pOperation the fixed value of pattern parameter operation, or null if not bound.
-   * @return the new, mutable (partial) match object.
-   * 
-   */
-  public static ChildCHRTSpecMatch newMutableMatch(final Comment pChrtspecComment, final BehavioralFeature pOperation) {
-    return new Mutable(pChrtspecComment, pOperation);
-  }
-  
-  /**
-   * Returns a new (partial) match.
-   * This can be used e.g. to call the matcher with a partial match.
-   * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @param pOperation the fixed value of pattern parameter operation, or null if not bound.
-   * @return the (partial) match object.
-   * 
-   */
-  public static ChildCHRTSpecMatch newMatch(final Comment pChrtspecComment, final BehavioralFeature pOperation) {
-    return new Immutable(pChrtspecComment, pOperation);
-  }
-  
-  private static final class Mutable extends ChildCHRTSpecMatch {
-    Mutable(final Comment pChrtspecComment, final BehavioralFeature pOperation) {
-      super(pChrtspecComment, pOperation);
-    }
-    
-    @Override
-    public boolean isMutable() {
-      return true;
-    }
-  }
-  
-  private static final class Immutable extends ChildCHRTSpecMatch {
-    Immutable(final Comment pChrtspecComment, final BehavioralFeature pOperation) {
-      super(pChrtspecComment, pOperation);
-    }
-    
-    @Override
-    public boolean isMutable() {
-      return false;
-    }
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildCHRTSpecMatcher.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildCHRTSpecMatcher.java
deleted file mode 100644
index c129aa1f21b31945224929ecf2a0c94bbccb75be..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildCHRTSpecMatcher.java
+++ /dev/null
@@ -1,310 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import org.apache.log4j.Logger;
-import org.eclipse.uml2.uml.BehavioralFeature;
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.viatra.query.runtime.api.IMatchProcessor;
-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import org.polarsys.chess.instance.view.ChildCHRTSpecMatch;
-import org.polarsys.chess.instance.view.util.ChildCHRTSpecQuerySpecification;
-
-/**
- * Generated pattern matcher API of the org.polarsys.chess.instance.view.childCHRTSpec pattern,
- * providing pattern-specific query methods.
- * 
- * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
- * e.g. in conjunction with {@link ViatraQueryEngine#on(Notifier)}.
- * 
- * <p>Matches of the pattern will be represented as {@link ChildCHRTSpecMatch}.
- * 
- * <p>Original source:
- * <code><pre>
- * {@literal @}ContainsItem(container = operation, item = chrtspecComment)
- * pattern childCHRTSpec(chrtspecComment, operation) {
- * 		
- * 	//find childPortSlotsOperation(slot, operation, _);
- * 	CHRtPortSlot.base_Slot(chrtportslot, slot);
- * 	CHRtPortSlot.cH_RtSpecification(chrtportslot, chrt);
- * 	CHRtSpecification.context(chrt, operation);
- * 	CHRtSpecification.base_Comment(chrt, chrtspecComment);
- * 
- * 	
- * }
- * </pre></code>
- * 
- * @see ChildCHRTSpecMatch
- *  @see ChildCHRTSpecProcessor
- * @see ChildCHRTSpecQuerySpecification
- * 
- */
-@SuppressWarnings("all")
-public class ChildCHRTSpecMatcher extends BaseMatcher<ChildCHRTSpecMatch> {
-  /**
-   * Initializes the pattern matcher within an existing VIATRA Query engine.
-   * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-   * The match set will be incrementally refreshed upon updates.
-   * @param engine the existing VIATRA Query engine in which this matcher will be created.
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * 
-   */
-  public static ChildCHRTSpecMatcher on(final ViatraQueryEngine engine) throws ViatraQueryException {
-    // check if matcher already exists
-    ChildCHRTSpecMatcher matcher = engine.getExistingMatcher(querySpecification());
-    if (matcher == null) {
-        matcher = (ChildCHRTSpecMatcher)engine.getMatcher(querySpecification());
-    }
-    return matcher;
-  }
-  
-  /**
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * @return an initialized matcher
-   * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
-   * 
-   */
-  public static ChildCHRTSpecMatcher create() throws ViatraQueryException {
-    return new ChildCHRTSpecMatcher();
-  }
-  
-  private final static int POSITION_CHRTSPECCOMMENT = 0;
-  
-  private final static int POSITION_OPERATION = 1;
-  
-  private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(ChildCHRTSpecMatcher.class);
-  
-  /**
-   * Initializes the pattern matcher within an existing VIATRA Query engine.
-   * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-   * The match set will be incrementally refreshed upon updates.
-   * @param engine the existing VIATRA Query engine in which this matcher will be created.
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * 
-   */
-  private ChildCHRTSpecMatcher() throws ViatraQueryException {
-    super(querySpecification());
-  }
-  
-  /**
-   * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @param pOperation the fixed value of pattern parameter operation, or null if not bound.
-   * @return matches represented as a ChildCHRTSpecMatch object.
-   * 
-   */
-  public Collection<ChildCHRTSpecMatch> getAllMatches(final Comment pChrtspecComment, final BehavioralFeature pOperation) {
-    return rawGetAllMatches(new Object[]{pChrtspecComment, pOperation});
-  }
-  
-  /**
-   * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-   * Neither determinism nor randomness of selection is guaranteed.
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @param pOperation the fixed value of pattern parameter operation, or null if not bound.
-   * @return a match represented as a ChildCHRTSpecMatch object, or null if no match is found.
-   * 
-   */
-  public ChildCHRTSpecMatch getOneArbitraryMatch(final Comment pChrtspecComment, final BehavioralFeature pOperation) {
-    return rawGetOneArbitraryMatch(new Object[]{pChrtspecComment, pOperation});
-  }
-  
-  /**
-   * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
-   * under any possible substitution of the unspecified parameters (if any).
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @param pOperation the fixed value of pattern parameter operation, or null if not bound.
-   * @return true if the input is a valid (partial) match of the pattern.
-   * 
-   */
-  public boolean hasMatch(final Comment pChrtspecComment, final BehavioralFeature pOperation) {
-    return rawHasMatch(new Object[]{pChrtspecComment, pOperation});
-  }
-  
-  /**
-   * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @param pOperation the fixed value of pattern parameter operation, or null if not bound.
-   * @return the number of pattern matches found.
-   * 
-   */
-  public int countMatches(final Comment pChrtspecComment, final BehavioralFeature pOperation) {
-    return rawCountMatches(new Object[]{pChrtspecComment, pOperation});
-  }
-  
-  /**
-   * Executes the given processor on each match of the pattern that conforms to the given fixed values of some parameters.
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @param pOperation the fixed value of pattern parameter operation, or null if not bound.
-   * @param processor the action that will process each pattern match.
-   * 
-   */
-  public void forEachMatch(final Comment pChrtspecComment, final BehavioralFeature pOperation, final IMatchProcessor<? super ChildCHRTSpecMatch> processor) {
-    rawForEachMatch(new Object[]{pChrtspecComment, pOperation}, processor);
-  }
-  
-  /**
-   * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-   * Neither determinism nor randomness of selection is guaranteed.
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @param pOperation the fixed value of pattern parameter operation, or null if not bound.
-   * @param processor the action that will process the selected match.
-   * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
-   * 
-   */
-  public boolean forOneArbitraryMatch(final Comment pChrtspecComment, final BehavioralFeature pOperation, final IMatchProcessor<? super ChildCHRTSpecMatch> processor) {
-    return rawForOneArbitraryMatch(new Object[]{pChrtspecComment, pOperation}, processor);
-  }
-  
-  /**
-   * Returns a new (partial) match.
-   * This can be used e.g. to call the matcher with a partial match.
-   * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @param pOperation the fixed value of pattern parameter operation, or null if not bound.
-   * @return the (partial) match object.
-   * 
-   */
-  public ChildCHRTSpecMatch newMatch(final Comment pChrtspecComment, final BehavioralFeature pOperation) {
-    return ChildCHRTSpecMatch.newMatch(pChrtspecComment, pOperation);
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for chrtspecComment.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  protected Set<Comment> rawAccumulateAllValuesOfchrtspecComment(final Object[] parameters) {
-    Set<Comment> results = new HashSet<Comment>();
-    rawAccumulateAllValues(POSITION_CHRTSPECCOMMENT, parameters, results);
-    return results;
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for chrtspecComment.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<Comment> getAllValuesOfchrtspecComment() {
-    return rawAccumulateAllValuesOfchrtspecComment(emptyArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for chrtspecComment.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<Comment> getAllValuesOfchrtspecComment(final ChildCHRTSpecMatch partialMatch) {
-    return rawAccumulateAllValuesOfchrtspecComment(partialMatch.toArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for chrtspecComment.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<Comment> getAllValuesOfchrtspecComment(final BehavioralFeature pOperation) {
-    return rawAccumulateAllValuesOfchrtspecComment(new Object[]{
-    null, 
-    pOperation
-    });
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for operation.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  protected Set<BehavioralFeature> rawAccumulateAllValuesOfoperation(final Object[] parameters) {
-    Set<BehavioralFeature> results = new HashSet<BehavioralFeature>();
-    rawAccumulateAllValues(POSITION_OPERATION, parameters, results);
-    return results;
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for operation.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<BehavioralFeature> getAllValuesOfoperation() {
-    return rawAccumulateAllValuesOfoperation(emptyArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for operation.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<BehavioralFeature> getAllValuesOfoperation(final ChildCHRTSpecMatch partialMatch) {
-    return rawAccumulateAllValuesOfoperation(partialMatch.toArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for operation.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<BehavioralFeature> getAllValuesOfoperation(final Comment pChrtspecComment) {
-    return rawAccumulateAllValuesOfoperation(new Object[]{
-    pChrtspecComment, 
-    null
-    });
-  }
-  
-  @Override
-  protected ChildCHRTSpecMatch tupleToMatch(final Tuple t) {
-    try {
-        return ChildCHRTSpecMatch.newMatch((Comment) t.get(POSITION_CHRTSPECCOMMENT), (BehavioralFeature) t.get(POSITION_OPERATION));
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in tuple not properly typed!",e);
-        return null;
-    }
-  }
-  
-  @Override
-  protected ChildCHRTSpecMatch arrayToMatch(final Object[] match) {
-    try {
-        return ChildCHRTSpecMatch.newMatch((Comment) match[POSITION_CHRTSPECCOMMENT], (BehavioralFeature) match[POSITION_OPERATION]);
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in array not properly typed!",e);
-        return null;
-    }
-  }
-  
-  @Override
-  protected ChildCHRTSpecMatch arrayToMatchMutable(final Object[] match) {
-    try {
-        return ChildCHRTSpecMatch.newMutableMatch((Comment) match[POSITION_CHRTSPECCOMMENT], (BehavioralFeature) match[POSITION_OPERATION]);
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in array not properly typed!",e);
-        return null;
-    }
-  }
-  
-  /**
-   * @return the singleton instance of the query specification of this pattern
-   * @throws ViatraQueryException if the pattern definition could not be loaded
-   * 
-   */
-  public static IQuerySpecification<ChildCHRTSpecMatcher> querySpecification() throws ViatraQueryException {
-    return ChildCHRTSpecQuerySpecification.instance();
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPortSlotsMatch.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPortSlotsMatch.java
deleted file mode 100644
index df9ff9d9a0913e36a42998ca433c4f7184e149ea..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPortSlotsMatch.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.uml2.uml.Slot;
-import org.eclipse.viatra.query.runtime.api.IPatternMatch;
-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.polarsys.chess.instance.view.util.ChildPortSlotsQuerySpecification;
-
-/**
- * Pattern-specific match representation of the org.polarsys.chess.instance.view.childPortSlots pattern,
- * to be used in conjunction with {@link ChildPortSlotsMatcher}.
- * 
- * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
- * Each instance is a (possibly partial) substitution of pattern parameters,
- * usable to represent a match of the pattern in the result of a query,
- * or to specify the bound (fixed) input parameters when issuing a query.
- * 
- * @see ChildPortSlotsMatcher
- *  @see ChildPortSlotsProcessor
- * 
- */
-@SuppressWarnings("all")
-public abstract class ChildPortSlotsMatch extends BasePatternMatch {
-  private InstanceSpecification fChild;
-  
-  private Slot fSlot;
-  
-  private String fName;
-  
-  private static List<String> parameterNames = makeImmutableList("child", "slot", "name");
-  
-  private ChildPortSlotsMatch(final InstanceSpecification pChild, final Slot pSlot, final String pName) {
-    this.fChild = pChild;
-    this.fSlot = pSlot;
-    this.fName = pName;
-  }
-  
-  @Override
-  public Object get(final String parameterName) {
-    if ("child".equals(parameterName)) return this.fChild;
-    if ("slot".equals(parameterName)) return this.fSlot;
-    if ("name".equals(parameterName)) return this.fName;
-    return null;
-  }
-  
-  public InstanceSpecification getChild() {
-    return this.fChild;
-  }
-  
-  public Slot getSlot() {
-    return this.fSlot;
-  }
-  
-  public String getName() {
-    return this.fName;
-  }
-  
-  @Override
-  public boolean set(final String parameterName, final Object newValue) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    if ("child".equals(parameterName) ) {
-        this.fChild = (InstanceSpecification) newValue;
-        return true;
-    }
-    if ("slot".equals(parameterName) ) {
-        this.fSlot = (Slot) newValue;
-        return true;
-    }
-    if ("name".equals(parameterName) ) {
-        this.fName = (String) newValue;
-        return true;
-    }
-    return false;
-  }
-  
-  public void setChild(final InstanceSpecification pChild) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    this.fChild = pChild;
-  }
-  
-  public void setSlot(final Slot pSlot) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    this.fSlot = pSlot;
-  }
-  
-  public void setName(final String pName) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    this.fName = pName;
-  }
-  
-  @Override
-  public String patternName() {
-    return "org.polarsys.chess.instance.view.childPortSlots";
-  }
-  
-  @Override
-  public List<String> parameterNames() {
-    return ChildPortSlotsMatch.parameterNames;
-  }
-  
-  @Override
-  public Object[] toArray() {
-    return new Object[]{fChild, fSlot, fName};
-  }
-  
-  @Override
-  public ChildPortSlotsMatch toImmutable() {
-    return isMutable() ? newMatch(fChild, fSlot, fName) : this;
-  }
-  
-  @Override
-  public String prettyPrint() {
-    StringBuilder result = new StringBuilder();
-    result.append("\"child\"=" + prettyPrintValue(fChild) + ", ");
-    result.append("\"slot\"=" + prettyPrintValue(fSlot) + ", ");
-    result.append("\"name\"=" + prettyPrintValue(fName));
-    return result.toString();
-  }
-  
-  @Override
-  public int hashCode() {
-    return Objects.hash(fChild, fSlot, fName);
-  }
-  
-  @Override
-  public boolean equals(final Object obj) {
-    if (this == obj)
-        return true;
-    if (obj == null) {
-        return false;
-    }
-    if ((obj instanceof ChildPortSlotsMatch)) {
-        ChildPortSlotsMatch other = (ChildPortSlotsMatch) obj;
-        return Objects.equals(fChild, other.fChild) && Objects.equals(fSlot, other.fSlot) && Objects.equals(fName, other.fName);
-    } else {
-        // this should be infrequent
-        if (!(obj instanceof IPatternMatch)) {
-            return false;
-        }
-        IPatternMatch otherSig  = (IPatternMatch) obj;
-        return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
-    }
-  }
-  
-  @Override
-  public ChildPortSlotsQuerySpecification specification() {
-    try {
-        return ChildPortSlotsQuerySpecification.instance();
-    } catch (ViatraQueryException ex) {
-         // This cannot happen, as the match object can only be instantiated if the query specification exists
-         throw new IllegalStateException (ex);
-    }
-  }
-  
-  /**
-   * Returns an empty, mutable match.
-   * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-   * 
-   * @return the empty match.
-   * 
-   */
-  public static ChildPortSlotsMatch newEmptyMatch() {
-    return new Mutable(null, null, null);
-  }
-  
-  /**
-   * Returns a mutable (partial) match.
-   * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-   * 
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pSlot the fixed value of pattern parameter slot, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return the new, mutable (partial) match object.
-   * 
-   */
-  public static ChildPortSlotsMatch newMutableMatch(final InstanceSpecification pChild, final Slot pSlot, final String pName) {
-    return new Mutable(pChild, pSlot, pName);
-  }
-  
-  /**
-   * Returns a new (partial) match.
-   * This can be used e.g. to call the matcher with a partial match.
-   * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pSlot the fixed value of pattern parameter slot, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return the (partial) match object.
-   * 
-   */
-  public static ChildPortSlotsMatch newMatch(final InstanceSpecification pChild, final Slot pSlot, final String pName) {
-    return new Immutable(pChild, pSlot, pName);
-  }
-  
-  private static final class Mutable extends ChildPortSlotsMatch {
-    Mutable(final InstanceSpecification pChild, final Slot pSlot, final String pName) {
-      super(pChild, pSlot, pName);
-    }
-    
-    @Override
-    public boolean isMutable() {
-      return true;
-    }
-  }
-  
-  private static final class Immutable extends ChildPortSlotsMatch {
-    Immutable(final InstanceSpecification pChild, final Slot pSlot, final String pName) {
-      super(pChild, pSlot, pName);
-    }
-    
-    @Override
-    public boolean isMutable() {
-      return false;
-    }
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPortSlotsMatcher.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPortSlotsMatcher.java
deleted file mode 100644
index bf143d1264a53f9d53899772847aadfdf22cafc8..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPortSlotsMatcher.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import org.apache.log4j.Logger;
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.uml2.uml.Slot;
-import org.eclipse.viatra.query.runtime.api.IMatchProcessor;
-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import org.polarsys.chess.instance.view.ChildPortSlotsMatch;
-import org.polarsys.chess.instance.view.util.ChildPortSlotsQuerySpecification;
-
-/**
- * Generated pattern matcher API of the org.polarsys.chess.instance.view.childPortSlots pattern,
- * providing pattern-specific query methods.
- * 
- * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
- * e.g. in conjunction with {@link ViatraQueryEngine#on(Notifier)}.
- * 
- * <p>Matches of the pattern will be represented as {@link ChildPortSlotsMatch}.
- * 
- * <p>Original source:
- * <code><pre>
- * {@literal @}Item(item = slot, hierarchy = "child", label = "$name$ ( Provided Port)")
- * {@literal @}ContainsItem(container = child, item = slot)
- * pattern childPortSlots(child, slot, name) {
- * 	//find swSystemChild2(child, _, _, _, _);
- * 	InstanceSpecification.slot(child, slot);
- * 	Slot.definingFeature(slot, port);
- * 	Port.name(port,name);
- * 	
- * 	ClientServerPort.base_Port(csp, port);
- * 
- * 	neg find portHelperWithValue(slot,_);
- * 	find clientServerPortHelperWithInterface (csp, _);
- * }
- * </pre></code>
- * 
- * @see ChildPortSlotsMatch
- *  @see ChildPortSlotsProcessor
- * @see ChildPortSlotsQuerySpecification
- * 
- */
-@SuppressWarnings("all")
-public class ChildPortSlotsMatcher extends BaseMatcher<ChildPortSlotsMatch> {
-  /**
-   * Initializes the pattern matcher within an existing VIATRA Query engine.
-   * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-   * The match set will be incrementally refreshed upon updates.
-   * @param engine the existing VIATRA Query engine in which this matcher will be created.
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * 
-   */
-  public static ChildPortSlotsMatcher on(final ViatraQueryEngine engine) throws ViatraQueryException {
-    // check if matcher already exists
-    ChildPortSlotsMatcher matcher = engine.getExistingMatcher(querySpecification());
-    if (matcher == null) {
-        matcher = (ChildPortSlotsMatcher)engine.getMatcher(querySpecification());
-    }
-    return matcher;
-  }
-  
-  /**
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * @return an initialized matcher
-   * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
-   * 
-   */
-  public static ChildPortSlotsMatcher create() throws ViatraQueryException {
-    return new ChildPortSlotsMatcher();
-  }
-  
-  private final static int POSITION_CHILD = 0;
-  
-  private final static int POSITION_SLOT = 1;
-  
-  private final static int POSITION_NAME = 2;
-  
-  private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(ChildPortSlotsMatcher.class);
-  
-  /**
-   * Initializes the pattern matcher within an existing VIATRA Query engine.
-   * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-   * The match set will be incrementally refreshed upon updates.
-   * @param engine the existing VIATRA Query engine in which this matcher will be created.
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * 
-   */
-  private ChildPortSlotsMatcher() throws ViatraQueryException {
-    super(querySpecification());
-  }
-  
-  /**
-   * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pSlot the fixed value of pattern parameter slot, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return matches represented as a ChildPortSlotsMatch object.
-   * 
-   */
-  public Collection<ChildPortSlotsMatch> getAllMatches(final InstanceSpecification pChild, final Slot pSlot, final String pName) {
-    return rawGetAllMatches(new Object[]{pChild, pSlot, pName});
-  }
-  
-  /**
-   * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-   * Neither determinism nor randomness of selection is guaranteed.
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pSlot the fixed value of pattern parameter slot, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return a match represented as a ChildPortSlotsMatch object, or null if no match is found.
-   * 
-   */
-  public ChildPortSlotsMatch getOneArbitraryMatch(final InstanceSpecification pChild, final Slot pSlot, final String pName) {
-    return rawGetOneArbitraryMatch(new Object[]{pChild, pSlot, pName});
-  }
-  
-  /**
-   * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
-   * under any possible substitution of the unspecified parameters (if any).
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pSlot the fixed value of pattern parameter slot, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return true if the input is a valid (partial) match of the pattern.
-   * 
-   */
-  public boolean hasMatch(final InstanceSpecification pChild, final Slot pSlot, final String pName) {
-    return rawHasMatch(new Object[]{pChild, pSlot, pName});
-  }
-  
-  /**
-   * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pSlot the fixed value of pattern parameter slot, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return the number of pattern matches found.
-   * 
-   */
-  public int countMatches(final InstanceSpecification pChild, final Slot pSlot, final String pName) {
-    return rawCountMatches(new Object[]{pChild, pSlot, pName});
-  }
-  
-  /**
-   * Executes the given processor on each match of the pattern that conforms to the given fixed values of some parameters.
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pSlot the fixed value of pattern parameter slot, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @param processor the action that will process each pattern match.
-   * 
-   */
-  public void forEachMatch(final InstanceSpecification pChild, final Slot pSlot, final String pName, final IMatchProcessor<? super ChildPortSlotsMatch> processor) {
-    rawForEachMatch(new Object[]{pChild, pSlot, pName}, processor);
-  }
-  
-  /**
-   * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-   * Neither determinism nor randomness of selection is guaranteed.
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pSlot the fixed value of pattern parameter slot, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @param processor the action that will process the selected match.
-   * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
-   * 
-   */
-  public boolean forOneArbitraryMatch(final InstanceSpecification pChild, final Slot pSlot, final String pName, final IMatchProcessor<? super ChildPortSlotsMatch> processor) {
-    return rawForOneArbitraryMatch(new Object[]{pChild, pSlot, pName}, processor);
-  }
-  
-  /**
-   * Returns a new (partial) match.
-   * This can be used e.g. to call the matcher with a partial match.
-   * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pSlot the fixed value of pattern parameter slot, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return the (partial) match object.
-   * 
-   */
-  public ChildPortSlotsMatch newMatch(final InstanceSpecification pChild, final Slot pSlot, final String pName) {
-    return ChildPortSlotsMatch.newMatch(pChild, pSlot, pName);
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for child.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  protected Set<InstanceSpecification> rawAccumulateAllValuesOfchild(final Object[] parameters) {
-    Set<InstanceSpecification> results = new HashSet<InstanceSpecification>();
-    rawAccumulateAllValues(POSITION_CHILD, parameters, results);
-    return results;
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for child.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<InstanceSpecification> getAllValuesOfchild() {
-    return rawAccumulateAllValuesOfchild(emptyArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for child.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<InstanceSpecification> getAllValuesOfchild(final ChildPortSlotsMatch partialMatch) {
-    return rawAccumulateAllValuesOfchild(partialMatch.toArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for child.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<InstanceSpecification> getAllValuesOfchild(final Slot pSlot, final String pName) {
-    return rawAccumulateAllValuesOfchild(new Object[]{
-    null, 
-    pSlot, 
-    pName
-    });
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for slot.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  protected Set<Slot> rawAccumulateAllValuesOfslot(final Object[] parameters) {
-    Set<Slot> results = new HashSet<Slot>();
-    rawAccumulateAllValues(POSITION_SLOT, parameters, results);
-    return results;
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for slot.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<Slot> getAllValuesOfslot() {
-    return rawAccumulateAllValuesOfslot(emptyArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for slot.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<Slot> getAllValuesOfslot(final ChildPortSlotsMatch partialMatch) {
-    return rawAccumulateAllValuesOfslot(partialMatch.toArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for slot.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<Slot> getAllValuesOfslot(final InstanceSpecification pChild, final String pName) {
-    return rawAccumulateAllValuesOfslot(new Object[]{
-    pChild, 
-    null, 
-    pName
-    });
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for name.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  protected Set<String> rawAccumulateAllValuesOfname(final Object[] parameters) {
-    Set<String> results = new HashSet<String>();
-    rawAccumulateAllValues(POSITION_NAME, parameters, results);
-    return results;
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for name.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<String> getAllValuesOfname() {
-    return rawAccumulateAllValuesOfname(emptyArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for name.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<String> getAllValuesOfname(final ChildPortSlotsMatch partialMatch) {
-    return rawAccumulateAllValuesOfname(partialMatch.toArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for name.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<String> getAllValuesOfname(final InstanceSpecification pChild, final Slot pSlot) {
-    return rawAccumulateAllValuesOfname(new Object[]{
-    pChild, 
-    pSlot, 
-    null
-    });
-  }
-  
-  @Override
-  protected ChildPortSlotsMatch tupleToMatch(final Tuple t) {
-    try {
-        return ChildPortSlotsMatch.newMatch((InstanceSpecification) t.get(POSITION_CHILD), (Slot) t.get(POSITION_SLOT), (String) t.get(POSITION_NAME));
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in tuple not properly typed!",e);
-        return null;
-    }
-  }
-  
-  @Override
-  protected ChildPortSlotsMatch arrayToMatch(final Object[] match) {
-    try {
-        return ChildPortSlotsMatch.newMatch((InstanceSpecification) match[POSITION_CHILD], (Slot) match[POSITION_SLOT], (String) match[POSITION_NAME]);
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in array not properly typed!",e);
-        return null;
-    }
-  }
-  
-  @Override
-  protected ChildPortSlotsMatch arrayToMatchMutable(final Object[] match) {
-    try {
-        return ChildPortSlotsMatch.newMutableMatch((InstanceSpecification) match[POSITION_CHILD], (Slot) match[POSITION_SLOT], (String) match[POSITION_NAME]);
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in array not properly typed!",e);
-        return null;
-    }
-  }
-  
-  /**
-   * @return the singleton instance of the query specification of this pattern
-   * @throws ViatraQueryException if the pattern definition could not be loaded
-   * 
-   */
-  public static IQuerySpecification<ChildPortSlotsMatcher> querySpecification() throws ViatraQueryException {
-    return ChildPortSlotsQuerySpecification.instance();
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPortSlotsOperationItemMatch.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPortSlotsOperationItemMatch.java
deleted file mode 100644
index 151e0f111025145a8dae9b94877854c88103240e..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPortSlotsOperationItemMatch.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import org.eclipse.uml2.uml.Operation;
-import org.eclipse.viatra.query.runtime.api.IPatternMatch;
-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.polarsys.chess.instance.view.util.ChildPortSlotsOperationItemQuerySpecification;
-
-/**
- * Pattern-specific match representation of the org.polarsys.chess.instance.view.childPortSlotsOperationItem pattern,
- * to be used in conjunction with {@link ChildPortSlotsOperationItemMatcher}.
- * 
- * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
- * Each instance is a (possibly partial) substitution of pattern parameters,
- * usable to represent a match of the pattern in the result of a query,
- * or to specify the bound (fixed) input parameters when issuing a query.
- * 
- * @see ChildPortSlotsOperationItemMatcher
- *  @see ChildPortSlotsOperationItemProcessor
- * 
- */
-@SuppressWarnings("all")
-public abstract class ChildPortSlotsOperationItemMatch extends BasePatternMatch {
-  private Operation fOperation;
-  
-  private String fNameC;
-  
-  private static List<String> parameterNames = makeImmutableList("operation", "nameC");
-  
-  private ChildPortSlotsOperationItemMatch(final Operation pOperation, final String pNameC) {
-    this.fOperation = pOperation;
-    this.fNameC = pNameC;
-  }
-  
-  @Override
-  public Object get(final String parameterName) {
-    if ("operation".equals(parameterName)) return this.fOperation;
-    if ("nameC".equals(parameterName)) return this.fNameC;
-    return null;
-  }
-  
-  public Operation getOperation() {
-    return this.fOperation;
-  }
-  
-  public String getNameC() {
-    return this.fNameC;
-  }
-  
-  @Override
-  public boolean set(final String parameterName, final Object newValue) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    if ("operation".equals(parameterName) ) {
-        this.fOperation = (Operation) newValue;
-        return true;
-    }
-    if ("nameC".equals(parameterName) ) {
-        this.fNameC = (String) newValue;
-        return true;
-    }
-    return false;
-  }
-  
-  public void setOperation(final Operation pOperation) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    this.fOperation = pOperation;
-  }
-  
-  public void setNameC(final String pNameC) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    this.fNameC = pNameC;
-  }
-  
-  @Override
-  public String patternName() {
-    return "org.polarsys.chess.instance.view.childPortSlotsOperationItem";
-  }
-  
-  @Override
-  public List<String> parameterNames() {
-    return ChildPortSlotsOperationItemMatch.parameterNames;
-  }
-  
-  @Override
-  public Object[] toArray() {
-    return new Object[]{fOperation, fNameC};
-  }
-  
-  @Override
-  public ChildPortSlotsOperationItemMatch toImmutable() {
-    return isMutable() ? newMatch(fOperation, fNameC) : this;
-  }
-  
-  @Override
-  public String prettyPrint() {
-    StringBuilder result = new StringBuilder();
-    result.append("\"operation\"=" + prettyPrintValue(fOperation) + ", ");
-    result.append("\"nameC\"=" + prettyPrintValue(fNameC));
-    return result.toString();
-  }
-  
-  @Override
-  public int hashCode() {
-    return Objects.hash(fOperation, fNameC);
-  }
-  
-  @Override
-  public boolean equals(final Object obj) {
-    if (this == obj)
-        return true;
-    if (obj == null) {
-        return false;
-    }
-    if ((obj instanceof ChildPortSlotsOperationItemMatch)) {
-        ChildPortSlotsOperationItemMatch other = (ChildPortSlotsOperationItemMatch) obj;
-        return Objects.equals(fOperation, other.fOperation) && Objects.equals(fNameC, other.fNameC);
-    } else {
-        // this should be infrequent
-        if (!(obj instanceof IPatternMatch)) {
-            return false;
-        }
-        IPatternMatch otherSig  = (IPatternMatch) obj;
-        return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
-    }
-  }
-  
-  @Override
-  public ChildPortSlotsOperationItemQuerySpecification specification() {
-    try {
-        return ChildPortSlotsOperationItemQuerySpecification.instance();
-    } catch (ViatraQueryException ex) {
-         // This cannot happen, as the match object can only be instantiated if the query specification exists
-         throw new IllegalStateException (ex);
-    }
-  }
-  
-  /**
-   * Returns an empty, mutable match.
-   * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-   * 
-   * @return the empty match.
-   * 
-   */
-  public static ChildPortSlotsOperationItemMatch newEmptyMatch() {
-    return new Mutable(null, null);
-  }
-  
-  /**
-   * Returns a mutable (partial) match.
-   * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-   * 
-   * @param pOperation the fixed value of pattern parameter operation, or null if not bound.
-   * @param pNameC the fixed value of pattern parameter nameC, or null if not bound.
-   * @return the new, mutable (partial) match object.
-   * 
-   */
-  public static ChildPortSlotsOperationItemMatch newMutableMatch(final Operation pOperation, final String pNameC) {
-    return new Mutable(pOperation, pNameC);
-  }
-  
-  /**
-   * Returns a new (partial) match.
-   * This can be used e.g. to call the matcher with a partial match.
-   * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-   * @param pOperation the fixed value of pattern parameter operation, or null if not bound.
-   * @param pNameC the fixed value of pattern parameter nameC, or null if not bound.
-   * @return the (partial) match object.
-   * 
-   */
-  public static ChildPortSlotsOperationItemMatch newMatch(final Operation pOperation, final String pNameC) {
-    return new Immutable(pOperation, pNameC);
-  }
-  
-  private static final class Mutable extends ChildPortSlotsOperationItemMatch {
-    Mutable(final Operation pOperation, final String pNameC) {
-      super(pOperation, pNameC);
-    }
-    
-    @Override
-    public boolean isMutable() {
-      return true;
-    }
-  }
-  
-  private static final class Immutable extends ChildPortSlotsOperationItemMatch {
-    Immutable(final Operation pOperation, final String pNameC) {
-      super(pOperation, pNameC);
-    }
-    
-    @Override
-    public boolean isMutable() {
-      return false;
-    }
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPortSlotsOperationItemMatcher.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPortSlotsOperationItemMatcher.java
deleted file mode 100644
index 4d78f5725cbcc18b48eb9bf8d9cfa08d36087ad2..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPortSlotsOperationItemMatcher.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import org.apache.log4j.Logger;
-import org.eclipse.uml2.uml.Operation;
-import org.eclipse.viatra.query.runtime.api.IMatchProcessor;
-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import org.polarsys.chess.instance.view.ChildPortSlotsOperationItemMatch;
-import org.polarsys.chess.instance.view.util.ChildPortSlotsOperationItemQuerySpecification;
-
-/**
- * Generated pattern matcher API of the org.polarsys.chess.instance.view.childPortSlotsOperationItem pattern,
- * providing pattern-specific query methods.
- * 
- * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
- * e.g. in conjunction with {@link ViatraQueryEngine#on(Notifier)}.
- * 
- * <p>Matches of the pattern will be represented as {@link ChildPortSlotsOperationItemMatch}.
- * 
- * <p>Original source:
- * <code><pre>
- * {@literal @}Item(item = operation, hierarchy = "child", label = "$nameC$ (Operation)")
- * pattern childPortSlotsOperationItem(operation, nameC) {
- *     find childPortSlotsOperation(_, operation, nameC);
- * }
- * </pre></code>
- * 
- * @see ChildPortSlotsOperationItemMatch
- *  @see ChildPortSlotsOperationItemProcessor
- * @see ChildPortSlotsOperationItemQuerySpecification
- * 
- */
-@SuppressWarnings("all")
-public class ChildPortSlotsOperationItemMatcher extends BaseMatcher<ChildPortSlotsOperationItemMatch> {
-  /**
-   * Initializes the pattern matcher within an existing VIATRA Query engine.
-   * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-   * The match set will be incrementally refreshed upon updates.
-   * @param engine the existing VIATRA Query engine in which this matcher will be created.
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * 
-   */
-  public static ChildPortSlotsOperationItemMatcher on(final ViatraQueryEngine engine) throws ViatraQueryException {
-    // check if matcher already exists
-    ChildPortSlotsOperationItemMatcher matcher = engine.getExistingMatcher(querySpecification());
-    if (matcher == null) {
-        matcher = (ChildPortSlotsOperationItemMatcher)engine.getMatcher(querySpecification());
-    }
-    return matcher;
-  }
-  
-  /**
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * @return an initialized matcher
-   * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
-   * 
-   */
-  public static ChildPortSlotsOperationItemMatcher create() throws ViatraQueryException {
-    return new ChildPortSlotsOperationItemMatcher();
-  }
-  
-  private final static int POSITION_OPERATION = 0;
-  
-  private final static int POSITION_NAMEC = 1;
-  
-  private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(ChildPortSlotsOperationItemMatcher.class);
-  
-  /**
-   * Initializes the pattern matcher within an existing VIATRA Query engine.
-   * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-   * The match set will be incrementally refreshed upon updates.
-   * @param engine the existing VIATRA Query engine in which this matcher will be created.
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * 
-   */
-  private ChildPortSlotsOperationItemMatcher() throws ViatraQueryException {
-    super(querySpecification());
-  }
-  
-  /**
-   * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
-   * @param pOperation the fixed value of pattern parameter operation, or null if not bound.
-   * @param pNameC the fixed value of pattern parameter nameC, or null if not bound.
-   * @return matches represented as a ChildPortSlotsOperationItemMatch object.
-   * 
-   */
-  public Collection<ChildPortSlotsOperationItemMatch> getAllMatches(final Operation pOperation, final String pNameC) {
-    return rawGetAllMatches(new Object[]{pOperation, pNameC});
-  }
-  
-  /**
-   * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-   * Neither determinism nor randomness of selection is guaranteed.
-   * @param pOperation the fixed value of pattern parameter operation, or null if not bound.
-   * @param pNameC the fixed value of pattern parameter nameC, or null if not bound.
-   * @return a match represented as a ChildPortSlotsOperationItemMatch object, or null if no match is found.
-   * 
-   */
-  public ChildPortSlotsOperationItemMatch getOneArbitraryMatch(final Operation pOperation, final String pNameC) {
-    return rawGetOneArbitraryMatch(new Object[]{pOperation, pNameC});
-  }
-  
-  /**
-   * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
-   * under any possible substitution of the unspecified parameters (if any).
-   * @param pOperation the fixed value of pattern parameter operation, or null if not bound.
-   * @param pNameC the fixed value of pattern parameter nameC, or null if not bound.
-   * @return true if the input is a valid (partial) match of the pattern.
-   * 
-   */
-  public boolean hasMatch(final Operation pOperation, final String pNameC) {
-    return rawHasMatch(new Object[]{pOperation, pNameC});
-  }
-  
-  /**
-   * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
-   * @param pOperation the fixed value of pattern parameter operation, or null if not bound.
-   * @param pNameC the fixed value of pattern parameter nameC, or null if not bound.
-   * @return the number of pattern matches found.
-   * 
-   */
-  public int countMatches(final Operation pOperation, final String pNameC) {
-    return rawCountMatches(new Object[]{pOperation, pNameC});
-  }
-  
-  /**
-   * Executes the given processor on each match of the pattern that conforms to the given fixed values of some parameters.
-   * @param pOperation the fixed value of pattern parameter operation, or null if not bound.
-   * @param pNameC the fixed value of pattern parameter nameC, or null if not bound.
-   * @param processor the action that will process each pattern match.
-   * 
-   */
-  public void forEachMatch(final Operation pOperation, final String pNameC, final IMatchProcessor<? super ChildPortSlotsOperationItemMatch> processor) {
-    rawForEachMatch(new Object[]{pOperation, pNameC}, processor);
-  }
-  
-  /**
-   * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-   * Neither determinism nor randomness of selection is guaranteed.
-   * @param pOperation the fixed value of pattern parameter operation, or null if not bound.
-   * @param pNameC the fixed value of pattern parameter nameC, or null if not bound.
-   * @param processor the action that will process the selected match.
-   * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
-   * 
-   */
-  public boolean forOneArbitraryMatch(final Operation pOperation, final String pNameC, final IMatchProcessor<? super ChildPortSlotsOperationItemMatch> processor) {
-    return rawForOneArbitraryMatch(new Object[]{pOperation, pNameC}, processor);
-  }
-  
-  /**
-   * Returns a new (partial) match.
-   * This can be used e.g. to call the matcher with a partial match.
-   * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-   * @param pOperation the fixed value of pattern parameter operation, or null if not bound.
-   * @param pNameC the fixed value of pattern parameter nameC, or null if not bound.
-   * @return the (partial) match object.
-   * 
-   */
-  public ChildPortSlotsOperationItemMatch newMatch(final Operation pOperation, final String pNameC) {
-    return ChildPortSlotsOperationItemMatch.newMatch(pOperation, pNameC);
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for operation.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  protected Set<Operation> rawAccumulateAllValuesOfoperation(final Object[] parameters) {
-    Set<Operation> results = new HashSet<Operation>();
-    rawAccumulateAllValues(POSITION_OPERATION, parameters, results);
-    return results;
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for operation.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<Operation> getAllValuesOfoperation() {
-    return rawAccumulateAllValuesOfoperation(emptyArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for operation.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<Operation> getAllValuesOfoperation(final ChildPortSlotsOperationItemMatch partialMatch) {
-    return rawAccumulateAllValuesOfoperation(partialMatch.toArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for operation.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<Operation> getAllValuesOfoperation(final String pNameC) {
-    return rawAccumulateAllValuesOfoperation(new Object[]{
-    null, 
-    pNameC
-    });
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for nameC.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  protected Set<String> rawAccumulateAllValuesOfnameC(final Object[] parameters) {
-    Set<String> results = new HashSet<String>();
-    rawAccumulateAllValues(POSITION_NAMEC, parameters, results);
-    return results;
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for nameC.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<String> getAllValuesOfnameC() {
-    return rawAccumulateAllValuesOfnameC(emptyArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for nameC.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<String> getAllValuesOfnameC(final ChildPortSlotsOperationItemMatch partialMatch) {
-    return rawAccumulateAllValuesOfnameC(partialMatch.toArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for nameC.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<String> getAllValuesOfnameC(final Operation pOperation) {
-    return rawAccumulateAllValuesOfnameC(new Object[]{
-    pOperation, 
-    null
-    });
-  }
-  
-  @Override
-  protected ChildPortSlotsOperationItemMatch tupleToMatch(final Tuple t) {
-    try {
-        return ChildPortSlotsOperationItemMatch.newMatch((Operation) t.get(POSITION_OPERATION), (String) t.get(POSITION_NAMEC));
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in tuple not properly typed!",e);
-        return null;
-    }
-  }
-  
-  @Override
-  protected ChildPortSlotsOperationItemMatch arrayToMatch(final Object[] match) {
-    try {
-        return ChildPortSlotsOperationItemMatch.newMatch((Operation) match[POSITION_OPERATION], (String) match[POSITION_NAMEC]);
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in array not properly typed!",e);
-        return null;
-    }
-  }
-  
-  @Override
-  protected ChildPortSlotsOperationItemMatch arrayToMatchMutable(final Object[] match) {
-    try {
-        return ChildPortSlotsOperationItemMatch.newMutableMatch((Operation) match[POSITION_OPERATION], (String) match[POSITION_NAMEC]);
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in array not properly typed!",e);
-        return null;
-    }
-  }
-  
-  /**
-   * @return the singleton instance of the query specification of this pattern
-   * @throws ViatraQueryException if the pattern definition could not be loaded
-   * 
-   */
-  public static IQuerySpecification<ChildPortSlotsOperationItemMatcher> querySpecification() throws ViatraQueryException {
-    return ChildPortSlotsOperationItemQuerySpecification.instance();
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPortSlotsOperationMatch.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPortSlotsOperationMatch.java
deleted file mode 100644
index 11e579d3d716c26cce63d428836cacd908079b81..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPortSlotsOperationMatch.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import org.eclipse.uml2.uml.Operation;
-import org.eclipse.uml2.uml.Slot;
-import org.eclipse.viatra.query.runtime.api.IPatternMatch;
-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.polarsys.chess.instance.view.util.ChildPortSlotsOperationQuerySpecification;
-
-/**
- * Pattern-specific match representation of the org.polarsys.chess.instance.view.childPortSlotsOperation pattern,
- * to be used in conjunction with {@link ChildPortSlotsOperationMatcher}.
- * 
- * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
- * Each instance is a (possibly partial) substitution of pattern parameters,
- * usable to represent a match of the pattern in the result of a query,
- * or to specify the bound (fixed) input parameters when issuing a query.
- * 
- * @see ChildPortSlotsOperationMatcher
- *  @see ChildPortSlotsOperationProcessor
- * 
- */
-@SuppressWarnings("all")
-public abstract class ChildPortSlotsOperationMatch extends BasePatternMatch {
-  private Slot fSlot;
-  
-  private Operation fOperation;
-  
-  private String fNameC;
-  
-  private static List<String> parameterNames = makeImmutableList("slot", "operation", "nameC");
-  
-  private ChildPortSlotsOperationMatch(final Slot pSlot, final Operation pOperation, final String pNameC) {
-    this.fSlot = pSlot;
-    this.fOperation = pOperation;
-    this.fNameC = pNameC;
-  }
-  
-  @Override
-  public Object get(final String parameterName) {
-    if ("slot".equals(parameterName)) return this.fSlot;
-    if ("operation".equals(parameterName)) return this.fOperation;
-    if ("nameC".equals(parameterName)) return this.fNameC;
-    return null;
-  }
-  
-  public Slot getSlot() {
-    return this.fSlot;
-  }
-  
-  public Operation getOperation() {
-    return this.fOperation;
-  }
-  
-  public String getNameC() {
-    return this.fNameC;
-  }
-  
-  @Override
-  public boolean set(final String parameterName, final Object newValue) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    if ("slot".equals(parameterName) ) {
-        this.fSlot = (Slot) newValue;
-        return true;
-    }
-    if ("operation".equals(parameterName) ) {
-        this.fOperation = (Operation) newValue;
-        return true;
-    }
-    if ("nameC".equals(parameterName) ) {
-        this.fNameC = (String) newValue;
-        return true;
-    }
-    return false;
-  }
-  
-  public void setSlot(final Slot pSlot) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    this.fSlot = pSlot;
-  }
-  
-  public void setOperation(final Operation pOperation) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    this.fOperation = pOperation;
-  }
-  
-  public void setNameC(final String pNameC) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    this.fNameC = pNameC;
-  }
-  
-  @Override
-  public String patternName() {
-    return "org.polarsys.chess.instance.view.childPortSlotsOperation";
-  }
-  
-  @Override
-  public List<String> parameterNames() {
-    return ChildPortSlotsOperationMatch.parameterNames;
-  }
-  
-  @Override
-  public Object[] toArray() {
-    return new Object[]{fSlot, fOperation, fNameC};
-  }
-  
-  @Override
-  public ChildPortSlotsOperationMatch toImmutable() {
-    return isMutable() ? newMatch(fSlot, fOperation, fNameC) : this;
-  }
-  
-  @Override
-  public String prettyPrint() {
-    StringBuilder result = new StringBuilder();
-    result.append("\"slot\"=" + prettyPrintValue(fSlot) + ", ");
-    result.append("\"operation\"=" + prettyPrintValue(fOperation) + ", ");
-    result.append("\"nameC\"=" + prettyPrintValue(fNameC));
-    return result.toString();
-  }
-  
-  @Override
-  public int hashCode() {
-    return Objects.hash(fSlot, fOperation, fNameC);
-  }
-  
-  @Override
-  public boolean equals(final Object obj) {
-    if (this == obj)
-        return true;
-    if (obj == null) {
-        return false;
-    }
-    if ((obj instanceof ChildPortSlotsOperationMatch)) {
-        ChildPortSlotsOperationMatch other = (ChildPortSlotsOperationMatch) obj;
-        return Objects.equals(fSlot, other.fSlot) && Objects.equals(fOperation, other.fOperation) && Objects.equals(fNameC, other.fNameC);
-    } else {
-        // this should be infrequent
-        if (!(obj instanceof IPatternMatch)) {
-            return false;
-        }
-        IPatternMatch otherSig  = (IPatternMatch) obj;
-        return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
-    }
-  }
-  
-  @Override
-  public ChildPortSlotsOperationQuerySpecification specification() {
-    try {
-        return ChildPortSlotsOperationQuerySpecification.instance();
-    } catch (ViatraQueryException ex) {
-         // This cannot happen, as the match object can only be instantiated if the query specification exists
-         throw new IllegalStateException (ex);
-    }
-  }
-  
-  /**
-   * Returns an empty, mutable match.
-   * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-   * 
-   * @return the empty match.
-   * 
-   */
-  public static ChildPortSlotsOperationMatch newEmptyMatch() {
-    return new Mutable(null, null, null);
-  }
-  
-  /**
-   * Returns a mutable (partial) match.
-   * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-   * 
-   * @param pSlot the fixed value of pattern parameter slot, or null if not bound.
-   * @param pOperation the fixed value of pattern parameter operation, or null if not bound.
-   * @param pNameC the fixed value of pattern parameter nameC, or null if not bound.
-   * @return the new, mutable (partial) match object.
-   * 
-   */
-  public static ChildPortSlotsOperationMatch newMutableMatch(final Slot pSlot, final Operation pOperation, final String pNameC) {
-    return new Mutable(pSlot, pOperation, pNameC);
-  }
-  
-  /**
-   * Returns a new (partial) match.
-   * This can be used e.g. to call the matcher with a partial match.
-   * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-   * @param pSlot the fixed value of pattern parameter slot, or null if not bound.
-   * @param pOperation the fixed value of pattern parameter operation, or null if not bound.
-   * @param pNameC the fixed value of pattern parameter nameC, or null if not bound.
-   * @return the (partial) match object.
-   * 
-   */
-  public static ChildPortSlotsOperationMatch newMatch(final Slot pSlot, final Operation pOperation, final String pNameC) {
-    return new Immutable(pSlot, pOperation, pNameC);
-  }
-  
-  private static final class Mutable extends ChildPortSlotsOperationMatch {
-    Mutable(final Slot pSlot, final Operation pOperation, final String pNameC) {
-      super(pSlot, pOperation, pNameC);
-    }
-    
-    @Override
-    public boolean isMutable() {
-      return true;
-    }
-  }
-  
-  private static final class Immutable extends ChildPortSlotsOperationMatch {
-    Immutable(final Slot pSlot, final Operation pOperation, final String pNameC) {
-      super(pSlot, pOperation, pNameC);
-    }
-    
-    @Override
-    public boolean isMutable() {
-      return false;
-    }
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPortSlotsOperationMatcher.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPortSlotsOperationMatcher.java
deleted file mode 100644
index 1bf06f1f12c51ebc221009c83ceb8c1e0b929736..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPortSlotsOperationMatcher.java
+++ /dev/null
@@ -1,369 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import org.apache.log4j.Logger;
-import org.eclipse.uml2.uml.Operation;
-import org.eclipse.uml2.uml.Slot;
-import org.eclipse.viatra.query.runtime.api.IMatchProcessor;
-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import org.polarsys.chess.instance.view.ChildPortSlotsOperationMatch;
-import org.polarsys.chess.instance.view.util.ChildPortSlotsOperationQuerySpecification;
-
-/**
- * Generated pattern matcher API of the org.polarsys.chess.instance.view.childPortSlotsOperation pattern,
- * providing pattern-specific query methods.
- * 
- * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
- * e.g. in conjunction with {@link ViatraQueryEngine#on(Notifier)}.
- * 
- * <p>Matches of the pattern will be represented as {@link ChildPortSlotsOperationMatch}.
- * 
- * <p>Original source:
- * <code><pre>
- * {@literal @}ContainsItem(container = slot, item = operation)
- * pattern childPortSlotsOperation(slot, operation, nameC) {
- * 	find childPortSlots(child, slot, _);
- * 	Slot.definingFeature(slot, port);
- * 	ClientServerPort.base_Port(csp, port);
- * 	find clientServerPortHelperWithInterface (csp,interface);
- * 	Interface.ownedOperation(interface, operationI);
- * 	
- * 	//retrieve the same operation owned by the referred component
- * 
- * 	InstanceSpecification.classifier(child, component);
- * 	
- *     Component.ownedOperation(component, operation);
- *     Operation.name(operationI, nameI);
- *     Operation.name(operation, nameC);
- *     check(nameI.compareTo(nameC)==0);
- * }
- * </pre></code>
- * 
- * @see ChildPortSlotsOperationMatch
- *  @see ChildPortSlotsOperationProcessor
- * @see ChildPortSlotsOperationQuerySpecification
- * 
- */
-@SuppressWarnings("all")
-public class ChildPortSlotsOperationMatcher extends BaseMatcher<ChildPortSlotsOperationMatch> {
-  /**
-   * Initializes the pattern matcher within an existing VIATRA Query engine.
-   * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-   * The match set will be incrementally refreshed upon updates.
-   * @param engine the existing VIATRA Query engine in which this matcher will be created.
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * 
-   */
-  public static ChildPortSlotsOperationMatcher on(final ViatraQueryEngine engine) throws ViatraQueryException {
-    // check if matcher already exists
-    ChildPortSlotsOperationMatcher matcher = engine.getExistingMatcher(querySpecification());
-    if (matcher == null) {
-        matcher = (ChildPortSlotsOperationMatcher)engine.getMatcher(querySpecification());
-    }
-    return matcher;
-  }
-  
-  /**
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * @return an initialized matcher
-   * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
-   * 
-   */
-  public static ChildPortSlotsOperationMatcher create() throws ViatraQueryException {
-    return new ChildPortSlotsOperationMatcher();
-  }
-  
-  private final static int POSITION_SLOT = 0;
-  
-  private final static int POSITION_OPERATION = 1;
-  
-  private final static int POSITION_NAMEC = 2;
-  
-  private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(ChildPortSlotsOperationMatcher.class);
-  
-  /**
-   * Initializes the pattern matcher within an existing VIATRA Query engine.
-   * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-   * The match set will be incrementally refreshed upon updates.
-   * @param engine the existing VIATRA Query engine in which this matcher will be created.
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * 
-   */
-  private ChildPortSlotsOperationMatcher() throws ViatraQueryException {
-    super(querySpecification());
-  }
-  
-  /**
-   * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
-   * @param pSlot the fixed value of pattern parameter slot, or null if not bound.
-   * @param pOperation the fixed value of pattern parameter operation, or null if not bound.
-   * @param pNameC the fixed value of pattern parameter nameC, or null if not bound.
-   * @return matches represented as a ChildPortSlotsOperationMatch object.
-   * 
-   */
-  public Collection<ChildPortSlotsOperationMatch> getAllMatches(final Slot pSlot, final Operation pOperation, final String pNameC) {
-    return rawGetAllMatches(new Object[]{pSlot, pOperation, pNameC});
-  }
-  
-  /**
-   * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-   * Neither determinism nor randomness of selection is guaranteed.
-   * @param pSlot the fixed value of pattern parameter slot, or null if not bound.
-   * @param pOperation the fixed value of pattern parameter operation, or null if not bound.
-   * @param pNameC the fixed value of pattern parameter nameC, or null if not bound.
-   * @return a match represented as a ChildPortSlotsOperationMatch object, or null if no match is found.
-   * 
-   */
-  public ChildPortSlotsOperationMatch getOneArbitraryMatch(final Slot pSlot, final Operation pOperation, final String pNameC) {
-    return rawGetOneArbitraryMatch(new Object[]{pSlot, pOperation, pNameC});
-  }
-  
-  /**
-   * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
-   * under any possible substitution of the unspecified parameters (if any).
-   * @param pSlot the fixed value of pattern parameter slot, or null if not bound.
-   * @param pOperation the fixed value of pattern parameter operation, or null if not bound.
-   * @param pNameC the fixed value of pattern parameter nameC, or null if not bound.
-   * @return true if the input is a valid (partial) match of the pattern.
-   * 
-   */
-  public boolean hasMatch(final Slot pSlot, final Operation pOperation, final String pNameC) {
-    return rawHasMatch(new Object[]{pSlot, pOperation, pNameC});
-  }
-  
-  /**
-   * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
-   * @param pSlot the fixed value of pattern parameter slot, or null if not bound.
-   * @param pOperation the fixed value of pattern parameter operation, or null if not bound.
-   * @param pNameC the fixed value of pattern parameter nameC, or null if not bound.
-   * @return the number of pattern matches found.
-   * 
-   */
-  public int countMatches(final Slot pSlot, final Operation pOperation, final String pNameC) {
-    return rawCountMatches(new Object[]{pSlot, pOperation, pNameC});
-  }
-  
-  /**
-   * Executes the given processor on each match of the pattern that conforms to the given fixed values of some parameters.
-   * @param pSlot the fixed value of pattern parameter slot, or null if not bound.
-   * @param pOperation the fixed value of pattern parameter operation, or null if not bound.
-   * @param pNameC the fixed value of pattern parameter nameC, or null if not bound.
-   * @param processor the action that will process each pattern match.
-   * 
-   */
-  public void forEachMatch(final Slot pSlot, final Operation pOperation, final String pNameC, final IMatchProcessor<? super ChildPortSlotsOperationMatch> processor) {
-    rawForEachMatch(new Object[]{pSlot, pOperation, pNameC}, processor);
-  }
-  
-  /**
-   * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-   * Neither determinism nor randomness of selection is guaranteed.
-   * @param pSlot the fixed value of pattern parameter slot, or null if not bound.
-   * @param pOperation the fixed value of pattern parameter operation, or null if not bound.
-   * @param pNameC the fixed value of pattern parameter nameC, or null if not bound.
-   * @param processor the action that will process the selected match.
-   * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
-   * 
-   */
-  public boolean forOneArbitraryMatch(final Slot pSlot, final Operation pOperation, final String pNameC, final IMatchProcessor<? super ChildPortSlotsOperationMatch> processor) {
-    return rawForOneArbitraryMatch(new Object[]{pSlot, pOperation, pNameC}, processor);
-  }
-  
-  /**
-   * Returns a new (partial) match.
-   * This can be used e.g. to call the matcher with a partial match.
-   * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-   * @param pSlot the fixed value of pattern parameter slot, or null if not bound.
-   * @param pOperation the fixed value of pattern parameter operation, or null if not bound.
-   * @param pNameC the fixed value of pattern parameter nameC, or null if not bound.
-   * @return the (partial) match object.
-   * 
-   */
-  public ChildPortSlotsOperationMatch newMatch(final Slot pSlot, final Operation pOperation, final String pNameC) {
-    return ChildPortSlotsOperationMatch.newMatch(pSlot, pOperation, pNameC);
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for slot.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  protected Set<Slot> rawAccumulateAllValuesOfslot(final Object[] parameters) {
-    Set<Slot> results = new HashSet<Slot>();
-    rawAccumulateAllValues(POSITION_SLOT, parameters, results);
-    return results;
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for slot.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<Slot> getAllValuesOfslot() {
-    return rawAccumulateAllValuesOfslot(emptyArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for slot.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<Slot> getAllValuesOfslot(final ChildPortSlotsOperationMatch partialMatch) {
-    return rawAccumulateAllValuesOfslot(partialMatch.toArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for slot.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<Slot> getAllValuesOfslot(final Operation pOperation, final String pNameC) {
-    return rawAccumulateAllValuesOfslot(new Object[]{
-    null, 
-    pOperation, 
-    pNameC
-    });
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for operation.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  protected Set<Operation> rawAccumulateAllValuesOfoperation(final Object[] parameters) {
-    Set<Operation> results = new HashSet<Operation>();
-    rawAccumulateAllValues(POSITION_OPERATION, parameters, results);
-    return results;
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for operation.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<Operation> getAllValuesOfoperation() {
-    return rawAccumulateAllValuesOfoperation(emptyArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for operation.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<Operation> getAllValuesOfoperation(final ChildPortSlotsOperationMatch partialMatch) {
-    return rawAccumulateAllValuesOfoperation(partialMatch.toArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for operation.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<Operation> getAllValuesOfoperation(final Slot pSlot, final String pNameC) {
-    return rawAccumulateAllValuesOfoperation(new Object[]{
-    pSlot, 
-    null, 
-    pNameC
-    });
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for nameC.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  protected Set<String> rawAccumulateAllValuesOfnameC(final Object[] parameters) {
-    Set<String> results = new HashSet<String>();
-    rawAccumulateAllValues(POSITION_NAMEC, parameters, results);
-    return results;
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for nameC.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<String> getAllValuesOfnameC() {
-    return rawAccumulateAllValuesOfnameC(emptyArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for nameC.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<String> getAllValuesOfnameC(final ChildPortSlotsOperationMatch partialMatch) {
-    return rawAccumulateAllValuesOfnameC(partialMatch.toArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for nameC.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<String> getAllValuesOfnameC(final Slot pSlot, final Operation pOperation) {
-    return rawAccumulateAllValuesOfnameC(new Object[]{
-    pSlot, 
-    pOperation, 
-    null
-    });
-  }
-  
-  @Override
-  protected ChildPortSlotsOperationMatch tupleToMatch(final Tuple t) {
-    try {
-        return ChildPortSlotsOperationMatch.newMatch((Slot) t.get(POSITION_SLOT), (Operation) t.get(POSITION_OPERATION), (String) t.get(POSITION_NAMEC));
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in tuple not properly typed!",e);
-        return null;
-    }
-  }
-  
-  @Override
-  protected ChildPortSlotsOperationMatch arrayToMatch(final Object[] match) {
-    try {
-        return ChildPortSlotsOperationMatch.newMatch((Slot) match[POSITION_SLOT], (Operation) match[POSITION_OPERATION], (String) match[POSITION_NAMEC]);
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in array not properly typed!",e);
-        return null;
-    }
-  }
-  
-  @Override
-  protected ChildPortSlotsOperationMatch arrayToMatchMutable(final Object[] match) {
-    try {
-        return ChildPortSlotsOperationMatch.newMutableMatch((Slot) match[POSITION_SLOT], (Operation) match[POSITION_OPERATION], (String) match[POSITION_NAMEC]);
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in array not properly typed!",e);
-        return null;
-    }
-  }
-  
-  /**
-   * @return the singleton instance of the query specification of this pattern
-   * @throws ViatraQueryException if the pattern definition could not be loaded
-   * 
-   */
-  public static IQuerySpecification<ChildPortSlotsOperationMatcher> querySpecification() throws ViatraQueryException {
-    return ChildPortSlotsOperationQuerySpecification.instance();
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPrivCHRTSpecItemMatch.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPrivCHRTSpecItemMatch.java
deleted file mode 100644
index c3bab2ad7528716e32c3d5198d68b33286c6c4bc..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPrivCHRTSpecItemMatch.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.viatra.query.runtime.api.IPatternMatch;
-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.polarsys.chess.instance.view.util.ChildPrivCHRTSpecItemQuerySpecification;
-
-/**
- * Pattern-specific match representation of the org.polarsys.chess.instance.view.childPrivCHRTSpecItem pattern,
- * to be used in conjunction with {@link ChildPrivCHRTSpecItemMatcher}.
- * 
- * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
- * Each instance is a (possibly partial) substitution of pattern parameters,
- * usable to represent a match of the pattern in the result of a query,
- * or to specify the bound (fixed) input parameters when issuing a query.
- * 
- * @see ChildPrivCHRTSpecItemMatcher
- *  @see ChildPrivCHRTSpecItemProcessor
- * 
- */
-@SuppressWarnings("all")
-public abstract class ChildPrivCHRTSpecItemMatch extends BasePatternMatch {
-  private Comment fChrtspecComment;
-  
-  private static List<String> parameterNames = makeImmutableList("chrtspecComment");
-  
-  private ChildPrivCHRTSpecItemMatch(final Comment pChrtspecComment) {
-    this.fChrtspecComment = pChrtspecComment;
-  }
-  
-  @Override
-  public Object get(final String parameterName) {
-    if ("chrtspecComment".equals(parameterName)) return this.fChrtspecComment;
-    return null;
-  }
-  
-  public Comment getChrtspecComment() {
-    return this.fChrtspecComment;
-  }
-  
-  @Override
-  public boolean set(final String parameterName, final Object newValue) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    if ("chrtspecComment".equals(parameterName) ) {
-        this.fChrtspecComment = (Comment) newValue;
-        return true;
-    }
-    return false;
-  }
-  
-  public void setChrtspecComment(final Comment pChrtspecComment) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    this.fChrtspecComment = pChrtspecComment;
-  }
-  
-  @Override
-  public String patternName() {
-    return "org.polarsys.chess.instance.view.childPrivCHRTSpecItem";
-  }
-  
-  @Override
-  public List<String> parameterNames() {
-    return ChildPrivCHRTSpecItemMatch.parameterNames;
-  }
-  
-  @Override
-  public Object[] toArray() {
-    return new Object[]{fChrtspecComment};
-  }
-  
-  @Override
-  public ChildPrivCHRTSpecItemMatch toImmutable() {
-    return isMutable() ? newMatch(fChrtspecComment) : this;
-  }
-  
-  @Override
-  public String prettyPrint() {
-    StringBuilder result = new StringBuilder();
-    result.append("\"chrtspecComment\"=" + prettyPrintValue(fChrtspecComment));
-    return result.toString();
-  }
-  
-  @Override
-  public int hashCode() {
-    return Objects.hash(fChrtspecComment);
-  }
-  
-  @Override
-  public boolean equals(final Object obj) {
-    if (this == obj)
-        return true;
-    if (obj == null) {
-        return false;
-    }
-    if ((obj instanceof ChildPrivCHRTSpecItemMatch)) {
-        ChildPrivCHRTSpecItemMatch other = (ChildPrivCHRTSpecItemMatch) obj;
-        return Objects.equals(fChrtspecComment, other.fChrtspecComment);
-    } else {
-        // this should be infrequent
-        if (!(obj instanceof IPatternMatch)) {
-            return false;
-        }
-        IPatternMatch otherSig  = (IPatternMatch) obj;
-        return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
-    }
-  }
-  
-  @Override
-  public ChildPrivCHRTSpecItemQuerySpecification specification() {
-    try {
-        return ChildPrivCHRTSpecItemQuerySpecification.instance();
-    } catch (ViatraQueryException ex) {
-         // This cannot happen, as the match object can only be instantiated if the query specification exists
-         throw new IllegalStateException (ex);
-    }
-  }
-  
-  /**
-   * Returns an empty, mutable match.
-   * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-   * 
-   * @return the empty match.
-   * 
-   */
-  public static ChildPrivCHRTSpecItemMatch newEmptyMatch() {
-    return new Mutable(null);
-  }
-  
-  /**
-   * Returns a mutable (partial) match.
-   * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-   * 
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @return the new, mutable (partial) match object.
-   * 
-   */
-  public static ChildPrivCHRTSpecItemMatch newMutableMatch(final Comment pChrtspecComment) {
-    return new Mutable(pChrtspecComment);
-  }
-  
-  /**
-   * Returns a new (partial) match.
-   * This can be used e.g. to call the matcher with a partial match.
-   * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @return the (partial) match object.
-   * 
-   */
-  public static ChildPrivCHRTSpecItemMatch newMatch(final Comment pChrtspecComment) {
-    return new Immutable(pChrtspecComment);
-  }
-  
-  private static final class Mutable extends ChildPrivCHRTSpecItemMatch {
-    Mutable(final Comment pChrtspecComment) {
-      super(pChrtspecComment);
-    }
-    
-    @Override
-    public boolean isMutable() {
-      return true;
-    }
-  }
-  
-  private static final class Immutable extends ChildPrivCHRTSpecItemMatch {
-    Immutable(final Comment pChrtspecComment) {
-      super(pChrtspecComment);
-    }
-    
-    @Override
-    public boolean isMutable() {
-      return false;
-    }
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPrivCHRTSpecItemMatcher.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPrivCHRTSpecItemMatcher.java
deleted file mode 100644
index d0557b95c75ac7b508c257a5707b70d94fb65c9a..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPrivCHRTSpecItemMatcher.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import org.apache.log4j.Logger;
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.viatra.query.runtime.api.IMatchProcessor;
-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import org.polarsys.chess.instance.view.ChildPrivCHRTSpecItemMatch;
-import org.polarsys.chess.instance.view.util.ChildPrivCHRTSpecItemQuerySpecification;
-
-/**
- * Generated pattern matcher API of the org.polarsys.chess.instance.view.childPrivCHRTSpecItem pattern,
- * providing pattern-specific query methods.
- * 
- * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
- * e.g. in conjunction with {@link ViatraQueryEngine#on(Notifier)}.
- * 
- * <p>Matches of the pattern will be represented as {@link ChildPrivCHRTSpecItemMatch}.
- * 
- * <p>Original source:
- * <code><pre>
- * {@literal @}Item(item = chrtspecComment, hierarchy = "child", label = "CHRtSpecification")
- * pattern childPrivCHRTSpecItem(chrtspecComment) {
- * 	//find childPortSlotsOperation(slot, operation, _);
- * 	find childPrivCHRTSpec(chrtspecComment, _);
- * }
- * </pre></code>
- * 
- * @see ChildPrivCHRTSpecItemMatch
- *  @see ChildPrivCHRTSpecItemProcessor
- * @see ChildPrivCHRTSpecItemQuerySpecification
- * 
- */
-@SuppressWarnings("all")
-public class ChildPrivCHRTSpecItemMatcher extends BaseMatcher<ChildPrivCHRTSpecItemMatch> {
-  /**
-   * Initializes the pattern matcher within an existing VIATRA Query engine.
-   * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-   * The match set will be incrementally refreshed upon updates.
-   * @param engine the existing VIATRA Query engine in which this matcher will be created.
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * 
-   */
-  public static ChildPrivCHRTSpecItemMatcher on(final ViatraQueryEngine engine) throws ViatraQueryException {
-    // check if matcher already exists
-    ChildPrivCHRTSpecItemMatcher matcher = engine.getExistingMatcher(querySpecification());
-    if (matcher == null) {
-        matcher = (ChildPrivCHRTSpecItemMatcher)engine.getMatcher(querySpecification());
-    }
-    return matcher;
-  }
-  
-  /**
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * @return an initialized matcher
-   * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
-   * 
-   */
-  public static ChildPrivCHRTSpecItemMatcher create() throws ViatraQueryException {
-    return new ChildPrivCHRTSpecItemMatcher();
-  }
-  
-  private final static int POSITION_CHRTSPECCOMMENT = 0;
-  
-  private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(ChildPrivCHRTSpecItemMatcher.class);
-  
-  /**
-   * Initializes the pattern matcher within an existing VIATRA Query engine.
-   * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-   * The match set will be incrementally refreshed upon updates.
-   * @param engine the existing VIATRA Query engine in which this matcher will be created.
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * 
-   */
-  private ChildPrivCHRTSpecItemMatcher() throws ViatraQueryException {
-    super(querySpecification());
-  }
-  
-  /**
-   * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @return matches represented as a ChildPrivCHRTSpecItemMatch object.
-   * 
-   */
-  public Collection<ChildPrivCHRTSpecItemMatch> getAllMatches(final Comment pChrtspecComment) {
-    return rawGetAllMatches(new Object[]{pChrtspecComment});
-  }
-  
-  /**
-   * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-   * Neither determinism nor randomness of selection is guaranteed.
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @return a match represented as a ChildPrivCHRTSpecItemMatch object, or null if no match is found.
-   * 
-   */
-  public ChildPrivCHRTSpecItemMatch getOneArbitraryMatch(final Comment pChrtspecComment) {
-    return rawGetOneArbitraryMatch(new Object[]{pChrtspecComment});
-  }
-  
-  /**
-   * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
-   * under any possible substitution of the unspecified parameters (if any).
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @return true if the input is a valid (partial) match of the pattern.
-   * 
-   */
-  public boolean hasMatch(final Comment pChrtspecComment) {
-    return rawHasMatch(new Object[]{pChrtspecComment});
-  }
-  
-  /**
-   * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @return the number of pattern matches found.
-   * 
-   */
-  public int countMatches(final Comment pChrtspecComment) {
-    return rawCountMatches(new Object[]{pChrtspecComment});
-  }
-  
-  /**
-   * Executes the given processor on each match of the pattern that conforms to the given fixed values of some parameters.
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @param processor the action that will process each pattern match.
-   * 
-   */
-  public void forEachMatch(final Comment pChrtspecComment, final IMatchProcessor<? super ChildPrivCHRTSpecItemMatch> processor) {
-    rawForEachMatch(new Object[]{pChrtspecComment}, processor);
-  }
-  
-  /**
-   * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-   * Neither determinism nor randomness of selection is guaranteed.
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @param processor the action that will process the selected match.
-   * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
-   * 
-   */
-  public boolean forOneArbitraryMatch(final Comment pChrtspecComment, final IMatchProcessor<? super ChildPrivCHRTSpecItemMatch> processor) {
-    return rawForOneArbitraryMatch(new Object[]{pChrtspecComment}, processor);
-  }
-  
-  /**
-   * Returns a new (partial) match.
-   * This can be used e.g. to call the matcher with a partial match.
-   * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @return the (partial) match object.
-   * 
-   */
-  public ChildPrivCHRTSpecItemMatch newMatch(final Comment pChrtspecComment) {
-    return ChildPrivCHRTSpecItemMatch.newMatch(pChrtspecComment);
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for chrtspecComment.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  protected Set<Comment> rawAccumulateAllValuesOfchrtspecComment(final Object[] parameters) {
-    Set<Comment> results = new HashSet<Comment>();
-    rawAccumulateAllValues(POSITION_CHRTSPECCOMMENT, parameters, results);
-    return results;
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for chrtspecComment.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<Comment> getAllValuesOfchrtspecComment() {
-    return rawAccumulateAllValuesOfchrtspecComment(emptyArray());
-  }
-  
-  @Override
-  protected ChildPrivCHRTSpecItemMatch tupleToMatch(final Tuple t) {
-    try {
-        return ChildPrivCHRTSpecItemMatch.newMatch((Comment) t.get(POSITION_CHRTSPECCOMMENT));
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in tuple not properly typed!",e);
-        return null;
-    }
-  }
-  
-  @Override
-  protected ChildPrivCHRTSpecItemMatch arrayToMatch(final Object[] match) {
-    try {
-        return ChildPrivCHRTSpecItemMatch.newMatch((Comment) match[POSITION_CHRTSPECCOMMENT]);
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in array not properly typed!",e);
-        return null;
-    }
-  }
-  
-  @Override
-  protected ChildPrivCHRTSpecItemMatch arrayToMatchMutable(final Object[] match) {
-    try {
-        return ChildPrivCHRTSpecItemMatch.newMutableMatch((Comment) match[POSITION_CHRTSPECCOMMENT]);
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in array not properly typed!",e);
-        return null;
-    }
-  }
-  
-  /**
-   * @return the singleton instance of the query specification of this pattern
-   * @throws ViatraQueryException if the pattern definition could not be loaded
-   * 
-   */
-  public static IQuerySpecification<ChildPrivCHRTSpecItemMatcher> querySpecification() throws ViatraQueryException {
-    return ChildPrivCHRTSpecItemQuerySpecification.instance();
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPrivCHRTSpecMatch.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPrivCHRTSpecMatch.java
deleted file mode 100644
index ff9600e1454e8c06006824a7e3ac3bb9dc89d4c8..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPrivCHRTSpecMatch.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import org.eclipse.uml2.uml.BehavioralFeature;
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.viatra.query.runtime.api.IPatternMatch;
-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.polarsys.chess.instance.view.util.ChildPrivCHRTSpecQuerySpecification;
-
-/**
- * Pattern-specific match representation of the org.polarsys.chess.instance.view.childPrivCHRTSpec pattern,
- * to be used in conjunction with {@link ChildPrivCHRTSpecMatcher}.
- * 
- * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
- * Each instance is a (possibly partial) substitution of pattern parameters,
- * usable to represent a match of the pattern in the result of a query,
- * or to specify the bound (fixed) input parameters when issuing a query.
- * 
- * @see ChildPrivCHRTSpecMatcher
- *  @see ChildPrivCHRTSpecProcessor
- * 
- */
-@SuppressWarnings("all")
-public abstract class ChildPrivCHRTSpecMatch extends BasePatternMatch {
-  private Comment fChrtspecComment;
-  
-  private BehavioralFeature fPrivoperation;
-  
-  private static List<String> parameterNames = makeImmutableList("chrtspecComment", "privoperation");
-  
-  private ChildPrivCHRTSpecMatch(final Comment pChrtspecComment, final BehavioralFeature pPrivoperation) {
-    this.fChrtspecComment = pChrtspecComment;
-    this.fPrivoperation = pPrivoperation;
-  }
-  
-  @Override
-  public Object get(final String parameterName) {
-    if ("chrtspecComment".equals(parameterName)) return this.fChrtspecComment;
-    if ("privoperation".equals(parameterName)) return this.fPrivoperation;
-    return null;
-  }
-  
-  public Comment getChrtspecComment() {
-    return this.fChrtspecComment;
-  }
-  
-  public BehavioralFeature getPrivoperation() {
-    return this.fPrivoperation;
-  }
-  
-  @Override
-  public boolean set(final String parameterName, final Object newValue) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    if ("chrtspecComment".equals(parameterName) ) {
-        this.fChrtspecComment = (Comment) newValue;
-        return true;
-    }
-    if ("privoperation".equals(parameterName) ) {
-        this.fPrivoperation = (BehavioralFeature) newValue;
-        return true;
-    }
-    return false;
-  }
-  
-  public void setChrtspecComment(final Comment pChrtspecComment) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    this.fChrtspecComment = pChrtspecComment;
-  }
-  
-  public void setPrivoperation(final BehavioralFeature pPrivoperation) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    this.fPrivoperation = pPrivoperation;
-  }
-  
-  @Override
-  public String patternName() {
-    return "org.polarsys.chess.instance.view.childPrivCHRTSpec";
-  }
-  
-  @Override
-  public List<String> parameterNames() {
-    return ChildPrivCHRTSpecMatch.parameterNames;
-  }
-  
-  @Override
-  public Object[] toArray() {
-    return new Object[]{fChrtspecComment, fPrivoperation};
-  }
-  
-  @Override
-  public ChildPrivCHRTSpecMatch toImmutable() {
-    return isMutable() ? newMatch(fChrtspecComment, fPrivoperation) : this;
-  }
-  
-  @Override
-  public String prettyPrint() {
-    StringBuilder result = new StringBuilder();
-    result.append("\"chrtspecComment\"=" + prettyPrintValue(fChrtspecComment) + ", ");
-    result.append("\"privoperation\"=" + prettyPrintValue(fPrivoperation));
-    return result.toString();
-  }
-  
-  @Override
-  public int hashCode() {
-    return Objects.hash(fChrtspecComment, fPrivoperation);
-  }
-  
-  @Override
-  public boolean equals(final Object obj) {
-    if (this == obj)
-        return true;
-    if (obj == null) {
-        return false;
-    }
-    if ((obj instanceof ChildPrivCHRTSpecMatch)) {
-        ChildPrivCHRTSpecMatch other = (ChildPrivCHRTSpecMatch) obj;
-        return Objects.equals(fChrtspecComment, other.fChrtspecComment) && Objects.equals(fPrivoperation, other.fPrivoperation);
-    } else {
-        // this should be infrequent
-        if (!(obj instanceof IPatternMatch)) {
-            return false;
-        }
-        IPatternMatch otherSig  = (IPatternMatch) obj;
-        return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
-    }
-  }
-  
-  @Override
-  public ChildPrivCHRTSpecQuerySpecification specification() {
-    try {
-        return ChildPrivCHRTSpecQuerySpecification.instance();
-    } catch (ViatraQueryException ex) {
-         // This cannot happen, as the match object can only be instantiated if the query specification exists
-         throw new IllegalStateException (ex);
-    }
-  }
-  
-  /**
-   * Returns an empty, mutable match.
-   * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-   * 
-   * @return the empty match.
-   * 
-   */
-  public static ChildPrivCHRTSpecMatch newEmptyMatch() {
-    return new Mutable(null, null);
-  }
-  
-  /**
-   * Returns a mutable (partial) match.
-   * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-   * 
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @param pPrivoperation the fixed value of pattern parameter privoperation, or null if not bound.
-   * @return the new, mutable (partial) match object.
-   * 
-   */
-  public static ChildPrivCHRTSpecMatch newMutableMatch(final Comment pChrtspecComment, final BehavioralFeature pPrivoperation) {
-    return new Mutable(pChrtspecComment, pPrivoperation);
-  }
-  
-  /**
-   * Returns a new (partial) match.
-   * This can be used e.g. to call the matcher with a partial match.
-   * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @param pPrivoperation the fixed value of pattern parameter privoperation, or null if not bound.
-   * @return the (partial) match object.
-   * 
-   */
-  public static ChildPrivCHRTSpecMatch newMatch(final Comment pChrtspecComment, final BehavioralFeature pPrivoperation) {
-    return new Immutable(pChrtspecComment, pPrivoperation);
-  }
-  
-  private static final class Mutable extends ChildPrivCHRTSpecMatch {
-    Mutable(final Comment pChrtspecComment, final BehavioralFeature pPrivoperation) {
-      super(pChrtspecComment, pPrivoperation);
-    }
-    
-    @Override
-    public boolean isMutable() {
-      return true;
-    }
-  }
-  
-  private static final class Immutable extends ChildPrivCHRTSpecMatch {
-    Immutable(final Comment pChrtspecComment, final BehavioralFeature pPrivoperation) {
-      super(pChrtspecComment, pPrivoperation);
-    }
-    
-    @Override
-    public boolean isMutable() {
-      return false;
-    }
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPrivCHRTSpecMatcher.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPrivCHRTSpecMatcher.java
deleted file mode 100644
index 6c5a6ce6138c034f56c0ab61d899ee8efb60d272..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPrivCHRTSpecMatcher.java
+++ /dev/null
@@ -1,310 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import org.apache.log4j.Logger;
-import org.eclipse.uml2.uml.BehavioralFeature;
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.viatra.query.runtime.api.IMatchProcessor;
-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import org.polarsys.chess.instance.view.ChildPrivCHRTSpecMatch;
-import org.polarsys.chess.instance.view.util.ChildPrivCHRTSpecQuerySpecification;
-
-/**
- * Generated pattern matcher API of the org.polarsys.chess.instance.view.childPrivCHRTSpec pattern,
- * providing pattern-specific query methods.
- * 
- * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
- * e.g. in conjunction with {@link ViatraQueryEngine#on(Notifier)}.
- * 
- * <p>Matches of the pattern will be represented as {@link ChildPrivCHRTSpecMatch}.
- * 
- * <p>Original source:
- * <code><pre>
- * {@literal @}ContainsItem(container = privoperation, item = chrtspecComment)
- * pattern childPrivCHRTSpec(chrtspecComment, privoperation) {
- * 		
- * 	//find childPortSlotsOperation(slot, operation, _);
- * 	CHRtPortSlot.base_InstanceSpecification(chrtportslot, instancespec);
- * 	CHRtPortSlot.cH_RtSpecification(chrtportslot, chrt);
- * 	CHRtSpecification.context(chrt, privoperation);
- * 	CHRtSpecification.base_Comment(chrt, chrtspecComment);
- * 
- * 	
- * }
- * </pre></code>
- * 
- * @see ChildPrivCHRTSpecMatch
- *  @see ChildPrivCHRTSpecProcessor
- * @see ChildPrivCHRTSpecQuerySpecification
- * 
- */
-@SuppressWarnings("all")
-public class ChildPrivCHRTSpecMatcher extends BaseMatcher<ChildPrivCHRTSpecMatch> {
-  /**
-   * Initializes the pattern matcher within an existing VIATRA Query engine.
-   * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-   * The match set will be incrementally refreshed upon updates.
-   * @param engine the existing VIATRA Query engine in which this matcher will be created.
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * 
-   */
-  public static ChildPrivCHRTSpecMatcher on(final ViatraQueryEngine engine) throws ViatraQueryException {
-    // check if matcher already exists
-    ChildPrivCHRTSpecMatcher matcher = engine.getExistingMatcher(querySpecification());
-    if (matcher == null) {
-        matcher = (ChildPrivCHRTSpecMatcher)engine.getMatcher(querySpecification());
-    }
-    return matcher;
-  }
-  
-  /**
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * @return an initialized matcher
-   * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
-   * 
-   */
-  public static ChildPrivCHRTSpecMatcher create() throws ViatraQueryException {
-    return new ChildPrivCHRTSpecMatcher();
-  }
-  
-  private final static int POSITION_CHRTSPECCOMMENT = 0;
-  
-  private final static int POSITION_PRIVOPERATION = 1;
-  
-  private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(ChildPrivCHRTSpecMatcher.class);
-  
-  /**
-   * Initializes the pattern matcher within an existing VIATRA Query engine.
-   * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-   * The match set will be incrementally refreshed upon updates.
-   * @param engine the existing VIATRA Query engine in which this matcher will be created.
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * 
-   */
-  private ChildPrivCHRTSpecMatcher() throws ViatraQueryException {
-    super(querySpecification());
-  }
-  
-  /**
-   * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @param pPrivoperation the fixed value of pattern parameter privoperation, or null if not bound.
-   * @return matches represented as a ChildPrivCHRTSpecMatch object.
-   * 
-   */
-  public Collection<ChildPrivCHRTSpecMatch> getAllMatches(final Comment pChrtspecComment, final BehavioralFeature pPrivoperation) {
-    return rawGetAllMatches(new Object[]{pChrtspecComment, pPrivoperation});
-  }
-  
-  /**
-   * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-   * Neither determinism nor randomness of selection is guaranteed.
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @param pPrivoperation the fixed value of pattern parameter privoperation, or null if not bound.
-   * @return a match represented as a ChildPrivCHRTSpecMatch object, or null if no match is found.
-   * 
-   */
-  public ChildPrivCHRTSpecMatch getOneArbitraryMatch(final Comment pChrtspecComment, final BehavioralFeature pPrivoperation) {
-    return rawGetOneArbitraryMatch(new Object[]{pChrtspecComment, pPrivoperation});
-  }
-  
-  /**
-   * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
-   * under any possible substitution of the unspecified parameters (if any).
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @param pPrivoperation the fixed value of pattern parameter privoperation, or null if not bound.
-   * @return true if the input is a valid (partial) match of the pattern.
-   * 
-   */
-  public boolean hasMatch(final Comment pChrtspecComment, final BehavioralFeature pPrivoperation) {
-    return rawHasMatch(new Object[]{pChrtspecComment, pPrivoperation});
-  }
-  
-  /**
-   * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @param pPrivoperation the fixed value of pattern parameter privoperation, or null if not bound.
-   * @return the number of pattern matches found.
-   * 
-   */
-  public int countMatches(final Comment pChrtspecComment, final BehavioralFeature pPrivoperation) {
-    return rawCountMatches(new Object[]{pChrtspecComment, pPrivoperation});
-  }
-  
-  /**
-   * Executes the given processor on each match of the pattern that conforms to the given fixed values of some parameters.
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @param pPrivoperation the fixed value of pattern parameter privoperation, or null if not bound.
-   * @param processor the action that will process each pattern match.
-   * 
-   */
-  public void forEachMatch(final Comment pChrtspecComment, final BehavioralFeature pPrivoperation, final IMatchProcessor<? super ChildPrivCHRTSpecMatch> processor) {
-    rawForEachMatch(new Object[]{pChrtspecComment, pPrivoperation}, processor);
-  }
-  
-  /**
-   * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-   * Neither determinism nor randomness of selection is guaranteed.
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @param pPrivoperation the fixed value of pattern parameter privoperation, or null if not bound.
-   * @param processor the action that will process the selected match.
-   * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
-   * 
-   */
-  public boolean forOneArbitraryMatch(final Comment pChrtspecComment, final BehavioralFeature pPrivoperation, final IMatchProcessor<? super ChildPrivCHRTSpecMatch> processor) {
-    return rawForOneArbitraryMatch(new Object[]{pChrtspecComment, pPrivoperation}, processor);
-  }
-  
-  /**
-   * Returns a new (partial) match.
-   * This can be used e.g. to call the matcher with a partial match.
-   * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-   * @param pChrtspecComment the fixed value of pattern parameter chrtspecComment, or null if not bound.
-   * @param pPrivoperation the fixed value of pattern parameter privoperation, or null if not bound.
-   * @return the (partial) match object.
-   * 
-   */
-  public ChildPrivCHRTSpecMatch newMatch(final Comment pChrtspecComment, final BehavioralFeature pPrivoperation) {
-    return ChildPrivCHRTSpecMatch.newMatch(pChrtspecComment, pPrivoperation);
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for chrtspecComment.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  protected Set<Comment> rawAccumulateAllValuesOfchrtspecComment(final Object[] parameters) {
-    Set<Comment> results = new HashSet<Comment>();
-    rawAccumulateAllValues(POSITION_CHRTSPECCOMMENT, parameters, results);
-    return results;
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for chrtspecComment.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<Comment> getAllValuesOfchrtspecComment() {
-    return rawAccumulateAllValuesOfchrtspecComment(emptyArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for chrtspecComment.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<Comment> getAllValuesOfchrtspecComment(final ChildPrivCHRTSpecMatch partialMatch) {
-    return rawAccumulateAllValuesOfchrtspecComment(partialMatch.toArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for chrtspecComment.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<Comment> getAllValuesOfchrtspecComment(final BehavioralFeature pPrivoperation) {
-    return rawAccumulateAllValuesOfchrtspecComment(new Object[]{
-    null, 
-    pPrivoperation
-    });
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for privoperation.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  protected Set<BehavioralFeature> rawAccumulateAllValuesOfprivoperation(final Object[] parameters) {
-    Set<BehavioralFeature> results = new HashSet<BehavioralFeature>();
-    rawAccumulateAllValues(POSITION_PRIVOPERATION, parameters, results);
-    return results;
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for privoperation.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<BehavioralFeature> getAllValuesOfprivoperation() {
-    return rawAccumulateAllValuesOfprivoperation(emptyArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for privoperation.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<BehavioralFeature> getAllValuesOfprivoperation(final ChildPrivCHRTSpecMatch partialMatch) {
-    return rawAccumulateAllValuesOfprivoperation(partialMatch.toArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for privoperation.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<BehavioralFeature> getAllValuesOfprivoperation(final Comment pChrtspecComment) {
-    return rawAccumulateAllValuesOfprivoperation(new Object[]{
-    pChrtspecComment, 
-    null
-    });
-  }
-  
-  @Override
-  protected ChildPrivCHRTSpecMatch tupleToMatch(final Tuple t) {
-    try {
-        return ChildPrivCHRTSpecMatch.newMatch((Comment) t.get(POSITION_CHRTSPECCOMMENT), (BehavioralFeature) t.get(POSITION_PRIVOPERATION));
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in tuple not properly typed!",e);
-        return null;
-    }
-  }
-  
-  @Override
-  protected ChildPrivCHRTSpecMatch arrayToMatch(final Object[] match) {
-    try {
-        return ChildPrivCHRTSpecMatch.newMatch((Comment) match[POSITION_CHRTSPECCOMMENT], (BehavioralFeature) match[POSITION_PRIVOPERATION]);
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in array not properly typed!",e);
-        return null;
-    }
-  }
-  
-  @Override
-  protected ChildPrivCHRTSpecMatch arrayToMatchMutable(final Object[] match) {
-    try {
-        return ChildPrivCHRTSpecMatch.newMutableMatch((Comment) match[POSITION_CHRTSPECCOMMENT], (BehavioralFeature) match[POSITION_PRIVOPERATION]);
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in array not properly typed!",e);
-        return null;
-    }
-  }
-  
-  /**
-   * @return the singleton instance of the query specification of this pattern
-   * @throws ViatraQueryException if the pattern definition could not be loaded
-   * 
-   */
-  public static IQuerySpecification<ChildPrivCHRTSpecMatcher> querySpecification() throws ViatraQueryException {
-    return ChildPrivCHRTSpecQuerySpecification.instance();
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPrivateOperationsMatch.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPrivateOperationsMatch.java
deleted file mode 100644
index 19a9b0061e235252fb185dca857449d35f3c1ee4..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPrivateOperationsMatch.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.uml2.uml.Operation;
-import org.eclipse.viatra.query.runtime.api.IPatternMatch;
-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.polarsys.chess.instance.view.util.ChildPrivateOperationsQuerySpecification;
-
-/**
- * Pattern-specific match representation of the org.polarsys.chess.instance.view.childPrivateOperations pattern,
- * to be used in conjunction with {@link ChildPrivateOperationsMatcher}.
- * 
- * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
- * Each instance is a (possibly partial) substitution of pattern parameters,
- * usable to represent a match of the pattern in the result of a query,
- * or to specify the bound (fixed) input parameters when issuing a query.
- * 
- * @see ChildPrivateOperationsMatcher
- *  @see ChildPrivateOperationsProcessor
- * 
- */
-@SuppressWarnings("all")
-public abstract class ChildPrivateOperationsMatch extends BasePatternMatch {
-  private InstanceSpecification fChild;
-  
-  private Operation fPrivoperation;
-  
-  private String fName;
-  
-  private static List<String> parameterNames = makeImmutableList("child", "privoperation", "name");
-  
-  private ChildPrivateOperationsMatch(final InstanceSpecification pChild, final Operation pPrivoperation, final String pName) {
-    this.fChild = pChild;
-    this.fPrivoperation = pPrivoperation;
-    this.fName = pName;
-  }
-  
-  @Override
-  public Object get(final String parameterName) {
-    if ("child".equals(parameterName)) return this.fChild;
-    if ("privoperation".equals(parameterName)) return this.fPrivoperation;
-    if ("name".equals(parameterName)) return this.fName;
-    return null;
-  }
-  
-  public InstanceSpecification getChild() {
-    return this.fChild;
-  }
-  
-  public Operation getPrivoperation() {
-    return this.fPrivoperation;
-  }
-  
-  public String getName() {
-    return this.fName;
-  }
-  
-  @Override
-  public boolean set(final String parameterName, final Object newValue) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    if ("child".equals(parameterName) ) {
-        this.fChild = (InstanceSpecification) newValue;
-        return true;
-    }
-    if ("privoperation".equals(parameterName) ) {
-        this.fPrivoperation = (Operation) newValue;
-        return true;
-    }
-    if ("name".equals(parameterName) ) {
-        this.fName = (String) newValue;
-        return true;
-    }
-    return false;
-  }
-  
-  public void setChild(final InstanceSpecification pChild) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    this.fChild = pChild;
-  }
-  
-  public void setPrivoperation(final Operation pPrivoperation) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    this.fPrivoperation = pPrivoperation;
-  }
-  
-  public void setName(final String pName) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    this.fName = pName;
-  }
-  
-  @Override
-  public String patternName() {
-    return "org.polarsys.chess.instance.view.childPrivateOperations";
-  }
-  
-  @Override
-  public List<String> parameterNames() {
-    return ChildPrivateOperationsMatch.parameterNames;
-  }
-  
-  @Override
-  public Object[] toArray() {
-    return new Object[]{fChild, fPrivoperation, fName};
-  }
-  
-  @Override
-  public ChildPrivateOperationsMatch toImmutable() {
-    return isMutable() ? newMatch(fChild, fPrivoperation, fName) : this;
-  }
-  
-  @Override
-  public String prettyPrint() {
-    StringBuilder result = new StringBuilder();
-    result.append("\"child\"=" + prettyPrintValue(fChild) + ", ");
-    result.append("\"privoperation\"=" + prettyPrintValue(fPrivoperation) + ", ");
-    result.append("\"name\"=" + prettyPrintValue(fName));
-    return result.toString();
-  }
-  
-  @Override
-  public int hashCode() {
-    return Objects.hash(fChild, fPrivoperation, fName);
-  }
-  
-  @Override
-  public boolean equals(final Object obj) {
-    if (this == obj)
-        return true;
-    if (obj == null) {
-        return false;
-    }
-    if ((obj instanceof ChildPrivateOperationsMatch)) {
-        ChildPrivateOperationsMatch other = (ChildPrivateOperationsMatch) obj;
-        return Objects.equals(fChild, other.fChild) && Objects.equals(fPrivoperation, other.fPrivoperation) && Objects.equals(fName, other.fName);
-    } else {
-        // this should be infrequent
-        if (!(obj instanceof IPatternMatch)) {
-            return false;
-        }
-        IPatternMatch otherSig  = (IPatternMatch) obj;
-        return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
-    }
-  }
-  
-  @Override
-  public ChildPrivateOperationsQuerySpecification specification() {
-    try {
-        return ChildPrivateOperationsQuerySpecification.instance();
-    } catch (ViatraQueryException ex) {
-         // This cannot happen, as the match object can only be instantiated if the query specification exists
-         throw new IllegalStateException (ex);
-    }
-  }
-  
-  /**
-   * Returns an empty, mutable match.
-   * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-   * 
-   * @return the empty match.
-   * 
-   */
-  public static ChildPrivateOperationsMatch newEmptyMatch() {
-    return new Mutable(null, null, null);
-  }
-  
-  /**
-   * Returns a mutable (partial) match.
-   * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-   * 
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pPrivoperation the fixed value of pattern parameter privoperation, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return the new, mutable (partial) match object.
-   * 
-   */
-  public static ChildPrivateOperationsMatch newMutableMatch(final InstanceSpecification pChild, final Operation pPrivoperation, final String pName) {
-    return new Mutable(pChild, pPrivoperation, pName);
-  }
-  
-  /**
-   * Returns a new (partial) match.
-   * This can be used e.g. to call the matcher with a partial match.
-   * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pPrivoperation the fixed value of pattern parameter privoperation, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return the (partial) match object.
-   * 
-   */
-  public static ChildPrivateOperationsMatch newMatch(final InstanceSpecification pChild, final Operation pPrivoperation, final String pName) {
-    return new Immutable(pChild, pPrivoperation, pName);
-  }
-  
-  private static final class Mutable extends ChildPrivateOperationsMatch {
-    Mutable(final InstanceSpecification pChild, final Operation pPrivoperation, final String pName) {
-      super(pChild, pPrivoperation, pName);
-    }
-    
-    @Override
-    public boolean isMutable() {
-      return true;
-    }
-  }
-  
-  private static final class Immutable extends ChildPrivateOperationsMatch {
-    Immutable(final InstanceSpecification pChild, final Operation pPrivoperation, final String pName) {
-      super(pChild, pPrivoperation, pName);
-    }
-    
-    @Override
-    public boolean isMutable() {
-      return false;
-    }
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPrivateOperationsMatcher.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPrivateOperationsMatcher.java
deleted file mode 100644
index 401214f1aea4dba41f8c142b3563377d5668d719..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/ChildPrivateOperationsMatcher.java
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import org.apache.log4j.Logger;
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.uml2.uml.Operation;
-import org.eclipse.viatra.query.runtime.api.IMatchProcessor;
-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import org.polarsys.chess.instance.view.ChildPrivateOperationsMatch;
-import org.polarsys.chess.instance.view.util.ChildPrivateOperationsQuerySpecification;
-
-/**
- * Generated pattern matcher API of the org.polarsys.chess.instance.view.childPrivateOperations pattern,
- * providing pattern-specific query methods.
- * 
- * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
- * e.g. in conjunction with {@link ViatraQueryEngine#on(Notifier)}.
- * 
- * <p>Matches of the pattern will be represented as {@link ChildPrivateOperationsMatch}.
- * 
- * <p>Original source:
- * <code><pre>
- * {@literal @}Item(item = privoperation, hierarchy = "child", label = "$name$ (Operation)")
- * {@literal @}ContainsItem(container = child, item = privoperation)
- * pattern childPrivateOperations(child, privoperation, name) {
- * 		
- * 	InstanceSpecification.classifier(child, component);
- * 	Component.ownedOperation(component, privoperation);
- * 	neg find childPortSlotsOperation(_, privoperation, _);
- * 	Operation.name(privoperation, name);
- * }
- * </pre></code>
- * 
- * @see ChildPrivateOperationsMatch
- *  @see ChildPrivateOperationsProcessor
- * @see ChildPrivateOperationsQuerySpecification
- * 
- */
-@SuppressWarnings("all")
-public class ChildPrivateOperationsMatcher extends BaseMatcher<ChildPrivateOperationsMatch> {
-  /**
-   * Initializes the pattern matcher within an existing VIATRA Query engine.
-   * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-   * The match set will be incrementally refreshed upon updates.
-   * @param engine the existing VIATRA Query engine in which this matcher will be created.
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * 
-   */
-  public static ChildPrivateOperationsMatcher on(final ViatraQueryEngine engine) throws ViatraQueryException {
-    // check if matcher already exists
-    ChildPrivateOperationsMatcher matcher = engine.getExistingMatcher(querySpecification());
-    if (matcher == null) {
-        matcher = (ChildPrivateOperationsMatcher)engine.getMatcher(querySpecification());
-    }
-    return matcher;
-  }
-  
-  /**
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * @return an initialized matcher
-   * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
-   * 
-   */
-  public static ChildPrivateOperationsMatcher create() throws ViatraQueryException {
-    return new ChildPrivateOperationsMatcher();
-  }
-  
-  private final static int POSITION_CHILD = 0;
-  
-  private final static int POSITION_PRIVOPERATION = 1;
-  
-  private final static int POSITION_NAME = 2;
-  
-  private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(ChildPrivateOperationsMatcher.class);
-  
-  /**
-   * Initializes the pattern matcher within an existing VIATRA Query engine.
-   * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-   * The match set will be incrementally refreshed upon updates.
-   * @param engine the existing VIATRA Query engine in which this matcher will be created.
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * 
-   */
-  private ChildPrivateOperationsMatcher() throws ViatraQueryException {
-    super(querySpecification());
-  }
-  
-  /**
-   * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pPrivoperation the fixed value of pattern parameter privoperation, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return matches represented as a ChildPrivateOperationsMatch object.
-   * 
-   */
-  public Collection<ChildPrivateOperationsMatch> getAllMatches(final InstanceSpecification pChild, final Operation pPrivoperation, final String pName) {
-    return rawGetAllMatches(new Object[]{pChild, pPrivoperation, pName});
-  }
-  
-  /**
-   * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-   * Neither determinism nor randomness of selection is guaranteed.
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pPrivoperation the fixed value of pattern parameter privoperation, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return a match represented as a ChildPrivateOperationsMatch object, or null if no match is found.
-   * 
-   */
-  public ChildPrivateOperationsMatch getOneArbitraryMatch(final InstanceSpecification pChild, final Operation pPrivoperation, final String pName) {
-    return rawGetOneArbitraryMatch(new Object[]{pChild, pPrivoperation, pName});
-  }
-  
-  /**
-   * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
-   * under any possible substitution of the unspecified parameters (if any).
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pPrivoperation the fixed value of pattern parameter privoperation, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return true if the input is a valid (partial) match of the pattern.
-   * 
-   */
-  public boolean hasMatch(final InstanceSpecification pChild, final Operation pPrivoperation, final String pName) {
-    return rawHasMatch(new Object[]{pChild, pPrivoperation, pName});
-  }
-  
-  /**
-   * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pPrivoperation the fixed value of pattern parameter privoperation, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return the number of pattern matches found.
-   * 
-   */
-  public int countMatches(final InstanceSpecification pChild, final Operation pPrivoperation, final String pName) {
-    return rawCountMatches(new Object[]{pChild, pPrivoperation, pName});
-  }
-  
-  /**
-   * Executes the given processor on each match of the pattern that conforms to the given fixed values of some parameters.
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pPrivoperation the fixed value of pattern parameter privoperation, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @param processor the action that will process each pattern match.
-   * 
-   */
-  public void forEachMatch(final InstanceSpecification pChild, final Operation pPrivoperation, final String pName, final IMatchProcessor<? super ChildPrivateOperationsMatch> processor) {
-    rawForEachMatch(new Object[]{pChild, pPrivoperation, pName}, processor);
-  }
-  
-  /**
-   * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-   * Neither determinism nor randomness of selection is guaranteed.
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pPrivoperation the fixed value of pattern parameter privoperation, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @param processor the action that will process the selected match.
-   * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
-   * 
-   */
-  public boolean forOneArbitraryMatch(final InstanceSpecification pChild, final Operation pPrivoperation, final String pName, final IMatchProcessor<? super ChildPrivateOperationsMatch> processor) {
-    return rawForOneArbitraryMatch(new Object[]{pChild, pPrivoperation, pName}, processor);
-  }
-  
-  /**
-   * Returns a new (partial) match.
-   * This can be used e.g. to call the matcher with a partial match.
-   * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pPrivoperation the fixed value of pattern parameter privoperation, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return the (partial) match object.
-   * 
-   */
-  public ChildPrivateOperationsMatch newMatch(final InstanceSpecification pChild, final Operation pPrivoperation, final String pName) {
-    return ChildPrivateOperationsMatch.newMatch(pChild, pPrivoperation, pName);
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for child.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  protected Set<InstanceSpecification> rawAccumulateAllValuesOfchild(final Object[] parameters) {
-    Set<InstanceSpecification> results = new HashSet<InstanceSpecification>();
-    rawAccumulateAllValues(POSITION_CHILD, parameters, results);
-    return results;
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for child.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<InstanceSpecification> getAllValuesOfchild() {
-    return rawAccumulateAllValuesOfchild(emptyArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for child.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<InstanceSpecification> getAllValuesOfchild(final ChildPrivateOperationsMatch partialMatch) {
-    return rawAccumulateAllValuesOfchild(partialMatch.toArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for child.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<InstanceSpecification> getAllValuesOfchild(final Operation pPrivoperation, final String pName) {
-    return rawAccumulateAllValuesOfchild(new Object[]{
-    null, 
-    pPrivoperation, 
-    pName
-    });
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for privoperation.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  protected Set<Operation> rawAccumulateAllValuesOfprivoperation(final Object[] parameters) {
-    Set<Operation> results = new HashSet<Operation>();
-    rawAccumulateAllValues(POSITION_PRIVOPERATION, parameters, results);
-    return results;
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for privoperation.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<Operation> getAllValuesOfprivoperation() {
-    return rawAccumulateAllValuesOfprivoperation(emptyArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for privoperation.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<Operation> getAllValuesOfprivoperation(final ChildPrivateOperationsMatch partialMatch) {
-    return rawAccumulateAllValuesOfprivoperation(partialMatch.toArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for privoperation.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<Operation> getAllValuesOfprivoperation(final InstanceSpecification pChild, final String pName) {
-    return rawAccumulateAllValuesOfprivoperation(new Object[]{
-    pChild, 
-    null, 
-    pName
-    });
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for name.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  protected Set<String> rawAccumulateAllValuesOfname(final Object[] parameters) {
-    Set<String> results = new HashSet<String>();
-    rawAccumulateAllValues(POSITION_NAME, parameters, results);
-    return results;
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for name.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<String> getAllValuesOfname() {
-    return rawAccumulateAllValuesOfname(emptyArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for name.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<String> getAllValuesOfname(final ChildPrivateOperationsMatch partialMatch) {
-    return rawAccumulateAllValuesOfname(partialMatch.toArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for name.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<String> getAllValuesOfname(final InstanceSpecification pChild, final Operation pPrivoperation) {
-    return rawAccumulateAllValuesOfname(new Object[]{
-    pChild, 
-    pPrivoperation, 
-    null
-    });
-  }
-  
-  @Override
-  protected ChildPrivateOperationsMatch tupleToMatch(final Tuple t) {
-    try {
-        return ChildPrivateOperationsMatch.newMatch((InstanceSpecification) t.get(POSITION_CHILD), (Operation) t.get(POSITION_PRIVOPERATION), (String) t.get(POSITION_NAME));
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in tuple not properly typed!",e);
-        return null;
-    }
-  }
-  
-  @Override
-  protected ChildPrivateOperationsMatch arrayToMatch(final Object[] match) {
-    try {
-        return ChildPrivateOperationsMatch.newMatch((InstanceSpecification) match[POSITION_CHILD], (Operation) match[POSITION_PRIVOPERATION], (String) match[POSITION_NAME]);
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in array not properly typed!",e);
-        return null;
-    }
-  }
-  
-  @Override
-  protected ChildPrivateOperationsMatch arrayToMatchMutable(final Object[] match) {
-    try {
-        return ChildPrivateOperationsMatch.newMutableMatch((InstanceSpecification) match[POSITION_CHILD], (Operation) match[POSITION_PRIVOPERATION], (String) match[POSITION_NAME]);
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in array not properly typed!",e);
-        return null;
-    }
-  }
-  
-  /**
-   * @return the singleton instance of the query specification of this pattern
-   * @throws ViatraQueryException if the pattern definition could not be loaded
-   * 
-   */
-  public static IQuerySpecification<ChildPrivateOperationsMatcher> querySpecification() throws ViatraQueryException {
-    return ChildPrivateOperationsQuerySpecification.instance();
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/SwSystemCHGaResourcePlatformMatch.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/SwSystemCHGaResourcePlatformMatch.java
deleted file mode 100644
index 2357f469cb2aa68cb82035fef44bdaaa74055ad0..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/SwSystemCHGaResourcePlatformMatch.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import org.eclipse.viatra.query.runtime.api.IPatternMatch;
-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.polarsys.chess.instance.view.util.SwSystemCHGaResourcePlatformQuerySpecification;
-
-/**
- * Pattern-specific match representation of the org.polarsys.chess.instance.view.swSystemCHGaResourcePlatform pattern,
- * to be used in conjunction with {@link SwSystemCHGaResourcePlatformMatcher}.
- * 
- * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
- * Each instance is a (possibly partial) substitution of pattern parameters,
- * usable to represent a match of the pattern in the result of a query,
- * or to specify the bound (fixed) input parameters when issuing a query.
- * 
- * @see SwSystemCHGaResourcePlatformMatcher
- *  @see SwSystemCHGaResourcePlatformProcessor
- * 
- */
-@SuppressWarnings("all")
-public abstract class SwSystemCHGaResourcePlatformMatch extends BasePatternMatch {
-  private org.eclipse.uml2.uml.Package fInstSpec;
-  
-  private static List<String> parameterNames = makeImmutableList("instSpec");
-  
-  private SwSystemCHGaResourcePlatformMatch(final org.eclipse.uml2.uml.Package pInstSpec) {
-    this.fInstSpec = pInstSpec;
-  }
-  
-  @Override
-  public Object get(final String parameterName) {
-    if ("instSpec".equals(parameterName)) return this.fInstSpec;
-    return null;
-  }
-  
-  public org.eclipse.uml2.uml.Package getInstSpec() {
-    return this.fInstSpec;
-  }
-  
-  @Override
-  public boolean set(final String parameterName, final Object newValue) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    if ("instSpec".equals(parameterName) ) {
-        this.fInstSpec = (org.eclipse.uml2.uml.Package) newValue;
-        return true;
-    }
-    return false;
-  }
-  
-  public void setInstSpec(final org.eclipse.uml2.uml.Package pInstSpec) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    this.fInstSpec = pInstSpec;
-  }
-  
-  @Override
-  public String patternName() {
-    return "org.polarsys.chess.instance.view.swSystemCHGaResourcePlatform";
-  }
-  
-  @Override
-  public List<String> parameterNames() {
-    return SwSystemCHGaResourcePlatformMatch.parameterNames;
-  }
-  
-  @Override
-  public Object[] toArray() {
-    return new Object[]{fInstSpec};
-  }
-  
-  @Override
-  public SwSystemCHGaResourcePlatformMatch toImmutable() {
-    return isMutable() ? newMatch(fInstSpec) : this;
-  }
-  
-  @Override
-  public String prettyPrint() {
-    StringBuilder result = new StringBuilder();
-    result.append("\"instSpec\"=" + prettyPrintValue(fInstSpec));
-    return result.toString();
-  }
-  
-  @Override
-  public int hashCode() {
-    return Objects.hash(fInstSpec);
-  }
-  
-  @Override
-  public boolean equals(final Object obj) {
-    if (this == obj)
-        return true;
-    if (obj == null) {
-        return false;
-    }
-    if ((obj instanceof SwSystemCHGaResourcePlatformMatch)) {
-        SwSystemCHGaResourcePlatformMatch other = (SwSystemCHGaResourcePlatformMatch) obj;
-        return Objects.equals(fInstSpec, other.fInstSpec);
-    } else {
-        // this should be infrequent
-        if (!(obj instanceof IPatternMatch)) {
-            return false;
-        }
-        IPatternMatch otherSig  = (IPatternMatch) obj;
-        return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
-    }
-  }
-  
-  @Override
-  public SwSystemCHGaResourcePlatformQuerySpecification specification() {
-    try {
-        return SwSystemCHGaResourcePlatformQuerySpecification.instance();
-    } catch (ViatraQueryException ex) {
-         // This cannot happen, as the match object can only be instantiated if the query specification exists
-         throw new IllegalStateException (ex);
-    }
-  }
-  
-  /**
-   * Returns an empty, mutable match.
-   * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-   * 
-   * @return the empty match.
-   * 
-   */
-  public static SwSystemCHGaResourcePlatformMatch newEmptyMatch() {
-    return new Mutable(null);
-  }
-  
-  /**
-   * Returns a mutable (partial) match.
-   * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-   * 
-   * @param pInstSpec the fixed value of pattern parameter instSpec, or null if not bound.
-   * @return the new, mutable (partial) match object.
-   * 
-   */
-  public static SwSystemCHGaResourcePlatformMatch newMutableMatch(final org.eclipse.uml2.uml.Package pInstSpec) {
-    return new Mutable(pInstSpec);
-  }
-  
-  /**
-   * Returns a new (partial) match.
-   * This can be used e.g. to call the matcher with a partial match.
-   * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-   * @param pInstSpec the fixed value of pattern parameter instSpec, or null if not bound.
-   * @return the (partial) match object.
-   * 
-   */
-  public static SwSystemCHGaResourcePlatformMatch newMatch(final org.eclipse.uml2.uml.Package pInstSpec) {
-    return new Immutable(pInstSpec);
-  }
-  
-  private static final class Mutable extends SwSystemCHGaResourcePlatformMatch {
-    Mutable(final org.eclipse.uml2.uml.Package pInstSpec) {
-      super(pInstSpec);
-    }
-    
-    @Override
-    public boolean isMutable() {
-      return true;
-    }
-  }
-  
-  private static final class Immutable extends SwSystemCHGaResourcePlatformMatch {
-    Immutable(final org.eclipse.uml2.uml.Package pInstSpec) {
-      super(pInstSpec);
-    }
-    
-    @Override
-    public boolean isMutable() {
-      return false;
-    }
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/SwSystemCHGaResourcePlatformMatcher.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/SwSystemCHGaResourcePlatformMatcher.java
deleted file mode 100644
index 4cc2f32c80ba83eaad284a1d438a728bfe7b6ae7..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/SwSystemCHGaResourcePlatformMatcher.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import org.apache.log4j.Logger;
-import org.eclipse.viatra.query.runtime.api.IMatchProcessor;
-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import org.polarsys.chess.instance.view.SwSystemCHGaResourcePlatformMatch;
-import org.polarsys.chess.instance.view.util.SwSystemCHGaResourcePlatformQuerySpecification;
-
-/**
- * Generated pattern matcher API of the org.polarsys.chess.instance.view.swSystemCHGaResourcePlatform pattern,
- * providing pattern-specific query methods.
- * 
- * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
- * e.g. in conjunction with {@link ViatraQueryEngine#on(Notifier)}.
- * 
- * <p>Matches of the pattern will be represented as {@link SwSystemCHGaResourcePlatformMatch}.
- * 
- * <p>Original source:
- * <code><pre>
- * {@literal @}Item(item = instSpec, hierarchy = "child", label = "$instSpec.name$ (Package)")
- * //{@literal @}ContainsItem(container = modelComponentView, item = instSpec)
- * pattern swSystemCHGaResourcePlatform(instSpec) {
- * 	//find modelComponentView(modelComponentView);
- * 	CHGaResourcePlatform.base_Package(_, instSpec);
- * }
- * </pre></code>
- * 
- * @see SwSystemCHGaResourcePlatformMatch
- *  @see SwSystemCHGaResourcePlatformProcessor
- * @see SwSystemCHGaResourcePlatformQuerySpecification
- * 
- */
-@SuppressWarnings("all")
-public class SwSystemCHGaResourcePlatformMatcher extends BaseMatcher<SwSystemCHGaResourcePlatformMatch> {
-  /**
-   * Initializes the pattern matcher within an existing VIATRA Query engine.
-   * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-   * The match set will be incrementally refreshed upon updates.
-   * @param engine the existing VIATRA Query engine in which this matcher will be created.
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * 
-   */
-  public static SwSystemCHGaResourcePlatformMatcher on(final ViatraQueryEngine engine) throws ViatraQueryException {
-    // check if matcher already exists
-    SwSystemCHGaResourcePlatformMatcher matcher = engine.getExistingMatcher(querySpecification());
-    if (matcher == null) {
-        matcher = (SwSystemCHGaResourcePlatformMatcher)engine.getMatcher(querySpecification());
-    }
-    return matcher;
-  }
-  
-  /**
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * @return an initialized matcher
-   * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
-   * 
-   */
-  public static SwSystemCHGaResourcePlatformMatcher create() throws ViatraQueryException {
-    return new SwSystemCHGaResourcePlatformMatcher();
-  }
-  
-  private final static int POSITION_INSTSPEC = 0;
-  
-  private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(SwSystemCHGaResourcePlatformMatcher.class);
-  
-  /**
-   * Initializes the pattern matcher within an existing VIATRA Query engine.
-   * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-   * The match set will be incrementally refreshed upon updates.
-   * @param engine the existing VIATRA Query engine in which this matcher will be created.
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * 
-   */
-  private SwSystemCHGaResourcePlatformMatcher() throws ViatraQueryException {
-    super(querySpecification());
-  }
-  
-  /**
-   * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
-   * @param pInstSpec the fixed value of pattern parameter instSpec, or null if not bound.
-   * @return matches represented as a SwSystemCHGaResourcePlatformMatch object.
-   * 
-   */
-  public Collection<SwSystemCHGaResourcePlatformMatch> getAllMatches(final org.eclipse.uml2.uml.Package pInstSpec) {
-    return rawGetAllMatches(new Object[]{pInstSpec});
-  }
-  
-  /**
-   * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-   * Neither determinism nor randomness of selection is guaranteed.
-   * @param pInstSpec the fixed value of pattern parameter instSpec, or null if not bound.
-   * @return a match represented as a SwSystemCHGaResourcePlatformMatch object, or null if no match is found.
-   * 
-   */
-  public SwSystemCHGaResourcePlatformMatch getOneArbitraryMatch(final org.eclipse.uml2.uml.Package pInstSpec) {
-    return rawGetOneArbitraryMatch(new Object[]{pInstSpec});
-  }
-  
-  /**
-   * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
-   * under any possible substitution of the unspecified parameters (if any).
-   * @param pInstSpec the fixed value of pattern parameter instSpec, or null if not bound.
-   * @return true if the input is a valid (partial) match of the pattern.
-   * 
-   */
-  public boolean hasMatch(final org.eclipse.uml2.uml.Package pInstSpec) {
-    return rawHasMatch(new Object[]{pInstSpec});
-  }
-  
-  /**
-   * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
-   * @param pInstSpec the fixed value of pattern parameter instSpec, or null if not bound.
-   * @return the number of pattern matches found.
-   * 
-   */
-  public int countMatches(final org.eclipse.uml2.uml.Package pInstSpec) {
-    return rawCountMatches(new Object[]{pInstSpec});
-  }
-  
-  /**
-   * Executes the given processor on each match of the pattern that conforms to the given fixed values of some parameters.
-   * @param pInstSpec the fixed value of pattern parameter instSpec, or null if not bound.
-   * @param processor the action that will process each pattern match.
-   * 
-   */
-  public void forEachMatch(final org.eclipse.uml2.uml.Package pInstSpec, final IMatchProcessor<? super SwSystemCHGaResourcePlatformMatch> processor) {
-    rawForEachMatch(new Object[]{pInstSpec}, processor);
-  }
-  
-  /**
-   * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-   * Neither determinism nor randomness of selection is guaranteed.
-   * @param pInstSpec the fixed value of pattern parameter instSpec, or null if not bound.
-   * @param processor the action that will process the selected match.
-   * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
-   * 
-   */
-  public boolean forOneArbitraryMatch(final org.eclipse.uml2.uml.Package pInstSpec, final IMatchProcessor<? super SwSystemCHGaResourcePlatformMatch> processor) {
-    return rawForOneArbitraryMatch(new Object[]{pInstSpec}, processor);
-  }
-  
-  /**
-   * Returns a new (partial) match.
-   * This can be used e.g. to call the matcher with a partial match.
-   * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-   * @param pInstSpec the fixed value of pattern parameter instSpec, or null if not bound.
-   * @return the (partial) match object.
-   * 
-   */
-  public SwSystemCHGaResourcePlatformMatch newMatch(final org.eclipse.uml2.uml.Package pInstSpec) {
-    return SwSystemCHGaResourcePlatformMatch.newMatch(pInstSpec);
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for instSpec.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  protected Set<org.eclipse.uml2.uml.Package> rawAccumulateAllValuesOfinstSpec(final Object[] parameters) {
-    Set<org.eclipse.uml2.uml.Package> results = new HashSet<org.eclipse.uml2.uml.Package>();
-    rawAccumulateAllValues(POSITION_INSTSPEC, parameters, results);
-    return results;
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for instSpec.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<org.eclipse.uml2.uml.Package> getAllValuesOfinstSpec() {
-    return rawAccumulateAllValuesOfinstSpec(emptyArray());
-  }
-  
-  @Override
-  protected SwSystemCHGaResourcePlatformMatch tupleToMatch(final Tuple t) {
-    try {
-        return SwSystemCHGaResourcePlatformMatch.newMatch((org.eclipse.uml2.uml.Package) t.get(POSITION_INSTSPEC));
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in tuple not properly typed!",e);
-        return null;
-    }
-  }
-  
-  @Override
-  protected SwSystemCHGaResourcePlatformMatch arrayToMatch(final Object[] match) {
-    try {
-        return SwSystemCHGaResourcePlatformMatch.newMatch((org.eclipse.uml2.uml.Package) match[POSITION_INSTSPEC]);
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in array not properly typed!",e);
-        return null;
-    }
-  }
-  
-  @Override
-  protected SwSystemCHGaResourcePlatformMatch arrayToMatchMutable(final Object[] match) {
-    try {
-        return SwSystemCHGaResourcePlatformMatch.newMutableMatch((org.eclipse.uml2.uml.Package) match[POSITION_INSTSPEC]);
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in array not properly typed!",e);
-        return null;
-    }
-  }
-  
-  /**
-   * @return the singleton instance of the query specification of this pattern
-   * @throws ViatraQueryException if the pattern definition could not be loaded
-   * 
-   */
-  public static IQuerySpecification<SwSystemCHGaResourcePlatformMatcher> querySpecification() throws ViatraQueryException {
-    return SwSystemCHGaResourcePlatformQuerySpecification.instance();
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/SwSystemChild2ItemMatch.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/SwSystemChild2ItemMatch.java
deleted file mode 100644
index 174153178c0bfbe543c8f7288b5d785795ec84c7..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/SwSystemChild2ItemMatch.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.viatra.query.runtime.api.IPatternMatch;
-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.polarsys.chess.instance.view.util.SwSystemChild2ItemQuerySpecification;
-
-/**
- * Pattern-specific match representation of the org.polarsys.chess.instance.view.swSystemChild2Item pattern,
- * to be used in conjunction with {@link SwSystemChild2ItemMatcher}.
- * 
- * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
- * Each instance is a (possibly partial) substitution of pattern parameters,
- * usable to represent a match of the pattern in the result of a query,
- * or to specify the bound (fixed) input parameters when issuing a query.
- * 
- * @see SwSystemChild2ItemMatcher
- *  @see SwSystemChild2ItemProcessor
- * 
- */
-@SuppressWarnings("all")
-public abstract class SwSystemChild2ItemMatch extends BasePatternMatch {
-  private InstanceSpecification fChild;
-  
-  private String fName;
-  
-  private static List<String> parameterNames = makeImmutableList("child", "name");
-  
-  private SwSystemChild2ItemMatch(final InstanceSpecification pChild, final String pName) {
-    this.fChild = pChild;
-    this.fName = pName;
-  }
-  
-  @Override
-  public Object get(final String parameterName) {
-    if ("child".equals(parameterName)) return this.fChild;
-    if ("name".equals(parameterName)) return this.fName;
-    return null;
-  }
-  
-  public InstanceSpecification getChild() {
-    return this.fChild;
-  }
-  
-  public String getName() {
-    return this.fName;
-  }
-  
-  @Override
-  public boolean set(final String parameterName, final Object newValue) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    if ("child".equals(parameterName) ) {
-        this.fChild = (InstanceSpecification) newValue;
-        return true;
-    }
-    if ("name".equals(parameterName) ) {
-        this.fName = (String) newValue;
-        return true;
-    }
-    return false;
-  }
-  
-  public void setChild(final InstanceSpecification pChild) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    this.fChild = pChild;
-  }
-  
-  public void setName(final String pName) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    this.fName = pName;
-  }
-  
-  @Override
-  public String patternName() {
-    return "org.polarsys.chess.instance.view.swSystemChild2Item";
-  }
-  
-  @Override
-  public List<String> parameterNames() {
-    return SwSystemChild2ItemMatch.parameterNames;
-  }
-  
-  @Override
-  public Object[] toArray() {
-    return new Object[]{fChild, fName};
-  }
-  
-  @Override
-  public SwSystemChild2ItemMatch toImmutable() {
-    return isMutable() ? newMatch(fChild, fName) : this;
-  }
-  
-  @Override
-  public String prettyPrint() {
-    StringBuilder result = new StringBuilder();
-    result.append("\"child\"=" + prettyPrintValue(fChild) + ", ");
-    result.append("\"name\"=" + prettyPrintValue(fName));
-    return result.toString();
-  }
-  
-  @Override
-  public int hashCode() {
-    return Objects.hash(fChild, fName);
-  }
-  
-  @Override
-  public boolean equals(final Object obj) {
-    if (this == obj)
-        return true;
-    if (obj == null) {
-        return false;
-    }
-    if ((obj instanceof SwSystemChild2ItemMatch)) {
-        SwSystemChild2ItemMatch other = (SwSystemChild2ItemMatch) obj;
-        return Objects.equals(fChild, other.fChild) && Objects.equals(fName, other.fName);
-    } else {
-        // this should be infrequent
-        if (!(obj instanceof IPatternMatch)) {
-            return false;
-        }
-        IPatternMatch otherSig  = (IPatternMatch) obj;
-        return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
-    }
-  }
-  
-  @Override
-  public SwSystemChild2ItemQuerySpecification specification() {
-    try {
-        return SwSystemChild2ItemQuerySpecification.instance();
-    } catch (ViatraQueryException ex) {
-         // This cannot happen, as the match object can only be instantiated if the query specification exists
-         throw new IllegalStateException (ex);
-    }
-  }
-  
-  /**
-   * Returns an empty, mutable match.
-   * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-   * 
-   * @return the empty match.
-   * 
-   */
-  public static SwSystemChild2ItemMatch newEmptyMatch() {
-    return new Mutable(null, null);
-  }
-  
-  /**
-   * Returns a mutable (partial) match.
-   * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-   * 
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return the new, mutable (partial) match object.
-   * 
-   */
-  public static SwSystemChild2ItemMatch newMutableMatch(final InstanceSpecification pChild, final String pName) {
-    return new Mutable(pChild, pName);
-  }
-  
-  /**
-   * Returns a new (partial) match.
-   * This can be used e.g. to call the matcher with a partial match.
-   * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return the (partial) match object.
-   * 
-   */
-  public static SwSystemChild2ItemMatch newMatch(final InstanceSpecification pChild, final String pName) {
-    return new Immutable(pChild, pName);
-  }
-  
-  private static final class Mutable extends SwSystemChild2ItemMatch {
-    Mutable(final InstanceSpecification pChild, final String pName) {
-      super(pChild, pName);
-    }
-    
-    @Override
-    public boolean isMutable() {
-      return true;
-    }
-  }
-  
-  private static final class Immutable extends SwSystemChild2ItemMatch {
-    Immutable(final InstanceSpecification pChild, final String pName) {
-      super(pChild, pName);
-    }
-    
-    @Override
-    public boolean isMutable() {
-      return false;
-    }
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/SwSystemChild2ItemMatcher.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/SwSystemChild2ItemMatcher.java
deleted file mode 100644
index e79bb78b5c6a7253bf5de1146628491c101e9e99..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/SwSystemChild2ItemMatcher.java
+++ /dev/null
@@ -1,310 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import org.apache.log4j.Logger;
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.viatra.query.runtime.api.IMatchProcessor;
-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import org.polarsys.chess.instance.view.SwSystemChild2ItemMatch;
-import org.polarsys.chess.instance.view.util.SwSystemChild2ItemQuerySpecification;
-
-/**
- * Generated pattern matcher API of the org.polarsys.chess.instance.view.swSystemChild2Item pattern,
- * providing pattern-specific query methods.
- * 
- * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
- * e.g. in conjunction with {@link ViatraQueryEngine#on(Notifier)}.
- * 
- * <p>Matches of the pattern will be represented as {@link SwSystemChild2ItemMatch}.
- * 
- * <p>Original source:
- * <code><pre>
- * {@literal @}Item(item = child, hierarchy = "child", label = "$name$ (Instance)")
- * pattern swSystemChild2Item(child, name) {
- * 	
- * 	find  swSystemChild2(child, _,  _, name);
- * 	//check(name.startsWith(parentname) && !name.equalsIgnoreCase(parentname) && !name.substring(parentname.length+1).contains("."));
- * 	InstanceSpecification.classifier(child, class);
- * 	Classifier.name(class, classname);
- * 	
- * 	check(name.contains("."));
- * 	check(!classname.empty);
- * 	
- * }
- * </pre></code>
- * 
- * @see SwSystemChild2ItemMatch
- *  @see SwSystemChild2ItemProcessor
- * @see SwSystemChild2ItemQuerySpecification
- * 
- */
-@SuppressWarnings("all")
-public class SwSystemChild2ItemMatcher extends BaseMatcher<SwSystemChild2ItemMatch> {
-  /**
-   * Initializes the pattern matcher within an existing VIATRA Query engine.
-   * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-   * The match set will be incrementally refreshed upon updates.
-   * @param engine the existing VIATRA Query engine in which this matcher will be created.
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * 
-   */
-  public static SwSystemChild2ItemMatcher on(final ViatraQueryEngine engine) throws ViatraQueryException {
-    // check if matcher already exists
-    SwSystemChild2ItemMatcher matcher = engine.getExistingMatcher(querySpecification());
-    if (matcher == null) {
-        matcher = (SwSystemChild2ItemMatcher)engine.getMatcher(querySpecification());
-    }
-    return matcher;
-  }
-  
-  /**
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * @return an initialized matcher
-   * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
-   * 
-   */
-  public static SwSystemChild2ItemMatcher create() throws ViatraQueryException {
-    return new SwSystemChild2ItemMatcher();
-  }
-  
-  private final static int POSITION_CHILD = 0;
-  
-  private final static int POSITION_NAME = 1;
-  
-  private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(SwSystemChild2ItemMatcher.class);
-  
-  /**
-   * Initializes the pattern matcher within an existing VIATRA Query engine.
-   * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-   * The match set will be incrementally refreshed upon updates.
-   * @param engine the existing VIATRA Query engine in which this matcher will be created.
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * 
-   */
-  private SwSystemChild2ItemMatcher() throws ViatraQueryException {
-    super(querySpecification());
-  }
-  
-  /**
-   * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return matches represented as a SwSystemChild2ItemMatch object.
-   * 
-   */
-  public Collection<SwSystemChild2ItemMatch> getAllMatches(final InstanceSpecification pChild, final String pName) {
-    return rawGetAllMatches(new Object[]{pChild, pName});
-  }
-  
-  /**
-   * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-   * Neither determinism nor randomness of selection is guaranteed.
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return a match represented as a SwSystemChild2ItemMatch object, or null if no match is found.
-   * 
-   */
-  public SwSystemChild2ItemMatch getOneArbitraryMatch(final InstanceSpecification pChild, final String pName) {
-    return rawGetOneArbitraryMatch(new Object[]{pChild, pName});
-  }
-  
-  /**
-   * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
-   * under any possible substitution of the unspecified parameters (if any).
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return true if the input is a valid (partial) match of the pattern.
-   * 
-   */
-  public boolean hasMatch(final InstanceSpecification pChild, final String pName) {
-    return rawHasMatch(new Object[]{pChild, pName});
-  }
-  
-  /**
-   * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return the number of pattern matches found.
-   * 
-   */
-  public int countMatches(final InstanceSpecification pChild, final String pName) {
-    return rawCountMatches(new Object[]{pChild, pName});
-  }
-  
-  /**
-   * Executes the given processor on each match of the pattern that conforms to the given fixed values of some parameters.
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @param processor the action that will process each pattern match.
-   * 
-   */
-  public void forEachMatch(final InstanceSpecification pChild, final String pName, final IMatchProcessor<? super SwSystemChild2ItemMatch> processor) {
-    rawForEachMatch(new Object[]{pChild, pName}, processor);
-  }
-  
-  /**
-   * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-   * Neither determinism nor randomness of selection is guaranteed.
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @param processor the action that will process the selected match.
-   * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
-   * 
-   */
-  public boolean forOneArbitraryMatch(final InstanceSpecification pChild, final String pName, final IMatchProcessor<? super SwSystemChild2ItemMatch> processor) {
-    return rawForOneArbitraryMatch(new Object[]{pChild, pName}, processor);
-  }
-  
-  /**
-   * Returns a new (partial) match.
-   * This can be used e.g. to call the matcher with a partial match.
-   * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return the (partial) match object.
-   * 
-   */
-  public SwSystemChild2ItemMatch newMatch(final InstanceSpecification pChild, final String pName) {
-    return SwSystemChild2ItemMatch.newMatch(pChild, pName);
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for child.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  protected Set<InstanceSpecification> rawAccumulateAllValuesOfchild(final Object[] parameters) {
-    Set<InstanceSpecification> results = new HashSet<InstanceSpecification>();
-    rawAccumulateAllValues(POSITION_CHILD, parameters, results);
-    return results;
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for child.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<InstanceSpecification> getAllValuesOfchild() {
-    return rawAccumulateAllValuesOfchild(emptyArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for child.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<InstanceSpecification> getAllValuesOfchild(final SwSystemChild2ItemMatch partialMatch) {
-    return rawAccumulateAllValuesOfchild(partialMatch.toArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for child.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<InstanceSpecification> getAllValuesOfchild(final String pName) {
-    return rawAccumulateAllValuesOfchild(new Object[]{
-    null, 
-    pName
-    });
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for name.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  protected Set<String> rawAccumulateAllValuesOfname(final Object[] parameters) {
-    Set<String> results = new HashSet<String>();
-    rawAccumulateAllValues(POSITION_NAME, parameters, results);
-    return results;
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for name.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<String> getAllValuesOfname() {
-    return rawAccumulateAllValuesOfname(emptyArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for name.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<String> getAllValuesOfname(final SwSystemChild2ItemMatch partialMatch) {
-    return rawAccumulateAllValuesOfname(partialMatch.toArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for name.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<String> getAllValuesOfname(final InstanceSpecification pChild) {
-    return rawAccumulateAllValuesOfname(new Object[]{
-    pChild, 
-    null
-    });
-  }
-  
-  @Override
-  protected SwSystemChild2ItemMatch tupleToMatch(final Tuple t) {
-    try {
-        return SwSystemChild2ItemMatch.newMatch((InstanceSpecification) t.get(POSITION_CHILD), (String) t.get(POSITION_NAME));
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in tuple not properly typed!",e);
-        return null;
-    }
-  }
-  
-  @Override
-  protected SwSystemChild2ItemMatch arrayToMatch(final Object[] match) {
-    try {
-        return SwSystemChild2ItemMatch.newMatch((InstanceSpecification) match[POSITION_CHILD], (String) match[POSITION_NAME]);
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in array not properly typed!",e);
-        return null;
-    }
-  }
-  
-  @Override
-  protected SwSystemChild2ItemMatch arrayToMatchMutable(final Object[] match) {
-    try {
-        return SwSystemChild2ItemMatch.newMutableMatch((InstanceSpecification) match[POSITION_CHILD], (String) match[POSITION_NAME]);
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in array not properly typed!",e);
-        return null;
-    }
-  }
-  
-  /**
-   * @return the singleton instance of the query specification of this pattern
-   * @throws ViatraQueryException if the pattern definition could not be loaded
-   * 
-   */
-  public static IQuerySpecification<SwSystemChild2ItemMatcher> querySpecification() throws ViatraQueryException {
-    return SwSystemChild2ItemQuerySpecification.instance();
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/SwSystemChild2Match.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/SwSystemChild2Match.java
deleted file mode 100644
index 600195ff404d6085c87e5806eec0b84c1aeae5ec..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/SwSystemChild2Match.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.viatra.query.runtime.api.IPatternMatch;
-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.polarsys.chess.instance.view.util.SwSystemChild2QuerySpecification;
-
-/**
- * Pattern-specific match representation of the org.polarsys.chess.instance.view.swSystemChild2 pattern,
- * to be used in conjunction with {@link SwSystemChild2Matcher}.
- * 
- * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
- * Each instance is a (possibly partial) substitution of pattern parameters,
- * usable to represent a match of the pattern in the result of a query,
- * or to specify the bound (fixed) input parameters when issuing a query.
- * 
- * @see SwSystemChild2Matcher
- *  @see SwSystemChild2Processor
- * 
- */
-@SuppressWarnings("all")
-public abstract class SwSystemChild2Match extends BasePatternMatch {
-  private InstanceSpecification fChild;
-  
-  private org.eclipse.uml2.uml.Package fInstSpec;
-  
-  private InstanceSpecification fParent;
-  
-  private String fName;
-  
-  private static List<String> parameterNames = makeImmutableList("child", "instSpec", "parent", "name");
-  
-  private SwSystemChild2Match(final InstanceSpecification pChild, final org.eclipse.uml2.uml.Package pInstSpec, final InstanceSpecification pParent, final String pName) {
-    this.fChild = pChild;
-    this.fInstSpec = pInstSpec;
-    this.fParent = pParent;
-    this.fName = pName;
-  }
-  
-  @Override
-  public Object get(final String parameterName) {
-    if ("child".equals(parameterName)) return this.fChild;
-    if ("instSpec".equals(parameterName)) return this.fInstSpec;
-    if ("parent".equals(parameterName)) return this.fParent;
-    if ("name".equals(parameterName)) return this.fName;
-    return null;
-  }
-  
-  public InstanceSpecification getChild() {
-    return this.fChild;
-  }
-  
-  public org.eclipse.uml2.uml.Package getInstSpec() {
-    return this.fInstSpec;
-  }
-  
-  public InstanceSpecification getParent() {
-    return this.fParent;
-  }
-  
-  public String getName() {
-    return this.fName;
-  }
-  
-  @Override
-  public boolean set(final String parameterName, final Object newValue) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    if ("child".equals(parameterName) ) {
-        this.fChild = (InstanceSpecification) newValue;
-        return true;
-    }
-    if ("instSpec".equals(parameterName) ) {
-        this.fInstSpec = (org.eclipse.uml2.uml.Package) newValue;
-        return true;
-    }
-    if ("parent".equals(parameterName) ) {
-        this.fParent = (InstanceSpecification) newValue;
-        return true;
-    }
-    if ("name".equals(parameterName) ) {
-        this.fName = (String) newValue;
-        return true;
-    }
-    return false;
-  }
-  
-  public void setChild(final InstanceSpecification pChild) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    this.fChild = pChild;
-  }
-  
-  public void setInstSpec(final org.eclipse.uml2.uml.Package pInstSpec) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    this.fInstSpec = pInstSpec;
-  }
-  
-  public void setParent(final InstanceSpecification pParent) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    this.fParent = pParent;
-  }
-  
-  public void setName(final String pName) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    this.fName = pName;
-  }
-  
-  @Override
-  public String patternName() {
-    return "org.polarsys.chess.instance.view.swSystemChild2";
-  }
-  
-  @Override
-  public List<String> parameterNames() {
-    return SwSystemChild2Match.parameterNames;
-  }
-  
-  @Override
-  public Object[] toArray() {
-    return new Object[]{fChild, fInstSpec, fParent, fName};
-  }
-  
-  @Override
-  public SwSystemChild2Match toImmutable() {
-    return isMutable() ? newMatch(fChild, fInstSpec, fParent, fName) : this;
-  }
-  
-  @Override
-  public String prettyPrint() {
-    StringBuilder result = new StringBuilder();
-    result.append("\"child\"=" + prettyPrintValue(fChild) + ", ");
-    result.append("\"instSpec\"=" + prettyPrintValue(fInstSpec) + ", ");
-    result.append("\"parent\"=" + prettyPrintValue(fParent) + ", ");
-    result.append("\"name\"=" + prettyPrintValue(fName));
-    return result.toString();
-  }
-  
-  @Override
-  public int hashCode() {
-    return Objects.hash(fChild, fInstSpec, fParent, fName);
-  }
-  
-  @Override
-  public boolean equals(final Object obj) {
-    if (this == obj)
-        return true;
-    if (obj == null) {
-        return false;
-    }
-    if ((obj instanceof SwSystemChild2Match)) {
-        SwSystemChild2Match other = (SwSystemChild2Match) obj;
-        return Objects.equals(fChild, other.fChild) && Objects.equals(fInstSpec, other.fInstSpec) && Objects.equals(fParent, other.fParent) && Objects.equals(fName, other.fName);
-    } else {
-        // this should be infrequent
-        if (!(obj instanceof IPatternMatch)) {
-            return false;
-        }
-        IPatternMatch otherSig  = (IPatternMatch) obj;
-        return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
-    }
-  }
-  
-  @Override
-  public SwSystemChild2QuerySpecification specification() {
-    try {
-        return SwSystemChild2QuerySpecification.instance();
-    } catch (ViatraQueryException ex) {
-         // This cannot happen, as the match object can only be instantiated if the query specification exists
-         throw new IllegalStateException (ex);
-    }
-  }
-  
-  /**
-   * Returns an empty, mutable match.
-   * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-   * 
-   * @return the empty match.
-   * 
-   */
-  public static SwSystemChild2Match newEmptyMatch() {
-    return new Mutable(null, null, null, null);
-  }
-  
-  /**
-   * Returns a mutable (partial) match.
-   * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-   * 
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pInstSpec the fixed value of pattern parameter instSpec, or null if not bound.
-   * @param pParent the fixed value of pattern parameter parent, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return the new, mutable (partial) match object.
-   * 
-   */
-  public static SwSystemChild2Match newMutableMatch(final InstanceSpecification pChild, final org.eclipse.uml2.uml.Package pInstSpec, final InstanceSpecification pParent, final String pName) {
-    return new Mutable(pChild, pInstSpec, pParent, pName);
-  }
-  
-  /**
-   * Returns a new (partial) match.
-   * This can be used e.g. to call the matcher with a partial match.
-   * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pInstSpec the fixed value of pattern parameter instSpec, or null if not bound.
-   * @param pParent the fixed value of pattern parameter parent, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return the (partial) match object.
-   * 
-   */
-  public static SwSystemChild2Match newMatch(final InstanceSpecification pChild, final org.eclipse.uml2.uml.Package pInstSpec, final InstanceSpecification pParent, final String pName) {
-    return new Immutable(pChild, pInstSpec, pParent, pName);
-  }
-  
-  private static final class Mutable extends SwSystemChild2Match {
-    Mutable(final InstanceSpecification pChild, final org.eclipse.uml2.uml.Package pInstSpec, final InstanceSpecification pParent, final String pName) {
-      super(pChild, pInstSpec, pParent, pName);
-    }
-    
-    @Override
-    public boolean isMutable() {
-      return true;
-    }
-  }
-  
-  private static final class Immutable extends SwSystemChild2Match {
-    Immutable(final InstanceSpecification pChild, final org.eclipse.uml2.uml.Package pInstSpec, final InstanceSpecification pParent, final String pName) {
-      super(pChild, pInstSpec, pParent, pName);
-    }
-    
-    @Override
-    public boolean isMutable() {
-      return false;
-    }
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/SwSystemChild2Matcher.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/SwSystemChild2Matcher.java
deleted file mode 100644
index 01aa145e3b8d6bf848eab3f097bd1289924f8d05..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/SwSystemChild2Matcher.java
+++ /dev/null
@@ -1,420 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import org.apache.log4j.Logger;
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.viatra.query.runtime.api.IMatchProcessor;
-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import org.polarsys.chess.instance.view.SwSystemChild2Match;
-import org.polarsys.chess.instance.view.util.SwSystemChild2QuerySpecification;
-
-/**
- * Generated pattern matcher API of the org.polarsys.chess.instance.view.swSystemChild2 pattern,
- * providing pattern-specific query methods.
- * 
- * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
- * e.g. in conjunction with {@link ViatraQueryEngine#on(Notifier)}.
- * 
- * <p>Matches of the pattern will be represented as {@link SwSystemChild2Match}.
- * 
- * <p>Original source:
- * <code><pre>
- * {@literal @}ContainsItem(container = parent, item = child)
- * 
- * pattern swSystemChild2(child, instSpec, parent, name) {
- * 	find swSystemCHGaResourcePlatform(instSpec);
- * 	Package.packagedElement(instSpec, child);
- * 	InstanceSpecification(child);
- * 	InstanceSpecification.name(child, name);
- * 	
- * 	Package.packagedElement(instSpec, parent);
- * 	InstanceSpecification.name(parent, parentname);
- * 	child != parent;
- * 	check(name.startsWith(parentname) && !name.equalsIgnoreCase(parentname) && !name.substring(parentname.length+1).contains("."));
- * 	
- * }
- * </pre></code>
- * 
- * @see SwSystemChild2Match
- *  @see SwSystemChild2Processor
- * @see SwSystemChild2QuerySpecification
- * 
- */
-@SuppressWarnings("all")
-public class SwSystemChild2Matcher extends BaseMatcher<SwSystemChild2Match> {
-  /**
-   * Initializes the pattern matcher within an existing VIATRA Query engine.
-   * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-   * The match set will be incrementally refreshed upon updates.
-   * @param engine the existing VIATRA Query engine in which this matcher will be created.
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * 
-   */
-  public static SwSystemChild2Matcher on(final ViatraQueryEngine engine) throws ViatraQueryException {
-    // check if matcher already exists
-    SwSystemChild2Matcher matcher = engine.getExistingMatcher(querySpecification());
-    if (matcher == null) {
-        matcher = (SwSystemChild2Matcher)engine.getMatcher(querySpecification());
-    }
-    return matcher;
-  }
-  
-  /**
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * @return an initialized matcher
-   * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
-   * 
-   */
-  public static SwSystemChild2Matcher create() throws ViatraQueryException {
-    return new SwSystemChild2Matcher();
-  }
-  
-  private final static int POSITION_CHILD = 0;
-  
-  private final static int POSITION_INSTSPEC = 1;
-  
-  private final static int POSITION_PARENT = 2;
-  
-  private final static int POSITION_NAME = 3;
-  
-  private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(SwSystemChild2Matcher.class);
-  
-  /**
-   * Initializes the pattern matcher within an existing VIATRA Query engine.
-   * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-   * The match set will be incrementally refreshed upon updates.
-   * @param engine the existing VIATRA Query engine in which this matcher will be created.
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * 
-   */
-  private SwSystemChild2Matcher() throws ViatraQueryException {
-    super(querySpecification());
-  }
-  
-  /**
-   * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pInstSpec the fixed value of pattern parameter instSpec, or null if not bound.
-   * @param pParent the fixed value of pattern parameter parent, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return matches represented as a SwSystemChild2Match object.
-   * 
-   */
-  public Collection<SwSystemChild2Match> getAllMatches(final InstanceSpecification pChild, final org.eclipse.uml2.uml.Package pInstSpec, final InstanceSpecification pParent, final String pName) {
-    return rawGetAllMatches(new Object[]{pChild, pInstSpec, pParent, pName});
-  }
-  
-  /**
-   * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-   * Neither determinism nor randomness of selection is guaranteed.
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pInstSpec the fixed value of pattern parameter instSpec, or null if not bound.
-   * @param pParent the fixed value of pattern parameter parent, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return a match represented as a SwSystemChild2Match object, or null if no match is found.
-   * 
-   */
-  public SwSystemChild2Match getOneArbitraryMatch(final InstanceSpecification pChild, final org.eclipse.uml2.uml.Package pInstSpec, final InstanceSpecification pParent, final String pName) {
-    return rawGetOneArbitraryMatch(new Object[]{pChild, pInstSpec, pParent, pName});
-  }
-  
-  /**
-   * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
-   * under any possible substitution of the unspecified parameters (if any).
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pInstSpec the fixed value of pattern parameter instSpec, or null if not bound.
-   * @param pParent the fixed value of pattern parameter parent, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return true if the input is a valid (partial) match of the pattern.
-   * 
-   */
-  public boolean hasMatch(final InstanceSpecification pChild, final org.eclipse.uml2.uml.Package pInstSpec, final InstanceSpecification pParent, final String pName) {
-    return rawHasMatch(new Object[]{pChild, pInstSpec, pParent, pName});
-  }
-  
-  /**
-   * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pInstSpec the fixed value of pattern parameter instSpec, or null if not bound.
-   * @param pParent the fixed value of pattern parameter parent, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return the number of pattern matches found.
-   * 
-   */
-  public int countMatches(final InstanceSpecification pChild, final org.eclipse.uml2.uml.Package pInstSpec, final InstanceSpecification pParent, final String pName) {
-    return rawCountMatches(new Object[]{pChild, pInstSpec, pParent, pName});
-  }
-  
-  /**
-   * Executes the given processor on each match of the pattern that conforms to the given fixed values of some parameters.
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pInstSpec the fixed value of pattern parameter instSpec, or null if not bound.
-   * @param pParent the fixed value of pattern parameter parent, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @param processor the action that will process each pattern match.
-   * 
-   */
-  public void forEachMatch(final InstanceSpecification pChild, final org.eclipse.uml2.uml.Package pInstSpec, final InstanceSpecification pParent, final String pName, final IMatchProcessor<? super SwSystemChild2Match> processor) {
-    rawForEachMatch(new Object[]{pChild, pInstSpec, pParent, pName}, processor);
-  }
-  
-  /**
-   * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-   * Neither determinism nor randomness of selection is guaranteed.
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pInstSpec the fixed value of pattern parameter instSpec, or null if not bound.
-   * @param pParent the fixed value of pattern parameter parent, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @param processor the action that will process the selected match.
-   * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
-   * 
-   */
-  public boolean forOneArbitraryMatch(final InstanceSpecification pChild, final org.eclipse.uml2.uml.Package pInstSpec, final InstanceSpecification pParent, final String pName, final IMatchProcessor<? super SwSystemChild2Match> processor) {
-    return rawForOneArbitraryMatch(new Object[]{pChild, pInstSpec, pParent, pName}, processor);
-  }
-  
-  /**
-   * Returns a new (partial) match.
-   * This can be used e.g. to call the matcher with a partial match.
-   * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-   * @param pChild the fixed value of pattern parameter child, or null if not bound.
-   * @param pInstSpec the fixed value of pattern parameter instSpec, or null if not bound.
-   * @param pParent the fixed value of pattern parameter parent, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return the (partial) match object.
-   * 
-   */
-  public SwSystemChild2Match newMatch(final InstanceSpecification pChild, final org.eclipse.uml2.uml.Package pInstSpec, final InstanceSpecification pParent, final String pName) {
-    return SwSystemChild2Match.newMatch(pChild, pInstSpec, pParent, pName);
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for child.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  protected Set<InstanceSpecification> rawAccumulateAllValuesOfchild(final Object[] parameters) {
-    Set<InstanceSpecification> results = new HashSet<InstanceSpecification>();
-    rawAccumulateAllValues(POSITION_CHILD, parameters, results);
-    return results;
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for child.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<InstanceSpecification> getAllValuesOfchild() {
-    return rawAccumulateAllValuesOfchild(emptyArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for child.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<InstanceSpecification> getAllValuesOfchild(final SwSystemChild2Match partialMatch) {
-    return rawAccumulateAllValuesOfchild(partialMatch.toArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for child.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<InstanceSpecification> getAllValuesOfchild(final org.eclipse.uml2.uml.Package pInstSpec, final InstanceSpecification pParent, final String pName) {
-    return rawAccumulateAllValuesOfchild(new Object[]{
-    null, 
-    pInstSpec, 
-    pParent, 
-    pName
-    });
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for instSpec.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  protected Set<org.eclipse.uml2.uml.Package> rawAccumulateAllValuesOfinstSpec(final Object[] parameters) {
-    Set<org.eclipse.uml2.uml.Package> results = new HashSet<org.eclipse.uml2.uml.Package>();
-    rawAccumulateAllValues(POSITION_INSTSPEC, parameters, results);
-    return results;
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for instSpec.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<org.eclipse.uml2.uml.Package> getAllValuesOfinstSpec() {
-    return rawAccumulateAllValuesOfinstSpec(emptyArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for instSpec.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<org.eclipse.uml2.uml.Package> getAllValuesOfinstSpec(final SwSystemChild2Match partialMatch) {
-    return rawAccumulateAllValuesOfinstSpec(partialMatch.toArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for instSpec.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<org.eclipse.uml2.uml.Package> getAllValuesOfinstSpec(final InstanceSpecification pChild, final InstanceSpecification pParent, final String pName) {
-    return rawAccumulateAllValuesOfinstSpec(new Object[]{
-    pChild, 
-    null, 
-    pParent, 
-    pName
-    });
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for parent.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  protected Set<InstanceSpecification> rawAccumulateAllValuesOfparent(final Object[] parameters) {
-    Set<InstanceSpecification> results = new HashSet<InstanceSpecification>();
-    rawAccumulateAllValues(POSITION_PARENT, parameters, results);
-    return results;
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for parent.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<InstanceSpecification> getAllValuesOfparent() {
-    return rawAccumulateAllValuesOfparent(emptyArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for parent.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<InstanceSpecification> getAllValuesOfparent(final SwSystemChild2Match partialMatch) {
-    return rawAccumulateAllValuesOfparent(partialMatch.toArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for parent.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<InstanceSpecification> getAllValuesOfparent(final InstanceSpecification pChild, final org.eclipse.uml2.uml.Package pInstSpec, final String pName) {
-    return rawAccumulateAllValuesOfparent(new Object[]{
-    pChild, 
-    pInstSpec, 
-    null, 
-    pName
-    });
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for name.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  protected Set<String> rawAccumulateAllValuesOfname(final Object[] parameters) {
-    Set<String> results = new HashSet<String>();
-    rawAccumulateAllValues(POSITION_NAME, parameters, results);
-    return results;
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for name.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<String> getAllValuesOfname() {
-    return rawAccumulateAllValuesOfname(emptyArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for name.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<String> getAllValuesOfname(final SwSystemChild2Match partialMatch) {
-    return rawAccumulateAllValuesOfname(partialMatch.toArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for name.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<String> getAllValuesOfname(final InstanceSpecification pChild, final org.eclipse.uml2.uml.Package pInstSpec, final InstanceSpecification pParent) {
-    return rawAccumulateAllValuesOfname(new Object[]{
-    pChild, 
-    pInstSpec, 
-    pParent, 
-    null
-    });
-  }
-  
-  @Override
-  protected SwSystemChild2Match tupleToMatch(final Tuple t) {
-    try {
-        return SwSystemChild2Match.newMatch((InstanceSpecification) t.get(POSITION_CHILD), (org.eclipse.uml2.uml.Package) t.get(POSITION_INSTSPEC), (InstanceSpecification) t.get(POSITION_PARENT), (String) t.get(POSITION_NAME));
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in tuple not properly typed!",e);
-        return null;
-    }
-  }
-  
-  @Override
-  protected SwSystemChild2Match arrayToMatch(final Object[] match) {
-    try {
-        return SwSystemChild2Match.newMatch((InstanceSpecification) match[POSITION_CHILD], (org.eclipse.uml2.uml.Package) match[POSITION_INSTSPEC], (InstanceSpecification) match[POSITION_PARENT], (String) match[POSITION_NAME]);
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in array not properly typed!",e);
-        return null;
-    }
-  }
-  
-  @Override
-  protected SwSystemChild2Match arrayToMatchMutable(final Object[] match) {
-    try {
-        return SwSystemChild2Match.newMutableMatch((InstanceSpecification) match[POSITION_CHILD], (org.eclipse.uml2.uml.Package) match[POSITION_INSTSPEC], (InstanceSpecification) match[POSITION_PARENT], (String) match[POSITION_NAME]);
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in array not properly typed!",e);
-        return null;
-    }
-  }
-  
-  /**
-   * @return the singleton instance of the query specification of this pattern
-   * @throws ViatraQueryException if the pattern definition could not be loaded
-   * 
-   */
-  public static IQuerySpecification<SwSystemChild2Matcher> querySpecification() throws ViatraQueryException {
-    return SwSystemChild2QuerySpecification.instance();
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/SwSystemRootMatch.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/SwSystemRootMatch.java
deleted file mode 100644
index 4d97177487274d7e7b0ea3d29c128cf95ba520b5..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/SwSystemRootMatch.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.viatra.query.runtime.api.IPatternMatch;
-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.polarsys.chess.instance.view.util.SwSystemRootQuerySpecification;
-
-/**
- * Pattern-specific match representation of the org.polarsys.chess.instance.view.swSystemRoot pattern,
- * to be used in conjunction with {@link SwSystemRootMatcher}.
- * 
- * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
- * Each instance is a (possibly partial) substitution of pattern parameters,
- * usable to represent a match of the pattern in the result of a query,
- * or to specify the bound (fixed) input parameters when issuing a query.
- * 
- * @see SwSystemRootMatcher
- *  @see SwSystemRootProcessor
- * 
- */
-@SuppressWarnings("all")
-public abstract class SwSystemRootMatch extends BasePatternMatch {
-  private InstanceSpecification fRoot;
-  
-  private org.eclipse.uml2.uml.Package fInstSpec;
-  
-  private String fName;
-  
-  private static List<String> parameterNames = makeImmutableList("root", "instSpec", "name");
-  
-  private SwSystemRootMatch(final InstanceSpecification pRoot, final org.eclipse.uml2.uml.Package pInstSpec, final String pName) {
-    this.fRoot = pRoot;
-    this.fInstSpec = pInstSpec;
-    this.fName = pName;
-  }
-  
-  @Override
-  public Object get(final String parameterName) {
-    if ("root".equals(parameterName)) return this.fRoot;
-    if ("instSpec".equals(parameterName)) return this.fInstSpec;
-    if ("name".equals(parameterName)) return this.fName;
-    return null;
-  }
-  
-  public InstanceSpecification getRoot() {
-    return this.fRoot;
-  }
-  
-  public org.eclipse.uml2.uml.Package getInstSpec() {
-    return this.fInstSpec;
-  }
-  
-  public String getName() {
-    return this.fName;
-  }
-  
-  @Override
-  public boolean set(final String parameterName, final Object newValue) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    if ("root".equals(parameterName) ) {
-        this.fRoot = (InstanceSpecification) newValue;
-        return true;
-    }
-    if ("instSpec".equals(parameterName) ) {
-        this.fInstSpec = (org.eclipse.uml2.uml.Package) newValue;
-        return true;
-    }
-    if ("name".equals(parameterName) ) {
-        this.fName = (String) newValue;
-        return true;
-    }
-    return false;
-  }
-  
-  public void setRoot(final InstanceSpecification pRoot) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    this.fRoot = pRoot;
-  }
-  
-  public void setInstSpec(final org.eclipse.uml2.uml.Package pInstSpec) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    this.fInstSpec = pInstSpec;
-  }
-  
-  public void setName(final String pName) {
-    if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-    this.fName = pName;
-  }
-  
-  @Override
-  public String patternName() {
-    return "org.polarsys.chess.instance.view.swSystemRoot";
-  }
-  
-  @Override
-  public List<String> parameterNames() {
-    return SwSystemRootMatch.parameterNames;
-  }
-  
-  @Override
-  public Object[] toArray() {
-    return new Object[]{fRoot, fInstSpec, fName};
-  }
-  
-  @Override
-  public SwSystemRootMatch toImmutable() {
-    return isMutable() ? newMatch(fRoot, fInstSpec, fName) : this;
-  }
-  
-  @Override
-  public String prettyPrint() {
-    StringBuilder result = new StringBuilder();
-    result.append("\"root\"=" + prettyPrintValue(fRoot) + ", ");
-    result.append("\"instSpec\"=" + prettyPrintValue(fInstSpec) + ", ");
-    result.append("\"name\"=" + prettyPrintValue(fName));
-    return result.toString();
-  }
-  
-  @Override
-  public int hashCode() {
-    return Objects.hash(fRoot, fInstSpec, fName);
-  }
-  
-  @Override
-  public boolean equals(final Object obj) {
-    if (this == obj)
-        return true;
-    if (obj == null) {
-        return false;
-    }
-    if ((obj instanceof SwSystemRootMatch)) {
-        SwSystemRootMatch other = (SwSystemRootMatch) obj;
-        return Objects.equals(fRoot, other.fRoot) && Objects.equals(fInstSpec, other.fInstSpec) && Objects.equals(fName, other.fName);
-    } else {
-        // this should be infrequent
-        if (!(obj instanceof IPatternMatch)) {
-            return false;
-        }
-        IPatternMatch otherSig  = (IPatternMatch) obj;
-        return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
-    }
-  }
-  
-  @Override
-  public SwSystemRootQuerySpecification specification() {
-    try {
-        return SwSystemRootQuerySpecification.instance();
-    } catch (ViatraQueryException ex) {
-         // This cannot happen, as the match object can only be instantiated if the query specification exists
-         throw new IllegalStateException (ex);
-    }
-  }
-  
-  /**
-   * Returns an empty, mutable match.
-   * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-   * 
-   * @return the empty match.
-   * 
-   */
-  public static SwSystemRootMatch newEmptyMatch() {
-    return new Mutable(null, null, null);
-  }
-  
-  /**
-   * Returns a mutable (partial) match.
-   * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-   * 
-   * @param pRoot the fixed value of pattern parameter root, or null if not bound.
-   * @param pInstSpec the fixed value of pattern parameter instSpec, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return the new, mutable (partial) match object.
-   * 
-   */
-  public static SwSystemRootMatch newMutableMatch(final InstanceSpecification pRoot, final org.eclipse.uml2.uml.Package pInstSpec, final String pName) {
-    return new Mutable(pRoot, pInstSpec, pName);
-  }
-  
-  /**
-   * Returns a new (partial) match.
-   * This can be used e.g. to call the matcher with a partial match.
-   * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-   * @param pRoot the fixed value of pattern parameter root, or null if not bound.
-   * @param pInstSpec the fixed value of pattern parameter instSpec, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return the (partial) match object.
-   * 
-   */
-  public static SwSystemRootMatch newMatch(final InstanceSpecification pRoot, final org.eclipse.uml2.uml.Package pInstSpec, final String pName) {
-    return new Immutable(pRoot, pInstSpec, pName);
-  }
-  
-  private static final class Mutable extends SwSystemRootMatch {
-    Mutable(final InstanceSpecification pRoot, final org.eclipse.uml2.uml.Package pInstSpec, final String pName) {
-      super(pRoot, pInstSpec, pName);
-    }
-    
-    @Override
-    public boolean isMutable() {
-      return true;
-    }
-  }
-  
-  private static final class Immutable extends SwSystemRootMatch {
-    Immutable(final InstanceSpecification pRoot, final org.eclipse.uml2.uml.Package pInstSpec, final String pName) {
-      super(pRoot, pInstSpec, pName);
-    }
-    
-    @Override
-    public boolean isMutable() {
-      return false;
-    }
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/SwSystemRootMatcher.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/SwSystemRootMatcher.java
deleted file mode 100644
index 27a78f6541f6afa8c86b06d88b9c575b99da3e28..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/SwSystemRootMatcher.java
+++ /dev/null
@@ -1,360 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import org.apache.log4j.Logger;
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.viatra.query.runtime.api.IMatchProcessor;
-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import org.polarsys.chess.instance.view.SwSystemRootMatch;
-import org.polarsys.chess.instance.view.util.SwSystemRootQuerySpecification;
-
-/**
- * Generated pattern matcher API of the org.polarsys.chess.instance.view.swSystemRoot pattern,
- * providing pattern-specific query methods.
- * 
- * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
- * e.g. in conjunction with {@link ViatraQueryEngine#on(Notifier)}.
- * 
- * <p>Matches of the pattern will be represented as {@link SwSystemRootMatch}.
- * 
- * <p>Original source:
- * <code><pre>
- * {@literal @}Item(item = root, hierarchy = "root", label = "$name$ (Instance)")
- * //{@literal @}ContainsItem(container = instSpec, item = root)
- * pattern swSystemRoot(root, instSpec, name) {
- * 	find swSystemCHGaResourcePlatform(instSpec);
- * 	Package.packagedElement(instSpec, root);
- * 	InstanceSpecification(root);
- * 	InstanceSpecification.name(root, name);
- * 	check(!name.contains("."));
- * }
- * </pre></code>
- * 
- * @see SwSystemRootMatch
- *  @see SwSystemRootProcessor
- * @see SwSystemRootQuerySpecification
- * 
- */
-@SuppressWarnings("all")
-public class SwSystemRootMatcher extends BaseMatcher<SwSystemRootMatch> {
-  /**
-   * Initializes the pattern matcher within an existing VIATRA Query engine.
-   * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-   * The match set will be incrementally refreshed upon updates.
-   * @param engine the existing VIATRA Query engine in which this matcher will be created.
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * 
-   */
-  public static SwSystemRootMatcher on(final ViatraQueryEngine engine) throws ViatraQueryException {
-    // check if matcher already exists
-    SwSystemRootMatcher matcher = engine.getExistingMatcher(querySpecification());
-    if (matcher == null) {
-        matcher = (SwSystemRootMatcher)engine.getMatcher(querySpecification());
-    }
-    return matcher;
-  }
-  
-  /**
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * @return an initialized matcher
-   * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
-   * 
-   */
-  public static SwSystemRootMatcher create() throws ViatraQueryException {
-    return new SwSystemRootMatcher();
-  }
-  
-  private final static int POSITION_ROOT = 0;
-  
-  private final static int POSITION_INSTSPEC = 1;
-  
-  private final static int POSITION_NAME = 2;
-  
-  private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(SwSystemRootMatcher.class);
-  
-  /**
-   * Initializes the pattern matcher within an existing VIATRA Query engine.
-   * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-   * The match set will be incrementally refreshed upon updates.
-   * @param engine the existing VIATRA Query engine in which this matcher will be created.
-   * @throws ViatraQueryException if an error occurs during pattern matcher creation
-   * 
-   */
-  private SwSystemRootMatcher() throws ViatraQueryException {
-    super(querySpecification());
-  }
-  
-  /**
-   * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
-   * @param pRoot the fixed value of pattern parameter root, or null if not bound.
-   * @param pInstSpec the fixed value of pattern parameter instSpec, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return matches represented as a SwSystemRootMatch object.
-   * 
-   */
-  public Collection<SwSystemRootMatch> getAllMatches(final InstanceSpecification pRoot, final org.eclipse.uml2.uml.Package pInstSpec, final String pName) {
-    return rawGetAllMatches(new Object[]{pRoot, pInstSpec, pName});
-  }
-  
-  /**
-   * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-   * Neither determinism nor randomness of selection is guaranteed.
-   * @param pRoot the fixed value of pattern parameter root, or null if not bound.
-   * @param pInstSpec the fixed value of pattern parameter instSpec, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return a match represented as a SwSystemRootMatch object, or null if no match is found.
-   * 
-   */
-  public SwSystemRootMatch getOneArbitraryMatch(final InstanceSpecification pRoot, final org.eclipse.uml2.uml.Package pInstSpec, final String pName) {
-    return rawGetOneArbitraryMatch(new Object[]{pRoot, pInstSpec, pName});
-  }
-  
-  /**
-   * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
-   * under any possible substitution of the unspecified parameters (if any).
-   * @param pRoot the fixed value of pattern parameter root, or null if not bound.
-   * @param pInstSpec the fixed value of pattern parameter instSpec, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return true if the input is a valid (partial) match of the pattern.
-   * 
-   */
-  public boolean hasMatch(final InstanceSpecification pRoot, final org.eclipse.uml2.uml.Package pInstSpec, final String pName) {
-    return rawHasMatch(new Object[]{pRoot, pInstSpec, pName});
-  }
-  
-  /**
-   * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
-   * @param pRoot the fixed value of pattern parameter root, or null if not bound.
-   * @param pInstSpec the fixed value of pattern parameter instSpec, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return the number of pattern matches found.
-   * 
-   */
-  public int countMatches(final InstanceSpecification pRoot, final org.eclipse.uml2.uml.Package pInstSpec, final String pName) {
-    return rawCountMatches(new Object[]{pRoot, pInstSpec, pName});
-  }
-  
-  /**
-   * Executes the given processor on each match of the pattern that conforms to the given fixed values of some parameters.
-   * @param pRoot the fixed value of pattern parameter root, or null if not bound.
-   * @param pInstSpec the fixed value of pattern parameter instSpec, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @param processor the action that will process each pattern match.
-   * 
-   */
-  public void forEachMatch(final InstanceSpecification pRoot, final org.eclipse.uml2.uml.Package pInstSpec, final String pName, final IMatchProcessor<? super SwSystemRootMatch> processor) {
-    rawForEachMatch(new Object[]{pRoot, pInstSpec, pName}, processor);
-  }
-  
-  /**
-   * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-   * Neither determinism nor randomness of selection is guaranteed.
-   * @param pRoot the fixed value of pattern parameter root, or null if not bound.
-   * @param pInstSpec the fixed value of pattern parameter instSpec, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @param processor the action that will process the selected match.
-   * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
-   * 
-   */
-  public boolean forOneArbitraryMatch(final InstanceSpecification pRoot, final org.eclipse.uml2.uml.Package pInstSpec, final String pName, final IMatchProcessor<? super SwSystemRootMatch> processor) {
-    return rawForOneArbitraryMatch(new Object[]{pRoot, pInstSpec, pName}, processor);
-  }
-  
-  /**
-   * Returns a new (partial) match.
-   * This can be used e.g. to call the matcher with a partial match.
-   * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-   * @param pRoot the fixed value of pattern parameter root, or null if not bound.
-   * @param pInstSpec the fixed value of pattern parameter instSpec, or null if not bound.
-   * @param pName the fixed value of pattern parameter name, or null if not bound.
-   * @return the (partial) match object.
-   * 
-   */
-  public SwSystemRootMatch newMatch(final InstanceSpecification pRoot, final org.eclipse.uml2.uml.Package pInstSpec, final String pName) {
-    return SwSystemRootMatch.newMatch(pRoot, pInstSpec, pName);
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for root.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  protected Set<InstanceSpecification> rawAccumulateAllValuesOfroot(final Object[] parameters) {
-    Set<InstanceSpecification> results = new HashSet<InstanceSpecification>();
-    rawAccumulateAllValues(POSITION_ROOT, parameters, results);
-    return results;
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for root.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<InstanceSpecification> getAllValuesOfroot() {
-    return rawAccumulateAllValuesOfroot(emptyArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for root.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<InstanceSpecification> getAllValuesOfroot(final SwSystemRootMatch partialMatch) {
-    return rawAccumulateAllValuesOfroot(partialMatch.toArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for root.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<InstanceSpecification> getAllValuesOfroot(final org.eclipse.uml2.uml.Package pInstSpec, final String pName) {
-    return rawAccumulateAllValuesOfroot(new Object[]{
-    null, 
-    pInstSpec, 
-    pName
-    });
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for instSpec.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  protected Set<org.eclipse.uml2.uml.Package> rawAccumulateAllValuesOfinstSpec(final Object[] parameters) {
-    Set<org.eclipse.uml2.uml.Package> results = new HashSet<org.eclipse.uml2.uml.Package>();
-    rawAccumulateAllValues(POSITION_INSTSPEC, parameters, results);
-    return results;
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for instSpec.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<org.eclipse.uml2.uml.Package> getAllValuesOfinstSpec() {
-    return rawAccumulateAllValuesOfinstSpec(emptyArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for instSpec.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<org.eclipse.uml2.uml.Package> getAllValuesOfinstSpec(final SwSystemRootMatch partialMatch) {
-    return rawAccumulateAllValuesOfinstSpec(partialMatch.toArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for instSpec.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<org.eclipse.uml2.uml.Package> getAllValuesOfinstSpec(final InstanceSpecification pRoot, final String pName) {
-    return rawAccumulateAllValuesOfinstSpec(new Object[]{
-    pRoot, 
-    null, 
-    pName
-    });
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for name.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  protected Set<String> rawAccumulateAllValuesOfname(final Object[] parameters) {
-    Set<String> results = new HashSet<String>();
-    rawAccumulateAllValues(POSITION_NAME, parameters, results);
-    return results;
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for name.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<String> getAllValuesOfname() {
-    return rawAccumulateAllValuesOfname(emptyArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for name.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<String> getAllValuesOfname(final SwSystemRootMatch partialMatch) {
-    return rawAccumulateAllValuesOfname(partialMatch.toArray());
-  }
-  
-  /**
-   * Retrieve the set of values that occur in matches for name.
-   * @return the Set of all values or empty set if there are no matches
-   * 
-   */
-  public Set<String> getAllValuesOfname(final InstanceSpecification pRoot, final org.eclipse.uml2.uml.Package pInstSpec) {
-    return rawAccumulateAllValuesOfname(new Object[]{
-    pRoot, 
-    pInstSpec, 
-    null
-    });
-  }
-  
-  @Override
-  protected SwSystemRootMatch tupleToMatch(final Tuple t) {
-    try {
-        return SwSystemRootMatch.newMatch((InstanceSpecification) t.get(POSITION_ROOT), (org.eclipse.uml2.uml.Package) t.get(POSITION_INSTSPEC), (String) t.get(POSITION_NAME));
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in tuple not properly typed!",e);
-        return null;
-    }
-  }
-  
-  @Override
-  protected SwSystemRootMatch arrayToMatch(final Object[] match) {
-    try {
-        return SwSystemRootMatch.newMatch((InstanceSpecification) match[POSITION_ROOT], (org.eclipse.uml2.uml.Package) match[POSITION_INSTSPEC], (String) match[POSITION_NAME]);
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in array not properly typed!",e);
-        return null;
-    }
-  }
-  
-  @Override
-  protected SwSystemRootMatch arrayToMatchMutable(final Object[] match) {
-    try {
-        return SwSystemRootMatch.newMutableMatch((InstanceSpecification) match[POSITION_ROOT], (org.eclipse.uml2.uml.Package) match[POSITION_INSTSPEC], (String) match[POSITION_NAME]);
-    } catch(ClassCastException e) {
-        LOGGER.error("Element(s) in array not properly typed!",e);
-        return null;
-    }
-  }
-  
-  /**
-   * @return the singleton instance of the query specification of this pattern
-   * @throws ViatraQueryException if the pattern definition could not be loaded
-   * 
-   */
-  public static IQuerySpecification<SwSystemRootMatcher> querySpecification() throws ViatraQueryException {
-    return SwSystemRootQuerySpecification.instance();
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/View.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/View.java
deleted file mode 100644
index 5de3f455ee118a9ac6672c4595d1c024afc4dfdc..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/View.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view;
-
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedPatternGroup;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.polarsys.chess.instance.view.ChildCHRTSpecItemMatcher;
-import org.polarsys.chess.instance.view.ChildCHRTSpecMatcher;
-import org.polarsys.chess.instance.view.ChildPortSlotsMatcher;
-import org.polarsys.chess.instance.view.ChildPortSlotsOperationItemMatcher;
-import org.polarsys.chess.instance.view.ChildPortSlotsOperationMatcher;
-import org.polarsys.chess.instance.view.ChildPrivCHRTSpecItemMatcher;
-import org.polarsys.chess.instance.view.ChildPrivCHRTSpecMatcher;
-import org.polarsys.chess.instance.view.ChildPrivateOperationsMatcher;
-import org.polarsys.chess.instance.view.SwSystemCHGaResourcePlatformMatcher;
-import org.polarsys.chess.instance.view.SwSystemChild2ItemMatcher;
-import org.polarsys.chess.instance.view.SwSystemChild2Matcher;
-import org.polarsys.chess.instance.view.SwSystemRootMatcher;
-import org.polarsys.chess.instance.view.util.ChildCHRTSpecItemQuerySpecification;
-import org.polarsys.chess.instance.view.util.ChildCHRTSpecQuerySpecification;
-import org.polarsys.chess.instance.view.util.ChildPortSlotsOperationItemQuerySpecification;
-import org.polarsys.chess.instance.view.util.ChildPortSlotsOperationQuerySpecification;
-import org.polarsys.chess.instance.view.util.ChildPortSlotsQuerySpecification;
-import org.polarsys.chess.instance.view.util.ChildPrivCHRTSpecItemQuerySpecification;
-import org.polarsys.chess.instance.view.util.ChildPrivCHRTSpecQuerySpecification;
-import org.polarsys.chess.instance.view.util.ChildPrivateOperationsQuerySpecification;
-import org.polarsys.chess.instance.view.util.SwSystemCHGaResourcePlatformQuerySpecification;
-import org.polarsys.chess.instance.view.util.SwSystemChild2ItemQuerySpecification;
-import org.polarsys.chess.instance.view.util.SwSystemChild2QuerySpecification;
-import org.polarsys.chess.instance.view.util.SwSystemRootQuerySpecification;
-
-/**
- * A pattern group formed of all public patterns defined in view.vql.
- * 
- * <p>Use the static instance as any {@link org.eclipse.viatra.query.runtime.api.IPatternGroup}, to conveniently prepare
- * a VIATRA Query engine for matching all patterns originally defined in file view.vql,
- * in order to achieve better performance than one-by-one on-demand matcher initialization.
- * 
- * <p> From package org.polarsys.chess.instance.view, the group contains the definition of the following patterns: <ul>
- * <li>swSystemCHGaResourcePlatform</li>
- * <li>swSystemRoot</li>
- * <li>swSystemChild2Item</li>
- * <li>swSystemChild2</li>
- * <li>childPortSlots</li>
- * <li>childPrivateOperations</li>
- * <li>childPortSlotsOperationItem</li>
- * <li>childPortSlotsOperation</li>
- * <li>childCHRTSpecItem</li>
- * <li>childCHRTSpec</li>
- * <li>childPrivCHRTSpecItem</li>
- * <li>childPrivCHRTSpec</li>
- * </ul>
- * 
- * @see IPatternGroup
- * 
- */
-@SuppressWarnings("all")
-public final class View extends BaseGeneratedPatternGroup {
-  /**
-   * Access the pattern group.
-   * 
-   * @return the singleton instance of the group
-   * @throws ViatraQueryException if there was an error loading the generated code of pattern specifications
-   * 
-   */
-  public static View instance() throws ViatraQueryException {
-    if (INSTANCE == null) {
-        INSTANCE = new View();
-    }
-    return INSTANCE;
-  }
-  
-  private static View INSTANCE;
-  
-  private View() throws ViatraQueryException {
-    querySpecifications.add(SwSystemCHGaResourcePlatformQuerySpecification.instance());
-    querySpecifications.add(SwSystemRootQuerySpecification.instance());
-    querySpecifications.add(SwSystemChild2ItemQuerySpecification.instance());
-    querySpecifications.add(SwSystemChild2QuerySpecification.instance());
-    querySpecifications.add(ChildPortSlotsQuerySpecification.instance());
-    querySpecifications.add(ChildPrivateOperationsQuerySpecification.instance());
-    querySpecifications.add(ChildPortSlotsOperationItemQuerySpecification.instance());
-    querySpecifications.add(ChildPortSlotsOperationQuerySpecification.instance());
-    querySpecifications.add(ChildCHRTSpecItemQuerySpecification.instance());
-    querySpecifications.add(ChildCHRTSpecQuerySpecification.instance());
-    querySpecifications.add(ChildPrivCHRTSpecItemQuerySpecification.instance());
-    querySpecifications.add(ChildPrivCHRTSpecQuerySpecification.instance());
-  }
-  
-  public SwSystemCHGaResourcePlatformQuerySpecification getSwSystemCHGaResourcePlatform() throws ViatraQueryException {
-    return SwSystemCHGaResourcePlatformQuerySpecification.instance();
-  }
-  
-  public SwSystemCHGaResourcePlatformMatcher getSwSystemCHGaResourcePlatform(final ViatraQueryEngine engine) throws ViatraQueryException {
-    return SwSystemCHGaResourcePlatformMatcher.on(engine);
-  }
-  
-  public SwSystemRootQuerySpecification getSwSystemRoot() throws ViatraQueryException {
-    return SwSystemRootQuerySpecification.instance();
-  }
-  
-  public SwSystemRootMatcher getSwSystemRoot(final ViatraQueryEngine engine) throws ViatraQueryException {
-    return SwSystemRootMatcher.on(engine);
-  }
-  
-  public SwSystemChild2ItemQuerySpecification getSwSystemChild2Item() throws ViatraQueryException {
-    return SwSystemChild2ItemQuerySpecification.instance();
-  }
-  
-  public SwSystemChild2ItemMatcher getSwSystemChild2Item(final ViatraQueryEngine engine) throws ViatraQueryException {
-    return SwSystemChild2ItemMatcher.on(engine);
-  }
-  
-  public SwSystemChild2QuerySpecification getSwSystemChild2() throws ViatraQueryException {
-    return SwSystemChild2QuerySpecification.instance();
-  }
-  
-  public SwSystemChild2Matcher getSwSystemChild2(final ViatraQueryEngine engine) throws ViatraQueryException {
-    return SwSystemChild2Matcher.on(engine);
-  }
-  
-  public ChildPortSlotsQuerySpecification getChildPortSlots() throws ViatraQueryException {
-    return ChildPortSlotsQuerySpecification.instance();
-  }
-  
-  public ChildPortSlotsMatcher getChildPortSlots(final ViatraQueryEngine engine) throws ViatraQueryException {
-    return ChildPortSlotsMatcher.on(engine);
-  }
-  
-  public ChildPrivateOperationsQuerySpecification getChildPrivateOperations() throws ViatraQueryException {
-    return ChildPrivateOperationsQuerySpecification.instance();
-  }
-  
-  public ChildPrivateOperationsMatcher getChildPrivateOperations(final ViatraQueryEngine engine) throws ViatraQueryException {
-    return ChildPrivateOperationsMatcher.on(engine);
-  }
-  
-  public ChildPortSlotsOperationItemQuerySpecification getChildPortSlotsOperationItem() throws ViatraQueryException {
-    return ChildPortSlotsOperationItemQuerySpecification.instance();
-  }
-  
-  public ChildPortSlotsOperationItemMatcher getChildPortSlotsOperationItem(final ViatraQueryEngine engine) throws ViatraQueryException {
-    return ChildPortSlotsOperationItemMatcher.on(engine);
-  }
-  
-  public ChildPortSlotsOperationQuerySpecification getChildPortSlotsOperation() throws ViatraQueryException {
-    return ChildPortSlotsOperationQuerySpecification.instance();
-  }
-  
-  public ChildPortSlotsOperationMatcher getChildPortSlotsOperation(final ViatraQueryEngine engine) throws ViatraQueryException {
-    return ChildPortSlotsOperationMatcher.on(engine);
-  }
-  
-  public ChildCHRTSpecItemQuerySpecification getChildCHRTSpecItem() throws ViatraQueryException {
-    return ChildCHRTSpecItemQuerySpecification.instance();
-  }
-  
-  public ChildCHRTSpecItemMatcher getChildCHRTSpecItem(final ViatraQueryEngine engine) throws ViatraQueryException {
-    return ChildCHRTSpecItemMatcher.on(engine);
-  }
-  
-  public ChildCHRTSpecQuerySpecification getChildCHRTSpec() throws ViatraQueryException {
-    return ChildCHRTSpecQuerySpecification.instance();
-  }
-  
-  public ChildCHRTSpecMatcher getChildCHRTSpec(final ViatraQueryEngine engine) throws ViatraQueryException {
-    return ChildCHRTSpecMatcher.on(engine);
-  }
-  
-  public ChildPrivCHRTSpecItemQuerySpecification getChildPrivCHRTSpecItem() throws ViatraQueryException {
-    return ChildPrivCHRTSpecItemQuerySpecification.instance();
-  }
-  
-  public ChildPrivCHRTSpecItemMatcher getChildPrivCHRTSpecItem(final ViatraQueryEngine engine) throws ViatraQueryException {
-    return ChildPrivCHRTSpecItemMatcher.on(engine);
-  }
-  
-  public ChildPrivCHRTSpecQuerySpecification getChildPrivCHRTSpec() throws ViatraQueryException {
-    return ChildPrivCHRTSpecQuerySpecification.instance();
-  }
-  
-  public ChildPrivCHRTSpecMatcher getChildPrivCHRTSpec(final ViatraQueryEngine engine) throws ViatraQueryException {
-    return ChildPrivCHRTSpecMatcher.on(engine);
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/internal/.ClientServerPortHelperWithInterfaceQuerySpecification.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/internal/.ClientServerPortHelperWithInterfaceQuerySpecification.java._trace
deleted file mode 100644
index dc6341669206dff6ee853174e2e6a9a69971c8b0..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/internal/.ClientServerPortHelperWithInterfaceQuerySpecification.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/internal/.PortHelperWithValueQuerySpecification.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/internal/.PortHelperWithValueQuerySpecification.java._trace
deleted file mode 100644
index 01fce8b4aeb0914b8c3a5d9f36556d75307e961f..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/internal/.PortHelperWithValueQuerySpecification.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/internal/.ViewAll.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/internal/.ViewAll.java._trace
deleted file mode 100644
index 8f0189cfe8b03ec9e3cba796ed69c3704320fd12..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/internal/.ViewAll.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/internal/.gitignore b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/internal/.gitignore
deleted file mode 100644
index d3f5a12faa99758192ecc4ed3fc22c9249232e86..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/internal/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/internal/ClientServerPortHelperWithInterfaceQuerySpecification.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/internal/ClientServerPortHelperWithInterfaceQuerySpecification.java
deleted file mode 100644
index 6ac1495aef58e058b2095a78864ff56cd7cd39c6..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/internal/ClientServerPortHelperWithInterfaceQuerySpecification.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view.internal;
-
-import com.google.common.collect.Sets;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.eclipse.viatra.query.runtime.matchers.context.IInputKey;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.QueryInitializationException;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-
-/**
- * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
- * 
- * @see GenericPatternMatcher
- * @see GenericPatternMatch
- * 
- */
-@SuppressWarnings("all")
-public final class ClientServerPortHelperWithInterfaceQuerySpecification extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
-  private ClientServerPortHelperWithInterfaceQuerySpecification() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryException if the pattern definition could not be loaded
-   * 
-   */
-  public static ClientServerPortHelperWithInterfaceQuerySpecification instance() throws ViatraQueryException {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: org.polarsys.chess.instance.view.internal.ClientServerPortHelperWithInterfaceQuerySpecification (visibility: PUBLIC, simpleName: ClientServerPortHelperWithInterfaceQuerySpecification, identifier: org.polarsys.chess.instance.view.internal.ClientServerPortHelperWithInterfaceQuerySpecification, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: org.polarsys.chess.instance.view.internal) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: org.polarsys.chess.instance.view.internal.ClientServerPortHelperWithInterfaceQuerySpecification (visibility: PUBLIC, simpleName: ClientServerPortHelperWithInterfaceQuerySpecification, identifier: org.polarsys.chess.instance.view.internal.ClientServerPortHelperWithInterfaceQuerySpecification, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: org.polarsys.chess.instance.view.internal) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private final static ClientServerPortHelperWithInterfaceQuerySpecification INSTANCE = new ClientServerPortHelperWithInterfaceQuerySpecification();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private final static Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternalSneaky();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private final static ClientServerPortHelperWithInterfaceQuerySpecification.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_pCsp = new PParameter("csp", "org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.ClientServerPort", (IInputKey)null, PParameterDirection.INOUT);
-    
-    private final PParameter parameter_pInterf = new PParameter("interf", "org.eclipse.uml2.uml.Interface", (IInputKey)null, PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_pCsp, parameter_pInterf);
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "org.polarsys.chess.instance.view.clientServerPortHelperWithInterface";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("csp","interf");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() throws QueryInitializationException {
-      Set<PBody> bodies = Sets.newLinkedHashSet();
-      {
-          PBody body = new PBody(this);
-          PVariable var_csp = body.getOrCreateVariableByName("csp");
-          PVariable var_interf = body.getOrCreateVariableByName("interf");
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_csp, parameter_pCsp),
-             new ExportedParameter(body, var_interf, parameter_pInterf)
-          ));
-          // 	ClientServerPort.provInterface(csp, interf)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_csp), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/papyrus/GCM/1", "ClientServerPort")));
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_csp, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.eclipse.org/papyrus/GCM/1", "ClientServerPort", "provInterface")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Interface")));
-          new Equality(body, var__virtual_0_, var_interf);
-          bodies.add(body);
-      }
-      return bodies;
-    }
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/internal/PortHelperWithValueQuerySpecification.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/internal/PortHelperWithValueQuerySpecification.java
deleted file mode 100644
index 294a60f84f365c4249387bb42d4cdbe27a856ccc..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/internal/PortHelperWithValueQuerySpecification.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view.internal;
-
-import com.google.common.collect.Sets;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.eclipse.viatra.query.runtime.matchers.context.IInputKey;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.QueryInitializationException;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-
-/**
- * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
- * 
- * @see GenericPatternMatcher
- * @see GenericPatternMatch
- * 
- */
-@SuppressWarnings("all")
-public final class PortHelperWithValueQuerySpecification extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
-  private PortHelperWithValueQuerySpecification() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryException if the pattern definition could not be loaded
-   * 
-   */
-  public static PortHelperWithValueQuerySpecification instance() throws ViatraQueryException {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: org.polarsys.chess.instance.view.internal.PortHelperWithValueQuerySpecification (visibility: PUBLIC, simpleName: PortHelperWithValueQuerySpecification, identifier: org.polarsys.chess.instance.view.internal.PortHelperWithValueQuerySpecification, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: org.polarsys.chess.instance.view.internal) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: org.polarsys.chess.instance.view.internal.PortHelperWithValueQuerySpecification (visibility: PUBLIC, simpleName: PortHelperWithValueQuerySpecification, identifier: org.polarsys.chess.instance.view.internal.PortHelperWithValueQuerySpecification, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: org.polarsys.chess.instance.view.internal) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private final static PortHelperWithValueQuerySpecification INSTANCE = new PortHelperWithValueQuerySpecification();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private final static Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternalSneaky();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private final static PortHelperWithValueQuerySpecification.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_pSlot = new PParameter("slot", "org.eclipse.uml2.uml.Slot", (IInputKey)null, PParameterDirection.INOUT);
-    
-    private final PParameter parameter_pValue = new PParameter("value", "org.eclipse.uml2.uml.ValueSpecification", (IInputKey)null, PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_pSlot, parameter_pValue);
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "org.polarsys.chess.instance.view.portHelperWithValue";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("slot","value");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() throws QueryInitializationException {
-      Set<PBody> bodies = Sets.newLinkedHashSet();
-      {
-          PBody body = new PBody(this);
-          PVariable var_slot = body.getOrCreateVariableByName("slot");
-          PVariable var_value = body.getOrCreateVariableByName("value");
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_slot, parameter_pSlot),
-             new ExportedParameter(body, var_value, parameter_pValue)
-          ));
-          // 	Slot.value(slot,value)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_slot), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Slot")));
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_slot, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Slot", "value")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "ValueSpecification")));
-          new Equality(body, var__virtual_0_, var_value);
-          bodies.add(body);
-      }
-      return bodies;
-    }
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/internal/ViewAll.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/internal/ViewAll.java
deleted file mode 100644
index b89129b4180d64204224494eb8063af1987a6e6c..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/internal/ViewAll.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view.internal;
-
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedPatternGroup;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.polarsys.chess.instance.view.internal.ClientServerPortHelperWithInterfaceQuerySpecification;
-import org.polarsys.chess.instance.view.internal.PortHelperWithValueQuerySpecification;
-import org.polarsys.chess.instance.view.util.ChildCHRTSpecItemQuerySpecification;
-import org.polarsys.chess.instance.view.util.ChildCHRTSpecQuerySpecification;
-import org.polarsys.chess.instance.view.util.ChildPortSlotsOperationItemQuerySpecification;
-import org.polarsys.chess.instance.view.util.ChildPortSlotsOperationQuerySpecification;
-import org.polarsys.chess.instance.view.util.ChildPortSlotsQuerySpecification;
-import org.polarsys.chess.instance.view.util.ChildPrivCHRTSpecItemQuerySpecification;
-import org.polarsys.chess.instance.view.util.ChildPrivCHRTSpecQuerySpecification;
-import org.polarsys.chess.instance.view.util.ChildPrivateOperationsQuerySpecification;
-import org.polarsys.chess.instance.view.util.SwSystemCHGaResourcePlatformQuerySpecification;
-import org.polarsys.chess.instance.view.util.SwSystemChild2ItemQuerySpecification;
-import org.polarsys.chess.instance.view.util.SwSystemChild2QuerySpecification;
-import org.polarsys.chess.instance.view.util.SwSystemRootQuerySpecification;
-
-/**
- * A pattern group formed of all patterns defined in view.vql.
- * 
- * <p>A private group that includes private patterns as well. Only intended use case is for pattern testing.
- * 
- * <p> From package org.polarsys.chess.instance.view, the group contains the definition of the following patterns: <ul>
- * <li>swSystemCHGaResourcePlatform</li>
- * <li>swSystemRoot</li>
- * <li>swSystemChild2Item</li>
- * <li>swSystemChild2</li>
- * <li>childPortSlots</li>
- * <li>childPrivateOperations</li>
- * <li>childPortSlotsOperationItem</li>
- * <li>childPortSlotsOperation</li>
- * <li>childCHRTSpecItem</li>
- * <li>childCHRTSpec</li>
- * <li>childPrivCHRTSpecItem</li>
- * <li>childPrivCHRTSpec</li>
- * <li>portHelperWithValue</li>
- * <li>clientServerPortHelperWithInterface</li>
- * </ul>
- * 
- * @see IPatternGroup
- * 
- */
-@SuppressWarnings("all")
-public final class ViewAll extends BaseGeneratedPatternGroup {
-  /**
-   * Access the pattern group.
-   * 
-   * @return the singleton instance of the group
-   * @throws ViatraQueryException if there was an error loading the generated code of pattern specifications
-   * 
-   */
-  public static ViewAll instance() throws ViatraQueryException {
-    if (INSTANCE == null) {
-        INSTANCE = new ViewAll();
-    }
-    return INSTANCE;
-  }
-  
-  private static ViewAll INSTANCE;
-  
-  private ViewAll() throws ViatraQueryException {
-    querySpecifications.add(SwSystemCHGaResourcePlatformQuerySpecification.instance());
-    querySpecifications.add(SwSystemRootQuerySpecification.instance());
-    querySpecifications.add(SwSystemChild2ItemQuerySpecification.instance());
-    querySpecifications.add(SwSystemChild2QuerySpecification.instance());
-    querySpecifications.add(ChildPortSlotsQuerySpecification.instance());
-    querySpecifications.add(ChildPrivateOperationsQuerySpecification.instance());
-    querySpecifications.add(ChildPortSlotsOperationItemQuerySpecification.instance());
-    querySpecifications.add(ChildPortSlotsOperationQuerySpecification.instance());
-    querySpecifications.add(ChildCHRTSpecItemQuerySpecification.instance());
-    querySpecifications.add(ChildCHRTSpecQuerySpecification.instance());
-    querySpecifications.add(ChildPrivCHRTSpecItemQuerySpecification.instance());
-    querySpecifications.add(ChildPrivCHRTSpecQuerySpecification.instance());
-    querySpecifications.add(PortHelperWithValueQuerySpecification.instance());
-    querySpecifications.add(ClientServerPortHelperWithInterfaceQuerySpecification.instance());
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildCHRTSpecItemProcessor.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildCHRTSpecItemProcessor.java._trace
deleted file mode 100644
index 81f507b040fc9e93232521ea140c631da18ff706..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildCHRTSpecItemProcessor.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildCHRTSpecItemQuerySpecification.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildCHRTSpecItemQuerySpecification.java._trace
deleted file mode 100644
index 501365208fec909d64c1835389c27e8cd4dea9eb..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildCHRTSpecItemQuerySpecification.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildCHRTSpecProcessor.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildCHRTSpecProcessor.java._trace
deleted file mode 100644
index b72e158cb98bdb659a5b93bb350b953702454a82..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildCHRTSpecProcessor.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildCHRTSpecQuerySpecification.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildCHRTSpecQuerySpecification.java._trace
deleted file mode 100644
index b9c5dae28a04f53cf2a2350381d3f092748f8f41..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildCHRTSpecQuerySpecification.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPortSlotsOperationItemProcessor.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPortSlotsOperationItemProcessor.java._trace
deleted file mode 100644
index 91ac85769c739d108ba3c9979d145708d6750d7d..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPortSlotsOperationItemProcessor.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPortSlotsOperationItemQuerySpecification.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPortSlotsOperationItemQuerySpecification.java._trace
deleted file mode 100644
index d64ae22644901905c05dcdc898829ebac0539691..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPortSlotsOperationItemQuerySpecification.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPortSlotsOperationProcessor.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPortSlotsOperationProcessor.java._trace
deleted file mode 100644
index 1e743b5ab478b9fea3484b0e109310f318288de8..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPortSlotsOperationProcessor.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPortSlotsOperationQuerySpecification.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPortSlotsOperationQuerySpecification.java._trace
deleted file mode 100644
index f62a338522ded9ced7451573066546c046e4e40c..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPortSlotsOperationQuerySpecification.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPortSlotsProcessor.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPortSlotsProcessor.java._trace
deleted file mode 100644
index 59cfeaa9f82609c45168e9e2156d275867d8f1db..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPortSlotsProcessor.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPortSlotsQuerySpecification.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPortSlotsQuerySpecification.java._trace
deleted file mode 100644
index c7b6382de7855579532e658482f583256ed51c86..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPortSlotsQuerySpecification.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPrivCHRTSpecItemProcessor.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPrivCHRTSpecItemProcessor.java._trace
deleted file mode 100644
index 1c87aa6a7575e0ba463d37850a69b30b11700985..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPrivCHRTSpecItemProcessor.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPrivCHRTSpecItemQuerySpecification.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPrivCHRTSpecItemQuerySpecification.java._trace
deleted file mode 100644
index 41127673fb3831dd479b77292b69843bb6e49c9d..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPrivCHRTSpecItemQuerySpecification.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPrivCHRTSpecProcessor.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPrivCHRTSpecProcessor.java._trace
deleted file mode 100644
index 8a71864fcea66831938f5cc13043f6a73b2b1420..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPrivCHRTSpecProcessor.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPrivCHRTSpecQuerySpecification.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPrivCHRTSpecQuerySpecification.java._trace
deleted file mode 100644
index 7cc41c0263be38ea28e5ac8e3d8b093e9de6ea1d..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPrivCHRTSpecQuerySpecification.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPrivateOperationsProcessor.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPrivateOperationsProcessor.java._trace
deleted file mode 100644
index b1c9615c118bb967f8281a83e04448af44d8819d..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPrivateOperationsProcessor.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPrivateOperationsQuerySpecification.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPrivateOperationsQuerySpecification.java._trace
deleted file mode 100644
index db4ad7bbb7e8a094cbf144f836276ef6da4aadbb..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.ChildPrivateOperationsQuerySpecification.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.SwSystemCHGaResourcePlatformProcessor.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.SwSystemCHGaResourcePlatformProcessor.java._trace
deleted file mode 100644
index 52720bdd28fe535674450d241dd8ffce8f873d20..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.SwSystemCHGaResourcePlatformProcessor.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.SwSystemCHGaResourcePlatformQuerySpecification.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.SwSystemCHGaResourcePlatformQuerySpecification.java._trace
deleted file mode 100644
index eb40de201e648888d77f89a8a22a66028f1b376b..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.SwSystemCHGaResourcePlatformQuerySpecification.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.SwSystemChild2ItemProcessor.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.SwSystemChild2ItemProcessor.java._trace
deleted file mode 100644
index faa8a65431a4726213bba86187ddc9a40319c4eb..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.SwSystemChild2ItemProcessor.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.SwSystemChild2ItemQuerySpecification.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.SwSystemChild2ItemQuerySpecification.java._trace
deleted file mode 100644
index 7d07da1ce24022cf9e40dec6022a2db536fb8c7b..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.SwSystemChild2ItemQuerySpecification.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.SwSystemChild2Processor.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.SwSystemChild2Processor.java._trace
deleted file mode 100644
index 39330f2c627f17c0b13bfc31f07799d514378386..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.SwSystemChild2Processor.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.SwSystemChild2QuerySpecification.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.SwSystemChild2QuerySpecification.java._trace
deleted file mode 100644
index 1509901d0a07a22a5d30586ad93f49fa8d90d4e1..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.SwSystemChild2QuerySpecification.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.SwSystemRootProcessor.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.SwSystemRootProcessor.java._trace
deleted file mode 100644
index 57e9422957561bac1a5db0b98094fe7718eab953..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.SwSystemRootProcessor.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.SwSystemRootQuerySpecification.java._trace b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.SwSystemRootQuerySpecification.java._trace
deleted file mode 100644
index 41946c7d4cbd01bebd13cfa4575090f34e9a5456..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.SwSystemRootQuerySpecification.java._trace and /dev/null differ
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.gitignore b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/.gitignore
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildCHRTSpecItemProcessor.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildCHRTSpecItemProcessor.java
deleted file mode 100644
index 96e026957e40409c59102836e6819b681bfe1c59..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildCHRTSpecItemProcessor.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view.util;
-
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.viatra.query.runtime.api.IMatchProcessor;
-import org.polarsys.chess.instance.view.ChildCHRTSpecItemMatch;
-
-/**
- * A match processor tailored for the org.polarsys.chess.instance.view.childCHRTSpecItem pattern.
- * 
- * Clients should derive an (anonymous) class that implements the abstract process().
- * 
- */
-@SuppressWarnings("all")
-public abstract class ChildCHRTSpecItemProcessor implements IMatchProcessor<ChildCHRTSpecItemMatch> {
-  /**
-   * Defines the action that is to be executed on each match.
-   * @param pChrtspecComment the value of pattern parameter chrtspecComment in the currently processed match
-   * 
-   */
-  public abstract void process(final Comment pChrtspecComment);
-  
-  @Override
-  public void process(final ChildCHRTSpecItemMatch match) {
-    process(match.getChrtspecComment());
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildCHRTSpecItemQuerySpecification.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildCHRTSpecItemQuerySpecification.java
deleted file mode 100644
index 099eb0a97daf9ffe4d2894eacecf7759af71a685..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildCHRTSpecItemQuerySpecification.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view.util;
-
-import com.google.common.collect.Sets;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.eclipse.viatra.query.runtime.matchers.context.IInputKey;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.QueryInitializationException;
-import org.eclipse.viatra.query.runtime.matchers.tuple.FlatTuple;
-import org.polarsys.chess.instance.view.ChildCHRTSpecItemMatch;
-import org.polarsys.chess.instance.view.ChildCHRTSpecItemMatcher;
-import org.polarsys.chess.instance.view.util.ChildCHRTSpecQuerySpecification;
-
-/**
- * A pattern-specific query specification that can instantiate ChildCHRTSpecItemMatcher in a type-safe way.
- * 
- * @see ChildCHRTSpecItemMatcher
- * @see ChildCHRTSpecItemMatch
- * 
- */
-@SuppressWarnings("all")
-public final class ChildCHRTSpecItemQuerySpecification extends BaseGeneratedEMFQuerySpecification<ChildCHRTSpecItemMatcher> {
-  private ChildCHRTSpecItemQuerySpecification() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryException if the pattern definition could not be loaded
-   * 
-   */
-  public static ChildCHRTSpecItemQuerySpecification instance() throws ViatraQueryException {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  @Override
-  protected ChildCHRTSpecItemMatcher instantiate(final ViatraQueryEngine engine) throws ViatraQueryException {
-    return ChildCHRTSpecItemMatcher.on(engine);
-  }
-  
-  @Override
-  public ChildCHRTSpecItemMatcher instantiate() throws ViatraQueryException {
-    return ChildCHRTSpecItemMatcher.create();
-  }
-  
-  @Override
-  public ChildCHRTSpecItemMatch newEmptyMatch() {
-    return ChildCHRTSpecItemMatch.newEmptyMatch();
-  }
-  
-  @Override
-  public ChildCHRTSpecItemMatch newMatch(final Object... parameters) {
-    return ChildCHRTSpecItemMatch.newMatch((org.eclipse.uml2.uml.Comment) parameters[0]);
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: org.polarsys.chess.instance.view.util.ChildCHRTSpecItemQuerySpecification (visibility: PUBLIC, simpleName: ChildCHRTSpecItemQuerySpecification, identifier: org.polarsys.chess.instance.view.util.ChildCHRTSpecItemQuerySpecification, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: org.polarsys.chess.instance.view.util) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: org.polarsys.chess.instance.view.util.ChildCHRTSpecItemQuerySpecification (visibility: PUBLIC, simpleName: ChildCHRTSpecItemQuerySpecification, identifier: org.polarsys.chess.instance.view.util.ChildCHRTSpecItemQuerySpecification, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: org.polarsys.chess.instance.view.util) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private final static ChildCHRTSpecItemQuerySpecification INSTANCE = new ChildCHRTSpecItemQuerySpecification();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private final static Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternalSneaky();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private final static ChildCHRTSpecItemQuerySpecification.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_pChrtspecComment = new PParameter("chrtspecComment", "org.eclipse.uml2.uml.Comment", (IInputKey)null, PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_pChrtspecComment);
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "org.polarsys.chess.instance.view.childCHRTSpecItem";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("chrtspecComment");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() throws QueryInitializationException {
-      Set<PBody> bodies = Sets.newLinkedHashSet();
-      try {
-          {
-              PBody body = new PBody(this);
-              PVariable var_chrtspecComment = body.getOrCreateVariableByName("chrtspecComment");
-              PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
-              body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-                 new ExportedParameter(body, var_chrtspecComment, parameter_pChrtspecComment)
-              ));
-              // 	//find childPortSlotsOperation(slot, operation, _);	find childCHRTSpec(chrtspecComment, _)
-              new PositivePatternCall(body, new FlatTuple(var_chrtspecComment, var___0_), ChildCHRTSpecQuerySpecification.instance().getInternalQueryRepresentation());
-              bodies.add(body);
-          }
-          {
-              PAnnotation annotation = new PAnnotation("Item");
-              annotation.addAttribute("item", new ParameterReference("chrtspecComment"));
-              annotation.addAttribute("hierarchy", "child");
-              annotation.addAttribute("label", "CHRtSpecification");
-              addAnnotation(annotation);
-          }
-      } catch (ViatraQueryException ex) {
-          throw processDependencyException(ex);
-      }
-      return bodies;
-    }
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildCHRTSpecProcessor.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildCHRTSpecProcessor.java
deleted file mode 100644
index b016114c8425d40f7993e00a3863d9e6bb4d398d..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildCHRTSpecProcessor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view.util;
-
-import org.eclipse.uml2.uml.BehavioralFeature;
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.viatra.query.runtime.api.IMatchProcessor;
-import org.polarsys.chess.instance.view.ChildCHRTSpecMatch;
-
-/**
- * A match processor tailored for the org.polarsys.chess.instance.view.childCHRTSpec pattern.
- * 
- * Clients should derive an (anonymous) class that implements the abstract process().
- * 
- */
-@SuppressWarnings("all")
-public abstract class ChildCHRTSpecProcessor implements IMatchProcessor<ChildCHRTSpecMatch> {
-  /**
-   * Defines the action that is to be executed on each match.
-   * @param pChrtspecComment the value of pattern parameter chrtspecComment in the currently processed match
-   * @param pOperation the value of pattern parameter operation in the currently processed match
-   * 
-   */
-  public abstract void process(final Comment pChrtspecComment, final BehavioralFeature pOperation);
-  
-  @Override
-  public void process(final ChildCHRTSpecMatch match) {
-    process(match.getChrtspecComment(), match.getOperation());
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildCHRTSpecQuerySpecification.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildCHRTSpecQuerySpecification.java
deleted file mode 100644
index bdfa4cdb0ee95f52be63603aba1bf81620f4ba7c..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildCHRTSpecQuerySpecification.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view.util;
-
-import com.google.common.collect.Sets;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.eclipse.viatra.query.runtime.matchers.context.IInputKey;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.QueryInitializationException;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-import org.polarsys.chess.instance.view.ChildCHRTSpecMatch;
-import org.polarsys.chess.instance.view.ChildCHRTSpecMatcher;
-
-/**
- * A pattern-specific query specification that can instantiate ChildCHRTSpecMatcher in a type-safe way.
- * 
- * @see ChildCHRTSpecMatcher
- * @see ChildCHRTSpecMatch
- * 
- */
-@SuppressWarnings("all")
-public final class ChildCHRTSpecQuerySpecification extends BaseGeneratedEMFQuerySpecification<ChildCHRTSpecMatcher> {
-  private ChildCHRTSpecQuerySpecification() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryException if the pattern definition could not be loaded
-   * 
-   */
-  public static ChildCHRTSpecQuerySpecification instance() throws ViatraQueryException {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  @Override
-  protected ChildCHRTSpecMatcher instantiate(final ViatraQueryEngine engine) throws ViatraQueryException {
-    return ChildCHRTSpecMatcher.on(engine);
-  }
-  
-  @Override
-  public ChildCHRTSpecMatcher instantiate() throws ViatraQueryException {
-    return ChildCHRTSpecMatcher.create();
-  }
-  
-  @Override
-  public ChildCHRTSpecMatch newEmptyMatch() {
-    return ChildCHRTSpecMatch.newEmptyMatch();
-  }
-  
-  @Override
-  public ChildCHRTSpecMatch newMatch(final Object... parameters) {
-    return ChildCHRTSpecMatch.newMatch((org.eclipse.uml2.uml.Comment) parameters[0], (org.eclipse.uml2.uml.BehavioralFeature) parameters[1]);
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: org.polarsys.chess.instance.view.util.ChildCHRTSpecQuerySpecification (visibility: PUBLIC, simpleName: ChildCHRTSpecQuerySpecification, identifier: org.polarsys.chess.instance.view.util.ChildCHRTSpecQuerySpecification, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: org.polarsys.chess.instance.view.util) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: org.polarsys.chess.instance.view.util.ChildCHRTSpecQuerySpecification (visibility: PUBLIC, simpleName: ChildCHRTSpecQuerySpecification, identifier: org.polarsys.chess.instance.view.util.ChildCHRTSpecQuerySpecification, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: org.polarsys.chess.instance.view.util) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private final static ChildCHRTSpecQuerySpecification INSTANCE = new ChildCHRTSpecQuerySpecification();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private final static Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternalSneaky();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private final static ChildCHRTSpecQuerySpecification.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_pChrtspecComment = new PParameter("chrtspecComment", "org.eclipse.uml2.uml.Comment", (IInputKey)null, PParameterDirection.INOUT);
-    
-    private final PParameter parameter_pOperation = new PParameter("operation", "org.eclipse.uml2.uml.BehavioralFeature", (IInputKey)null, PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_pChrtspecComment, parameter_pOperation);
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "org.polarsys.chess.instance.view.childCHRTSpec";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("chrtspecComment","operation");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() throws QueryInitializationException {
-      Set<PBody> bodies = Sets.newLinkedHashSet();
-      {
-          PBody body = new PBody(this);
-          PVariable var_chrtspecComment = body.getOrCreateVariableByName("chrtspecComment");
-          PVariable var_operation = body.getOrCreateVariableByName("operation");
-          PVariable var_chrtportslot = body.getOrCreateVariableByName("chrtportslot");
-          PVariable var_slot = body.getOrCreateVariableByName("slot");
-          PVariable var_chrt = body.getOrCreateVariableByName("chrt");
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_chrtspecComment, parameter_pChrtspecComment),
-             new ExportedParameter(body, var_operation, parameter_pOperation)
-          ));
-          // 			//find childPortSlotsOperation(slot, operation, _);	CHRtPortSlot.base_Slot(chrtportslot, slot)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_chrtportslot), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://CHESS/Predictability/RTComponentModel", "CHRtPortSlot")));
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_chrtportslot, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://CHESS/Predictability/RTComponentModel", "CHRtPortSlot", "base_Slot")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Slot")));
-          new Equality(body, var__virtual_0_, var_slot);
-          // 	CHRtPortSlot.cH_RtSpecification(chrtportslot, chrt)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_chrtportslot), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://CHESS/Predictability/RTComponentModel", "CHRtPortSlot")));
-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_chrtportslot, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://CHESS/Predictability/RTComponentModel", "CHRtPortSlot", "cH_RtSpecification")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://CHESS/Predictability/RTComponentModel", "CHRtSpecification")));
-          new Equality(body, var__virtual_1_, var_chrt);
-          // 	CHRtSpecification.context(chrt, operation)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_chrt), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://CHESS/Predictability/RTComponentModel", "CHRtSpecification")));
-          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_chrt, var__virtual_2_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://CHESS/Predictability/RTComponentModel", "CHRtSpecification", "context")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "BehavioralFeature")));
-          new Equality(body, var__virtual_2_, var_operation);
-          // 	CHRtSpecification.base_Comment(chrt, chrtspecComment)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_chrt), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://CHESS/Predictability/RTComponentModel", "CHRtSpecification")));
-          PVariable var__virtual_3_ = body.getOrCreateVariableByName(".virtual{3}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_chrt, var__virtual_3_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://CHESS/Predictability/RTComponentModel", "CHRtSpecification", "base_Comment")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_3_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Comment")));
-          new Equality(body, var__virtual_3_, var_chrtspecComment);
-          bodies.add(body);
-      }
-      {
-          PAnnotation annotation = new PAnnotation("ContainsItem");
-          annotation.addAttribute("container", new ParameterReference("operation"));
-          annotation.addAttribute("item", new ParameterReference("chrtspecComment"));
-          addAnnotation(annotation);
-      }
-      return bodies;
-    }
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPortSlotsOperationItemProcessor.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPortSlotsOperationItemProcessor.java
deleted file mode 100644
index 05b52117b4ea60a457e93982410c1d7fcceea05d..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPortSlotsOperationItemProcessor.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view.util;
-
-import org.eclipse.uml2.uml.Operation;
-import org.eclipse.viatra.query.runtime.api.IMatchProcessor;
-import org.polarsys.chess.instance.view.ChildPortSlotsOperationItemMatch;
-
-/**
- * A match processor tailored for the org.polarsys.chess.instance.view.childPortSlotsOperationItem pattern.
- * 
- * Clients should derive an (anonymous) class that implements the abstract process().
- * 
- */
-@SuppressWarnings("all")
-public abstract class ChildPortSlotsOperationItemProcessor implements IMatchProcessor<ChildPortSlotsOperationItemMatch> {
-  /**
-   * Defines the action that is to be executed on each match.
-   * @param pOperation the value of pattern parameter operation in the currently processed match
-   * @param pNameC the value of pattern parameter nameC in the currently processed match
-   * 
-   */
-  public abstract void process(final Operation pOperation, final String pNameC);
-  
-  @Override
-  public void process(final ChildPortSlotsOperationItemMatch match) {
-    process(match.getOperation(), match.getNameC());
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPortSlotsOperationItemQuerySpecification.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPortSlotsOperationItemQuerySpecification.java
deleted file mode 100644
index 1d230be22a562866760ca0ad98b6047aaa51ceb3..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPortSlotsOperationItemQuerySpecification.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view.util;
-
-import com.google.common.collect.Sets;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.eclipse.viatra.query.runtime.matchers.context.IInputKey;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.QueryInitializationException;
-import org.eclipse.viatra.query.runtime.matchers.tuple.FlatTuple;
-import org.polarsys.chess.instance.view.ChildPortSlotsOperationItemMatch;
-import org.polarsys.chess.instance.view.ChildPortSlotsOperationItemMatcher;
-import org.polarsys.chess.instance.view.util.ChildPortSlotsOperationQuerySpecification;
-
-/**
- * A pattern-specific query specification that can instantiate ChildPortSlotsOperationItemMatcher in a type-safe way.
- * 
- * @see ChildPortSlotsOperationItemMatcher
- * @see ChildPortSlotsOperationItemMatch
- * 
- */
-@SuppressWarnings("all")
-public final class ChildPortSlotsOperationItemQuerySpecification extends BaseGeneratedEMFQuerySpecification<ChildPortSlotsOperationItemMatcher> {
-  private ChildPortSlotsOperationItemQuerySpecification() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryException if the pattern definition could not be loaded
-   * 
-   */
-  public static ChildPortSlotsOperationItemQuerySpecification instance() throws ViatraQueryException {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  @Override
-  protected ChildPortSlotsOperationItemMatcher instantiate(final ViatraQueryEngine engine) throws ViatraQueryException {
-    return ChildPortSlotsOperationItemMatcher.on(engine);
-  }
-  
-  @Override
-  public ChildPortSlotsOperationItemMatcher instantiate() throws ViatraQueryException {
-    return ChildPortSlotsOperationItemMatcher.create();
-  }
-  
-  @Override
-  public ChildPortSlotsOperationItemMatch newEmptyMatch() {
-    return ChildPortSlotsOperationItemMatch.newEmptyMatch();
-  }
-  
-  @Override
-  public ChildPortSlotsOperationItemMatch newMatch(final Object... parameters) {
-    return ChildPortSlotsOperationItemMatch.newMatch((org.eclipse.uml2.uml.Operation) parameters[0], (java.lang.String) parameters[1]);
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: org.polarsys.chess.instance.view.util.ChildPortSlotsOperationItemQuerySpecification (visibility: PUBLIC, simpleName: ChildPortSlotsOperationItemQuerySpecification, identifier: org.polarsys.chess.instance.view.util.ChildPortSlotsOperationItemQuerySpecification, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: org.polarsys.chess.instance.view.util) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: org.polarsys.chess.instance.view.util.ChildPortSlotsOperationItemQuerySpecification (visibility: PUBLIC, simpleName: ChildPortSlotsOperationItemQuerySpecification, identifier: org.polarsys.chess.instance.view.util.ChildPortSlotsOperationItemQuerySpecification, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: org.polarsys.chess.instance.view.util) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private final static ChildPortSlotsOperationItemQuerySpecification INSTANCE = new ChildPortSlotsOperationItemQuerySpecification();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private final static Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternalSneaky();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private final static ChildPortSlotsOperationItemQuerySpecification.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_pOperation = new PParameter("operation", "org.eclipse.uml2.uml.Operation", (IInputKey)null, PParameterDirection.INOUT);
-    
-    private final PParameter parameter_pNameC = new PParameter("nameC", "java.lang.String", (IInputKey)null, PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_pOperation, parameter_pNameC);
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "org.polarsys.chess.instance.view.childPortSlotsOperationItem";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("operation","nameC");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() throws QueryInitializationException {
-      Set<PBody> bodies = Sets.newLinkedHashSet();
-      try {
-          {
-              PBody body = new PBody(this);
-              PVariable var_operation = body.getOrCreateVariableByName("operation");
-              PVariable var_nameC = body.getOrCreateVariableByName("nameC");
-              PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
-              body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-                 new ExportedParameter(body, var_operation, parameter_pOperation),
-                 new ExportedParameter(body, var_nameC, parameter_pNameC)
-              ));
-              //     find childPortSlotsOperation(_, operation, nameC)
-              new PositivePatternCall(body, new FlatTuple(var___0_, var_operation, var_nameC), ChildPortSlotsOperationQuerySpecification.instance().getInternalQueryRepresentation());
-              bodies.add(body);
-          }
-          {
-              PAnnotation annotation = new PAnnotation("Item");
-              annotation.addAttribute("item", new ParameterReference("operation"));
-              annotation.addAttribute("hierarchy", "child");
-              annotation.addAttribute("label", "$nameC$ (Operation)");
-              addAnnotation(annotation);
-          }
-      } catch (ViatraQueryException ex) {
-          throw processDependencyException(ex);
-      }
-      return bodies;
-    }
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPortSlotsOperationProcessor.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPortSlotsOperationProcessor.java
deleted file mode 100644
index 009858610b5832e281e354002e873e2a4593aff8..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPortSlotsOperationProcessor.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view.util;
-
-import org.eclipse.uml2.uml.Operation;
-import org.eclipse.uml2.uml.Slot;
-import org.eclipse.viatra.query.runtime.api.IMatchProcessor;
-import org.polarsys.chess.instance.view.ChildPortSlotsOperationMatch;
-
-/**
- * A match processor tailored for the org.polarsys.chess.instance.view.childPortSlotsOperation pattern.
- * 
- * Clients should derive an (anonymous) class that implements the abstract process().
- * 
- */
-@SuppressWarnings("all")
-public abstract class ChildPortSlotsOperationProcessor implements IMatchProcessor<ChildPortSlotsOperationMatch> {
-  /**
-   * Defines the action that is to be executed on each match.
-   * @param pSlot the value of pattern parameter slot in the currently processed match
-   * @param pOperation the value of pattern parameter operation in the currently processed match
-   * @param pNameC the value of pattern parameter nameC in the currently processed match
-   * 
-   */
-  public abstract void process(final Slot pSlot, final Operation pOperation, final String pNameC);
-  
-  @Override
-  public void process(final ChildPortSlotsOperationMatch match) {
-    process(match.getSlot(), match.getOperation(), match.getNameC());
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPortSlotsOperationQuerySpecification.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPortSlotsOperationQuerySpecification.java
deleted file mode 100644
index 0d08e48bb6806dff5239c314f68f971d4ca90dbd..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPortSlotsOperationQuerySpecification.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view.util;
-
-import com.google.common.collect.Sets;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EDataTypeInSlotsKey;
-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.eclipse.viatra.query.runtime.matchers.context.IInputKey;
-import org.eclipse.viatra.query.runtime.matchers.psystem.IExpressionEvaluator;
-import org.eclipse.viatra.query.runtime.matchers.psystem.IValueProvider;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.QueryInitializationException;
-import org.eclipse.viatra.query.runtime.matchers.tuple.FlatTuple;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-import org.polarsys.chess.instance.view.ChildPortSlotsOperationMatch;
-import org.polarsys.chess.instance.view.ChildPortSlotsOperationMatcher;
-import org.polarsys.chess.instance.view.internal.ClientServerPortHelperWithInterfaceQuerySpecification;
-import org.polarsys.chess.instance.view.util.ChildPortSlotsQuerySpecification;
-
-/**
- * A pattern-specific query specification that can instantiate ChildPortSlotsOperationMatcher in a type-safe way.
- * 
- * @see ChildPortSlotsOperationMatcher
- * @see ChildPortSlotsOperationMatch
- * 
- */
-@SuppressWarnings("all")
-public final class ChildPortSlotsOperationQuerySpecification extends BaseGeneratedEMFQuerySpecification<ChildPortSlotsOperationMatcher> {
-  private ChildPortSlotsOperationQuerySpecification() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryException if the pattern definition could not be loaded
-   * 
-   */
-  public static ChildPortSlotsOperationQuerySpecification instance() throws ViatraQueryException {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  @Override
-  protected ChildPortSlotsOperationMatcher instantiate(final ViatraQueryEngine engine) throws ViatraQueryException {
-    return ChildPortSlotsOperationMatcher.on(engine);
-  }
-  
-  @Override
-  public ChildPortSlotsOperationMatcher instantiate() throws ViatraQueryException {
-    return ChildPortSlotsOperationMatcher.create();
-  }
-  
-  @Override
-  public ChildPortSlotsOperationMatch newEmptyMatch() {
-    return ChildPortSlotsOperationMatch.newEmptyMatch();
-  }
-  
-  @Override
-  public ChildPortSlotsOperationMatch newMatch(final Object... parameters) {
-    return ChildPortSlotsOperationMatch.newMatch((org.eclipse.uml2.uml.Slot) parameters[0], (org.eclipse.uml2.uml.Operation) parameters[1], (java.lang.String) parameters[2]);
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: org.polarsys.chess.instance.view.util.ChildPortSlotsOperationQuerySpecification (visibility: PUBLIC, simpleName: ChildPortSlotsOperationQuerySpecification, identifier: org.polarsys.chess.instance.view.util.ChildPortSlotsOperationQuerySpecification, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: org.polarsys.chess.instance.view.util) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: org.polarsys.chess.instance.view.util.ChildPortSlotsOperationQuerySpecification (visibility: PUBLIC, simpleName: ChildPortSlotsOperationQuerySpecification, identifier: org.polarsys.chess.instance.view.util.ChildPortSlotsOperationQuerySpecification, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: org.polarsys.chess.instance.view.util) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private final static ChildPortSlotsOperationQuerySpecification INSTANCE = new ChildPortSlotsOperationQuerySpecification();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private final static Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternalSneaky();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private final static ChildPortSlotsOperationQuerySpecification.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_pSlot = new PParameter("slot", "org.eclipse.uml2.uml.Slot", (IInputKey)null, PParameterDirection.INOUT);
-    
-    private final PParameter parameter_pOperation = new PParameter("operation", "org.eclipse.uml2.uml.Operation", (IInputKey)null, PParameterDirection.INOUT);
-    
-    private final PParameter parameter_pNameC = new PParameter("nameC", "java.lang.String", (IInputKey)null, PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_pSlot, parameter_pOperation, parameter_pNameC);
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "org.polarsys.chess.instance.view.childPortSlotsOperation";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("slot","operation","nameC");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() throws QueryInitializationException {
-      Set<PBody> bodies = Sets.newLinkedHashSet();
-      try {
-          {
-              PBody body = new PBody(this);
-              PVariable var_slot = body.getOrCreateVariableByName("slot");
-              PVariable var_operation = body.getOrCreateVariableByName("operation");
-              PVariable var_nameC = body.getOrCreateVariableByName("nameC");
-              PVariable var_child = body.getOrCreateVariableByName("child");
-              PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
-              PVariable var_port = body.getOrCreateVariableByName("port");
-              PVariable var_csp = body.getOrCreateVariableByName("csp");
-              PVariable var_interface = body.getOrCreateVariableByName("interface");
-              PVariable var_operationI = body.getOrCreateVariableByName("operationI");
-              PVariable var_component = body.getOrCreateVariableByName("component");
-              PVariable var_nameI = body.getOrCreateVariableByName("nameI");
-              body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-                 new ExportedParameter(body, var_slot, parameter_pSlot),
-                 new ExportedParameter(body, var_operation, parameter_pOperation),
-                 new ExportedParameter(body, var_nameC, parameter_pNameC)
-              ));
-              // 	find childPortSlots(child, slot, _)
-              new PositivePatternCall(body, new FlatTuple(var_child, var_slot, var___0_), ChildPortSlotsQuerySpecification.instance().getInternalQueryRepresentation());
-              // 	Slot.definingFeature(slot, port)
-              new TypeConstraint(body, Tuples.flatTupleOf(var_slot), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Slot")));
-              PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-              new TypeConstraint(body, Tuples.flatTupleOf(var_slot, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Slot", "definingFeature")));
-              new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "StructuralFeature")));
-              new Equality(body, var__virtual_0_, var_port);
-              // 	ClientServerPort.base_Port(csp, port)
-              new TypeConstraint(body, Tuples.flatTupleOf(var_csp), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/papyrus/GCM/1", "ClientServerPort")));
-              PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-              new TypeConstraint(body, Tuples.flatTupleOf(var_csp, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.eclipse.org/papyrus/GCM/1", "ClientServerPort", "base_Port")));
-              new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Port")));
-              new Equality(body, var__virtual_1_, var_port);
-              // 	find clientServerPortHelperWithInterface (csp,interface)
-              new PositivePatternCall(body, new FlatTuple(var_csp, var_interface), ClientServerPortHelperWithInterfaceQuerySpecification.instance().getInternalQueryRepresentation());
-              // 	Interface.ownedOperation(interface, operationI)
-              new TypeConstraint(body, Tuples.flatTupleOf(var_interface), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Interface")));
-              PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
-              new TypeConstraint(body, Tuples.flatTupleOf(var_interface, var__virtual_2_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Interface", "ownedOperation")));
-              new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Operation")));
-              new Equality(body, var__virtual_2_, var_operationI);
-              // 		//retrieve the same operation owned by the referred component	InstanceSpecification.classifier(child, component)
-              new TypeConstraint(body, Tuples.flatTupleOf(var_child), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "InstanceSpecification")));
-              PVariable var__virtual_3_ = body.getOrCreateVariableByName(".virtual{3}");
-              new TypeConstraint(body, Tuples.flatTupleOf(var_child, var__virtual_3_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "InstanceSpecification", "classifier")));
-              new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_3_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Classifier")));
-              new Equality(body, var__virtual_3_, var_component);
-              // 	    Component.ownedOperation(component, operation)
-              new TypeConstraint(body, Tuples.flatTupleOf(var_component), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Component")));
-              PVariable var__virtual_4_ = body.getOrCreateVariableByName(".virtual{4}");
-              new TypeConstraint(body, Tuples.flatTupleOf(var_component, var__virtual_4_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Class", "ownedOperation")));
-              new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_4_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Operation")));
-              new Equality(body, var__virtual_4_, var_operation);
-              //     Operation.name(operationI, nameI)
-              new TypeConstraint(body, Tuples.flatTupleOf(var_operationI), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Operation")));
-              PVariable var__virtual_5_ = body.getOrCreateVariableByName(".virtual{5}");
-              new TypeConstraint(body, Tuples.flatTupleOf(var_operationI, var__virtual_5_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "NamedElement", "name")));
-              new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_5_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/Types", "String")));
-              new Equality(body, var__virtual_5_, var_nameI);
-              //     Operation.name(operation, nameC)
-              new TypeConstraint(body, Tuples.flatTupleOf(var_operation), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Operation")));
-              PVariable var__virtual_6_ = body.getOrCreateVariableByName(".virtual{6}");
-              new TypeConstraint(body, Tuples.flatTupleOf(var_operation, var__virtual_6_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "NamedElement", "name")));
-              new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_6_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/Types", "String")));
-              new Equality(body, var__virtual_6_, var_nameC);
-              //     check(nameI.compareTo(nameC)==0)
-              new ExpressionEvaluation(body, new IExpressionEvaluator() {
-              
-                  @Override
-                  public String getShortDescription() {
-                      return "Expression evaluation from pattern childPortSlotsOperation";
-                  }
-                  
-                  @Override
-                  public Iterable<String> getInputParameterNames() {
-                      return Arrays.asList("nameC", "nameI");}
-              
-                  @Override
-                  public Object evaluateExpression(IValueProvider provider) throws Exception {
-                      String nameC = (String) provider.getValue("nameC");
-                      String nameI = (String) provider.getValue("nameI");
-                      return evaluateExpression_1_1(nameC, nameI);
-                  }
-              },  null); 
-              bodies.add(body);
-          }
-          {
-              PAnnotation annotation = new PAnnotation("ContainsItem");
-              annotation.addAttribute("container", new ParameterReference("slot"));
-              annotation.addAttribute("item", new ParameterReference("operation"));
-              addAnnotation(annotation);
-          }
-      } catch (ViatraQueryException ex) {
-          throw processDependencyException(ex);
-      }
-      return bodies;
-    }
-  }
-  
-  private static boolean evaluateExpression_1_1(final String nameC, final String nameI) {
-    int _compareTo = nameI.compareTo(nameC);
-    boolean _equals = (_compareTo == 0);
-    return _equals;
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPortSlotsProcessor.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPortSlotsProcessor.java
deleted file mode 100644
index 11cf16ee0444e353e88ac9099646ce770e129fb2..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPortSlotsProcessor.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view.util;
-
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.uml2.uml.Slot;
-import org.eclipse.viatra.query.runtime.api.IMatchProcessor;
-import org.polarsys.chess.instance.view.ChildPortSlotsMatch;
-
-/**
- * A match processor tailored for the org.polarsys.chess.instance.view.childPortSlots pattern.
- * 
- * Clients should derive an (anonymous) class that implements the abstract process().
- * 
- */
-@SuppressWarnings("all")
-public abstract class ChildPortSlotsProcessor implements IMatchProcessor<ChildPortSlotsMatch> {
-  /**
-   * Defines the action that is to be executed on each match.
-   * @param pChild the value of pattern parameter child in the currently processed match
-   * @param pSlot the value of pattern parameter slot in the currently processed match
-   * @param pName the value of pattern parameter name in the currently processed match
-   * 
-   */
-  public abstract void process(final InstanceSpecification pChild, final Slot pSlot, final String pName);
-  
-  @Override
-  public void process(final ChildPortSlotsMatch match) {
-    process(match.getChild(), match.getSlot(), match.getName());
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPortSlotsQuerySpecification.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPortSlotsQuerySpecification.java
deleted file mode 100644
index f3e108bc73060fa6c51ee3832b2c071200275753..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPortSlotsQuerySpecification.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view.util;
-
-import com.google.common.collect.Sets;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EDataTypeInSlotsKey;
-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.eclipse.viatra.query.runtime.matchers.context.IInputKey;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.QueryInitializationException;
-import org.eclipse.viatra.query.runtime.matchers.tuple.FlatTuple;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-import org.polarsys.chess.instance.view.ChildPortSlotsMatch;
-import org.polarsys.chess.instance.view.ChildPortSlotsMatcher;
-import org.polarsys.chess.instance.view.internal.ClientServerPortHelperWithInterfaceQuerySpecification;
-import org.polarsys.chess.instance.view.internal.PortHelperWithValueQuerySpecification;
-
-/**
- * A pattern-specific query specification that can instantiate ChildPortSlotsMatcher in a type-safe way.
- * 
- * @see ChildPortSlotsMatcher
- * @see ChildPortSlotsMatch
- * 
- */
-@SuppressWarnings("all")
-public final class ChildPortSlotsQuerySpecification extends BaseGeneratedEMFQuerySpecification<ChildPortSlotsMatcher> {
-  private ChildPortSlotsQuerySpecification() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryException if the pattern definition could not be loaded
-   * 
-   */
-  public static ChildPortSlotsQuerySpecification instance() throws ViatraQueryException {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  @Override
-  protected ChildPortSlotsMatcher instantiate(final ViatraQueryEngine engine) throws ViatraQueryException {
-    return ChildPortSlotsMatcher.on(engine);
-  }
-  
-  @Override
-  public ChildPortSlotsMatcher instantiate() throws ViatraQueryException {
-    return ChildPortSlotsMatcher.create();
-  }
-  
-  @Override
-  public ChildPortSlotsMatch newEmptyMatch() {
-    return ChildPortSlotsMatch.newEmptyMatch();
-  }
-  
-  @Override
-  public ChildPortSlotsMatch newMatch(final Object... parameters) {
-    return ChildPortSlotsMatch.newMatch((org.eclipse.uml2.uml.InstanceSpecification) parameters[0], (org.eclipse.uml2.uml.Slot) parameters[1], (java.lang.String) parameters[2]);
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: org.polarsys.chess.instance.view.util.ChildPortSlotsQuerySpecification (visibility: PUBLIC, simpleName: ChildPortSlotsQuerySpecification, identifier: org.polarsys.chess.instance.view.util.ChildPortSlotsQuerySpecification, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: org.polarsys.chess.instance.view.util) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: org.polarsys.chess.instance.view.util.ChildPortSlotsQuerySpecification (visibility: PUBLIC, simpleName: ChildPortSlotsQuerySpecification, identifier: org.polarsys.chess.instance.view.util.ChildPortSlotsQuerySpecification, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: org.polarsys.chess.instance.view.util) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private final static ChildPortSlotsQuerySpecification INSTANCE = new ChildPortSlotsQuerySpecification();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private final static Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternalSneaky();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private final static ChildPortSlotsQuerySpecification.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_pChild = new PParameter("child", "org.eclipse.uml2.uml.InstanceSpecification", (IInputKey)null, PParameterDirection.INOUT);
-    
-    private final PParameter parameter_pSlot = new PParameter("slot", "org.eclipse.uml2.uml.Slot", (IInputKey)null, PParameterDirection.INOUT);
-    
-    private final PParameter parameter_pName = new PParameter("name", "java.lang.String", (IInputKey)null, PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_pChild, parameter_pSlot, parameter_pName);
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "org.polarsys.chess.instance.view.childPortSlots";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("child","slot","name");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() throws QueryInitializationException {
-      Set<PBody> bodies = Sets.newLinkedHashSet();
-      try {
-          {
-              PBody body = new PBody(this);
-              PVariable var_child = body.getOrCreateVariableByName("child");
-              PVariable var_slot = body.getOrCreateVariableByName("slot");
-              PVariable var_name = body.getOrCreateVariableByName("name");
-              PVariable var_port = body.getOrCreateVariableByName("port");
-              PVariable var_csp = body.getOrCreateVariableByName("csp");
-              PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
-              PVariable var___1_ = body.getOrCreateVariableByName("_<1>");
-              body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-                 new ExportedParameter(body, var_child, parameter_pChild),
-                 new ExportedParameter(body, var_slot, parameter_pSlot),
-                 new ExportedParameter(body, var_name, parameter_pName)
-              ));
-              // 	//find swSystemChild2(child, _, _, _, _);	InstanceSpecification.slot(child, slot)
-              new TypeConstraint(body, Tuples.flatTupleOf(var_child), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "InstanceSpecification")));
-              PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-              new TypeConstraint(body, Tuples.flatTupleOf(var_child, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "InstanceSpecification", "slot")));
-              new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Slot")));
-              new Equality(body, var__virtual_0_, var_slot);
-              // 	Slot.definingFeature(slot, port)
-              new TypeConstraint(body, Tuples.flatTupleOf(var_slot), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Slot")));
-              PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-              new TypeConstraint(body, Tuples.flatTupleOf(var_slot, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Slot", "definingFeature")));
-              new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "StructuralFeature")));
-              new Equality(body, var__virtual_1_, var_port);
-              // 	Port.name(port,name)
-              new TypeConstraint(body, Tuples.flatTupleOf(var_port), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Port")));
-              PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
-              new TypeConstraint(body, Tuples.flatTupleOf(var_port, var__virtual_2_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "NamedElement", "name")));
-              new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/Types", "String")));
-              new Equality(body, var__virtual_2_, var_name);
-              // 		ClientServerPort.base_Port(csp, port)
-              new TypeConstraint(body, Tuples.flatTupleOf(var_csp), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/papyrus/GCM/1", "ClientServerPort")));
-              PVariable var__virtual_3_ = body.getOrCreateVariableByName(".virtual{3}");
-              new TypeConstraint(body, Tuples.flatTupleOf(var_csp, var__virtual_3_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.eclipse.org/papyrus/GCM/1", "ClientServerPort", "base_Port")));
-              new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_3_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Port")));
-              new Equality(body, var__virtual_3_, var_port);
-              // 	neg find portHelperWithValue(slot,_)
-              new NegativePatternCall(body, new FlatTuple(var_slot, var___0_), PortHelperWithValueQuerySpecification.instance().getInternalQueryRepresentation());
-              // 	find clientServerPortHelperWithInterface (csp, _)
-              new PositivePatternCall(body, new FlatTuple(var_csp, var___1_), ClientServerPortHelperWithInterfaceQuerySpecification.instance().getInternalQueryRepresentation());
-              bodies.add(body);
-          }
-          {
-              PAnnotation annotation = new PAnnotation("Item");
-              annotation.addAttribute("item", new ParameterReference("slot"));
-              annotation.addAttribute("hierarchy", "child");
-              annotation.addAttribute("label", "$name$ ( Provided Port)");
-              addAnnotation(annotation);
-          }
-          {
-              PAnnotation annotation = new PAnnotation("ContainsItem");
-              annotation.addAttribute("container", new ParameterReference("child"));
-              annotation.addAttribute("item", new ParameterReference("slot"));
-              addAnnotation(annotation);
-          }
-      } catch (ViatraQueryException ex) {
-          throw processDependencyException(ex);
-      }
-      return bodies;
-    }
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPrivCHRTSpecItemProcessor.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPrivCHRTSpecItemProcessor.java
deleted file mode 100644
index 7f04868640ad45c05b402eb89a6486f6009b2683..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPrivCHRTSpecItemProcessor.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view.util;
-
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.viatra.query.runtime.api.IMatchProcessor;
-import org.polarsys.chess.instance.view.ChildPrivCHRTSpecItemMatch;
-
-/**
- * A match processor tailored for the org.polarsys.chess.instance.view.childPrivCHRTSpecItem pattern.
- * 
- * Clients should derive an (anonymous) class that implements the abstract process().
- * 
- */
-@SuppressWarnings("all")
-public abstract class ChildPrivCHRTSpecItemProcessor implements IMatchProcessor<ChildPrivCHRTSpecItemMatch> {
-  /**
-   * Defines the action that is to be executed on each match.
-   * @param pChrtspecComment the value of pattern parameter chrtspecComment in the currently processed match
-   * 
-   */
-  public abstract void process(final Comment pChrtspecComment);
-  
-  @Override
-  public void process(final ChildPrivCHRTSpecItemMatch match) {
-    process(match.getChrtspecComment());
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPrivCHRTSpecItemQuerySpecification.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPrivCHRTSpecItemQuerySpecification.java
deleted file mode 100644
index 614fcbe78a2457bf2a33938c2fd6b67148e95d6e..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPrivCHRTSpecItemQuerySpecification.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view.util;
-
-import com.google.common.collect.Sets;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.eclipse.viatra.query.runtime.matchers.context.IInputKey;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.QueryInitializationException;
-import org.eclipse.viatra.query.runtime.matchers.tuple.FlatTuple;
-import org.polarsys.chess.instance.view.ChildPrivCHRTSpecItemMatch;
-import org.polarsys.chess.instance.view.ChildPrivCHRTSpecItemMatcher;
-import org.polarsys.chess.instance.view.util.ChildPrivCHRTSpecQuerySpecification;
-
-/**
- * A pattern-specific query specification that can instantiate ChildPrivCHRTSpecItemMatcher in a type-safe way.
- * 
- * @see ChildPrivCHRTSpecItemMatcher
- * @see ChildPrivCHRTSpecItemMatch
- * 
- */
-@SuppressWarnings("all")
-public final class ChildPrivCHRTSpecItemQuerySpecification extends BaseGeneratedEMFQuerySpecification<ChildPrivCHRTSpecItemMatcher> {
-  private ChildPrivCHRTSpecItemQuerySpecification() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryException if the pattern definition could not be loaded
-   * 
-   */
-  public static ChildPrivCHRTSpecItemQuerySpecification instance() throws ViatraQueryException {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  @Override
-  protected ChildPrivCHRTSpecItemMatcher instantiate(final ViatraQueryEngine engine) throws ViatraQueryException {
-    return ChildPrivCHRTSpecItemMatcher.on(engine);
-  }
-  
-  @Override
-  public ChildPrivCHRTSpecItemMatcher instantiate() throws ViatraQueryException {
-    return ChildPrivCHRTSpecItemMatcher.create();
-  }
-  
-  @Override
-  public ChildPrivCHRTSpecItemMatch newEmptyMatch() {
-    return ChildPrivCHRTSpecItemMatch.newEmptyMatch();
-  }
-  
-  @Override
-  public ChildPrivCHRTSpecItemMatch newMatch(final Object... parameters) {
-    return ChildPrivCHRTSpecItemMatch.newMatch((org.eclipse.uml2.uml.Comment) parameters[0]);
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: org.polarsys.chess.instance.view.util.ChildPrivCHRTSpecItemQuerySpecification (visibility: PUBLIC, simpleName: ChildPrivCHRTSpecItemQuerySpecification, identifier: org.polarsys.chess.instance.view.util.ChildPrivCHRTSpecItemQuerySpecification, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: org.polarsys.chess.instance.view.util) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: org.polarsys.chess.instance.view.util.ChildPrivCHRTSpecItemQuerySpecification (visibility: PUBLIC, simpleName: ChildPrivCHRTSpecItemQuerySpecification, identifier: org.polarsys.chess.instance.view.util.ChildPrivCHRTSpecItemQuerySpecification, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: org.polarsys.chess.instance.view.util) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private final static ChildPrivCHRTSpecItemQuerySpecification INSTANCE = new ChildPrivCHRTSpecItemQuerySpecification();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private final static Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternalSneaky();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private final static ChildPrivCHRTSpecItemQuerySpecification.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_pChrtspecComment = new PParameter("chrtspecComment", "org.eclipse.uml2.uml.Comment", (IInputKey)null, PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_pChrtspecComment);
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "org.polarsys.chess.instance.view.childPrivCHRTSpecItem";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("chrtspecComment");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() throws QueryInitializationException {
-      Set<PBody> bodies = Sets.newLinkedHashSet();
-      try {
-          {
-              PBody body = new PBody(this);
-              PVariable var_chrtspecComment = body.getOrCreateVariableByName("chrtspecComment");
-              PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
-              body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-                 new ExportedParameter(body, var_chrtspecComment, parameter_pChrtspecComment)
-              ));
-              // 	//find childPortSlotsOperation(slot, operation, _);	find childPrivCHRTSpec(chrtspecComment, _)
-              new PositivePatternCall(body, new FlatTuple(var_chrtspecComment, var___0_), ChildPrivCHRTSpecQuerySpecification.instance().getInternalQueryRepresentation());
-              bodies.add(body);
-          }
-          {
-              PAnnotation annotation = new PAnnotation("Item");
-              annotation.addAttribute("item", new ParameterReference("chrtspecComment"));
-              annotation.addAttribute("hierarchy", "child");
-              annotation.addAttribute("label", "CHRtSpecification");
-              addAnnotation(annotation);
-          }
-      } catch (ViatraQueryException ex) {
-          throw processDependencyException(ex);
-      }
-      return bodies;
-    }
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPrivCHRTSpecProcessor.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPrivCHRTSpecProcessor.java
deleted file mode 100644
index 5e8af8512f1ed751a7a1e663d9fe85dbd90bdb87..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPrivCHRTSpecProcessor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view.util;
-
-import org.eclipse.uml2.uml.BehavioralFeature;
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.viatra.query.runtime.api.IMatchProcessor;
-import org.polarsys.chess.instance.view.ChildPrivCHRTSpecMatch;
-
-/**
- * A match processor tailored for the org.polarsys.chess.instance.view.childPrivCHRTSpec pattern.
- * 
- * Clients should derive an (anonymous) class that implements the abstract process().
- * 
- */
-@SuppressWarnings("all")
-public abstract class ChildPrivCHRTSpecProcessor implements IMatchProcessor<ChildPrivCHRTSpecMatch> {
-  /**
-   * Defines the action that is to be executed on each match.
-   * @param pChrtspecComment the value of pattern parameter chrtspecComment in the currently processed match
-   * @param pPrivoperation the value of pattern parameter privoperation in the currently processed match
-   * 
-   */
-  public abstract void process(final Comment pChrtspecComment, final BehavioralFeature pPrivoperation);
-  
-  @Override
-  public void process(final ChildPrivCHRTSpecMatch match) {
-    process(match.getChrtspecComment(), match.getPrivoperation());
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPrivCHRTSpecQuerySpecification.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPrivCHRTSpecQuerySpecification.java
deleted file mode 100644
index ea7ae9c0213e190cc90477351beec0ab7d423574..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPrivCHRTSpecQuerySpecification.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view.util;
-
-import com.google.common.collect.Sets;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.eclipse.viatra.query.runtime.matchers.context.IInputKey;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.QueryInitializationException;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-import org.polarsys.chess.instance.view.ChildPrivCHRTSpecMatch;
-import org.polarsys.chess.instance.view.ChildPrivCHRTSpecMatcher;
-
-/**
- * A pattern-specific query specification that can instantiate ChildPrivCHRTSpecMatcher in a type-safe way.
- * 
- * @see ChildPrivCHRTSpecMatcher
- * @see ChildPrivCHRTSpecMatch
- * 
- */
-@SuppressWarnings("all")
-public final class ChildPrivCHRTSpecQuerySpecification extends BaseGeneratedEMFQuerySpecification<ChildPrivCHRTSpecMatcher> {
-  private ChildPrivCHRTSpecQuerySpecification() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryException if the pattern definition could not be loaded
-   * 
-   */
-  public static ChildPrivCHRTSpecQuerySpecification instance() throws ViatraQueryException {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  @Override
-  protected ChildPrivCHRTSpecMatcher instantiate(final ViatraQueryEngine engine) throws ViatraQueryException {
-    return ChildPrivCHRTSpecMatcher.on(engine);
-  }
-  
-  @Override
-  public ChildPrivCHRTSpecMatcher instantiate() throws ViatraQueryException {
-    return ChildPrivCHRTSpecMatcher.create();
-  }
-  
-  @Override
-  public ChildPrivCHRTSpecMatch newEmptyMatch() {
-    return ChildPrivCHRTSpecMatch.newEmptyMatch();
-  }
-  
-  @Override
-  public ChildPrivCHRTSpecMatch newMatch(final Object... parameters) {
-    return ChildPrivCHRTSpecMatch.newMatch((org.eclipse.uml2.uml.Comment) parameters[0], (org.eclipse.uml2.uml.BehavioralFeature) parameters[1]);
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: org.polarsys.chess.instance.view.util.ChildPrivCHRTSpecQuerySpecification (visibility: PUBLIC, simpleName: ChildPrivCHRTSpecQuerySpecification, identifier: org.polarsys.chess.instance.view.util.ChildPrivCHRTSpecQuerySpecification, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: org.polarsys.chess.instance.view.util) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: org.polarsys.chess.instance.view.util.ChildPrivCHRTSpecQuerySpecification (visibility: PUBLIC, simpleName: ChildPrivCHRTSpecQuerySpecification, identifier: org.polarsys.chess.instance.view.util.ChildPrivCHRTSpecQuerySpecification, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: org.polarsys.chess.instance.view.util) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private final static ChildPrivCHRTSpecQuerySpecification INSTANCE = new ChildPrivCHRTSpecQuerySpecification();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private final static Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternalSneaky();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private final static ChildPrivCHRTSpecQuerySpecification.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_pChrtspecComment = new PParameter("chrtspecComment", "org.eclipse.uml2.uml.Comment", (IInputKey)null, PParameterDirection.INOUT);
-    
-    private final PParameter parameter_pPrivoperation = new PParameter("privoperation", "org.eclipse.uml2.uml.BehavioralFeature", (IInputKey)null, PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_pChrtspecComment, parameter_pPrivoperation);
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "org.polarsys.chess.instance.view.childPrivCHRTSpec";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("chrtspecComment","privoperation");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() throws QueryInitializationException {
-      Set<PBody> bodies = Sets.newLinkedHashSet();
-      {
-          PBody body = new PBody(this);
-          PVariable var_chrtspecComment = body.getOrCreateVariableByName("chrtspecComment");
-          PVariable var_privoperation = body.getOrCreateVariableByName("privoperation");
-          PVariable var_chrtportslot = body.getOrCreateVariableByName("chrtportslot");
-          PVariable var_instancespec = body.getOrCreateVariableByName("instancespec");
-          PVariable var_chrt = body.getOrCreateVariableByName("chrt");
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_chrtspecComment, parameter_pChrtspecComment),
-             new ExportedParameter(body, var_privoperation, parameter_pPrivoperation)
-          ));
-          // 			//find childPortSlotsOperation(slot, operation, _);	CHRtPortSlot.base_InstanceSpecification(chrtportslot, instancespec)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_chrtportslot), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://CHESS/Predictability/RTComponentModel", "CHRtPortSlot")));
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_chrtportslot, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://CHESS/Predictability/RTComponentModel", "CHRtPortSlot", "base_InstanceSpecification")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "InstanceSpecification")));
-          new Equality(body, var__virtual_0_, var_instancespec);
-          // 	CHRtPortSlot.cH_RtSpecification(chrtportslot, chrt)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_chrtportslot), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://CHESS/Predictability/RTComponentModel", "CHRtPortSlot")));
-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_chrtportslot, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://CHESS/Predictability/RTComponentModel", "CHRtPortSlot", "cH_RtSpecification")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://CHESS/Predictability/RTComponentModel", "CHRtSpecification")));
-          new Equality(body, var__virtual_1_, var_chrt);
-          // 	CHRtSpecification.context(chrt, privoperation)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_chrt), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://CHESS/Predictability/RTComponentModel", "CHRtSpecification")));
-          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_chrt, var__virtual_2_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://CHESS/Predictability/RTComponentModel", "CHRtSpecification", "context")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "BehavioralFeature")));
-          new Equality(body, var__virtual_2_, var_privoperation);
-          // 	CHRtSpecification.base_Comment(chrt, chrtspecComment)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_chrt), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://CHESS/Predictability/RTComponentModel", "CHRtSpecification")));
-          PVariable var__virtual_3_ = body.getOrCreateVariableByName(".virtual{3}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_chrt, var__virtual_3_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://CHESS/Predictability/RTComponentModel", "CHRtSpecification", "base_Comment")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_3_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Comment")));
-          new Equality(body, var__virtual_3_, var_chrtspecComment);
-          bodies.add(body);
-      }
-      {
-          PAnnotation annotation = new PAnnotation("ContainsItem");
-          annotation.addAttribute("container", new ParameterReference("privoperation"));
-          annotation.addAttribute("item", new ParameterReference("chrtspecComment"));
-          addAnnotation(annotation);
-      }
-      return bodies;
-    }
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPrivateOperationsProcessor.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPrivateOperationsProcessor.java
deleted file mode 100644
index 5e3477e3c49a2e7381abc0dfd4551ce2f3ebe3a8..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPrivateOperationsProcessor.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view.util;
-
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.uml2.uml.Operation;
-import org.eclipse.viatra.query.runtime.api.IMatchProcessor;
-import org.polarsys.chess.instance.view.ChildPrivateOperationsMatch;
-
-/**
- * A match processor tailored for the org.polarsys.chess.instance.view.childPrivateOperations pattern.
- * 
- * Clients should derive an (anonymous) class that implements the abstract process().
- * 
- */
-@SuppressWarnings("all")
-public abstract class ChildPrivateOperationsProcessor implements IMatchProcessor<ChildPrivateOperationsMatch> {
-  /**
-   * Defines the action that is to be executed on each match.
-   * @param pChild the value of pattern parameter child in the currently processed match
-   * @param pPrivoperation the value of pattern parameter privoperation in the currently processed match
-   * @param pName the value of pattern parameter name in the currently processed match
-   * 
-   */
-  public abstract void process(final InstanceSpecification pChild, final Operation pPrivoperation, final String pName);
-  
-  @Override
-  public void process(final ChildPrivateOperationsMatch match) {
-    process(match.getChild(), match.getPrivoperation(), match.getName());
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPrivateOperationsQuerySpecification.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPrivateOperationsQuerySpecification.java
deleted file mode 100644
index f19eff14b2bd4107fdc2738aa9468d64e4b4d102..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/ChildPrivateOperationsQuerySpecification.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view.util;
-
-import com.google.common.collect.Sets;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EDataTypeInSlotsKey;
-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.eclipse.viatra.query.runtime.matchers.context.IInputKey;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.QueryInitializationException;
-import org.eclipse.viatra.query.runtime.matchers.tuple.FlatTuple;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-import org.polarsys.chess.instance.view.ChildPrivateOperationsMatch;
-import org.polarsys.chess.instance.view.ChildPrivateOperationsMatcher;
-import org.polarsys.chess.instance.view.util.ChildPortSlotsOperationQuerySpecification;
-
-/**
- * A pattern-specific query specification that can instantiate ChildPrivateOperationsMatcher in a type-safe way.
- * 
- * @see ChildPrivateOperationsMatcher
- * @see ChildPrivateOperationsMatch
- * 
- */
-@SuppressWarnings("all")
-public final class ChildPrivateOperationsQuerySpecification extends BaseGeneratedEMFQuerySpecification<ChildPrivateOperationsMatcher> {
-  private ChildPrivateOperationsQuerySpecification() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryException if the pattern definition could not be loaded
-   * 
-   */
-  public static ChildPrivateOperationsQuerySpecification instance() throws ViatraQueryException {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  @Override
-  protected ChildPrivateOperationsMatcher instantiate(final ViatraQueryEngine engine) throws ViatraQueryException {
-    return ChildPrivateOperationsMatcher.on(engine);
-  }
-  
-  @Override
-  public ChildPrivateOperationsMatcher instantiate() throws ViatraQueryException {
-    return ChildPrivateOperationsMatcher.create();
-  }
-  
-  @Override
-  public ChildPrivateOperationsMatch newEmptyMatch() {
-    return ChildPrivateOperationsMatch.newEmptyMatch();
-  }
-  
-  @Override
-  public ChildPrivateOperationsMatch newMatch(final Object... parameters) {
-    return ChildPrivateOperationsMatch.newMatch((org.eclipse.uml2.uml.InstanceSpecification) parameters[0], (org.eclipse.uml2.uml.Operation) parameters[1], (java.lang.String) parameters[2]);
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: org.polarsys.chess.instance.view.util.ChildPrivateOperationsQuerySpecification (visibility: PUBLIC, simpleName: ChildPrivateOperationsQuerySpecification, identifier: org.polarsys.chess.instance.view.util.ChildPrivateOperationsQuerySpecification, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: org.polarsys.chess.instance.view.util) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: org.polarsys.chess.instance.view.util.ChildPrivateOperationsQuerySpecification (visibility: PUBLIC, simpleName: ChildPrivateOperationsQuerySpecification, identifier: org.polarsys.chess.instance.view.util.ChildPrivateOperationsQuerySpecification, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: org.polarsys.chess.instance.view.util) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private final static ChildPrivateOperationsQuerySpecification INSTANCE = new ChildPrivateOperationsQuerySpecification();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private final static Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternalSneaky();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private final static ChildPrivateOperationsQuerySpecification.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_pChild = new PParameter("child", "org.eclipse.uml2.uml.InstanceSpecification", (IInputKey)null, PParameterDirection.INOUT);
-    
-    private final PParameter parameter_pPrivoperation = new PParameter("privoperation", "org.eclipse.uml2.uml.Operation", (IInputKey)null, PParameterDirection.INOUT);
-    
-    private final PParameter parameter_pName = new PParameter("name", "java.lang.String", (IInputKey)null, PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_pChild, parameter_pPrivoperation, parameter_pName);
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "org.polarsys.chess.instance.view.childPrivateOperations";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("child","privoperation","name");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() throws QueryInitializationException {
-      Set<PBody> bodies = Sets.newLinkedHashSet();
-      try {
-          {
-              PBody body = new PBody(this);
-              PVariable var_child = body.getOrCreateVariableByName("child");
-              PVariable var_privoperation = body.getOrCreateVariableByName("privoperation");
-              PVariable var_name = body.getOrCreateVariableByName("name");
-              PVariable var_component = body.getOrCreateVariableByName("component");
-              PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
-              PVariable var___1_ = body.getOrCreateVariableByName("_<1>");
-              body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-                 new ExportedParameter(body, var_child, parameter_pChild),
-                 new ExportedParameter(body, var_privoperation, parameter_pPrivoperation),
-                 new ExportedParameter(body, var_name, parameter_pName)
-              ));
-              // 			InstanceSpecification.classifier(child, component)
-              new TypeConstraint(body, Tuples.flatTupleOf(var_child), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "InstanceSpecification")));
-              PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-              new TypeConstraint(body, Tuples.flatTupleOf(var_child, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "InstanceSpecification", "classifier")));
-              new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Classifier")));
-              new Equality(body, var__virtual_0_, var_component);
-              // 	Component.ownedOperation(component, privoperation)
-              new TypeConstraint(body, Tuples.flatTupleOf(var_component), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Component")));
-              PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-              new TypeConstraint(body, Tuples.flatTupleOf(var_component, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Class", "ownedOperation")));
-              new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Operation")));
-              new Equality(body, var__virtual_1_, var_privoperation);
-              // 	neg find childPortSlotsOperation(_, privoperation, _)
-              new NegativePatternCall(body, new FlatTuple(var___0_, var_privoperation, var___1_), ChildPortSlotsOperationQuerySpecification.instance().getInternalQueryRepresentation());
-              // 	Operation.name(privoperation, name)
-              new TypeConstraint(body, Tuples.flatTupleOf(var_privoperation), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Operation")));
-              PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
-              new TypeConstraint(body, Tuples.flatTupleOf(var_privoperation, var__virtual_2_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "NamedElement", "name")));
-              new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/Types", "String")));
-              new Equality(body, var__virtual_2_, var_name);
-              bodies.add(body);
-          }
-          {
-              PAnnotation annotation = new PAnnotation("Item");
-              annotation.addAttribute("item", new ParameterReference("privoperation"));
-              annotation.addAttribute("hierarchy", "child");
-              annotation.addAttribute("label", "$name$ (Operation)");
-              addAnnotation(annotation);
-          }
-          {
-              PAnnotation annotation = new PAnnotation("ContainsItem");
-              annotation.addAttribute("container", new ParameterReference("child"));
-              annotation.addAttribute("item", new ParameterReference("privoperation"));
-              addAnnotation(annotation);
-          }
-      } catch (ViatraQueryException ex) {
-          throw processDependencyException(ex);
-      }
-      return bodies;
-    }
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/SwSystemCHGaResourcePlatformProcessor.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/SwSystemCHGaResourcePlatformProcessor.java
deleted file mode 100644
index 129201a0ec5c408d84437d19ad4502c24e64cc9f..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/SwSystemCHGaResourcePlatformProcessor.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view.util;
-
-import org.eclipse.viatra.query.runtime.api.IMatchProcessor;
-import org.polarsys.chess.instance.view.SwSystemCHGaResourcePlatformMatch;
-
-/**
- * A match processor tailored for the org.polarsys.chess.instance.view.swSystemCHGaResourcePlatform pattern.
- * 
- * Clients should derive an (anonymous) class that implements the abstract process().
- * 
- */
-@SuppressWarnings("all")
-public abstract class SwSystemCHGaResourcePlatformProcessor implements IMatchProcessor<SwSystemCHGaResourcePlatformMatch> {
-  /**
-   * Defines the action that is to be executed on each match.
-   * @param pInstSpec the value of pattern parameter instSpec in the currently processed match
-   * 
-   */
-  public abstract void process(final org.eclipse.uml2.uml.Package pInstSpec);
-  
-  @Override
-  public void process(final SwSystemCHGaResourcePlatformMatch match) {
-    process(match.getInstSpec());
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/SwSystemCHGaResourcePlatformQuerySpecification.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/SwSystemCHGaResourcePlatformQuerySpecification.java
deleted file mode 100644
index d72ff5cf0b3457140810bbf4a32d4d910234e595..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/SwSystemCHGaResourcePlatformQuerySpecification.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view.util;
-
-import com.google.common.collect.Sets;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.eclipse.viatra.query.runtime.matchers.context.IInputKey;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.QueryInitializationException;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-import org.polarsys.chess.instance.view.SwSystemCHGaResourcePlatformMatch;
-import org.polarsys.chess.instance.view.SwSystemCHGaResourcePlatformMatcher;
-
-/**
- * A pattern-specific query specification that can instantiate SwSystemCHGaResourcePlatformMatcher in a type-safe way.
- * 
- * @see SwSystemCHGaResourcePlatformMatcher
- * @see SwSystemCHGaResourcePlatformMatch
- * 
- */
-@SuppressWarnings("all")
-public final class SwSystemCHGaResourcePlatformQuerySpecification extends BaseGeneratedEMFQuerySpecification<SwSystemCHGaResourcePlatformMatcher> {
-  private SwSystemCHGaResourcePlatformQuerySpecification() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryException if the pattern definition could not be loaded
-   * 
-   */
-  public static SwSystemCHGaResourcePlatformQuerySpecification instance() throws ViatraQueryException {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  @Override
-  protected SwSystemCHGaResourcePlatformMatcher instantiate(final ViatraQueryEngine engine) throws ViatraQueryException {
-    return SwSystemCHGaResourcePlatformMatcher.on(engine);
-  }
-  
-  @Override
-  public SwSystemCHGaResourcePlatformMatcher instantiate() throws ViatraQueryException {
-    return SwSystemCHGaResourcePlatformMatcher.create();
-  }
-  
-  @Override
-  public SwSystemCHGaResourcePlatformMatch newEmptyMatch() {
-    return SwSystemCHGaResourcePlatformMatch.newEmptyMatch();
-  }
-  
-  @Override
-  public SwSystemCHGaResourcePlatformMatch newMatch(final Object... parameters) {
-    return SwSystemCHGaResourcePlatformMatch.newMatch((org.eclipse.uml2.uml.Package) parameters[0]);
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: org.polarsys.chess.instance.view.util.SwSystemCHGaResourcePlatformQuerySpecification (visibility: PUBLIC, simpleName: SwSystemCHGaResourcePlatformQuerySpecification, identifier: org.polarsys.chess.instance.view.util.SwSystemCHGaResourcePlatformQuerySpecification, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: org.polarsys.chess.instance.view.util) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: org.polarsys.chess.instance.view.util.SwSystemCHGaResourcePlatformQuerySpecification (visibility: PUBLIC, simpleName: SwSystemCHGaResourcePlatformQuerySpecification, identifier: org.polarsys.chess.instance.view.util.SwSystemCHGaResourcePlatformQuerySpecification, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: org.polarsys.chess.instance.view.util) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private final static SwSystemCHGaResourcePlatformQuerySpecification INSTANCE = new SwSystemCHGaResourcePlatformQuerySpecification();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private final static Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternalSneaky();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private final static SwSystemCHGaResourcePlatformQuerySpecification.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_pInstSpec = new PParameter("instSpec", "org.eclipse.uml2.uml.Package", (IInputKey)null, PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_pInstSpec);
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "org.polarsys.chess.instance.view.swSystemCHGaResourcePlatform";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("instSpec");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() throws QueryInitializationException {
-      Set<PBody> bodies = Sets.newLinkedHashSet();
-      {
-          PBody body = new PBody(this);
-          PVariable var_instSpec = body.getOrCreateVariableByName("instSpec");
-          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_instSpec, parameter_pInstSpec)
-          ));
-          // 	//find modelComponentView(modelComponentView);	CHGaResourcePlatform.base_Package(_, instSpec)
-          new TypeConstraint(body, Tuples.flatTupleOf(var___0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://CHESS/Core", "CHGaResourcePlatform")));
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var___0_, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://CHESS/Core", "CHGaResourcePlatform", "base_Package")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Package")));
-          new Equality(body, var__virtual_0_, var_instSpec);
-          bodies.add(body);
-      }
-      {
-          PAnnotation annotation = new PAnnotation("Item");
-          annotation.addAttribute("item", new ParameterReference("instSpec"));
-          annotation.addAttribute("hierarchy", "child");
-          annotation.addAttribute("label", "$instSpec.name$ (Package)");
-          addAnnotation(annotation);
-      }
-      return bodies;
-    }
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/SwSystemChild2ItemProcessor.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/SwSystemChild2ItemProcessor.java
deleted file mode 100644
index b14d03748bc4533bcb541d206a30dff3b9b97d03..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/SwSystemChild2ItemProcessor.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view.util;
-
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.viatra.query.runtime.api.IMatchProcessor;
-import org.polarsys.chess.instance.view.SwSystemChild2ItemMatch;
-
-/**
- * A match processor tailored for the org.polarsys.chess.instance.view.swSystemChild2Item pattern.
- * 
- * Clients should derive an (anonymous) class that implements the abstract process().
- * 
- */
-@SuppressWarnings("all")
-public abstract class SwSystemChild2ItemProcessor implements IMatchProcessor<SwSystemChild2ItemMatch> {
-  /**
-   * Defines the action that is to be executed on each match.
-   * @param pChild the value of pattern parameter child in the currently processed match
-   * @param pName the value of pattern parameter name in the currently processed match
-   * 
-   */
-  public abstract void process(final InstanceSpecification pChild, final String pName);
-  
-  @Override
-  public void process(final SwSystemChild2ItemMatch match) {
-    process(match.getChild(), match.getName());
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/SwSystemChild2ItemQuerySpecification.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/SwSystemChild2ItemQuerySpecification.java
deleted file mode 100644
index c94e668b7e748686daeab4c608b9188971cd3983..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/SwSystemChild2ItemQuerySpecification.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view.util;
-
-import com.google.common.collect.Sets;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EDataTypeInSlotsKey;
-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.eclipse.viatra.query.runtime.matchers.context.IInputKey;
-import org.eclipse.viatra.query.runtime.matchers.psystem.IExpressionEvaluator;
-import org.eclipse.viatra.query.runtime.matchers.psystem.IValueProvider;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.QueryInitializationException;
-import org.eclipse.viatra.query.runtime.matchers.tuple.FlatTuple;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-import org.polarsys.chess.instance.view.SwSystemChild2ItemMatch;
-import org.polarsys.chess.instance.view.SwSystemChild2ItemMatcher;
-import org.polarsys.chess.instance.view.util.SwSystemChild2QuerySpecification;
-
-/**
- * A pattern-specific query specification that can instantiate SwSystemChild2ItemMatcher in a type-safe way.
- * 
- * @see SwSystemChild2ItemMatcher
- * @see SwSystemChild2ItemMatch
- * 
- */
-@SuppressWarnings("all")
-public final class SwSystemChild2ItemQuerySpecification extends BaseGeneratedEMFQuerySpecification<SwSystemChild2ItemMatcher> {
-  private SwSystemChild2ItemQuerySpecification() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryException if the pattern definition could not be loaded
-   * 
-   */
-  public static SwSystemChild2ItemQuerySpecification instance() throws ViatraQueryException {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  @Override
-  protected SwSystemChild2ItemMatcher instantiate(final ViatraQueryEngine engine) throws ViatraQueryException {
-    return SwSystemChild2ItemMatcher.on(engine);
-  }
-  
-  @Override
-  public SwSystemChild2ItemMatcher instantiate() throws ViatraQueryException {
-    return SwSystemChild2ItemMatcher.create();
-  }
-  
-  @Override
-  public SwSystemChild2ItemMatch newEmptyMatch() {
-    return SwSystemChild2ItemMatch.newEmptyMatch();
-  }
-  
-  @Override
-  public SwSystemChild2ItemMatch newMatch(final Object... parameters) {
-    return SwSystemChild2ItemMatch.newMatch((org.eclipse.uml2.uml.InstanceSpecification) parameters[0], (java.lang.String) parameters[1]);
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: org.polarsys.chess.instance.view.util.SwSystemChild2ItemQuerySpecification (visibility: PUBLIC, simpleName: SwSystemChild2ItemQuerySpecification, identifier: org.polarsys.chess.instance.view.util.SwSystemChild2ItemQuerySpecification, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: org.polarsys.chess.instance.view.util) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: org.polarsys.chess.instance.view.util.SwSystemChild2ItemQuerySpecification (visibility: PUBLIC, simpleName: SwSystemChild2ItemQuerySpecification, identifier: org.polarsys.chess.instance.view.util.SwSystemChild2ItemQuerySpecification, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: org.polarsys.chess.instance.view.util) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private final static SwSystemChild2ItemQuerySpecification INSTANCE = new SwSystemChild2ItemQuerySpecification();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private final static Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternalSneaky();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private final static SwSystemChild2ItemQuerySpecification.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_pChild = new PParameter("child", "org.eclipse.uml2.uml.InstanceSpecification", (IInputKey)null, PParameterDirection.INOUT);
-    
-    private final PParameter parameter_pName = new PParameter("name", "java.lang.String", (IInputKey)null, PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_pChild, parameter_pName);
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "org.polarsys.chess.instance.view.swSystemChild2Item";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("child","name");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() throws QueryInitializationException {
-      Set<PBody> bodies = Sets.newLinkedHashSet();
-      try {
-          {
-              PBody body = new PBody(this);
-              PVariable var_child = body.getOrCreateVariableByName("child");
-              PVariable var_name = body.getOrCreateVariableByName("name");
-              PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
-              PVariable var___1_ = body.getOrCreateVariableByName("_<1>");
-              PVariable var_class = body.getOrCreateVariableByName("class");
-              PVariable var_classname = body.getOrCreateVariableByName("classname");
-              body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-                 new ExportedParameter(body, var_child, parameter_pChild),
-                 new ExportedParameter(body, var_name, parameter_pName)
-              ));
-              // 		find  swSystemChild2(child, _,  _, name)
-              new PositivePatternCall(body, new FlatTuple(var_child, var___0_, var___1_, var_name), SwSystemChild2QuerySpecification.instance().getInternalQueryRepresentation());
-              // 	//check(name.startsWith(parentname) && !name.equalsIgnoreCase(parentname) && !name.substring(parentname.length+1).contains("."));	InstanceSpecification.classifier(child, class)
-              new TypeConstraint(body, Tuples.flatTupleOf(var_child), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "InstanceSpecification")));
-              PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-              new TypeConstraint(body, Tuples.flatTupleOf(var_child, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "InstanceSpecification", "classifier")));
-              new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Classifier")));
-              new Equality(body, var__virtual_0_, var_class);
-              // 	Classifier.name(class, classname)
-              new TypeConstraint(body, Tuples.flatTupleOf(var_class), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Classifier")));
-              PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-              new TypeConstraint(body, Tuples.flatTupleOf(var_class, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "NamedElement", "name")));
-              new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/Types", "String")));
-              new Equality(body, var__virtual_1_, var_classname);
-              // 		check(name.contains("."))
-              new ExpressionEvaluation(body, new IExpressionEvaluator() {
-              
-                  @Override
-                  public String getShortDescription() {
-                      return "Expression evaluation from pattern swSystemChild2Item";
-                  }
-                  
-                  @Override
-                  public Iterable<String> getInputParameterNames() {
-                      return Arrays.asList("name");}
-              
-                  @Override
-                  public Object evaluateExpression(IValueProvider provider) throws Exception {
-                      String name = (String) provider.getValue("name");
-                      return evaluateExpression_1_1(name);
-                  }
-              },  null); 
-              // 	check(!classname.empty)
-              new ExpressionEvaluation(body, new IExpressionEvaluator() {
-              
-                  @Override
-                  public String getShortDescription() {
-                      return "Expression evaluation from pattern swSystemChild2Item";
-                  }
-                  
-                  @Override
-                  public Iterable<String> getInputParameterNames() {
-                      return Arrays.asList("classname");}
-              
-                  @Override
-                  public Object evaluateExpression(IValueProvider provider) throws Exception {
-                      String classname = (String) provider.getValue("classname");
-                      return evaluateExpression_1_2(classname);
-                  }
-              },  null); 
-              bodies.add(body);
-          }
-          {
-              PAnnotation annotation = new PAnnotation("Item");
-              annotation.addAttribute("item", new ParameterReference("child"));
-              annotation.addAttribute("hierarchy", "child");
-              annotation.addAttribute("label", "$name$ (Instance)");
-              addAnnotation(annotation);
-          }
-      } catch (ViatraQueryException ex) {
-          throw processDependencyException(ex);
-      }
-      return bodies;
-    }
-  }
-  
-  private static boolean evaluateExpression_1_1(final String name) {
-    boolean _contains = name.contains(".");
-    return _contains;
-  }
-  
-  private static boolean evaluateExpression_1_2(final String classname) {
-    boolean _isEmpty = classname.isEmpty();
-    boolean _not = (!_isEmpty);
-    return _not;
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/SwSystemChild2Processor.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/SwSystemChild2Processor.java
deleted file mode 100644
index 8b3f40b7295cc8a6a60139ac565ae967ae2f19d4..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/SwSystemChild2Processor.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view.util;
-
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.viatra.query.runtime.api.IMatchProcessor;
-import org.polarsys.chess.instance.view.SwSystemChild2Match;
-
-/**
- * A match processor tailored for the org.polarsys.chess.instance.view.swSystemChild2 pattern.
- * 
- * Clients should derive an (anonymous) class that implements the abstract process().
- * 
- */
-@SuppressWarnings("all")
-public abstract class SwSystemChild2Processor implements IMatchProcessor<SwSystemChild2Match> {
-  /**
-   * Defines the action that is to be executed on each match.
-   * @param pChild the value of pattern parameter child in the currently processed match
-   * @param pInstSpec the value of pattern parameter instSpec in the currently processed match
-   * @param pParent the value of pattern parameter parent in the currently processed match
-   * @param pName the value of pattern parameter name in the currently processed match
-   * 
-   */
-  public abstract void process(final InstanceSpecification pChild, final org.eclipse.uml2.uml.Package pInstSpec, final InstanceSpecification pParent, final String pName);
-  
-  @Override
-  public void process(final SwSystemChild2Match match) {
-    process(match.getChild(), match.getInstSpec(), match.getParent(), match.getName());
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/SwSystemChild2QuerySpecification.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/SwSystemChild2QuerySpecification.java
deleted file mode 100644
index 1ccdf19e1d21b13d0a766f66e951b971d53aa778..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/SwSystemChild2QuerySpecification.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view.util;
-
-import com.google.common.collect.Sets;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EDataTypeInSlotsKey;
-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.eclipse.viatra.query.runtime.matchers.context.IInputKey;
-import org.eclipse.viatra.query.runtime.matchers.psystem.IExpressionEvaluator;
-import org.eclipse.viatra.query.runtime.matchers.psystem.IValueProvider;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Inequality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.QueryInitializationException;
-import org.eclipse.viatra.query.runtime.matchers.tuple.FlatTuple;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-import org.polarsys.chess.instance.view.SwSystemChild2Match;
-import org.polarsys.chess.instance.view.SwSystemChild2Matcher;
-import org.polarsys.chess.instance.view.util.SwSystemCHGaResourcePlatformQuerySpecification;
-
-/**
- * A pattern-specific query specification that can instantiate SwSystemChild2Matcher in a type-safe way.
- * 
- * @see SwSystemChild2Matcher
- * @see SwSystemChild2Match
- * 
- */
-@SuppressWarnings("all")
-public final class SwSystemChild2QuerySpecification extends BaseGeneratedEMFQuerySpecification<SwSystemChild2Matcher> {
-  private SwSystemChild2QuerySpecification() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryException if the pattern definition could not be loaded
-   * 
-   */
-  public static SwSystemChild2QuerySpecification instance() throws ViatraQueryException {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  @Override
-  protected SwSystemChild2Matcher instantiate(final ViatraQueryEngine engine) throws ViatraQueryException {
-    return SwSystemChild2Matcher.on(engine);
-  }
-  
-  @Override
-  public SwSystemChild2Matcher instantiate() throws ViatraQueryException {
-    return SwSystemChild2Matcher.create();
-  }
-  
-  @Override
-  public SwSystemChild2Match newEmptyMatch() {
-    return SwSystemChild2Match.newEmptyMatch();
-  }
-  
-  @Override
-  public SwSystemChild2Match newMatch(final Object... parameters) {
-    return SwSystemChild2Match.newMatch((org.eclipse.uml2.uml.InstanceSpecification) parameters[0], (org.eclipse.uml2.uml.Package) parameters[1], (org.eclipse.uml2.uml.InstanceSpecification) parameters[2], (java.lang.String) parameters[3]);
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: org.polarsys.chess.instance.view.util.SwSystemChild2QuerySpecification (visibility: PUBLIC, simpleName: SwSystemChild2QuerySpecification, identifier: org.polarsys.chess.instance.view.util.SwSystemChild2QuerySpecification, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: org.polarsys.chess.instance.view.util) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: org.polarsys.chess.instance.view.util.SwSystemChild2QuerySpecification (visibility: PUBLIC, simpleName: SwSystemChild2QuerySpecification, identifier: org.polarsys.chess.instance.view.util.SwSystemChild2QuerySpecification, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: org.polarsys.chess.instance.view.util) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private final static SwSystemChild2QuerySpecification INSTANCE = new SwSystemChild2QuerySpecification();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private final static Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternalSneaky();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private final static SwSystemChild2QuerySpecification.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_pChild = new PParameter("child", "org.eclipse.uml2.uml.InstanceSpecification", (IInputKey)null, PParameterDirection.INOUT);
-    
-    private final PParameter parameter_pInstSpec = new PParameter("instSpec", "org.eclipse.uml2.uml.Package", (IInputKey)null, PParameterDirection.INOUT);
-    
-    private final PParameter parameter_pParent = new PParameter("parent", "org.eclipse.uml2.uml.InstanceSpecification", (IInputKey)null, PParameterDirection.INOUT);
-    
-    private final PParameter parameter_pName = new PParameter("name", "java.lang.String", (IInputKey)null, PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_pChild, parameter_pInstSpec, parameter_pParent, parameter_pName);
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "org.polarsys.chess.instance.view.swSystemChild2";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("child","instSpec","parent","name");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() throws QueryInitializationException {
-      Set<PBody> bodies = Sets.newLinkedHashSet();
-      try {
-          {
-              PBody body = new PBody(this);
-              PVariable var_child = body.getOrCreateVariableByName("child");
-              PVariable var_instSpec = body.getOrCreateVariableByName("instSpec");
-              PVariable var_parent = body.getOrCreateVariableByName("parent");
-              PVariable var_name = body.getOrCreateVariableByName("name");
-              PVariable var_parentname = body.getOrCreateVariableByName("parentname");
-              body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-                 new ExportedParameter(body, var_child, parameter_pChild),
-                 new ExportedParameter(body, var_instSpec, parameter_pInstSpec),
-                 new ExportedParameter(body, var_parent, parameter_pParent),
-                 new ExportedParameter(body, var_name, parameter_pName)
-              ));
-              // 	find swSystemCHGaResourcePlatform(instSpec)
-              new PositivePatternCall(body, new FlatTuple(var_instSpec), SwSystemCHGaResourcePlatformQuerySpecification.instance().getInternalQueryRepresentation());
-              // 	Package.packagedElement(instSpec, child)
-              new TypeConstraint(body, Tuples.flatTupleOf(var_instSpec), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Package")));
-              PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-              new TypeConstraint(body, Tuples.flatTupleOf(var_instSpec, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Package", "packagedElement")));
-              new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "PackageableElement")));
-              new Equality(body, var__virtual_0_, var_child);
-              // 	InstanceSpecification(child)
-              new TypeConstraint(body, Tuples.flatTupleOf(var_child), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "InstanceSpecification")));
-              // 	InstanceSpecification.name(child, name)
-              new TypeConstraint(body, Tuples.flatTupleOf(var_child), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "InstanceSpecification")));
-              PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-              new TypeConstraint(body, Tuples.flatTupleOf(var_child, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "NamedElement", "name")));
-              new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/Types", "String")));
-              new Equality(body, var__virtual_1_, var_name);
-              // 		Package.packagedElement(instSpec, parent)
-              new TypeConstraint(body, Tuples.flatTupleOf(var_instSpec), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Package")));
-              PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
-              new TypeConstraint(body, Tuples.flatTupleOf(var_instSpec, var__virtual_2_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Package", "packagedElement")));
-              new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "PackageableElement")));
-              new Equality(body, var__virtual_2_, var_parent);
-              // 	InstanceSpecification.name(parent, parentname)
-              new TypeConstraint(body, Tuples.flatTupleOf(var_parent), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "InstanceSpecification")));
-              PVariable var__virtual_3_ = body.getOrCreateVariableByName(".virtual{3}");
-              new TypeConstraint(body, Tuples.flatTupleOf(var_parent, var__virtual_3_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "NamedElement", "name")));
-              new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_3_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/Types", "String")));
-              new Equality(body, var__virtual_3_, var_parentname);
-              // 	child != parent
-              new Inequality(body, var_child, var_parent);
-              // 	check(name.startsWith(parentname) && !name.equalsIgnoreCase(parentname) && !name.substring(parentname.length+1).contains("."))
-              new ExpressionEvaluation(body, new IExpressionEvaluator() {
-              
-                  @Override
-                  public String getShortDescription() {
-                      return "Expression evaluation from pattern swSystemChild2";
-                  }
-                  
-                  @Override
-                  public Iterable<String> getInputParameterNames() {
-                      return Arrays.asList("name", "parentname");}
-              
-                  @Override
-                  public Object evaluateExpression(IValueProvider provider) throws Exception {
-                      String name = (String) provider.getValue("name");
-                      String parentname = (String) provider.getValue("parentname");
-                      return evaluateExpression_1_1(name, parentname);
-                  }
-              },  null); 
-              bodies.add(body);
-          }
-          {
-              PAnnotation annotation = new PAnnotation("ContainsItem");
-              annotation.addAttribute("container", new ParameterReference("parent"));
-              annotation.addAttribute("item", new ParameterReference("child"));
-              addAnnotation(annotation);
-          }
-      } catch (ViatraQueryException ex) {
-          throw processDependencyException(ex);
-      }
-      return bodies;
-    }
-  }
-  
-  private static boolean evaluateExpression_1_1(final String name, final String parentname) {
-    return ((name.startsWith(parentname) && (!name.equalsIgnoreCase(parentname))) && (!name.substring((parentname.length() + 1)).contains(".")));
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/SwSystemRootProcessor.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/SwSystemRootProcessor.java
deleted file mode 100644
index c666e0434ebcd1a7aafb443a8ba335b375325815..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/SwSystemRootProcessor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view.util;
-
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.viatra.query.runtime.api.IMatchProcessor;
-import org.polarsys.chess.instance.view.SwSystemRootMatch;
-
-/**
- * A match processor tailored for the org.polarsys.chess.instance.view.swSystemRoot pattern.
- * 
- * Clients should derive an (anonymous) class that implements the abstract process().
- * 
- */
-@SuppressWarnings("all")
-public abstract class SwSystemRootProcessor implements IMatchProcessor<SwSystemRootMatch> {
-  /**
-   * Defines the action that is to be executed on each match.
-   * @param pRoot the value of pattern parameter root in the currently processed match
-   * @param pInstSpec the value of pattern parameter instSpec in the currently processed match
-   * @param pName the value of pattern parameter name in the currently processed match
-   * 
-   */
-  public abstract void process(final InstanceSpecification pRoot, final org.eclipse.uml2.uml.Package pInstSpec, final String pName);
-  
-  @Override
-  public void process(final SwSystemRootMatch match) {
-    process(match.getRoot(), match.getInstSpec(), match.getName());
-  }
-}
diff --git a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/SwSystemRootQuerySpecification.java b/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/SwSystemRootQuerySpecification.java
deleted file mode 100644
index caf3ddae581ff4a942ee9ca8f8dd22ffcfdac235..0000000000000000000000000000000000000000
--- a/plugins/org.polarsys.chess.instance.view/src-gen/org/polarsys/chess/instance/view/util/SwSystemRootQuerySpecification.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/**
- * 
- *   Copyright (c) 2016 Budapest University of Technology and Economics, Intecs
- *  
- *      
- *   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
- *  
- *  
- */
-package org.polarsys.chess.instance.view.util;
-
-import com.google.common.collect.Sets;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EDataTypeInSlotsKey;
-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.eclipse.viatra.query.runtime.matchers.context.IInputKey;
-import org.eclipse.viatra.query.runtime.matchers.psystem.IExpressionEvaluator;
-import org.eclipse.viatra.query.runtime.matchers.psystem.IValueProvider;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.QueryInitializationException;
-import org.eclipse.viatra.query.runtime.matchers.tuple.FlatTuple;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-import org.polarsys.chess.instance.view.SwSystemRootMatch;
-import org.polarsys.chess.instance.view.SwSystemRootMatcher;
-import org.polarsys.chess.instance.view.util.SwSystemCHGaResourcePlatformQuerySpecification;
-
-/**
- * A pattern-specific query specification that can instantiate SwSystemRootMatcher in a type-safe way.
- * 
- * @see SwSystemRootMatcher
- * @see SwSystemRootMatch
- * 
- */
-@SuppressWarnings("all")
-public final class SwSystemRootQuerySpecification extends BaseGeneratedEMFQuerySpecification<SwSystemRootMatcher> {
-  private SwSystemRootQuerySpecification() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryException if the pattern definition could not be loaded
-   * 
-   */
-  public static SwSystemRootQuerySpecification instance() throws ViatraQueryException {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  @Override
-  protected SwSystemRootMatcher instantiate(final ViatraQueryEngine engine) throws ViatraQueryException {
-    return SwSystemRootMatcher.on(engine);
-  }
-  
-  @Override
-  public SwSystemRootMatcher instantiate() throws ViatraQueryException {
-    return SwSystemRootMatcher.create();
-  }
-  
-  @Override
-  public SwSystemRootMatch newEmptyMatch() {
-    return SwSystemRootMatch.newEmptyMatch();
-  }
-  
-  @Override
-  public SwSystemRootMatch newMatch(final Object... parameters) {
-    return SwSystemRootMatch.newMatch((org.eclipse.uml2.uml.InstanceSpecification) parameters[0], (org.eclipse.uml2.uml.Package) parameters[1], (java.lang.String) parameters[2]);
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: org.polarsys.chess.instance.view.util.SwSystemRootQuerySpecification (visibility: PUBLIC, simpleName: SwSystemRootQuerySpecification, identifier: org.polarsys.chess.instance.view.util.SwSystemRootQuerySpecification, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: org.polarsys.chess.instance.view.util) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: org.polarsys.chess.instance.view.util.SwSystemRootQuerySpecification (visibility: PUBLIC, simpleName: SwSystemRootQuerySpecification, identifier: org.polarsys.chess.instance.view.util.SwSystemRootQuerySpecification, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: org.polarsys.chess.instance.view.util) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private final static SwSystemRootQuerySpecification INSTANCE = new SwSystemRootQuerySpecification();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private final static Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternalSneaky();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private final static SwSystemRootQuerySpecification.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_pRoot = new PParameter("root", "org.eclipse.uml2.uml.InstanceSpecification", (IInputKey)null, PParameterDirection.INOUT);
-    
-    private final PParameter parameter_pInstSpec = new PParameter("instSpec", "org.eclipse.uml2.uml.Package", (IInputKey)null, PParameterDirection.INOUT);
-    
-    private final PParameter parameter_pName = new PParameter("name", "java.lang.String", (IInputKey)null, PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_pRoot, parameter_pInstSpec, parameter_pName);
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "org.polarsys.chess.instance.view.swSystemRoot";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("root","instSpec","name");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() throws QueryInitializationException {
-      Set<PBody> bodies = Sets.newLinkedHashSet();
-      try {
-          {
-              PBody body = new PBody(this);
-              PVariable var_root = body.getOrCreateVariableByName("root");
-              PVariable var_instSpec = body.getOrCreateVariableByName("instSpec");
-              PVariable var_name = body.getOrCreateVariableByName("name");
-              body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-                 new ExportedParameter(body, var_root, parameter_pRoot),
-                 new ExportedParameter(body, var_instSpec, parameter_pInstSpec),
-                 new ExportedParameter(body, var_name, parameter_pName)
-              ));
-              // 	find swSystemCHGaResourcePlatform(instSpec)
-              new PositivePatternCall(body, new FlatTuple(var_instSpec), SwSystemCHGaResourcePlatformQuerySpecification.instance().getInternalQueryRepresentation());
-              // 	Package.packagedElement(instSpec, root)
-              new TypeConstraint(body, Tuples.flatTupleOf(var_instSpec), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Package")));
-              PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-              new TypeConstraint(body, Tuples.flatTupleOf(var_instSpec, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "Package", "packagedElement")));
-              new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "PackageableElement")));
-              new Equality(body, var__virtual_0_, var_root);
-              // 	InstanceSpecification(root)
-              new TypeConstraint(body, Tuples.flatTupleOf(var_root), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "InstanceSpecification")));
-              // 	InstanceSpecification.name(root, name)
-              new TypeConstraint(body, Tuples.flatTupleOf(var_root), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "InstanceSpecification")));
-              PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-              new TypeConstraint(body, Tuples.flatTupleOf(var_root, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.eclipse.org/uml2/5.0.0/UML", "NamedElement", "name")));
-              new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.eclipse.org/uml2/5.0.0/Types", "String")));
-              new Equality(body, var__virtual_1_, var_name);
-              // 	check(!name.contains("."))
-              new ExpressionEvaluation(body, new IExpressionEvaluator() {
-              
-                  @Override
-                  public String getShortDescription() {
-                      return "Expression evaluation from pattern swSystemRoot";
-                  }
-                  
-                  @Override
-                  public Iterable<String> getInputParameterNames() {
-                      return Arrays.asList("name");}
-              
-                  @Override
-                  public Object evaluateExpression(IValueProvider provider) throws Exception {
-                      String name = (String) provider.getValue("name");
-                      return evaluateExpression_1_1(name);
-                  }
-              },  null); 
-              bodies.add(body);
-          }
-          {
-              PAnnotation annotation = new PAnnotation("Item");
-              annotation.addAttribute("item", new ParameterReference("root"));
-              annotation.addAttribute("hierarchy", "root");
-              annotation.addAttribute("label", "$name$ (Instance)");
-              addAnnotation(annotation);
-          }
-      } catch (ViatraQueryException ex) {
-          throw processDependencyException(ex);
-      }
-      return bodies;
-    }
-  }
-  
-  private static boolean evaluateExpression_1_1(final String name) {
-    boolean _contains = name.contains(".");
-    boolean _not = (!_contains);
-    return _not;
-  }
-}
diff --git a/plugins/org.polarsys.chess.m2m/.classpath b/plugins/org.polarsys.chess.m2m/.classpath
index ad32c83a7885b8953a938b41df3b4fd4fe1aae01..eca7bdba8f03f22510b7980a94dbfe10c16c0901 100644
--- a/plugins/org.polarsys.chess.m2m/.classpath
+++ b/plugins/org.polarsys.chess.m2m/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.polarsys.chess.m2m/.gitignore b/plugins/org.polarsys.chess.m2m/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/org.polarsys.chess.m2m/.gitignore
+++ b/plugins/org.polarsys.chess.m2m/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/org.polarsys.chess.m2m/.project b/plugins/org.polarsys.chess.m2m/.project
index ed6af370184cf08d683f89f71d122d951c2d9da0..ef67c9d6bbae18ccd4604003f2439d337e75b29a 100644
--- a/plugins/org.polarsys.chess.m2m/.project
+++ b/plugins/org.polarsys.chess.m2m/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -21,14 +26,15 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.polarsys.chess.m2m/.settings/org.eclipse.core.resources.prefs b/plugins/org.polarsys.chess.m2m/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.polarsys.chess.m2m/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.polarsys.chess.m2m/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.chess.m2m/.settings/org.eclipse.jdt.core.prefs
index 7ac39f290f159c41f6b74824f425e6b7189f2ee9..0c68a61dca867ceb49e79d2402935261ec3e3809 100644
--- a/plugins/org.polarsys.chess.m2m/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.polarsys.chess.m2m/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Wed Aug 24 14:45:58 CEST 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/org.polarsys.chess.m2m/.settings/org.eclipse.m2e.core.prefs b/plugins/org.polarsys.chess.m2m/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.polarsys.chess.m2m/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.polarsys.chess.m2m/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.polarsys.chess.m2m/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/org.polarsys.chess.m2m/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/org.polarsys.chess.m2m/META-INF/MANIFEST.MF b/plugins/org.polarsys.chess.m2m/META-INF/MANIFEST.MF
index 176b00f77ecc352e87279738d4c8df508ce1d713..393a08915ed22aea84f8c356cf40e3bca0f25ad8 100644
--- a/plugins/org.polarsys.chess.m2m/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.chess.m2m/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.polarsys.chess.m2m;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.polarsys.chess.m2m.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
@@ -29,9 +29,10 @@ Require-Bundle: org.eclipse.ui,
  org.polarsys.chess.service,
  org.eclipse.emf.common,
  org.eclipse.jface,
- org.eclipse.papyrus.infra.services.validation
+ org.eclipse.papyrus.infra.services.validation,
+ org.eclipse.xtext.ui;bundle-version="2.12.0"
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Polarsys CHESS Project
 Bundle-Name: PIM to PSM model transformations plug-in (Incubation)
 Export-Package: org.polarsys.chess.m2m;
diff --git a/plugins/org.polarsys.chess.m2m/pom.xml b/plugins/org.polarsys.chess.m2m/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b337f1fa95e6d9deff5843d358fbeabaf0b7f02c
--- /dev/null
+++ b/plugins/org.polarsys.chess.m2m/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.m2m</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.monitoring.edit/.gitignore b/plugins/org.polarsys.chess.monitoring.edit/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..b83d22266ac8aa2f8df2edef68082c789727841d
--- /dev/null
+++ b/plugins/org.polarsys.chess.monitoring.edit/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/plugins/org.polarsys.chess.monitoring.edit/.project b/plugins/org.polarsys.chess.monitoring.edit/.project
index 778b9fd8509302f22c65eb6365c1f561047ddc12..efcf2bf634ac6de7fa3ec7e68fbb2c02a07c86ea 100644
--- a/plugins/org.polarsys.chess.monitoring.edit/.project
+++ b/plugins/org.polarsys.chess.monitoring.edit/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
diff --git a/plugins/org.polarsys.chess.monitoring.edit/.settings/org.eclipse.core.resources.prefs b/plugins/org.polarsys.chess.monitoring.edit/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.polarsys.chess.monitoring.edit/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.polarsys.chess.monitoring.edit/.settings/org.eclipse.m2e.core.prefs b/plugins/org.polarsys.chess.monitoring.edit/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.polarsys.chess.monitoring.edit/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.polarsys.chess.monitoring.edit/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.polarsys.chess.monitoring.edit/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/org.polarsys.chess.monitoring.edit/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/org.polarsys.chess.monitoring.edit/pom.xml b/plugins/org.polarsys.chess.monitoring.edit/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d3c1c7f2dbf735dbc9af4adcba9323201aaee321
--- /dev/null
+++ b/plugins/org.polarsys.chess.monitoring.edit/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.monitoring.edit</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.monitoring.editor/.gitignore b/plugins/org.polarsys.chess.monitoring.editor/.gitignore
index ba077a4031add5b3a04384f8b9cfc414efbf47dd..8000a78c4ef391d06ce0f4381b512e49a8f79272 100644
--- a/plugins/org.polarsys.chess.monitoring.editor/.gitignore
+++ b/plugins/org.polarsys.chess.monitoring.editor/.gitignore
@@ -1 +1,2 @@
 bin
+/target/
diff --git a/plugins/org.polarsys.chess.monitoring.editor/.project b/plugins/org.polarsys.chess.monitoring.editor/.project
index 67276c1b82c0472a44b4ceec52af113413ec2ad7..cccccaaa76624d308c081aca0467a6a57a2e674d 100644
--- a/plugins/org.polarsys.chess.monitoring.editor/.project
+++ b/plugins/org.polarsys.chess.monitoring.editor/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
diff --git a/plugins/org.polarsys.chess.monitoring.editor/.settings/org.eclipse.core.resources.prefs b/plugins/org.polarsys.chess.monitoring.editor/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.polarsys.chess.monitoring.editor/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.polarsys.chess.monitoring.editor/.settings/org.eclipse.m2e.core.prefs b/plugins/org.polarsys.chess.monitoring.editor/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.polarsys.chess.monitoring.editor/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.polarsys.chess.monitoring.editor/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.polarsys.chess.monitoring.editor/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/org.polarsys.chess.monitoring.editor/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/org.polarsys.chess.monitoring.editor/pom.xml b/plugins/org.polarsys.chess.monitoring.editor/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a57e759aa37c1f019c392da8659fdc30aafa151c
--- /dev/null
+++ b/plugins/org.polarsys.chess.monitoring.editor/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.monitoring.editor</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.monitoring.tests/.gitignore b/plugins/org.polarsys.chess.monitoring.tests/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..b83d22266ac8aa2f8df2edef68082c789727841d
--- /dev/null
+++ b/plugins/org.polarsys.chess.monitoring.tests/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/plugins/org.polarsys.chess.monitoring.tests/.project b/plugins/org.polarsys.chess.monitoring.tests/.project
index 15d8874fe94ab05b9db9cdd7e18c600e1ca178bb..776c0ee03b1bc22bbf187a8aa63a67f015cf96f6 100644
--- a/plugins/org.polarsys.chess.monitoring.tests/.project
+++ b/plugins/org.polarsys.chess.monitoring.tests/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
diff --git a/plugins/org.polarsys.chess.monitoring.tests/.settings/org.eclipse.core.resources.prefs b/plugins/org.polarsys.chess.monitoring.tests/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.polarsys.chess.monitoring.tests/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.polarsys.chess.monitoring.tests/.settings/org.eclipse.m2e.core.prefs b/plugins/org.polarsys.chess.monitoring.tests/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.polarsys.chess.monitoring.tests/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.polarsys.chess.monitoring.tests/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.polarsys.chess.monitoring.tests/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/org.polarsys.chess.monitoring.tests/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/org.polarsys.chess.monitoring.tests/pom.xml b/plugins/org.polarsys.chess.monitoring.tests/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1227935820a2617ae51825107897d12ebe5a3f13
--- /dev/null
+++ b/plugins/org.polarsys.chess.monitoring.tests/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.monitoring.tests</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.monitoring/.classpath b/plugins/org.polarsys.chess.monitoring/.classpath
index 3bc247511f0f2d8c7cda0c9514a4e1d2c7ab5e23..eca7bdba8f03f22510b7980a94dbfe10c16c0901 100644
--- a/plugins/org.polarsys.chess.monitoring/.classpath
+++ b/plugins/org.polarsys.chess.monitoring/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.polarsys.chess.monitoring/.gitignore b/plugins/org.polarsys.chess.monitoring/.gitignore
index ba077a4031add5b3a04384f8b9cfc414efbf47dd..8000a78c4ef391d06ce0f4381b512e49a8f79272 100644
--- a/plugins/org.polarsys.chess.monitoring/.gitignore
+++ b/plugins/org.polarsys.chess.monitoring/.gitignore
@@ -1 +1,2 @@
 bin
+/target/
diff --git a/plugins/org.polarsys.chess.monitoring/.project b/plugins/org.polarsys.chess.monitoring/.project
index 35923677947aa0d5927ffb30b2454df6878427b9..187ccd8ee9b75f4b020bf42bb24c937562bd8862 100644
--- a/plugins/org.polarsys.chess.monitoring/.project
+++ b/plugins/org.polarsys.chess.monitoring/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.sirius.nature.modelingproject</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
diff --git a/plugins/org.polarsys.chess.monitoring/.settings/org.eclipse.core.resources.prefs b/plugins/org.polarsys.chess.monitoring/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.polarsys.chess.monitoring/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.polarsys.chess.monitoring/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.chess.monitoring/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..0c68a61dca867ceb49e79d2402935261ec3e3809
--- /dev/null
+++ b/plugins/org.polarsys.chess.monitoring/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/org.polarsys.chess.monitoring/.settings/org.eclipse.m2e.core.prefs b/plugins/org.polarsys.chess.monitoring/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.polarsys.chess.monitoring/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.polarsys.chess.monitoring/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.polarsys.chess.monitoring/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/org.polarsys.chess.monitoring/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/org.polarsys.chess.monitoring/META-INF/MANIFEST.MF b/plugins/org.polarsys.chess.monitoring/META-INF/MANIFEST.MF
index 76c2cbb53865fde1cf247ac7c05dc5cb9c1e00d8..8c459aea54d5e4d7639eb33ea3fd50c3a0864dae 100644
--- a/plugins/org.polarsys.chess.monitoring/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.chess.monitoring/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.chess.monitoring;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.polarsys.chess.monitoring.monitoringxml,
  org.polarsys.chess.monitoring.monitoringxml.impl,
  org.polarsys.chess.monitoring.monitoringxml.util
diff --git a/plugins/org.polarsys.chess.monitoring/pom.xml b/plugins/org.polarsys.chess.monitoring/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..985a51f3d3d8f9ddb34c626f80b40c0a724b99a5
--- /dev/null
+++ b/plugins/org.polarsys.chess.monitoring/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.monitoring</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.multicore/.classpath b/plugins/org.polarsys.chess.multicore/.classpath
index 0bfb9306c24dfe9c88625ceea0033448335d3cee..5797681944934dbdbad2db2a114e10d335f31f20 100644
--- a/plugins/org.polarsys.chess.multicore/.classpath
+++ b/plugins/org.polarsys.chess.multicore/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry excluding="org/concerto/multicore/dialogs/PartitionSelectorDialog.java" kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.polarsys.chess.multicore/.gitignore b/plugins/org.polarsys.chess.multicore/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/org.polarsys.chess.multicore/.gitignore
+++ b/plugins/org.polarsys.chess.multicore/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/org.polarsys.chess.multicore/.project b/plugins/org.polarsys.chess.multicore/.project
index 3889aa55f4ebbb1a1f30c24fb39876695f8e2b57..f377d9c669a9ff049665f674d2cdcba6a0a8100b 100644
--- a/plugins/org.polarsys.chess.multicore/.project
+++ b/plugins/org.polarsys.chess.multicore/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/org.polarsys.chess.multicore/.settings/org.eclipse.core.resources.prefs b/plugins/org.polarsys.chess.multicore/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.polarsys.chess.multicore/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.polarsys.chess.multicore/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.chess.multicore/.settings/org.eclipse.jdt.core.prefs
index 044ef7ad98d0dc6abddef8d16e81b3c27ae2fe6f..0c68a61dca867ceb49e79d2402935261ec3e3809 100644
--- a/plugins/org.polarsys.chess.multicore/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.polarsys.chess.multicore/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Tue Oct 05 10:28:34 CEST 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/org.polarsys.chess.multicore/.settings/org.eclipse.m2e.core.prefs b/plugins/org.polarsys.chess.multicore/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.polarsys.chess.multicore/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.polarsys.chess.multicore/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.polarsys.chess.multicore/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/org.polarsys.chess.multicore/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/org.polarsys.chess.multicore/META-INF/MANIFEST.MF b/plugins/org.polarsys.chess.multicore/META-INF/MANIFEST.MF
index 40b3a3923dd580d563eff760454ffc9bf0f9189f..0695f876c4d14c59781bf5f188ffc6529e3d8ffe 100644
--- a/plugins/org.polarsys.chess.multicore/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.chess.multicore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Multicore support
 Bundle-SymbolicName: org.polarsys.chess.multicore;singleton:=true
-Bundle-Version: 0.9.2.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.polarsys.chess.multicore.Activator
 Bundle-Vendor: UPD
 Require-Bundle: org.eclipse.ui.ide;bundle-version="3.10.0",
@@ -39,7 +39,7 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="3.10.0",
  org.eclipse.emf.ecore.xmi,
  org.polarsys.chess.validator,
  org.polarsys.chess.m2m
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.polarsys.chess.multicore.commands,
  org.polarsys.chess.multicore.dialogs,
diff --git a/plugins/org.polarsys.chess.multicore/build.properties b/plugins/org.polarsys.chess.multicore/build.properties
index e989717d5aaf8fa2f8b8c0dd5408b3626870317a..93e87633158e8bbe0aa76677613b50169b3a2830 100644
--- a/plugins/org.polarsys.chess.multicore/build.properties
+++ b/plugins/org.polarsys.chess.multicore/build.properties
@@ -3,7 +3,5 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               build.properties,\
-               bin/,\
-               transformations/,\
-               metamodels/
+               build.properties
+
diff --git a/plugins/org.polarsys.chess.multicore/pom.xml b/plugins/org.polarsys.chess.multicore/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..268b18e7a1c1d6c970f95da2532a983b2dbb5559
--- /dev/null
+++ b/plugins/org.polarsys.chess.multicore/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.multicore</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.paramArchConfigurator/.gitignore b/plugins/org.polarsys.chess.paramArchConfigurator/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/org.polarsys.chess.paramArchConfigurator/.gitignore
+++ b/plugins/org.polarsys.chess.paramArchConfigurator/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/org.polarsys.chess.paramArchConfigurator/.project b/plugins/org.polarsys.chess.paramArchConfigurator/.project
index 83150eff1a61a1c7776c2e905a9ca340fb68f065..2b9af3fd74a869647540297d1a42a01e88c1de36 100644
--- a/plugins/org.polarsys.chess.paramArchConfigurator/.project
+++ b/plugins/org.polarsys.chess.paramArchConfigurator/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/org.polarsys.chess.paramArchConfigurator/.settings/org.eclipse.core.resources.prefs b/plugins/org.polarsys.chess.paramArchConfigurator/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.polarsys.chess.paramArchConfigurator/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.polarsys.chess.paramArchConfigurator/.settings/org.eclipse.m2e.core.prefs b/plugins/org.polarsys.chess.paramArchConfigurator/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.polarsys.chess.paramArchConfigurator/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.polarsys.chess.paramArchConfigurator/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.polarsys.chess.paramArchConfigurator/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/org.polarsys.chess.paramArchConfigurator/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/org.polarsys.chess.paramArchConfigurator/bin/org/polarsys/chess/paramArchConfigurator/commands/InstantiateParamArchAsOssFileCommand.class b/plugins/org.polarsys.chess.paramArchConfigurator/bin/org/polarsys/chess/paramArchConfigurator/commands/InstantiateParamArchAsOssFileCommand.class
index 26192f6a1bd4c7f8bb17182eea2dc31e2362f424..4a4f7671c7d023a67215ba9940cf855ec3f78f14 100644
Binary files a/plugins/org.polarsys.chess.paramArchConfigurator/bin/org/polarsys/chess/paramArchConfigurator/commands/InstantiateParamArchAsOssFileCommand.class and b/plugins/org.polarsys.chess.paramArchConfigurator/bin/org/polarsys/chess/paramArchConfigurator/commands/InstantiateParamArchAsOssFileCommand.class differ
diff --git a/plugins/org.polarsys.chess.paramArchConfigurator/bin/org/polarsys/chess/paramArchConfigurator/ui/dialog/ConfigParameter$IntegerVerifyListener.class b/plugins/org.polarsys.chess.paramArchConfigurator/bin/org/polarsys/chess/paramArchConfigurator/ui/dialog/ConfigParameter$IntegerVerifyListener.class
deleted file mode 100644
index e9f0d6ffa6c09a2d3b3c954b098714dd8ff2946b..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.paramArchConfigurator/bin/org/polarsys/chess/paramArchConfigurator/ui/dialog/ConfigParameter$IntegerVerifyListener.class and /dev/null differ
diff --git a/plugins/org.polarsys.chess.paramArchConfigurator/bin/org/polarsys/chess/paramArchConfigurator/ui/dialog/ConfigParameter$RealVerifyListener.class b/plugins/org.polarsys.chess.paramArchConfigurator/bin/org/polarsys/chess/paramArchConfigurator/ui/dialog/ConfigParameter$RealVerifyListener.class
deleted file mode 100644
index 4bd2f68d34372b2342bb537b02961959f963b565..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.paramArchConfigurator/bin/org/polarsys/chess/paramArchConfigurator/ui/dialog/ConfigParameter$RealVerifyListener.class and /dev/null differ
diff --git a/plugins/org.polarsys.chess.paramArchConfigurator/bin/org/polarsys/chess/paramArchConfigurator/ui/dialog/ConfigParameter.class b/plugins/org.polarsys.chess.paramArchConfigurator/bin/org/polarsys/chess/paramArchConfigurator/ui/dialog/ConfigParameter.class
deleted file mode 100644
index 8c42496309a1ee1ab1f06df68546062c786377e1..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.paramArchConfigurator/bin/org/polarsys/chess/paramArchConfigurator/ui/dialog/ConfigParameter.class and /dev/null differ
diff --git a/plugins/org.polarsys.chess.paramArchConfigurator/bin/org/polarsys/chess/paramArchConfigurator/ui/dialog/ConfigureArchitectureDialog.class b/plugins/org.polarsys.chess.paramArchConfigurator/bin/org/polarsys/chess/paramArchConfigurator/ui/dialog/ConfigureArchitectureDialog.class
deleted file mode 100644
index 3e223f6b19317179e5e2085785585f3567535c8b..0000000000000000000000000000000000000000
Binary files a/plugins/org.polarsys.chess.paramArchConfigurator/bin/org/polarsys/chess/paramArchConfigurator/ui/dialog/ConfigureArchitectureDialog.class and /dev/null differ
diff --git a/plugins/org.polarsys.chess.paramArchConfigurator/pom.xml b/plugins/org.polarsys.chess.paramArchConfigurator/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b642198c3126f75e424b50bdaee796e6515f2e49
--- /dev/null
+++ b/plugins/org.polarsys.chess.paramArchConfigurator/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.paramArchConfigurator</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.patterns.library/.classpath b/plugins/org.polarsys.chess.patterns.library/.classpath
index eca7bdba8f03f22510b7980a94dbfe10c16c0901..075009d77450ff8bc131fb1e4741fc35e5e6fd72 100644
--- a/plugins/org.polarsys.chess.patterns.library/.classpath
+++ b/plugins/org.polarsys.chess.patterns.library/.classpath
@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.polarsys.chess.patterns.library/.gitignore b/plugins/org.polarsys.chess.patterns.library/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/org.polarsys.chess.patterns.library/.gitignore
+++ b/plugins/org.polarsys.chess.patterns.library/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/org.polarsys.chess.patterns.library/.project b/plugins/org.polarsys.chess.patterns.library/.project
index b33de9e1a0215fb15e679c5c7c3fff15bb8e0851..07dcf3ad86bb1cf3eb5196652d335371ab390ac9 100644
--- a/plugins/org.polarsys.chess.patterns.library/.project
+++ b/plugins/org.polarsys.chess.patterns.library/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/org.polarsys.chess.patterns.library/.settings/org.eclipse.core.resources.prefs b/plugins/org.polarsys.chess.patterns.library/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.polarsys.chess.patterns.library/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.polarsys.chess.patterns.library/.settings/org.eclipse.m2e.core.prefs b/plugins/org.polarsys.chess.patterns.library/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.polarsys.chess.patterns.library/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.polarsys.chess.patterns.library/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.polarsys.chess.patterns.library/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/org.polarsys.chess.patterns.library/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/org.polarsys.chess.patterns.library/build.properties b/plugins/org.polarsys.chess.patterns.library/build.properties
index db0138dd20c73a5a35de5aa55f197755e1e95aea..5b04283b917503167fc5c713b3cf15fdbb3d10a0 100644
--- a/plugins/org.polarsys.chess.patterns.library/build.properties
+++ b/plugins/org.polarsys.chess.patterns.library/build.properties
@@ -1,4 +1,3 @@
-source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
diff --git a/plugins/org.polarsys.chess.patterns.library/pom.xml b/plugins/org.polarsys.chess.patterns.library/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fe58f96cc96ae5620c67b3217e19be4e17e200db
--- /dev/null
+++ b/plugins/org.polarsys.chess.patterns.library/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.patterns.library</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.patterns.profile/.classpath b/plugins/org.polarsys.chess.patterns.profile/.classpath
index e7a4ca0c29c2f2a7331792ee4dc49cbece54744a..858bac421b84076c257427411b5e218d1ead299e 100644
--- a/plugins/org.polarsys.chess.patterns.profile/.classpath
+++ b/plugins/org.polarsys.chess.patterns.profile/.classpath
@@ -3,6 +3,5 @@
 	<classpathentry kind="src" path="src-gen"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.polarsys.chess.patterns.profile/.gitignore b/plugins/org.polarsys.chess.patterns.profile/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/org.polarsys.chess.patterns.profile/.gitignore
+++ b/plugins/org.polarsys.chess.patterns.profile/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/org.polarsys.chess.patterns.profile/.project b/plugins/org.polarsys.chess.patterns.profile/.project
index 03e9b0b745a5e12185953fdedccf60ddad555931..972f9dacef4011dbdd100509224159b7c86a948b 100644
--- a/plugins/org.polarsys.chess.patterns.profile/.project
+++ b/plugins/org.polarsys.chess.patterns.profile/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/org.polarsys.chess.patterns.profile/.settings/org.eclipse.core.resources.prefs b/plugins/org.polarsys.chess.patterns.profile/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.polarsys.chess.patterns.profile/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.polarsys.chess.patterns.profile/.settings/org.eclipse.m2e.core.prefs b/plugins/org.polarsys.chess.patterns.profile/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.polarsys.chess.patterns.profile/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.polarsys.chess.patterns.profile/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.polarsys.chess.patterns.profile/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/org.polarsys.chess.patterns.profile/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/org.polarsys.chess.patterns.profile/build.properties b/plugins/org.polarsys.chess.patterns.profile/build.properties
index 697ca964527a545764d3a69847c122b371257973..5b71297238a721150427ccca10fa956553bca0c6 100644
--- a/plugins/org.polarsys.chess.patterns.profile/build.properties
+++ b/plugins/org.polarsys.chess.patterns.profile/build.properties
@@ -1,10 +1,11 @@
 #
-
 bin.includes = .,\
                model/,\
                META-INF/,\
                plugin.xml,\
-               plugin.properties
+               plugin.properties,\
+               src-gen/
 jars.compile.order = .
-source.. = src-gen/
+source.. = src/,\
+			src-gen/
 output.. = bin/
diff --git a/plugins/org.polarsys.chess.patterns.profile/pom.xml b/plugins/org.polarsys.chess.patterns.profile/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e0bbce1871f9f69489b94beb482e7a515d146f96
--- /dev/null
+++ b/plugins/org.polarsys.chess.patterns.profile/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.patterns.profile</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.patterns/.gitignore b/plugins/org.polarsys.chess.patterns/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/org.polarsys.chess.patterns/.gitignore
+++ b/plugins/org.polarsys.chess.patterns/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/org.polarsys.chess.patterns/.project b/plugins/org.polarsys.chess.patterns/.project
index 280dbc755f03d87f2a5c5c510f096dd37378a437..259c41122e1e8dea9e534ed30c3572c3669819fd 100644
--- a/plugins/org.polarsys.chess.patterns/.project
+++ b/plugins/org.polarsys.chess.patterns/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/org.polarsys.chess.patterns/.settings/org.eclipse.core.resources.prefs b/plugins/org.polarsys.chess.patterns/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.polarsys.chess.patterns/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.polarsys.chess.patterns/.settings/org.eclipse.m2e.core.prefs b/plugins/org.polarsys.chess.patterns/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.polarsys.chess.patterns/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.polarsys.chess.patterns/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.polarsys.chess.patterns/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/org.polarsys.chess.patterns/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/org.polarsys.chess.patterns/pom.xml b/plugins/org.polarsys.chess.patterns/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6e9adc6830cfc68220c3cc4cd2416543a19f3300
--- /dev/null
+++ b/plugins/org.polarsys.chess.patterns/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.patterns</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.properties.propertyEditor/.gitignore b/plugins/org.polarsys.chess.properties.propertyEditor/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/org.polarsys.chess.properties.propertyEditor/.gitignore
+++ b/plugins/org.polarsys.chess.properties.propertyEditor/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/org.polarsys.chess.properties.propertyEditor/.project b/plugins/org.polarsys.chess.properties.propertyEditor/.project
index acdf322b4e19f50790b71cb8696fdb757e51c252..ef67f181e365aa45be3a6902e536deda2d5ee2f4 100644
--- a/plugins/org.polarsys.chess.properties.propertyEditor/.project
+++ b/plugins/org.polarsys.chess.properties.propertyEditor/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/org.polarsys.chess.properties.propertyEditor/.settings/org.eclipse.core.resources.prefs b/plugins/org.polarsys.chess.properties.propertyEditor/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.polarsys.chess.properties.propertyEditor/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.polarsys.chess.properties.propertyEditor/.settings/org.eclipse.m2e.core.prefs b/plugins/org.polarsys.chess.properties.propertyEditor/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.polarsys.chess.properties.propertyEditor/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.polarsys.chess.properties.propertyEditor/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.polarsys.chess.properties.propertyEditor/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/org.polarsys.chess.properties.propertyEditor/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/org.polarsys.chess.properties.propertyEditor/pom.xml b/plugins/org.polarsys.chess.properties.propertyEditor/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6f30738cca8df10e744209bd60adbbe79473d8b2
--- /dev/null
+++ b/plugins/org.polarsys.chess.properties.propertyEditor/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.properties.propertyEditor</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.service/.classpath b/plugins/org.polarsys.chess.service/.classpath
index 098194ca4b7d8f45177f94e735506ae3a26b5c94..eca7bdba8f03f22510b7980a94dbfe10c16c0901 100644
--- a/plugins/org.polarsys.chess.service/.classpath
+++ b/plugins/org.polarsys.chess.service/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.polarsys.chess.service/.gitignore b/plugins/org.polarsys.chess.service/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/org.polarsys.chess.service/.gitignore
+++ b/plugins/org.polarsys.chess.service/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/org.polarsys.chess.service/.project b/plugins/org.polarsys.chess.service/.project
index 27041768422de39d743bd83192c1277a68ae5428..9c53db18688c7d8eb822e3a66a216ea7b40462bc 100644
--- a/plugins/org.polarsys.chess.service/.project
+++ b/plugins/org.polarsys.chess.service/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -21,14 +26,15 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.polarsys.chess.service/.settings/org.eclipse.core.resources.prefs b/plugins/org.polarsys.chess.service/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.polarsys.chess.service/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.polarsys.chess.service/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.chess.service/.settings/org.eclipse.jdt.core.prefs
index f42de363afaae68bbd968318f1d331877f5514fc..0c68a61dca867ceb49e79d2402935261ec3e3809 100644
--- a/plugins/org.polarsys.chess.service/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.polarsys.chess.service/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/org.polarsys.chess.service/.settings/org.eclipse.m2e.core.prefs b/plugins/org.polarsys.chess.service/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.polarsys.chess.service/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.polarsys.chess.service/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.polarsys.chess.service/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/org.polarsys.chess.service/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/org.polarsys.chess.service/META-INF/MANIFEST.MF b/plugins/org.polarsys.chess.service/META-INF/MANIFEST.MF
index 47ed2a6a79a54b97b5e9f7c5ee729bff0053f3d7..1a2b4632b5c6c6820fa9fbc24d601a4a72d1af4a 100644
--- a/plugins/org.polarsys.chess.service/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.chess.service/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.polarsys.chess.service;singleton:=true
-Bundle-Version: 0.11.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.polarsys.chess.service.internal.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.infra.core,
@@ -18,9 +18,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.uml.tools,
  eu.fbk.eclipse.standardtools.utils,
  org.polarsys.chess.contracts.profile,
- eu.fbk.eclipse.standardtools.StateMachineTranslatorToSmv,
  org.polarsys.chess.chessmlprofile
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.polarsys.chess.service.core.exceptions,
  org.polarsys.chess.service.core.model,
  org.polarsys.chess.service.core.utils,
diff --git a/plugins/org.polarsys.chess.service/pom.xml b/plugins/org.polarsys.chess.service/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5bc4ba1d2256b82404eeaed59ec5fcba748caac0
--- /dev/null
+++ b/plugins/org.polarsys.chess.service/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.service</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/model/ChessSystemModel.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/model/ChessSystemModel.java
index dd8d6e1433ae080c1e4853054676e476d7653a35..695cee8c382ac9f1603474c660588e7c2d1233c4 100644
--- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/model/ChessSystemModel.java
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/model/ChessSystemModel.java
@@ -30,6 +30,7 @@ import org.eclipse.uml2.uml.Property;
 import org.eclipse.uml2.uml.Type;
 import org.eclipse.uml2.uml.UMLFactory;
 import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.Parameter;
 import org.polarsys.chess.contracts.profile.chesscontract.ContractProperty;
 import org.polarsys.chess.contracts.profile.chesscontract.ContractRefinement;
 import org.polarsys.chess.contracts.profile.chesscontract.util.ContractEntityUtil;
@@ -1013,6 +1014,11 @@ public class ChessSystemModel implements AbstractSystemModel {
 		return EntityUtil.getInstance().isBlockTypeAttribute(attributeName, (Class)blockAsClass);
 	}
 
+	@Override
+	public boolean isBlockType(Object type) {		
+		return EntityUtil.getInstance().isBlock((Element)type);
+	}
+	
 	@Override
 	public Object getAttributeBlockType(String attributeName, Object block) {
 		return EntityUtil.getInstance().getAttributeBlockType(attributeName,(Class)block);
@@ -1020,7 +1026,10 @@ public class ChessSystemModel implements AbstractSystemModel {
 
 	@Override
 	public Object getAttributeType(String attributeName, Object block) {
+		if(block instanceof Class){
 		return EntityUtil.getInstance().getAttributeType(attributeName,(Class)block);
+		}
+		return null;
 	}
 	
 	@Override
@@ -1049,8 +1058,8 @@ public class ChessSystemModel implements AbstractSystemModel {
 	}
 
 	@Override
-	public Object getOperationType(String variableName, Object block) {
-		return EntityUtil.getInstance().getOperationType(variableName, (Class)block);
+	public Object getOperationReturnType(String operationName, Object block) {
+		return EntityUtil.getInstance().getOperationType(operationName, (Class)block);
 	}
 
 	@Override
@@ -1099,4 +1108,34 @@ return EntityUtil.getInstance().isCallEventByOperationName(idName,currBlock);
 	public EList<String> getAttributesNames(Object component) {
 		return EntityUtil.getInstance().getAttributesNames((Class)component);
 	}
+
+	@Override
+	public boolean isCallEvent(Object element) {
+		return element instanceof CallEvent;
+	}
+
+	@Override
+	public Object getCallEventParameterType(String paramterName, Object callEvent) {
+		System.out.println(callEvent);
+		if(isCallEvent(callEvent)){
+			System.out.println("isCallEvent. operation: "+((CallEvent)callEvent).getOperation());
+			Parameter par = ((CallEvent)callEvent).getOperation().getOwnedParameter(paramterName, null);
+			if(par != null){
+				return par.getType();
+			}
+			
+		}
+		return null;
+	}
+
+	@Override
+	public Object getCallEventOperation(Object callEvent) throws Exception {
+		return EntityUtil.getInstance().getCallEventOperation((CallEvent)callEvent);
+	}
+	
+	@Override
+	public Object getParameterType(String paramName, String methodName, Object retrieveBlockType) {
+		return EntityUtil.getInstance().getParameterType(paramName, methodName, (Class)retrieveBlockType);
+	}
+
 }
diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/DialogUtils.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/DialogUtils.java
index e445450c484d63aafa966e057484a9cdb205773c..e0766df0faeec5e4a52537078523c4053f6fbd66 100644
--- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/DialogUtils.java
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/DialogUtils.java
@@ -11,6 +11,7 @@
 package org.polarsys.chess.service.gui.utils;
 
 import org.eclipse.swt.widgets.DirectoryDialog;
+import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PlatformUI;
 
@@ -34,16 +35,38 @@ public class DialogUtils {
 
 	
 	
-	public String getDirectoryNameFromDialog() throws Exception {
+	public String getDirectoryNameFromDialog() throws Exception {	
+		return getDirectoryNameFromDialog("Select the directory");
+	}
+
+	public String getDirectoryNameFromDialog(String title) throws Exception {
 		final Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
 
 		final DirectoryDialog directoryDialog = new DirectoryDialog(shell);
-		directoryDialog.setText("Select the directory");
+		directoryDialog.setText(title);
 		directoryDialog.setFilterPath(directoryUtils.getCurrentProjectDir());
 		String directoryName = directoryDialog.open();
 
 		return directoryName;
 	}
+	
+	public String getFileNameFromDialog() throws Exception {	
+		return getFileNameFromDialog("Select the file",null);
+	}
+
+	public String getFileNameFromDialog(String title, String filterExtension) throws Exception {
+		final Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
 
+		final FileDialog fileDialog = new FileDialog(shell);
+		fileDialog.setText(title);
+		fileDialog.setFilterPath(directoryUtils.getCurrentProjectDir());
+		if(filterExtension!=null){
+			String[] extensions = {filterExtension};
+			fileDialog.setFilterExtensions(extensions);
+		}
+		String directoryName = fileDialog.open();
 
+		return directoryName;
+	}
+	
 }
diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/ReportProblemsUtil.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/ReportProblemsUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..c28272cdb26dc96e58b6e5ccc0bcc3a262b45cdb
--- /dev/null
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/ReportProblemsUtil.java
@@ -0,0 +1,107 @@
+/*******************************************************************************
+ * Copyright (C) 2020 Fondazione Bruno Kessler.
+ * 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:
+ *     Luca Cristoforetti - initial API and implementation
+ ******************************************************************************/
+package org.polarsys.chess.service.gui.utils;
+
+import java.util.HashMap;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+
+/**
+ * An utility class to post messages to the Problems tab.
+ * 
+ * @author cristofo
+ *
+ */
+public class ReportProblemsUtil {
+	
+	/**
+	 * Deletes all markers on this resource.
+	 * @param resource the resource
+	 * @throws CoreException
+	 */
+	public static void cleanResource(IResource resource) throws CoreException {
+	    resource.deleteMarkers(null, true, IResource.DEPTH_INFINITE);		
+	}
+	
+	/**
+	 * Reports a warning in the Problems tab.
+	 * @param resource the resource
+	 * @param msg the message to display
+	 * @param lineNumber the line to select (or 0)
+	 * @param charStart the start of selection (or 0)
+	 * @param charEnd the end of seletion (or 0)
+	 * @return the created IMarker
+	 * @throws CoreException
+	 * @throws NullPointerException
+	 */
+	public static IMarker reportWarning(IResource resource, String msg, int lineNumber, 
+			int charStart, int charEnd) throws CoreException, NullPointerException {
+		return reportMessage(resource, msg, lineNumber, charStart, charEnd, 
+				IMarker.PROBLEM, IMarker.SEVERITY_WARNING);
+	}
+
+	/**
+	 * Reports an error in the Problems tab.
+	 * @param resource the resource
+	 * @param msg the message to display
+	 * @param lineNumber the line to select (or 0)
+	 * @param charStart the start of selection (or 0)
+	 * @param charEnd the end of seletion (or 0)
+	 * @return the created IMarker
+	 * @throws CoreException
+	 * @throws NullPointerException
+	 */
+	public static IMarker reportError(IResource resource, String msg, int lineNumber, 
+			int charStart, int charEnd) throws CoreException, NullPointerException {
+		return reportMessage(resource, msg, lineNumber, charStart, charEnd, 
+				IMarker.PROBLEM, IMarker.SEVERITY_ERROR);
+	}
+
+	/**
+	 * Reports an info in the Problems tab.
+	 * @param resource the resource
+	 * @param msg the message to display
+	 * @param lineNumber the line to select (or 0)
+	 * @param charStart the start of selection (or 0)
+	 * @param charEnd the end of seletion (or 0)
+	 * @return the created IMarker
+	 * @throws CoreException
+	 * @throws NullPointerException
+	 */
+	public static IMarker reportInfo(IResource resource, String msg, int lineNumber, 
+			int charStart, int charEnd) throws CoreException, NullPointerException {
+		return reportMessage(resource, msg, lineNumber, charStart, charEnd, 
+				IMarker.PROBLEM, IMarker.SEVERITY_INFO);
+	}
+
+	private static IMarker reportMessage(IResource resource, String msg, int lineNumber, int charStart, 
+			int charEnd, String type, int severity) throws CoreException, NullPointerException {
+		if (resource == null) {
+			throw new NullPointerException("Resource is null");
+		}
+		
+		IMarker m = resource.createMarker(type);
+		
+		HashMap<String, Object> attributes = new HashMap<String, Object>();
+		attributes.put(IMarker.PRIORITY, new Integer(IMarker.PRIORITY_HIGH));
+		attributes.put(IMarker.SEVERITY, new Integer(severity));
+		if (lineNumber > 0) attributes.put(IMarker.LINE_NUMBER, new Integer(lineNumber));
+		attributes.put(IMarker.MESSAGE, msg);
+		if (charStart > 0) attributes.put(IMarker.CHAR_START, new Integer(charStart)); // Note: this value is from the beginning of the document
+		if (charEnd > 0) attributes.put(IMarker.CHAR_END, new Integer(charEnd)); // Note: this value is from the beginning of the document
+//		m.setAttribute(IMarker.LOCATION, "whole file");	// This is a generic info about location
+
+		m.setAttributes(attributes);
+		return m;
+	}
+}
diff --git a/plugins/org.polarsys.chess.smvExporter/.gitignore b/plugins/org.polarsys.chess.smvExporter/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/org.polarsys.chess.smvExporter/.gitignore
+++ b/plugins/org.polarsys.chess.smvExporter/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/org.polarsys.chess.smvExporter/.project b/plugins/org.polarsys.chess.smvExporter/.project
index 6221c936bf6ae376ab42b35011e90eed0ecd7b91..a8df70c039fdbccc8dfc7625235252e130ce706c 100644
--- a/plugins/org.polarsys.chess.smvExporter/.project
+++ b/plugins/org.polarsys.chess.smvExporter/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/org.polarsys.chess.smvExporter/.settings/org.eclipse.core.resources.prefs b/plugins/org.polarsys.chess.smvExporter/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.polarsys.chess.smvExporter/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.polarsys.chess.smvExporter/.settings/org.eclipse.m2e.core.prefs b/plugins/org.polarsys.chess.smvExporter/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.polarsys.chess.smvExporter/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.polarsys.chess.smvExporter/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.polarsys.chess.smvExporter/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/org.polarsys.chess.smvExporter/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/org.polarsys.chess.smvExporter/pom.xml b/plugins/org.polarsys.chess.smvExporter/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7e5f89b859ecfb3c668ed1566e7b92b4b0052535
--- /dev/null
+++ b/plugins/org.polarsys.chess.smvExporter/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.smvExporter</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.tabbedproperties/.classpath b/plugins/org.polarsys.chess.tabbedproperties/.classpath
index 64c5e31b7a264082f4c1dfdabb8097de820e66ce..eca7bdba8f03f22510b7980a94dbfe10c16c0901 100644
--- a/plugins/org.polarsys.chess.tabbedproperties/.classpath
+++ b/plugins/org.polarsys.chess.tabbedproperties/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.polarsys.chess.tabbedproperties/.gitignore b/plugins/org.polarsys.chess.tabbedproperties/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/org.polarsys.chess.tabbedproperties/.gitignore
+++ b/plugins/org.polarsys.chess.tabbedproperties/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/org.polarsys.chess.tabbedproperties/.project b/plugins/org.polarsys.chess.tabbedproperties/.project
index 60b3f370c3c9df03937af1407500e45b933650f8..06023f378f27ab01a646944d66f5606a9788ebc0 100644
--- a/plugins/org.polarsys.chess.tabbedproperties/.project
+++ b/plugins/org.polarsys.chess.tabbedproperties/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/org.polarsys.chess.tabbedproperties/.settings/org.eclipse.core.resources.prefs b/plugins/org.polarsys.chess.tabbedproperties/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.polarsys.chess.tabbedproperties/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.polarsys.chess.tabbedproperties/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.chess.tabbedproperties/.settings/org.eclipse.jdt.core.prefs
index 6414e6580b76fca102431976f71cc52c3fdcba2a..0c68a61dca867ceb49e79d2402935261ec3e3809 100644
--- a/plugins/org.polarsys.chess.tabbedproperties/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.polarsys.chess.tabbedproperties/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Mon May 10 11:38:54 CEST 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/org.polarsys.chess.tabbedproperties/.settings/org.eclipse.m2e.core.prefs b/plugins/org.polarsys.chess.tabbedproperties/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.polarsys.chess.tabbedproperties/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.polarsys.chess.tabbedproperties/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.polarsys.chess.tabbedproperties/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/org.polarsys.chess.tabbedproperties/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/org.polarsys.chess.tabbedproperties/META-INF/MANIFEST.MF b/plugins/org.polarsys.chess.tabbedproperties/META-INF/MANIFEST.MF
index 1d96aca12c7c0b8bd04f88e8209df9d72a72ddbd..af62535a37d602b3f34e2a9db5f1e7a55697a021 100644
--- a/plugins/org.polarsys.chess.tabbedproperties/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.chess.tabbedproperties/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: diagram listener example
 Bundle-SymbolicName: org.polarsys.chess.tabbedproperties;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.polarsys.chess.tabbedproperties.Activator
 Bundle-Vendor: unipd.it
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.polarsys.chess.tabbedproperties,
  org.polarsys.chess.tabbedproperties.filters,
diff --git a/plugins/org.polarsys.chess.tabbedproperties/pom.xml b/plugins/org.polarsys.chess.tabbedproperties/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b460e54252561842aba32e703b393ffb69847a12
--- /dev/null
+++ b/plugins/org.polarsys.chess.tabbedproperties/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.tabbedproperties</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.test.runtime/build.properties b/plugins/org.polarsys.chess.test.runtime/build.properties
index 35e62587b86a6ecf03a27577ec0610ddebe43dc4..d7d16f63d0853b4b43772cb77c494c93c7446890 100644
--- a/plugins/org.polarsys.chess.test.runtime/build.properties
+++ b/plugins/org.polarsys.chess.test.runtime/build.properties
@@ -12,5 +12,4 @@ source.. = src/
 output.. = bin/
 bin.includes = plugin.xml,\
                META-INF/,\
-               .,\
-               icons/
+               .
\ No newline at end of file
diff --git a/plugins/org.polarsys.chess.test.runtime/pom.xml b/plugins/org.polarsys.chess.test.runtime/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5a7b821b8931fd24781161326c665adb21ada56c
--- /dev/null
+++ b/plugins/org.polarsys.chess.test.runtime/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>CHESS</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
+  <groupId>org.polarsys.chess</groupId>
+  <artifactId>org.polarsys.chess.test.runtime</artifactId>
+  <version>0.9.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.tradeoffAnalysis/.gitignore b/plugins/org.polarsys.chess.tradeoffAnalysis/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/org.polarsys.chess.tradeoffAnalysis/.gitignore
+++ b/plugins/org.polarsys.chess.tradeoffAnalysis/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/org.polarsys.chess.tradeoffAnalysis/.project b/plugins/org.polarsys.chess.tradeoffAnalysis/.project
index 72ef463fbdb4c1e98f76cd94363ce0dfffedcab3..e24b707485b6e671853eb36345e0985d4ab29ee7 100644
--- a/plugins/org.polarsys.chess.tradeoffAnalysis/.project
+++ b/plugins/org.polarsys.chess.tradeoffAnalysis/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/org.polarsys.chess.tradeoffAnalysis/.settings/org.eclipse.core.resources.prefs b/plugins/org.polarsys.chess.tradeoffAnalysis/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.polarsys.chess.tradeoffAnalysis/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.polarsys.chess.tradeoffAnalysis/.settings/org.eclipse.m2e.core.prefs b/plugins/org.polarsys.chess.tradeoffAnalysis/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.polarsys.chess.tradeoffAnalysis/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.polarsys.chess.tradeoffAnalysis/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.polarsys.chess.tradeoffAnalysis/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/org.polarsys.chess.tradeoffAnalysis/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/org.polarsys.chess.tradeoffAnalysis/pom.xml b/plugins/org.polarsys.chess.tradeoffAnalysis/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2ea729be9ed04102fae8d38ef5595d14cc7182b8
--- /dev/null
+++ b/plugins/org.polarsys.chess.tradeoffAnalysis/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.tradeoffAnalysis</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.updatesite/pom.xml b/plugins/org.polarsys.chess.updatesite/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e6bc2dbfc516b02ccdf2c570fc2efd27e3028ece
--- /dev/null
+++ b/plugins/org.polarsys.chess.updatesite/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>CHESS</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
+  <groupId>org.polarsys.chess</groupId>
+  <artifactId>org.polarsys.chess.updatesite</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>eclipse-update-site</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.updatesite/poma.xml b/plugins/org.polarsys.chess.updatesite/poma.xml
new file mode 100644
index 0000000000000000000000000000000000000000..10bb15cd718f3a19e8edf797ff6d89746c9b1293
--- /dev/null
+++ b/plugins/org.polarsys.chess.updatesite/poma.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>plugins</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+  </parent>
+  <groupId>org.polarsys.chess</groupId>
+  <artifactId>org.polarsys.chess.updatesite.aggregator</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <modules>
+    <module>../org.polarsys.chess.OSSImporter</module>
+    <module>../org.polarsys.chess.cdo</module>
+    <module>../org.polarsys.chess.cdo.feature</module>
+    <module>../org.polarsys.chess.chessmlprofile</module>
+    <module>../org.polarsys.chess.codegen.ada</module>
+    <module>../org.polarsys.chess.commands</module>
+    <module>../org.polarsys.chess.constraints.constraintEditor</module>
+    <module>../org.polarsys.chess.core</module>
+    <module>../org.polarsys.chess.diagram.ui</module>
+    <module>../org.polarsys.chess.diagramsCreator</module>
+    <module>../org.polarsys.chess.discovery</module>
+    <module>../org.polarsys.chess.feature</module>
+    <module>../org.polarsys.chess.functionBehaviors.functionBehaviorEditor</module>
+    <module>../org.polarsys.chess.m2m</module>
+    <module>../org.polarsys.chess.monitoring</module>
+    <module>../org.polarsys.chess.monitoring.tests</module>
+    <module>../org.polarsys.chess.multicore</module>
+    <module>../org.polarsys.chess.paramArchConfigurator</module>
+    <module>../org.polarsys.chess.patterns</module>
+    <module>../org.polarsys.chess.patterns.library</module>
+    <module>../org.polarsys.chess.patterns.profile</module>
+    <module>../org.polarsys.chess.properties.propertyEditor</module>
+    <module>../org.polarsys.chess.service</module>
+    <module>../org.polarsys.chess.smvExporter</module>
+    <module>../org.polarsys.chess.tabbedproperties</module>
+    <module>../org.polarsys.chess.tradeoffAnalysis</module>
+    <module>../org.polarsys.chess.validator</module>
+    <module>../org.polarsys.chess.wizards</module>
+    <module>../org.polarsys.chess.xtext.feature</module>
+    <module>../org.polarsys.chess.xtext.global</module>
+    <module>.</module>
+  </modules>
+</project>
diff --git a/plugins/org.polarsys.chess.validator/.classpath b/plugins/org.polarsys.chess.validator/.classpath
index ad32c83a7885b8953a938b41df3b4fd4fe1aae01..eca7bdba8f03f22510b7980a94dbfe10c16c0901 100644
--- a/plugins/org.polarsys.chess.validator/.classpath
+++ b/plugins/org.polarsys.chess.validator/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.polarsys.chess.validator/.gitignore b/plugins/org.polarsys.chess.validator/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/org.polarsys.chess.validator/.gitignore
+++ b/plugins/org.polarsys.chess.validator/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/org.polarsys.chess.validator/.project b/plugins/org.polarsys.chess.validator/.project
index d566e6209e81a27afa74a79910ce2bf751a052b2..7115e44d581c1f67f0d92e52687b982111250614 100644
--- a/plugins/org.polarsys.chess.validator/.project
+++ b/plugins/org.polarsys.chess.validator/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -26,15 +31,16 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>com.jutils.lint4j.core.Nature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/org.polarsys.chess.validator/.settings/org.eclipse.core.resources.prefs b/plugins/org.polarsys.chess.validator/.settings/org.eclipse.core.resources.prefs
index edb4f0a0f2ad21f839198dfce206a04815fc6f7c..e58d5b0e3981a721c2bf40e447f7d5d2090b26f8 100644
--- a/plugins/org.polarsys.chess.validator/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.polarsys.chess.validator/.settings/org.eclipse.core.resources.prefs
@@ -1,2 +1,3 @@
 eclipse.preferences.version=1
 encoding//src/org/polarsys/chess/validator/messages/messages.properties=ISO-8859-1
+encoding/<project>=UTF-8
diff --git a/plugins/org.polarsys.chess.validator/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.chess.validator/.settings/org.eclipse.jdt.core.prefs
index 8a5c6c7598c22ac26a1258d914137125b0454c0b..0c68a61dca867ceb49e79d2402935261ec3e3809 100644
--- a/plugins/org.polarsys.chess.validator/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.polarsys.chess.validator/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Fri Apr 15 14:43:26 CEST 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/org.polarsys.chess.validator/.settings/org.eclipse.m2e.core.prefs b/plugins/org.polarsys.chess.validator/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.polarsys.chess.validator/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.polarsys.chess.validator/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.polarsys.chess.validator/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/org.polarsys.chess.validator/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/org.polarsys.chess.validator/META-INF/MANIFEST.MF b/plugins/org.polarsys.chess.validator/META-INF/MANIFEST.MF
index d3f100ceca51a1c99132a75fa21d0c79c67d3044..30072b57bf1e44a6e7ebad715a5dd7c54f2a702d 100644
--- a/plugins/org.polarsys.chess.validator/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.chess.validator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CHESS Validator plug-in (Incubation)
 Bundle-SymbolicName: org.polarsys.chess.validator;singleton:=true
-Bundle-Version: 0.10.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.polarsys.chess.validator.Activator
 Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",
  org.eclipse.papyrus.marte.static.profile,
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",
  org.eclipse.papyrus.infra.services.validation;bundle-version="1.0.0",
  org.polarsys.chess.service
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Polarsys CHESS Project
 Export-Package: org.polarsys.chess.validator;
   uses:="org.eclipse.core.runtime,
diff --git a/plugins/org.polarsys.chess.validator/pom.xml b/plugins/org.polarsys.chess.validator/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e4f53e467816e85bce1365e5a36307d65cf1df7d
--- /dev/null
+++ b/plugins/org.polarsys.chess.validator/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.validator</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/managers/ResourceListener.java b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/managers/ResourceListener.java
index 35a23299dbd8479dc926ba2409225173afdcfece..a0087a2203bc8f8f69d25dd0b2049c8a78ea73c5 100755
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/managers/ResourceListener.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/managers/ResourceListener.java
@@ -98,7 +98,7 @@ public class ResourceListener extends ResourceSetListenerExtra {
 		
 		//printList(list);
 
-		boolean executeModelParser = true;
+		boolean executeModelParser = false;
 		if (!ds.isUserAction()){
 //			System.out.println("SUPER USER ACTIONS");
 			executeModelParser = false;
diff --git a/plugins/org.polarsys.chess.wizards/.classpath b/plugins/org.polarsys.chess.wizards/.classpath
index 64c5e31b7a264082f4c1dfdabb8097de820e66ce..eca7bdba8f03f22510b7980a94dbfe10c16c0901 100644
--- a/plugins/org.polarsys.chess.wizards/.classpath
+++ b/plugins/org.polarsys.chess.wizards/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.polarsys.chess.wizards/.gitignore b/plugins/org.polarsys.chess.wizards/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/org.polarsys.chess.wizards/.gitignore
+++ b/plugins/org.polarsys.chess.wizards/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/org.polarsys.chess.wizards/.project b/plugins/org.polarsys.chess.wizards/.project
index 28743f66c4aba6247366d7f010cd65b2dd025597..808b07adbbc63f223d5eeb0c443feb584e7213ef 100644
--- a/plugins/org.polarsys.chess.wizards/.project
+++ b/plugins/org.polarsys.chess.wizards/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/org.polarsys.chess.wizards/.settings/org.eclipse.core.resources.prefs b/plugins/org.polarsys.chess.wizards/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.polarsys.chess.wizards/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.polarsys.chess.wizards/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.chess.wizards/.settings/org.eclipse.jdt.core.prefs
index d30a5548f74376070e39b7f888ab94bd6b8e3b0f..3a21537071bf4118b9e1ee864cb4bc258aa48211 100644
--- a/plugins/org.polarsys.chess.wizards/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.polarsys.chess.wizards/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,11 @@
-#Wed May 25 16:49:25 CEST 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/org.polarsys.chess.wizards/.settings/org.eclipse.m2e.core.prefs b/plugins/org.polarsys.chess.wizards/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.polarsys.chess.wizards/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.polarsys.chess.wizards/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.polarsys.chess.wizards/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/org.polarsys.chess.wizards/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/org.polarsys.chess.wizards/META-INF/MANIFEST.MF b/plugins/org.polarsys.chess.wizards/META-INF/MANIFEST.MF
index 157c21ccf88df5b5f57178848bd7d6064d6e5e88..290d21d1e270c1e127d05aa5104300cbdf678ba8 100644
--- a/plugins/org.polarsys.chess.wizards/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.chess.wizards/META-INF/MANIFEST.MF
@@ -25,11 +25,11 @@ Export-Package: org.polarsys.chess.wizards,
  org.polarsys.chess.wizards.wizards
 Bundle-Vendor: %pluginProvider
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.polarsys.chess.wizards.Activator
 Bundle-SymbolicName: org.polarsys.chess.wizards;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 
diff --git a/plugins/org.polarsys.chess.wizards/build.properties b/plugins/org.polarsys.chess.wizards/build.properties
index e05d8b553e4bbd7d901bad4f398e92fb54c9e2c6..d3a99634eadf20e3ddf838b058a629b9ec9fefcf 100644
--- a/plugins/org.polarsys.chess.wizards/build.properties
+++ b/plugins/org.polarsys.chess.wizards/build.properties
@@ -2,12 +2,9 @@
 #Mon Sep 12 09:30:25 CEST 2011
 bin.includes = META-INF/,\
                .,\
-               icons/,\
                plugin.xml,\
-               schema/,\
                plugin.properties,\
                about.html,\
-               messages.properties,\
                resources/
 output..=bin/
 src.includes = about.html
diff --git a/plugins/org.polarsys.chess.wizards/pom.xml b/plugins/org.polarsys.chess.wizards/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c8b80c9a4a9f5a4dedc8d7004818f2d8932ca3e7
--- /dev/null
+++ b/plugins/org.polarsys.chess.wizards/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.wizards</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.xtext.feature/pom.xml b/plugins/org.polarsys.chess.xtext.feature/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2566fe5cb7fb28b0ec0a5a0bcc005819882d629b
--- /dev/null
+++ b/plugins/org.polarsys.chess.xtext.feature/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>CHESS</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
+  <groupId>org.polarsys.chess</groupId>
+  <artifactId>org.polarsys.chess.xtext.feature</artifactId>
+  <version>0.10.0-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/plugins/org.polarsys.chess.xtext.global/.classpath b/plugins/org.polarsys.chess.xtext.global/.classpath
index 098194ca4b7d8f45177f94e735506ae3a26b5c94..eca7bdba8f03f22510b7980a94dbfe10c16c0901 100644
--- a/plugins/org.polarsys.chess.xtext.global/.classpath
+++ b/plugins/org.polarsys.chess.xtext.global/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.polarsys.chess.xtext.global/.gitignore b/plugins/org.polarsys.chess.xtext.global/.gitignore
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..09e3bc9b241c477ea341af9ee029becad0c2148c 100644
--- a/plugins/org.polarsys.chess.xtext.global/.gitignore
+++ b/plugins/org.polarsys.chess.xtext.global/.gitignore
@@ -1 +1,2 @@
 /bin/
+/target/
diff --git a/plugins/org.polarsys.chess.xtext.global/.project b/plugins/org.polarsys.chess.xtext.global/.project
index 31cb7731d35ac59d48156fb89b92fceb551c256c..ef730edf69606835f41d16d72bf1cf79037daaef 100644
--- a/plugins/org.polarsys.chess.xtext.global/.project
+++ b/plugins/org.polarsys.chess.xtext.global/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,8 +25,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/plugins/org.polarsys.chess.xtext.global/.settings/org.eclipse.core.resources.prefs b/plugins/org.polarsys.chess.xtext.global/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/org.polarsys.chess.xtext.global/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.polarsys.chess.xtext.global/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.chess.xtext.global/.settings/org.eclipse.jdt.core.prefs
index f42de363afaae68bbd968318f1d331877f5514fc..0c68a61dca867ceb49e79d2402935261ec3e3809 100644
--- a/plugins/org.polarsys.chess.xtext.global/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.polarsys.chess.xtext.global/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/org.polarsys.chess.xtext.global/.settings/org.eclipse.m2e.core.prefs b/plugins/org.polarsys.chess.xtext.global/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/org.polarsys.chess.xtext.global/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/org.polarsys.chess.xtext.global/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/org.polarsys.chess.xtext.global/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/org.polarsys.chess.xtext.global/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/org.polarsys.chess.xtext.global/META-INF/MANIFEST.MF b/plugins/org.polarsys.chess.xtext.global/META-INF/MANIFEST.MF
index 0ad53a0591b7f3925410c32d9b7e07f960ffd158..bebb844a0d5068ed896a71524232df4af765811e 100644
--- a/plugins/org.polarsys.chess.xtext.global/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.chess.xtext.global/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.polarsys.chess.xtext.global.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.uml2.uml;bundle-version="5.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.polarsys.chess.xtext.global,
  org.polarsys.chess.xtext.global.utils
diff --git a/plugins/org.polarsys.chess.xtext.global/pom.xml b/plugins/org.polarsys.chess.xtext.global/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f399e443155642b340098d9069719e6b33cc28a6
--- /dev/null
+++ b/plugins/org.polarsys.chess.xtext.global/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.xtext.global</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/pom.xml b/plugins/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..33d197b7bc1db1d37fe89aa08f8e2cfb084849c2
--- /dev/null
+++ b/plugins/pom.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.polarsys.chess</groupId>
+  <artifactId>org.polarsys.chess.plugins</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <modules>
+    <module>contracts/org.polarsys.chess.contracts.chessextension</module>
+    <module>contracts/org.polarsys.chess.contracts.contractEditor</module>
+    <module>contracts/org.polarsys.chess.contracts.contractPropertyManager</module>
+    <module>contracts/org.polarsys.chess.contracts.feature</module>
+    <module>contracts/org.polarsys.chess.contracts.hierarchicalContractView</module>
+    <module>contracts/org.polarsys.chess.contracts.integration</module>
+    <module>contracts/org.polarsys.chess.contracts.profile</module>
+    <module>contracts/org.polarsys.chess.contracts.refinementView</module>
+    <module>contracts/org.polarsys.chess.contracts.safetyAnalysis</module>
+    <module>contracts/org.polarsys.chess.contracts.transformations</module>
+    <module>contracts/org.polarsys.chess.contracts.validation</module>
+    <module>contracts/org.polarsys.chess.contracts.verificationService</module>
+    <module>contracts/org.polarsys.chess.contracts.verificationService.test.runtime</module>
+    <module>fla/org.polarsys.chess.fla</module>
+    <module>fla/org.polarsys.chess.fla.FPTC2FLABehavior</module>
+    <module>fla/org.polarsys.chess.fla.faultTreeGenerator</module>
+    <module>fla/org.polarsys.chess.fla.feature</module>
+    <module>fla/org.polarsys.chess.fla.flamm</module>
+    <module>fla/org.polarsys.chess.fla.flaxml</module>
+    <module>fla/org.polarsys.chess.fla.transformations</module>
+    <module>fla/org.polarsys.chess.xtext.fladsl</module>
+    <module>fla/org.polarsys.chess.xtext.fladsl.ui</module>
+    <module>org.polarsys.chess.OSSImporter</module>
+    <module>org.polarsys.chess.cdo</module>
+    <module>org.polarsys.chess.cdo.feature</module>
+    <module>org.polarsys.chess.chessmlprofile</module>
+    <module>org.polarsys.chess.cleanCExporter</module>
+    <module>org.polarsys.chess.codegen.ada</module>
+    <module>org.polarsys.chess.commands</module>
+    <module>org.polarsys.chess.constraints.constraintEditor</module>
+    <module>org.polarsys.chess.core</module>
+    <module>org.polarsys.chess.diagram.ui</module>
+    <module>org.polarsys.chess.diagramsCreator</module>
+    <module>org.polarsys.chess.discovery</module>
+    <module>org.polarsys.chess.extra.site</module>
+    <module>org.polarsys.chess.feature</module>
+    <module>org.polarsys.chess.functionBehaviors.functionBehaviorEditor</module>
+    <module>org.polarsys.chess.instance.view</module>
+    <module>org.polarsys.chess.m2m</module>
+    <module>org.polarsys.chess.monitoring</module>
+    <module>org.polarsys.chess.monitoring.edit</module>
+    <module>org.polarsys.chess.monitoring.editor</module>
+    <module>org.polarsys.chess.monitoring.tests</module>
+    <module>org.polarsys.chess.multicore</module>
+    <module>org.polarsys.chess.paramArchConfigurator</module>
+    <module>org.polarsys.chess.patterns</module>
+    <module>org.polarsys.chess.patterns.library</module>
+    <module>org.polarsys.chess.patterns.profile</module>
+    <module>org.polarsys.chess.properties.propertyEditor</module>
+    <module>org.polarsys.chess.service</module>
+    <module>org.polarsys.chess.smvExporter</module>
+    <module>org.polarsys.chess.tabbedproperties</module>
+    <module>org.polarsys.chess.test.runtime</module>
+    <module>org.polarsys.chess.tradeoffAnalysis</module>
+    <module>org.polarsys.chess.updatesite</module>
+    <module>org.polarsys.chess.validator</module>
+    <module>org.polarsys.chess.wizards</module>
+    <module>org.polarsys.chess.xtext.feature</module>
+    <module>org.polarsys.chess.xtext.global</module>
+    <module>sba/org.polarsys.chess.statebased</module>
+    <module>sba/org.polarsys.chess.statebased.feature</module>
+  </modules>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-maven-plugin</artifactId>
+        <version>1.4.0</version>
+        <extensions>true</extensions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/plugins/sba/org.polarsys.chess.statebased.feature/pom.xml b/plugins/sba/org.polarsys.chess.statebased.feature/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c71f7387faa52da3c1154950b45701f285eacdff
--- /dev/null
+++ b/plugins/sba/org.polarsys.chess.statebased.feature/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>CHESS</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <groupId>org.polarsys.chess</groupId>
+  <artifactId>org.polarsys.chess.statebased.feature</artifactId>
+  <version>0.10.0-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/plugins/sba/org.polarsys.chess.statebased/.classpath b/plugins/sba/org.polarsys.chess.statebased/.classpath
index ad32c83a7885b8953a938b41df3b4fd4fe1aae01..eca7bdba8f03f22510b7980a94dbfe10c16c0901 100644
--- a/plugins/sba/org.polarsys.chess.statebased/.classpath
+++ b/plugins/sba/org.polarsys.chess.statebased/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/plugins/sba/org.polarsys.chess.statebased/.gitignore b/plugins/sba/org.polarsys.chess.statebased/.gitignore
index b420fefacb52e731071d85d06993964054e3a646..ffa11083e1cc84de2c8de40298a9e058636840ba 100644
--- a/plugins/sba/org.polarsys.chess.statebased/.gitignore
+++ b/plugins/sba/org.polarsys.chess.statebased/.gitignore
@@ -1,2 +1,3 @@
 ATL/*.asm
 bin
+/target/
diff --git a/plugins/sba/org.polarsys.chess.statebased/.project b/plugins/sba/org.polarsys.chess.statebased/.project
index fb10a7a53e350d0cf1d7ab45ae9cec86684f32a0..3eede789320bd7baf771b8f7e589a7f65a01d44d 100644
--- a/plugins/sba/org.polarsys.chess.statebased/.project
+++ b/plugins/sba/org.polarsys.chess.statebased/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -25,8 +30,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2m.atl.adt.builder.atlNature</nature>
diff --git a/plugins/sba/org.polarsys.chess.statebased/.settings/org.eclipse.core.resources.prefs b/plugins/sba/org.polarsys.chess.statebased/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..99f26c0203a7844de00dbfc56e6a35d8ed3c022c
--- /dev/null
+++ b/plugins/sba/org.polarsys.chess.statebased/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/sba/org.polarsys.chess.statebased/.settings/org.eclipse.jdt.core.prefs b/plugins/sba/org.polarsys.chess.statebased/.settings/org.eclipse.jdt.core.prefs
index e3d78ff16773af2d4ec574151573e774406e0d0f..0c68a61dca867ceb49e79d2402935261ec3e3809 100644
--- a/plugins/sba/org.polarsys.chess.statebased/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/sba/org.polarsys.chess.statebased/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Fri Sep 09 11:04:53 CEST 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/sba/org.polarsys.chess.statebased/.settings/org.eclipse.m2e.core.prefs b/plugins/sba/org.polarsys.chess.statebased/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65
--- /dev/null
+++ b/plugins/sba/org.polarsys.chess.statebased/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/plugins/sba/org.polarsys.chess.statebased/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/sba/org.polarsys.chess.statebased/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..fdf3191a52d3e61baf0587948830e0dab917fe88
--- /dev/null
+++ b/plugins/sba/org.polarsys.chess.statebased/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,7 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/plugins/sba/org.polarsys.chess.statebased/META-INF/MANIFEST.MF b/plugins/sba/org.polarsys.chess.statebased/META-INF/MANIFEST.MF
index 5c9df49e1e63cca7836a42f39ca4e41a32ce4398..5ef1c43f574fb61f377cf0a124db3200504bfd77 100644
--- a/plugins/sba/org.polarsys.chess.statebased/META-INF/MANIFEST.MF
+++ b/plugins/sba/org.polarsys.chess.statebased/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CHESS StateBased Analysis plugin
 Bundle-SymbolicName: org.polarsys.chess.statebased;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.polarsys.chess.statebased.Activator
 Bundle-Vendor: Intecs
 Require-Bundle: org.eclipse.ui,
@@ -32,6 +32,6 @@ Require-Bundle: org.eclipse.ui,
  org.polarsys.chess.commands;bundle-version="0.9.0",
  org.polarsys.chess.service,
  org.eclipse.papyrus.sysml;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.polarsys.chess.statebased
diff --git a/plugins/sba/org.polarsys.chess.statebased/pom.xml b/plugins/sba/org.polarsys.chess.statebased/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9a0b03efb6da78805bdae66327911c5a084ec644
--- /dev/null
+++ b/plugins/sba/org.polarsys.chess.statebased/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.polarsys.chess</groupId>
+    <artifactId>org.polarsys.chess.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../org.polarsys.chess.parent</relativePath>
+  </parent>
+  <artifactId>org.polarsys.chess.statebased</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>