commit 6b1c32d38d47f066083053eec6d355bcffa8be04
author Henrik Rentz-Reichert <hrr@protos.de> Mon Feb 13 09:50:58 2017 +0100
committer Henrik Rentz-Reichert <hrr@protos.de> Mon Feb 13 09:50:58 2017 +0100
tree cd83e650339d40e803992e325638ac2d48d8cd21
parent cde1fd1da9779f46e87e5c3258c6a5f2de809553

switched version IDs from 1.1.0 to 1.1.1

Change-Id: I0772129c28f1cc2816632fdf57338613afccf54e

examples/my.etrice.generator.launch/META-INF/MANIFEST.MF

diff --git a/examples/my.etrice.generator.launch/META-INF/MANIFEST.MF b/examples/my.etrice.generator.launch/META-INF/MANIFEST.MF
index 104f2cc..82a4147 100644
--- a/examples/my.etrice.generator.launch/META-INF/MANIFEST.MF
+++ b/examples/my.etrice.generator.launch/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Derived Generator Launcher
 Bundle-SymbolicName: my.etrice.generator.launch;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: my.etrice.generator;bundle-version="1.1.0",
- org.eclipse.etrice.generator;bundle-version="1.1.0",
- org.eclipse.etrice.generator.launch;bundle-version="1.1.0",
- org.eclipse.etrice.generator.launch.java;bundle-version="1.1.0",
- org.eclipse.etrice.generator.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.generator.java;bundle-version="1.1.0",
+Require-Bundle: my.etrice.generator;bundle-version="1.1.1",
+ org.eclipse.etrice.generator;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.launch;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.launch.java;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.java;bundle-version="1.1.1",
  org.eclipse.debug.ui;bundle-version="3.8.1",
  org.eclipse.swt;bundle-version="3.100.1",
  org.eclipse.core.runtime;bundle-version="3.8.0",

examples/my.etrice.generator/META-INF/MANIFEST.MF

diff --git a/examples/my.etrice.generator/META-INF/MANIFEST.MF b/examples/my.etrice.generator/META-INF/MANIFEST.MF
index 017ffb6..2f43b6a 100644
--- a/examples/my.etrice.generator/META-INF/MANIFEST.MF
+++ b/examples/my.etrice.generator/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Derived Generator
 Bundle-SymbolicName: my.etrice.generator
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.core.room;bundle-version="1.1.0",
- org.eclipse.etrice.generator.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.generator;bundle-version="1.1.0",
- org.eclipse.etrice.generator.java;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.core.room;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.generator;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.java;bundle-version="1.1.1",
  com.google.inject;bundle-version="3.0.0"
 Export-Package: my.etrice.generator

features/org.eclipse.etrice.cdt-integration.feature/feature.xml

diff --git a/features/org.eclipse.etrice.cdt-integration.feature/feature.xml b/features/org.eclipse.etrice.cdt-integration.feature/feature.xml
index a245630..97c277b 100644
--- a/features/org.eclipse.etrice.cdt-integration.feature/feature.xml
+++ b/features/org.eclipse.etrice.cdt-integration.feature/feature.xml
@@ -17,7 +17,7 @@
 <feature
       id="org.eclipse.etrice.cdt-integration.feature"
       label="%featureName"
-      version="1.1.0.qualifier"
+      version="1.1.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.etrice.core.room.ui"
       license-feature="org.eclipse.license"

features/org.eclipse.etrice.feature/feature.xml

diff --git a/features/org.eclipse.etrice.feature/feature.xml b/features/org.eclipse.etrice.feature/feature.xml
index 5ddbbbd..c03fd95 100644
--- a/features/org.eclipse.etrice.feature/feature.xml
+++ b/features/org.eclipse.etrice.feature/feature.xml
@@ -17,7 +17,7 @@
 <feature
       id="org.eclipse.etrice.feature"
       label="%featureName"
-      version="1.1.0.qualifier"
+      version="1.1.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.etrice.core.room.ui"
       license-feature="org.eclipse.license"
@@ -45,50 +45,50 @@
    </url>
 
       <requires>
-      <import plugin="org.eclipse.etrice.core.common" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.fsm" version="1.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.common" version="1.1.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.fsm" version="1.1.1" match="greaterOrEqual"/>
       <import plugin="org.antlr.runtime" version="3.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.resources" version="3.7.100" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual"/>
       <import plugin="org.apache.log4j"/>
-      <import plugin="org.eclipse.etrice.core.fsm.ui" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.common.ui" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.room" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.genmodel" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.ui.common.base" version="1.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.fsm.ui" version="1.1.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.common.ui" version="1.1.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.room" version="1.1.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.genmodel" version="1.1.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.ui.common.base" version="1.1.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui" version="3.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.editors" version="3.5.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.ide" version="3.5.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.codegen" version="2.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.compare"/>
       <import plugin="org.eclipse.core.filesystem" version="1.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.generator.fsm" version="1.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.generator.fsm" version="1.1.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.ide" version="3.9.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="3.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.ecore" version="2.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.ecore.xmi" version="2.5.0" match="greaterOrEqual"/>
       <import plugin="org.apache.commons.io" version="2.0.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.genmodel.fsm" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.generator" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.etmap" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.etphys" version="1.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.genmodel.fsm" version="1.1.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.generator" version="1.1.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.etmap" version="1.1.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.etphys" version="1.1.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.resources" version="3.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui" version="3.7.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.ide" version="3.7.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.generator.config" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.generator.doc" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.room.ui" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.ui.common" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.ui.behavior.fsm" version="1.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.generator.config" version="1.1.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.generator.doc" version="1.1.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.room.ui" version="1.1.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.ui.common" version="1.1.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.ui.behavior.fsm" version="1.1.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.graphiti" version="0.8.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.graphiti.ui" version="0.8.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.views.properties.tabbed" version="3.5.100" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.databinding" version="1.3.100" match="greaterOrEqual"/>
       <import plugin="org.eclipse.gef" version="3.6.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.transaction" version="1.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.abstractexec.behavior" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.ui.structure" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.ui.behavior" version="1.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.abstractexec.behavior" version="1.1.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.ui.structure" version="1.1.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.ui.behavior" version="1.1.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.gef" version="3.7.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.ide" version="3.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.graphiti.ui" version="0.7.0" match="greaterOrEqual"/>
@@ -98,29 +98,29 @@
       <import plugin="org.eclipse.jdt.core" version="3.9.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.workspace" version="1.5.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.databinding.beans" version="1.2.200" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.generator.ui" version="1.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.generator.ui" version="1.1.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.console" version="3.5.100" match="greaterOrEqual"/>
       <import plugin="org.eclipse.debug.core"/>
       <import plugin="org.eclipse.debug.ui"/>
       <import plugin="org.eclipse.core.variables" version="3.2.500" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jdt.launching" version="3.5.200" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.generator.java" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.generator.launch" version="1.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.generator.java" version="1.1.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.generator.launch" version="1.1.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jdt.ui" version="3.7.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jdt.core" version="3.7.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.common.ui" version="2.7.0" match="greaterOrEqual"/>
       <import plugin="org.apache.log4j" version="1.2.15" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.generator.c" version="1.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.generator.c" version="1.1.1" match="greaterOrEqual"/>
       <import plugin="org.apache.commons.logging"/>
-      <import plugin="org.eclipse.etrice.core.config" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.config.ui" version="1.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.config" version="1.1.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.config.ui" version="1.1.1" match="greaterOrEqual"/>
       <import plugin="org.junit"/>
       <import plugin="org.hamcrest.core"/>
       <import plugin="com.google.guava"/>
       <import plugin="org.eclipse.emf.ecore" version="2.7.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.generator.cpp" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.etmap.ui" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.etphys.ui" version="1.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.generator.cpp" version="1.1.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.etmap.ui" version="1.1.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.etphys.ui" version="1.1.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.resources" version="3.8.100" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.ecore" version="2.9.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jdt.launching" version="3.7.0" match="greaterOrEqual"/>

features/org.eclipse.etrice.fsm.feature/feature.xml

diff --git a/features/org.eclipse.etrice.fsm.feature/feature.xml b/features/org.eclipse.etrice.fsm.feature/feature.xml
index 4cd6db8..dba7836 100644
--- a/features/org.eclipse.etrice.fsm.feature/feature.xml
+++ b/features/org.eclipse.etrice.fsm.feature/feature.xml
@@ -17,7 +17,7 @@
 <feature
       id="org.eclipse.etrice.fsm.feature"
       label="eTrice.FSM Feature"
-      version="1.1.0.qualifier"
+      version="1.1.1.qualifier"
       provider-name="eTrice"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.v20140414-1359">

features/org.eclipse.etrice.tests.feature/feature.xml

diff --git a/features/org.eclipse.etrice.tests.feature/feature.xml b/features/org.eclipse.etrice.tests.feature/feature.xml
index 274ba95..729dbbd 100644
--- a/features/org.eclipse.etrice.tests.feature/feature.xml
+++ b/features/org.eclipse.etrice.tests.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.etrice.tests.feature"
       label="%featureName"
-      version="1.1.0.qualifier"
+      version="1.1.1.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -23,42 +23,42 @@
    </license>
 
    <requires>
-      <import plugin="org.eclipse.etrice.core.room" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.common" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.fsm" version="1.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.room" version="1.1.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.common" version="1.1.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.fsm" version="1.1.1" match="greaterOrEqual"/>
       <import plugin="org.junit" version="4.8.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.osgi" version="3.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext" version="2.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="3.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.ecore"/>
       <import plugin="org.eclipse.xtend.core" version="2.7.3" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.generator" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.generator.fsm" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.ui.behavior" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.ui.behavior.fsm" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.ui.common" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.ui.common.base" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.ui.tests.base" version="1.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.generator" version="1.1.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.generator.fsm" version="1.1.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.ui.behavior" version="1.1.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.ui.behavior.fsm" version="1.1.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.ui.common" version="1.1.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.ui.common.base" version="1.1.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.ui.tests.base" version="1.1.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui" version="3.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.graphiti" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.ui.structure" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.etunit.converter" version="1.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.ui.structure" version="1.1.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.etunit.converter" version="1.1.1" match="greaterOrEqual"/>
       <import plugin="org.junit" version="4.8.2" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.genmodel" version="1.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.genmodel" version="1.1.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.config" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.config.ui" version="1.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.config" version="1.1.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.config.ui" version="1.1.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.junit4" version="2.6.0" match="greaterOrEqual"/>
       <import plugin="org.apache.log4j" version="1.2.15" match="greaterOrEqual"/>
       <import plugin="org.apache.commons.logging" version="1.0.4" match="greaterOrEqual"/>
       <import plugin="org.hamcrest.core"/>
-      <import plugin="org.eclipse.etrice.abstractexec.behavior" version="1.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.abstractexec.behavior" version="1.1.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.ecore" version="2.7.0" match="greaterOrEqual"/>
       <import plugin="com.google.inject" version="3.0.0" match="greaterOrEqual"/>
       <import plugin="org.junit" version="4.10.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.etmap" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.etmap.ui" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.etrice.core.etphys" version="1.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.etmap" version="1.1.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.etmap.ui" version="1.1.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.etrice.core.etphys" version="1.1.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.etrice.core.etphys.ui"/>
       <import plugin="org.eclipse.core.runtime" version="3.5.0" match="compatible"/>
       <import plugin="org.eclipse.core.variables" version="3.0.0" match="compatible"/>

plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF
index 4cf6a72..65c84c7 100644
--- a/plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Abstract Execution for State Machines
 Bundle-SymbolicName: org.eclipse.etrice.abstractexec.behavior;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-Vendor: Eclipse eTrice
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.generator.fsm;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.fsm;bundle-version="1.1.1",
  org.eclipse.emf.ecore;bundle-version="2.7.0",
  org.eclipse.xtext;bundle-version="2.6.0",
  org.eclipse.core.runtime

plugins/org.eclipse.etrice.core.common.ui/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.core.common.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.common.ui/META-INF/MANIFEST.MF
index 8ebb331..50ffb5b 100644
--- a/plugins/org.eclipse.etrice.core.common.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.common.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Common eTrice DSL UI classes
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.common.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.etrice.core.common;visibility:=reexport,

plugins/org.eclipse.etrice.core.common/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.core.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.common/META-INF/MANIFEST.MF
index c5cdd14..7189642 100644
--- a/plugins/org.eclipse.etrice.core.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Common eTrice Grammar Fragment and Utility Classes
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.common; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport,

plugins/org.eclipse.etrice.core.common/pom.xml

diff --git a/plugins/org.eclipse.etrice.core.common/pom.xml b/plugins/org.eclipse.etrice.core.common/pom.xml
index d7a931d..f029dc7 100644
--- a/plugins/org.eclipse.etrice.core.common/pom.xml
+++ b/plugins/org.eclipse.etrice.core.common/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.etrice</groupId>
     <artifactId>java-generator</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
   </parent>
   

plugins/org.eclipse.etrice.core.config.ui/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.core.config.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.config.ui/META-INF/MANIFEST.MF
index 9650edc..19a607d 100644
--- a/plugins/org.eclipse.etrice.core.config.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.config.ui/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Config DSL UI
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.config.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.0",
- org.eclipse.etrice.core.common.ui;bundle-version="1.1.0",
- org.eclipse.etrice.core.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.core.room;bundle-version="1.1.0",
- org.eclipse.etrice.core.config;bundle-version="1.1.0";visibility:=reexport,
+Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.1",
+ org.eclipse.etrice.core.common.ui;bundle-version="1.1.1",
+ org.eclipse.etrice.core.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.core.room;bundle-version="1.1.1",
+ org.eclipse.etrice.core.config;bundle-version="1.1.1";visibility:=reexport,
  org.eclipse.xtext.ui;bundle-version="2.6.0",
  org.eclipse.ui.editors;bundle-version="3.5.0",
  org.eclipse.ui.ide;bundle-version="3.5.0",

plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF
index 5a8f290..843a846 100644
--- a/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Config DSL
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.config; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.0",
- org.eclipse.etrice.core.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.core.room;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.1",
+ org.eclipse.etrice.core.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.core.room;bundle-version="1.1.1",
  org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport,
  org.eclipse.xtext.xbase;bundle-version="2.6.0";resolution:=optional;visibility:=reexport,
  org.apache.log4j;bundle-version="1.2.15";visibility:=reexport,

plugins/org.eclipse.etrice.core.config/pom.xml

diff --git a/plugins/org.eclipse.etrice.core.config/pom.xml b/plugins/org.eclipse.etrice.core.config/pom.xml
index 1144102..9d99239 100644
--- a/plugins/org.eclipse.etrice.core.config/pom.xml
+++ b/plugins/org.eclipse.etrice.core.config/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.etrice</groupId>
     <artifactId>java-generator</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
   </parent>
   

plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF
index b9dff0e..30f091a 100644
--- a/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.etrice.core.etmap.ui
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.etmap.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.0",
- org.eclipse.etrice.core.etmap;bundle-version="1.1.0";visibility:=reexport,
- org.eclipse.etrice.core.etphys;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.1",
+ org.eclipse.etrice.core.etmap;bundle-version="1.1.1";visibility:=reexport,
+ org.eclipse.etrice.core.etphys;bundle-version="1.1.1",
  org.eclipse.xtext.ui;bundle-version="2.6.0",
  org.eclipse.ui.editors;bundle-version="3.5.0",
  org.eclipse.ui.ide;bundle-version="3.5.0",
@@ -17,8 +17,8 @@
  org.antlr.runtime,
  org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.6.0",
  org.eclipse.compare,
- org.eclipse.etrice.core.common.ui;bundle-version="1.1.0",
- org.eclipse.etrice.core.room;bundle-version="1.1.0"
+ org.eclipse.etrice.core.common.ui;bundle-version="1.1.1",
+ org.eclipse.etrice.core.room;bundle-version="1.1.1"
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.etrice.core.etmap.ui.contentassist,

plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF
index d2b821d..02823cf 100644
--- a/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.etrice.core.etmap
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.etmap; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.0",
- org.eclipse.etrice.core.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.core.room;bundle-version="1.1.0",
- org.eclipse.etrice.core.etphys;bundle-version="1.1.0",
- org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.core.genmodel;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.1",
+ org.eclipse.etrice.core.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.core.room;bundle-version="1.1.1",
+ org.eclipse.etrice.core.etphys;bundle-version="1.1.1",
+ org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.core.genmodel;bundle-version="1.1.1",
  org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport,
  org.eclipse.xtext.xbase;bundle-version="2.6.0";resolution:=optional;visibility:=reexport,
  org.eclipse.xtext.generator;bundle-version="2.6.0";resolution:=optional,

plugins/org.eclipse.etrice.core.etmap/pom.xml

diff --git a/plugins/org.eclipse.etrice.core.etmap/pom.xml b/plugins/org.eclipse.etrice.core.etmap/pom.xml
index d3a6cee..af56e61 100644
--- a/plugins/org.eclipse.etrice.core.etmap/pom.xml
+++ b/plugins/org.eclipse.etrice.core.etmap/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.etrice</groupId>
     <artifactId>java-generator</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
   </parent>
   

plugins/org.eclipse.etrice.core.etphys.ui/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.core.etphys.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.etphys.ui/META-INF/MANIFEST.MF
index 2d2d8db..fdc94c1 100644
--- a/plugins/org.eclipse.etrice.core.etphys.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.etphys.ui/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.etrice.core.etphys.ui
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.etphys.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.0",
- org.eclipse.etrice.core.etphys;bundle-version="1.1.0";visibility:=reexport,
+Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.1",
+ org.eclipse.etrice.core.etphys;bundle-version="1.1.1";visibility:=reexport,
  org.eclipse.xtext.ui;bundle-version="2.6.0",
  org.eclipse.ui.editors;bundle-version="3.5.0",
  org.eclipse.ui.ide;bundle-version="3.5.0",
@@ -16,7 +16,7 @@
  org.antlr.runtime,
  org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.6.0",
  org.eclipse.compare,
- org.eclipse.etrice.core.common.ui;bundle-version="1.1.0"
+ org.eclipse.etrice.core.common.ui;bundle-version="1.1.1"
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.etrice.core.etphys.ui.contentassist,

plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF
index e512bd9..e1e7c7c 100644
--- a/plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.etrice.core.etphys
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.etphys; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.1",
  org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport,
  org.eclipse.xtext.generator;bundle-version="2.6.0";resolution:=optional,
  org.antlr.runtime,
@@ -16,7 +16,7 @@
  org.eclipse.xtext.util;bundle-version="2.6.0",
  org.eclipse.emf.ecore,
  org.eclipse.emf.common,
- org.eclipse.etrice.core.common;bundle-version="1.1.0",
+ org.eclipse.etrice.core.common;bundle-version="1.1.1",
  org.eclipse.xtext.xbase.lib
 Import-Package: org.apache.log4j,
  org.eclipse.xtext.xbase.lib

plugins/org.eclipse.etrice.core.etphys/pom.xml

diff --git a/plugins/org.eclipse.etrice.core.etphys/pom.xml b/plugins/org.eclipse.etrice.core.etphys/pom.xml
index 5fb7c83..82d2536 100644
--- a/plugins/org.eclipse.etrice.core.etphys/pom.xml
+++ b/plugins/org.eclipse.etrice.core.etphys/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.etrice</groupId>
     <artifactId>java-generator</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
   </parent>
   

plugins/org.eclipse.etrice.core.fsm.ui/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.core.fsm.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.fsm.ui/META-INF/MANIFEST.MF
index 78b11ef..d001afb 100644
--- a/plugins/org.eclipse.etrice.core.fsm.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.fsm.ui/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: FSM DSL UI
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.fsm.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="1.1.1",
  org.eclipse.etrice.core.fsm;visibility:=reexport,
  org.eclipse.xtext.ui;bundle-version="2.6.0",
  org.eclipse.ui.editors;bundle-version="3.5.0",

plugins/org.eclipse.etrice.core.fsm/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.core.fsm/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.fsm/META-INF/MANIFEST.MF
index 9e8dbcb..55ef53d 100644
--- a/plugins/org.eclipse.etrice.core.fsm/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.fsm/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: FSM DSL
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.fsm; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.1",
  org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport,
  org.eclipse.xtext.xbase;bundle-version="2.6.0";resolution:=optional;visibility:=reexport,
  org.eclipse.xtext.generator;bundle-version="2.6.0";resolution:=optional,

plugins/org.eclipse.etrice.core.fsm/pom.xml

diff --git a/plugins/org.eclipse.etrice.core.fsm/pom.xml b/plugins/org.eclipse.etrice.core.fsm/pom.xml
index 09e05ac..712b746 100644
--- a/plugins/org.eclipse.etrice.core.fsm/pom.xml
+++ b/plugins/org.eclipse.etrice.core.fsm/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.etrice</groupId>
     <artifactId>java-generator</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
   </parent>
   

plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF
index 7bc0746..643502d 100644
--- a/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.etrice.core.genmodel.fsm;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.etrice.core.common;visibility:=reexport,
- org.eclipse.etrice.core.fsm;bundle-version="1.1.0";visibility:=reexport,
+ org.eclipse.etrice.core.fsm;bundle-version="1.1.1";visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.emf.ecore.xmi;visibility:=reexport

plugins/org.eclipse.etrice.core.genmodel.fsm/pom.xml

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm/pom.xml b/plugins/org.eclipse.etrice.core.genmodel.fsm/pom.xml
index 5c02923..0895761 100644
--- a/plugins/org.eclipse.etrice.core.genmodel.fsm/pom.xml
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.etrice</groupId>
     <artifactId>java-generator</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
   </parent>
   

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$1.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$1.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$1.class
new file mode 100644
index 0000000..f151c7f
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$1.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$2.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$2.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$2.class
new file mode 100644
index 0000000..ef7efc9
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$2.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$3.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$3.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$3.class
new file mode 100644
index 0000000..c9139e5
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$3.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$4.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$4.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$4.class
new file mode 100644
index 0000000..2eb5201
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$4.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$5.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$5.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$5.class
new file mode 100644
index 0000000..58a284c
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$5.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$6.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$6.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$6.class
new file mode 100644
index 0000000..80b203f
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$6.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$7.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$7.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$7.class
new file mode 100644
index 0000000..8e446a1
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$7.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$8.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$8.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$8.class
new file mode 100644
index 0000000..6d23069
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$8.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder.class
new file mode 100644
index 0000000..e79228e
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder.xtend

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder.xtend b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder.xtend
new file mode 100644
index 0000000..7bce745
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder.xtend
@@ -0,0 +1,163 @@
+/*******************************************************************************
+ * Copyright (c) 2017 protos software gmbh (http://www.protos.de).
+ * 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:
+ * 		Henrik Rentz-Reichert (initial contribution)
+ * 
+ *******************************************************************************/
+
+package org.eclipse.etrice.core.genmodel.fsm
+
+import com.google.inject.Inject
+import org.eclipse.etrice.core.fsm.fSM.ChoicepointTerminal
+import org.eclipse.etrice.core.fsm.fSM.ModelComponent
+import org.eclipse.etrice.core.fsm.fSM.NonInitialTransition
+import org.eclipse.etrice.core.fsm.fSM.StateGraph
+import org.eclipse.etrice.core.fsm.fSM.StateGraphNode
+import org.eclipse.etrice.core.fsm.fSM.StateTerminal
+import org.eclipse.etrice.core.fsm.fSM.SubStateTrPointTerminal
+import org.eclipse.etrice.core.fsm.fSM.TrPointTerminal
+import org.eclipse.etrice.core.fsm.fSM.Transition
+import org.eclipse.etrice.core.fsm.util.FSMHelpers
+import org.eclipse.etrice.core.genmodel.fsm.fsmgen.FsmGenFactory
+import org.eclipse.etrice.core.genmodel.fsm.fsmgen.Graph
+import org.eclipse.etrice.core.genmodel.fsm.fsmgen.GraphContainer
+import org.eclipse.etrice.core.fsm.fSM.State
+import org.eclipse.etrice.core.fsm.fSM.RefinedState
+import org.eclipse.etrice.core.fsm.fSM.SimpleState
+import org.eclipse.etrice.core.genmodel.fsm.fsmgen.Node
+import com.google.inject.Injector
+import org.eclipse.etrice.core.fsm.fSM.RefinedTransition
+
+class FsmGenBuilder {
+	
+	@Inject extension FSMHelpers fsmHelpers
+	val factory = FsmGenFactory.eINSTANCE
+	
+	new(Injector injector) {
+		injector.injectMembers(this)
+	}
+	
+	def GraphContainer createTransformedModel(ModelComponent mc) {
+		mc.createContainer
+	}
+	
+	private def GraphContainer create factory.createGraphContainer createContainer(ModelComponent mc) {
+		it.component = mc
+		it.graph = createStateMachine(mc)
+	}
+	
+	private def Graph createStateMachine(ModelComponent mc) {
+		// neither we nor all of our base classes need to have a state machine.
+		// So we ask for the super state machine rather than for the base class'
+		// state machine
+		val superFSM = mc.superStateMachine
+		
+		if (superFSM!=null) {
+			// if we have a super state machine we first recurse down
+			val baseGraph = createStateMachine(superFSM.modelComponent)
+			
+			// and then merge with our (actual) state machine
+			mergeGraph(baseGraph, mc.actualStateMachine)
+		}
+		else {
+			// first state machine in the hierarchy: create it
+			mc.actualStateMachine.createGraph
+		}
+	}
+	
+	private def Graph mergeGraph(Graph graph, StateGraph sg) {
+		// mark existing items as inherited
+		graph.nodes.forEach[inherited = true]
+		graph.links.forEach[inherited = true]
+		
+		// add items to already existing graph
+		graph.createContents(sg)
+		
+		// point to the current state graph
+		graph.stateGraph = sg
+		
+		return graph
+	}
+	
+	private def create factory.createGraph createGraph(StateGraph sg) {
+		it.stateGraph = sg
+		createContents(sg)
+	}
+	
+	private def createContents(Graph graph, StateGraph sg) {
+		graph.nodes.addAll(sg.chPoints.map[createNode])
+		graph.nodes.addAll(sg.trPoints.map[createNode])
+		graph.nodes.addAll(sg.states.filter(typeof(SimpleState)).map[createNode])
+		graph.links.addAll(sg.transitions.map[createLink])
+		
+		// refined states and transitions
+		sg.states.filter(typeof(RefinedState)).forEach[handleRefinedState]
+		sg.refinedTransitions.forEach[handleRefinedTransition]
+	}
+	
+	private def handleRefinedState(RefinedState s) {
+		// handle the sub graphs
+		if (s.subgraph!=null) {
+			if (s.target.subgraph!=null) {
+				val targetGraph = s.target.subgraph.createGraph
+				targetGraph.mergeGraph(s.subgraph)
+			}
+			else {
+				s.target.createNode.subgraph = s.subgraph.createGraph
+			}
+		}
+		// else nothing to do, whether the targetGraph exist or not
+		
+		// change the target Node's stateGraphNode to our RefinedState
+		val target = s.target.createNode
+		target.stateGraphNode = s
+	}
+	
+	private def handleRefinedTransition(RefinedTransition t) {
+		// change the target link's transition to the refined transition
+		t.target.createLink.transition = t
+	}
+	
+	private def create factory.createLink createLink(Transition tr) {
+		it.transition = tr
+		
+		it.source = if (tr instanceof NonInitialTransition)  {
+			tr.from.createNode
+		}
+		else {
+			null
+		}
+		it.target = tr.to.createNode
+	}
+	
+	private def dispatch create factory.createNode createNode(StateGraphNode s) {
+		it.stateGraphNode = s
+
+		it.subgraph = 
+			if (s instanceof State && (s as State).subgraph!=null) {
+				(s as State).subgraph.createGraph
+			}
+			else null
+	}
+	
+	private def dispatch Node createNode(ChoicepointTerminal tt) {
+		tt.cp.createNode
+	}
+	
+	private def dispatch Node createNode(TrPointTerminal tt) {
+		tt.trPoint.createNode
+	}
+	
+	private def dispatch Node createNode(StateTerminal tt) {
+		tt.state.createNode
+	}
+	
+	private def dispatch Node createNode(SubStateTrPointTerminal tt) {
+		tt.trPoint.createNode
+	}
+}
\ No newline at end of file

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenChecker$1.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenChecker$1.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenChecker$1.class
new file mode 100644
index 0000000..6fa109e
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenChecker$1.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenChecker$2.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenChecker$2.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenChecker$2.class
new file mode 100644
index 0000000..befdfe9
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenChecker$2.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenChecker$3.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenChecker$3.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenChecker$3.class
new file mode 100644
index 0000000..c4d6829
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenChecker$3.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenChecker.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenChecker.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenChecker.class
new file mode 100644
index 0000000..e850ba5
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenChecker.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenChecker.xtend

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenChecker.xtend b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenChecker.xtend
new file mode 100644
index 0000000..214d6f9
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenChecker.xtend
@@ -0,0 +1,119 @@
+/*******************************************************************************
+ * Copyright (c) 2017 protos software gmbh (http://www.protos.de).
+ * 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:
+ * 		Henrik Rentz-Reichert (initial contribution)
+ * 
+ *******************************************************************************/
+
+package org.eclipse.etrice.core.genmodel.fsm
+
+import org.eclipse.etrice.core.fsm.fSM.NonInitialTransition
+import org.eclipse.etrice.core.genmodel.fsm.fsmgen.Graph
+import org.eclipse.etrice.core.genmodel.fsm.fsmgen.GraphContainer
+import org.eclipse.etrice.core.genmodel.fsm.fsmgen.Link
+import org.eclipse.etrice.core.genmodel.fsm.fsmgen.Node
+import org.eclipse.etrice.core.fsm.fSM.TrPoint
+import org.eclipse.etrice.core.fsm.fSM.State
+
+class FsmGenChecker {
+	
+	static def check(GraphContainer gc, ILogger logger) {
+		// graphs
+		gc.eAllContents.filter(typeof(Graph)).forEach[checkGraph(it, logger)]
+		
+		// nodes
+		gc.eAllContents.filter(typeof(Node)).forEach[checkNode(it, logger)]
+		
+		// links
+		gc.eAllContents.filter(typeof(Link)).forEach[checkLink(it, logger)]
+	}
+	
+	def static void checkLink(Link it, ILogger logger) {
+		if (transition==null) {
+			logger.logError("graph doesn't point to ROOM transition")
+		}
+		else if (transition.eIsProxy) {
+			logger.logError("unresolved ROOM transition")
+		}
+		else if (transition.eContainer==null) {
+			logger.logError("dangling ROOM transition")
+		}
+		else if (target==null) {
+			logger.logError("link without target")
+		}
+		else if (source==null && transition instanceof NonInitialTransition) {
+			logger.logError("non-initial link without source")
+		}
+
+		if (source!=null) {
+			checkLinkEnd(it, it.source, logger)
+		}
+		checkLinkEnd(it, it.target, logger)
+	}
+	
+	def static checkLinkEnd(Link link, Node node, ILogger logger) {
+		if (node.eContainer == link.eContainer) {
+			return;
+		}
+		else {
+			if (!(node.stateGraphNode instanceof TrPoint)) {
+				logger.logError("subgraph item is not transition point")
+			}
+			else if (!(node.eContainer.eContainer instanceof Node)) {
+				logger.logError("subgraph item is in unexpected container")
+			}
+			else if (!((node.eContainer.eContainer as Node).stateGraphNode instanceof State)) {
+				logger.logError("subgraph item is in unexpected container")
+			}
+			else if (node.eContainer.eContainer.eContainer != link.eContainer) {
+				logger.logError("subgraph item is in unexpected container")
+			}
+		}
+	}
+	
+	def static void checkNode(Node it, ILogger logger) {
+		if (stateGraphNode==null) {
+			logger.logError("graph doesn't point to ROOM state graph node")
+		}
+		else if (stateGraphNode.eIsProxy) {
+			logger.logError("unresolved ROOM graph node")
+		}
+		else if (stateGraphNode.eContainer==null) {
+			logger.logError("dangling ROOM graph node")
+		}
+		else if (stateGraphNode.getName()==null) {
+			logger.logError("ROOM graph node without name")
+		}
+		
+		// incoming transitions
+		for (l : incoming) {
+			if (l.target.stateGraphNode != it.stateGraphNode) {
+				logger.logError("ROOM target node of an incoming transition must be myself")
+			}
+		}
+		
+		// outgoing transitions
+		for (l : outgoing) {
+			if (l.source.stateGraphNode != it.stateGraphNode) {
+				logger.logError("ROOM source node of an outgoing transition must be myself")
+			}
+		}
+	}
+	
+	def static void checkGraph(Graph it, ILogger logger) {
+		if (stateGraph==null) {
+			logger.logError("graph doesn't point to ROOM state graph")
+		}
+		else if (stateGraph.eIsProxy) {
+			logger.logError("unresolved ROOM graph")
+		}
+		else if (stateGraph.eContainer==null) {
+			logger.logError("dangling ROOM graph")
+		}
+	}
+}
\ No newline at end of file

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$1.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$1.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$1.class
new file mode 100644
index 0000000..b786008
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$1.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$2.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$2.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$2.class
new file mode 100644
index 0000000..41d7397
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$2.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$3.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$3.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$3.class
new file mode 100644
index 0000000..9fb1334
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$3.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$4.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$4.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$4.class
new file mode 100644
index 0000000..3939f33
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$4.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$5.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$5.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$5.class
new file mode 100644
index 0000000..a542162
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$5.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$6.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$6.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$6.class
new file mode 100644
index 0000000..fe7523d
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$6.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$7.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$7.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$7.class
new file mode 100644
index 0000000..88600cb
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$7.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$8.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$8.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$8.class
new file mode 100644
index 0000000..eaa7c44
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$8.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$9.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$9.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$9.class
new file mode 100644
index 0000000..0a4c169
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$9.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions.class
new file mode 100644
index 0000000..6a667e0
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions.xtend

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions.xtend b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions.xtend
new file mode 100644
index 0000000..ded58d1
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions.xtend
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright (c) 2017 protos software gmbh (http://www.protos.de).
+ * 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:
+ * 		Henrik Rentz-Reichert (initial contribution)
+ * 
+ *******************************************************************************/
+
+package org.eclipse.etrice.core.genmodel.fsm
+
+import org.eclipse.etrice.core.genmodel.fsm.fsmgen.Node
+import org.eclipse.etrice.core.genmodel.fsm.fsmgen.Graph
+import org.eclipse.etrice.core.fsm.fSM.State
+import org.eclipse.etrice.core.fsm.fSM.ChoicePoint
+import org.eclipse.etrice.core.fsm.fSM.TrPoint
+import org.eclipse.etrice.core.genmodel.fsm.fsmgen.Link
+
+class FsmGenExtensions {
+	
+	public static def getName(Node nd) {
+		nd.stateGraphNode.name
+	}
+	
+	public static def getStateNodes(Graph g) {
+		g.nodes.filter[stateGraphNode instanceof State]
+	}
+	
+	public static def getAllNodes(Graph g) {
+		g.eAllContents.filter(typeof(Node))
+	}
+	
+	public static def getAllStateNodes(Graph g) {
+		g.allNodes.filter[stateGraphNode instanceof State]
+	}
+	
+	public static def getChoicePointNodes(Graph g) {
+		g.nodes.filter[stateGraphNode instanceof ChoicePoint]
+	}
+	
+	public static def getAllChoicePointNodes(Graph g) {
+		g.allNodes.filter[stateGraphNode instanceof ChoicePoint]
+	}
+	
+	public static def getTrPointNodes(Graph g) {
+		g.nodes.filter[stateGraphNode instanceof TrPoint]
+	}
+	
+	public static def getAllTrPointNodes(Graph g) {
+		g.allNodes.filter[stateGraphNode instanceof TrPoint]
+	}
+	
+	public static def getStates(Graph g) {
+		g.stateNodes.map[stateGraphNode].filter(typeof(State))
+	}
+	
+	public static def getChoicePoints(Graph g) {
+		g.choicePointNodes.map[stateGraphNode].filter(typeof(ChoicePoint))
+	}
+	
+	public static def getTransitionPoints(Graph g) {
+		g.trPointNodes.map[stateGraphNode].filter(typeof(TrPoint))
+	}
+	
+	public static def getAllLinks(Graph g) {
+		g.eAllContents.filter(typeof(Link))
+	}
+}
\ No newline at end of file

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/ILogger.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/ILogger.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/ILogger.class
new file mode 100644
index 0000000..59f9713
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/ILogger.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/NullLogger.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/NullLogger.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/NullLogger.class
new file mode 100644
index 0000000..8b7d680
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/NullLogger.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/CommonTrigger.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/CommonTrigger.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/CommonTrigger.class
new file mode 100644
index 0000000..1160c12
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/CommonTrigger.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/FsmGenFactory.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/FsmGenFactory.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/FsmGenFactory.class
new file mode 100644
index 0000000..9f303af
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/FsmGenFactory.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/FsmGenPackage$Literals.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/FsmGenPackage$Literals.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/FsmGenPackage$Literals.class
new file mode 100644
index 0000000..b42368b
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/FsmGenPackage$Literals.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/FsmGenPackage.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/FsmGenPackage.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/FsmGenPackage.class
new file mode 100644
index 0000000..66cec13
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/FsmGenPackage.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/Graph.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/Graph.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/Graph.class
new file mode 100644
index 0000000..744507c
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/Graph.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/GraphContainer.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/GraphContainer.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/GraphContainer.class
new file mode 100644
index 0000000..a4fe8a4
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/GraphContainer.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/GraphItem.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/GraphItem.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/GraphItem.class
new file mode 100644
index 0000000..50b642b
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/GraphItem.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/Link.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/Link.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/Link.class
new file mode 100644
index 0000000..13f2de3
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/Link.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/Node.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/Node.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/Node.class
new file mode 100644
index 0000000..328bc4b
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/Node.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/CommonTriggerImpl.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/CommonTriggerImpl.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/CommonTriggerImpl.class
new file mode 100644
index 0000000..780d273
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/CommonTriggerImpl.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/FsmGenFactoryImpl.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/FsmGenFactoryImpl.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/FsmGenFactoryImpl.class
new file mode 100644
index 0000000..df3eac9
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/FsmGenFactoryImpl.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/FsmGenPackageImpl.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/FsmGenPackageImpl.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/FsmGenPackageImpl.class
new file mode 100644
index 0000000..4f30cde
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/FsmGenPackageImpl.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/GraphContainerImpl.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/GraphContainerImpl.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/GraphContainerImpl.class
new file mode 100644
index 0000000..7efe7a9
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/GraphContainerImpl.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/GraphImpl.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/GraphImpl.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/GraphImpl.class
new file mode 100644
index 0000000..f8b3801
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/GraphImpl.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/GraphItemImpl.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/GraphItemImpl.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/GraphItemImpl.class
new file mode 100644
index 0000000..c744c14
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/GraphItemImpl.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/LinkImpl.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/LinkImpl.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/LinkImpl.class
new file mode 100644
index 0000000..9c5d869
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/LinkImpl.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/NodeImpl.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/NodeImpl.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/NodeImpl.class
new file mode 100644
index 0000000..7a4c485
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/NodeImpl.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/util/FsmGenAdapterFactory$1.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/util/FsmGenAdapterFactory$1.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/util/FsmGenAdapterFactory$1.class
new file mode 100644
index 0000000..cd0d7fe
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/util/FsmGenAdapterFactory$1.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/util/FsmGenAdapterFactory.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/util/FsmGenAdapterFactory.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/util/FsmGenAdapterFactory.class
new file mode 100644
index 0000000..4d258ae
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/util/FsmGenAdapterFactory.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/util/FsmGenSwitch.class

diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/util/FsmGenSwitch.class b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/util/FsmGenSwitch.class
new file mode 100644
index 0000000..14214a0
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/util/FsmGenSwitch.class
Binary files differ

plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF
index 0f97fcf..c6fec3b 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.etrice.core.genmodel;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse eTrice
 Bundle-Localization: plugin
@@ -13,10 +13,10 @@
  org.eclipse.etrice.core.genmodel.etricegen.impl,
  org.eclipse.etrice.core.genmodel.etricegen.util,
  org.eclipse.etrice.core.genmodel.util
-Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.0";visibility:=reexport,
- org.eclipse.etrice.core.fsm;bundle-version="1.1.0";visibility:=reexport,
- org.eclipse.etrice.core.room;bundle-version="1.1.0";visibility:=reexport,
- org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.0";visibility:=reexport,
+Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.1";visibility:=reexport,
+ org.eclipse.etrice.core.fsm;bundle-version="1.1.1";visibility:=reexport,
+ org.eclipse.etrice.core.room;bundle-version="1.1.1";visibility:=reexport,
+ org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.1";visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.emf.ecore.xmi;visibility:=reexport

plugins/org.eclipse.etrice.core.genmodel/pom.xml

diff --git a/plugins/org.eclipse.etrice.core.genmodel/pom.xml b/plugins/org.eclipse.etrice.core.genmodel/pom.xml
index c1bce5b..572e2f0 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/pom.xml
+++ b/plugins/org.eclipse.etrice.core.genmodel/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.etrice</groupId>
     <artifactId>java-generator</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
   </parent>
   

plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF
index cc5db80..9d5f484 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ROOM DSL UI
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.room.ui;singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.fsm.ui;bundle-version="1.1.0",
- org.eclipse.etrice.core.common.ui;bundle-version="1.1.0",
- org.eclipse.etrice.core.room;bundle-version="1.1.0";visibility:=reexport,
- org.eclipse.etrice.core.genmodel;bundle-version="1.1.0",
- org.eclipse.etrice.ui.common.base;bundle-version="1.1.0",
- org.eclipse.etrice.doc;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.fsm.ui;bundle-version="1.1.1",
+ org.eclipse.etrice.core.common.ui;bundle-version="1.1.1",
+ org.eclipse.etrice.core.room;bundle-version="1.1.1";visibility:=reexport,
+ org.eclipse.etrice.core.genmodel;bundle-version="1.1.1",
+ org.eclipse.etrice.ui.common.base;bundle-version="1.1.1",
+ org.eclipse.etrice.doc;bundle-version="1.1.1",
  org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.ui.editors;bundle-version="3.5.0",
  org.eclipse.ui.ide;bundle-version="3.5.0",

plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF
index e5571ab..8f403b0 100644
--- a/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ROOM DSL
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.room;singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.0",
- org.eclipse.etrice.core.fsm;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.1",
+ org.eclipse.etrice.core.fsm;bundle-version="1.1.1",
  org.eclipse.xtext;bundle-version="2.6.0",
  org.eclipse.xtext.generator;bundle-version="2.6.0";resolution:=optional,
  org.eclipse.xtext.util;bundle-version="2.6.0",

plugins/org.eclipse.etrice.core.room/pom.xml

diff --git a/plugins/org.eclipse.etrice.core.room/pom.xml b/plugins/org.eclipse.etrice.core.room/pom.xml
index 410b877..9d047ea 100644
--- a/plugins/org.eclipse.etrice.core.room/pom.xml
+++ b/plugins/org.eclipse.etrice.core.room/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.etrice</groupId>
     <artifactId>java-generator</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
   </parent>
   

plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF
index 2f10635..3429b3f 100644
--- a/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Documentation
 Bundle-SymbolicName: org.eclipse.etrice.doc;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-Vendor: Eclipse eTrice
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

plugins/org.eclipse.etrice.etunit.converter/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.etunit.converter/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.etunit.converter/META-INF/MANIFEST.MF
index 3442afa..19a7bf7 100644
--- a/plugins/org.eclipse.etrice.etunit.converter/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.etunit.converter/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: etUnit File Converter
 Bundle-SymbolicName: org.eclipse.etrice.etunit.converter;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse eTrice
 Bundle-Localization: plugin

plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF
index 31a4796..3f3c61c 100644
--- a/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice C Generator
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.generator.c;singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.0",
- org.eclipse.etrice.core.etphys;bundle-version="1.1.0",
- org.eclipse.etrice.core.etmap;bundle-version="1.1.0",
- org.eclipse.etrice.generator.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.generator;bundle-version="1.1.0",
- org.eclipse.etrice.generator.config;bundle-version="1.1.0",
- org.eclipse.etrice.generator.doc;bundle-version="1.1.0",
- org.eclipse.etrice.generator.gnuplot;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.1",
+ org.eclipse.etrice.core.etphys;bundle-version="1.1.1",
+ org.eclipse.etrice.core.etmap;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.generator;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.config;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.doc;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.gnuplot;bundle-version="1.1.1",
  org.eclipse.xtend.lib;bundle-version="2.6.0",
  org.eclipse.xtext.generator;bundle-version="2.6.0",
  org.eclipse.xtext.util;bundle-version="2.6.0"

plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF
index ec63617..8075536 100644
--- a/plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Generator Config
 Bundle-SymbolicName: org.eclipse.etrice.generator.config;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-Vendor: Eclipse eTrice
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.0",
- org.eclipse.etrice.core.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.core.room;bundle-version="1.1.0",
- org.eclipse.etrice.core.config;bundle-version="1.1.0",
- org.eclipse.etrice.core.genmodel;bundle-version="1.1.0",
- org.eclipse.etrice.generator;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.1",
+ org.eclipse.etrice.core.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.core.room;bundle-version="1.1.1",
+ org.eclipse.etrice.core.config;bundle-version="1.1.1",
+ org.eclipse.etrice.core.genmodel;bundle-version="1.1.1",
+ org.eclipse.etrice.generator;bundle-version="1.1.1",
  org.eclipse.xtend.lib;bundle-version="2.6.0",
  com.google.guava;bundle-version="8.0.0",
  org.eclipse.xtext.xbase.lib;bundle-version="2.6.0"

plugins/org.eclipse.etrice.generator.config/pom.xml

diff --git a/plugins/org.eclipse.etrice.generator.config/pom.xml b/plugins/org.eclipse.etrice.generator.config/pom.xml
index 9f7e920..a03704e 100644
--- a/plugins/org.eclipse.etrice.generator.config/pom.xml
+++ b/plugins/org.eclipse.etrice.generator.config/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.etrice</groupId>
     <artifactId>java-generator</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
   </parent>
   

plugins/org.eclipse.etrice.generator.cpp/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.generator.cpp/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.cpp/META-INF/MANIFEST.MF
index e4027af..82b87e1 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.cpp/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice C++ Generator
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.generator.cpp;singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.0",
- org.eclipse.etrice.core.etphys;bundle-version="1.1.0",
- org.eclipse.etrice.core.etmap;bundle-version="1.1.0",
- org.eclipse.etrice.generator.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.generator;bundle-version="1.1.0",
- org.eclipse.etrice.generator.config;bundle-version="1.1.0",
- org.eclipse.etrice.generator.doc;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.1",
+ org.eclipse.etrice.core.etphys;bundle-version="1.1.1",
+ org.eclipse.etrice.core.etmap;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.generator;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.config;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.doc;bundle-version="1.1.1",
  org.eclipse.xtend.lib;bundle-version="2.6.0",
  org.eclipse.xtext.generator;bundle-version="2.6.0",
  org.eclipse.xtext.util;bundle-version="2.6.0"

plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF
index 5a37463..2bb7bbe 100644
--- a/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Document Generator
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.generator.doc;singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.0",
- org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.generator.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.generator;bundle-version="1.1.0",
- org.eclipse.etrice.core.etmap;bundle-version="1.1.0",
- org.eclipse.etrice.core.etphys;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.1",
+ org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.generator;bundle-version="1.1.1",
+ org.eclipse.etrice.core.etmap;bundle-version="1.1.1",
+ org.eclipse.etrice.core.etphys;bundle-version="1.1.1",
  org.eclipse.core.resources;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.ui;bundle-version="3.7.0",

plugins/org.eclipse.etrice.generator.doc/pom.xml

diff --git a/plugins/org.eclipse.etrice.generator.doc/pom.xml b/plugins/org.eclipse.etrice.generator.doc/pom.xml
index 10a4c5b..263ba6c 100644
--- a/plugins/org.eclipse.etrice.generator.doc/pom.xml
+++ b/plugins/org.eclipse.etrice.generator.doc/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.etrice</groupId>
     <artifactId>java-generator</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
   </parent>
   

plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF
index 847bf11..07b2ef5 100644
--- a/plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Generator for Finite State Machines
 Bundle-SymbolicName: org.eclipse.etrice.generator.fsm
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-Vendor: eTrice
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.etrice.generator.fsm.base,
  org.eclipse.etrice.generator.fsm.generic
-Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.core.genmodel.fsm;bundle-version="1.1.1",
  org.eclipse.emf;bundle-version="2.6.0",
  org.apache.commons.io;bundle-version="2.0.1",
  org.eclipse.core.resources;bundle-version="3.8.101",

plugins/org.eclipse.etrice.generator.fsm/pom.xml

diff --git a/plugins/org.eclipse.etrice.generator.fsm/pom.xml b/plugins/org.eclipse.etrice.generator.fsm/pom.xml
index 111fbd2..94e44bd 100644
--- a/plugins/org.eclipse.etrice.generator.fsm/pom.xml
+++ b/plugins/org.eclipse.etrice.generator.fsm/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.etrice</groupId>
     <artifactId>java-generator</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
   </parent>
   

plugins/org.eclipse.etrice.generator.fsmtest.ui/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.generator.fsmtest.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.fsmtest.ui/META-INF/MANIFEST.MF
index 39ae988..3501c50 100644
--- a/plugins/org.eclipse.etrice.generator.fsmtest.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.fsmtest.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.etrice.generator.fsmtest.ui
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.generator.fsmtest.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.etrice.generator.fsmtest;visibility:=reexport,

plugins/org.eclipse.etrice.generator.fsmtest/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.generator.fsmtest/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.fsmtest/META-INF/MANIFEST.MF
index 856d732..f7b4833 100644
--- a/plugins/org.eclipse.etrice.generator.fsmtest/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.fsmtest/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.etrice.generator.fsmtest
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.generator.fsmtest; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext;bundle-version="2.6.0";visibility:=reexport,

plugins/org.eclipse.etrice.generator.gnuplot/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.generator.gnuplot/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.gnuplot/META-INF/MANIFEST.MF
index 84a21ab..f166e86 100644
--- a/plugins/org.eclipse.etrice.generator.gnuplot/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.gnuplot/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Gnuplot generator
 Bundle-SymbolicName: org.eclipse.etrice.generator.gnuplot
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Export-Package: org.eclipse.etrice.generator.gnuplot
 Require-Bundle: org.eclipse.xtext;bundle-version="2.6.0",
  org.eclipse.xtend.lib;bundle-version="2.6.0",
- org.eclipse.etrice.generator;bundle-version="1.1.0",
- org.eclipse.etrice.generator.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.core.room;bundle-version="1.1.0",
- org.eclipse.etrice.core.genmodel;bundle-version="1.1.0",
- org.eclipse.etrice.core.etphys;bundle-version="1.1.0",
- org.eclipse.etrice.generator.config;bundle-version="1.1.0",
- org.eclipse.etrice.generator.java;bundle-version="1.1.0",
- org.eclipse.etrice.core.config;bundle-version="1.1.0",
- org.eclipse.etrice.core.etmap;bundle-version="1.1.0",
+ org.eclipse.etrice.generator;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.core.room;bundle-version="1.1.1",
+ org.eclipse.etrice.core.genmodel;bundle-version="1.1.1",
+ org.eclipse.etrice.core.etphys;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.config;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.java;bundle-version="1.1.1",
+ org.eclipse.etrice.core.config;bundle-version="1.1.1",
+ org.eclipse.etrice.core.etmap;bundle-version="1.1.1",
  org.eclipse.core.runtime;bundle-version="3.10.0",
- org.eclipse.etrice.generator.doc;bundle-version="1.1.0",
- org.eclipse.etrice.abstractexec.behavior;bundle-version="1.1.0"
+ org.eclipse.etrice.generator.doc;bundle-version="1.1.1",
+ org.eclipse.etrice.abstractexec.behavior;bundle-version="1.1.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy

plugins/org.eclipse.etrice.generator.java.mvn/pom.xml

diff --git a/plugins/org.eclipse.etrice.generator.java.mvn/pom.xml b/plugins/org.eclipse.etrice.generator.java.mvn/pom.xml
index 57a80ac..f171f47 100644
--- a/plugins/org.eclipse.etrice.generator.java.mvn/pom.xml
+++ b/plugins/org.eclipse.etrice.generator.java.mvn/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.eclipse.etrice</groupId>
 		<artifactId>java-generator</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.1-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
 	</parent>
 
@@ -188,67 +188,67 @@
 		<dependency>
 			<groupId>org.eclipse.etrice</groupId>
 			<artifactId>org.eclipse.etrice.generator.java</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.etrice</groupId>
 			<artifactId>org.eclipse.etrice.generator.config</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.etrice</groupId>
 			<artifactId>org.eclipse.etrice.generator.doc</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.etrice</groupId>
 			<artifactId>org.eclipse.etrice.generator.fsm</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.etrice</groupId>
 			<artifactId>org.eclipse.etrice.generator</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.etrice</groupId>
 			<artifactId>org.eclipse.etrice.core.common</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.etrice</groupId>
 			<artifactId>org.eclipse.etrice.core.fsm</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.etrice</groupId>
 			<artifactId>org.eclipse.etrice.core.room</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.etrice</groupId>
 			<artifactId>org.eclipse.etrice.core.etphys</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.etrice</groupId>
 			<artifactId>org.eclipse.etrice.core.etmap</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.etrice</groupId>
 			<artifactId>org.eclipse.etrice.core.config</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.etrice</groupId>
 			<artifactId>org.eclipse.etrice.core.genmodel.fsm</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.etrice</groupId>
 			<artifactId>org.eclipse.etrice.core.genmodel</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- IMPORTANT: runtime-assembler-cli uses another version of com.google.guava 

plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF
index b99cbab..e6c07cd 100644
--- a/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Java Generator
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.generator.java;singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.0",
- org.eclipse.etrice.core.etphys;bundle-version="1.1.0",
- org.eclipse.etrice.core.etmap;bundle-version="1.1.0",
- org.eclipse.etrice.generator.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.generator;bundle-version="1.1.0",
- org.eclipse.etrice.generator.config;bundle-version="1.1.0",
- org.eclipse.etrice.generator.doc;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.genmodel;bundle-version="1.1.1",
+ org.eclipse.etrice.core.etphys;bundle-version="1.1.1",
+ org.eclipse.etrice.core.etmap;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.generator;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.config;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.doc;bundle-version="1.1.1",
  org.eclipse.xtend.lib;bundle-version="2.6.0",
  org.eclipse.xtext.generator;bundle-version="2.6.0",
  org.eclipse.xtext.util;bundle-version="2.6.0"

plugins/org.eclipse.etrice.generator.java/pom.xml

diff --git a/plugins/org.eclipse.etrice.generator.java/pom.xml b/plugins/org.eclipse.etrice.generator.java/pom.xml
index d87451a..a050029 100644
--- a/plugins/org.eclipse.etrice.generator.java/pom.xml
+++ b/plugins/org.eclipse.etrice.generator.java/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.etrice</groupId>
     <artifactId>java-generator</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
   </parent>
   

plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF
index ca0b2fc..ea01fef 100644
--- a/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice C Generator Launcher
 Bundle-SymbolicName: org.eclipse.etrice.generator.launch.c;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-Activator: org.eclipse.etrice.generator.launch.c.Activator
-Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.0",
- org.eclipse.etrice.generator.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.generator.c;bundle-version="1.1.0",
- org.eclipse.etrice.generator.launch;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.c;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.launch;bundle-version="1.1.1",
  org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.debug.core,
@@ -15,7 +15,7 @@
  org.eclipse.jdt.ui;bundle-version="3.7.0",
  org.eclipse.jdt.core;bundle-version="3.7.0",
  org.eclipse.core.variables;bundle-version="3.2.500",
- org.eclipse.etrice.generator.ui;bundle-version="1.1.0"
+ org.eclipse.etrice.generator.ui;bundle-version="1.1.1"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.jdt.launching,

plugins/org.eclipse.etrice.generator.launch.cpp/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.generator.launch.cpp/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.launch.cpp/META-INF/MANIFEST.MF
index 8b3f109..796f80a 100644
--- a/plugins/org.eclipse.etrice.generator.launch.cpp/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.launch.cpp/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Cpp Generator Launcher
 Bundle-SymbolicName: org.eclipse.etrice.generator.launch.cpp;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-Activator: org.eclipse.etrice.generator.launch.cpp.Activator
-Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.0",
- org.eclipse.etrice.generator.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.generator.cpp;bundle-version="1.1.0",
- org.eclipse.etrice.generator.launch;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.cpp;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.launch;bundle-version="1.1.1",
  org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.debug.core,
@@ -15,7 +15,7 @@
  org.eclipse.jdt.ui;bundle-version="3.7.0",
  org.eclipse.jdt.core;bundle-version="3.7.0",
  org.eclipse.core.variables;bundle-version="3.2.500",
- org.eclipse.etrice.core.genmodel;bundle-version="1.1.0"
+ org.eclipse.etrice.core.genmodel;bundle-version="1.1.1"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.jdt.launching,

plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF
index 839212c..939e4a9 100644
--- a/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Java Generator Launcher
 Bundle-SymbolicName: org.eclipse.etrice.generator.launch.java;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-Activator: org.eclipse.etrice.generator.launch.java.Activator
-Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.0",
- org.eclipse.etrice.generator.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.generator.java;bundle-version="1.1.0",
- org.eclipse.etrice.generator.launch;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.java;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.launch;bundle-version="1.1.1",
  org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.debug.core,
@@ -15,7 +15,7 @@
  org.eclipse.jdt.ui;bundle-version="3.7.0",
  org.eclipse.jdt.core;bundle-version="3.7.0",
  org.eclipse.core.variables;bundle-version="3.2.500",
- org.eclipse.etrice.generator.ui;bundle-version="1.1.0"
+ org.eclipse.etrice.generator.ui;bundle-version="1.1.1"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.jdt.launching,

plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF
index 383b79b..8313fc0 100644
--- a/plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Generator Launch Base Classes
 Bundle-SymbolicName: org.eclipse.etrice.generator.launch;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-Activator: org.eclipse.etrice.generator.launch.Activator
-Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.0",
- org.eclipse.etrice.generator.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.generator.ui;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.ui;bundle-version="1.1.1",
  org.eclipse.ui,
  org.eclipse.ui.console,
  org.eclipse.xtext.ui.shared;bundle-version="2.6.0",

plugins/org.eclipse.etrice.generator.ui.cdt/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.generator.ui.cdt/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.ui.cdt/META-INF/MANIFEST.MF
index a405d90..f97fd5e 100644
--- a/plugins/org.eclipse.etrice.generator.ui.cdt/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.ui.cdt/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: CDT integration of eTrice
 Bundle-SymbolicName: org.eclipse.etrice.generator.ui.cdt;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-Vendor: Eclipse eTrice
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.etrice.generator.ui;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.generator.ui;bundle-version="1.1.1",
  org.eclipse.cdt.core;bundle-version="5.5.0",
  org.eclipse.cdt.managedbuilder.core;bundle-version="8.2.0",
  org.eclipse.equinox.common;bundle-version="3.6.200",

plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF
index 27f7aee..ce67865 100644
--- a/plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF
@@ -2,30 +2,30 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Generator UI
 Bundle-SymbolicName: org.eclipse.etrice.generator.ui;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: Eclipse eTrice
-Require-Bundle: org.eclipse.etrice.core.etmap;bundle-version="1.1.0",
- org.eclipse.etrice.core.etmap.ui;bundle-version="1.1.0",
- org.eclipse.etrice.core.etphys;bundle-version="1.1.0",
- org.eclipse.etrice.core.etphys.ui;bundle-version="1.1.0",
- org.eclipse.etrice.core.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.ui.common;bundle-version="1.1.0",
- org.eclipse.etrice.ui.runtime;bundle-version="1.1.0",
- org.eclipse.etrice.core.common;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.etmap;bundle-version="1.1.1",
+ org.eclipse.etrice.core.etmap.ui;bundle-version="1.1.1",
+ org.eclipse.etrice.core.etphys;bundle-version="1.1.1",
+ org.eclipse.etrice.core.etphys.ui;bundle-version="1.1.1",
+ org.eclipse.etrice.core.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.ui.common;bundle-version="1.1.1",
+ org.eclipse.etrice.ui.runtime;bundle-version="1.1.1",
+ org.eclipse.etrice.core.common;bundle-version="1.1.1",
  org.eclipse.core.runtime,
  org.eclipse.ui,
  org.apache.log4j;bundle-version="1.2.15",
  org.eclipse.core.resources;bundle-version="3.8.100",
  org.eclipse.emf.ecore;bundle-version="2.9.0",
- org.eclipse.etrice.core.room.ui;bundle-version="1.1.0",
+ org.eclipse.etrice.core.room.ui;bundle-version="1.1.1",
  org.eclipse.jdt.core;bundle-version="3.9.0",
  org.eclipse.jdt.launching;bundle-version="3.7.0",
  org.eclipse.ui.ide;bundle-version="3.9.0",
  org.eclipse.xtext.xbase.lib;bundle-version="2.6.0",
  org.eclipse.xtext;bundle-version="2.6.0",
  org.eclipse.xtext.ui;bundle-version="2.6.0",
- org.eclipse.etrice.generator;bundle-version="1.1.0"
+ org.eclipse.etrice.generator;bundle-version="1.1.1"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.etrice.generator.ui.Activator
 Export-Package: org.eclipse.etrice.generator.ui.configurator,

plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF
index 2720184..7430c03 100644
--- a/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Generator Model
 Bundle-SymbolicName: org.eclipse.etrice.generator;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse eTrice
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.etrice.generator.base,
  org.eclipse.etrice.generator.generic
-Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.0",
- org.eclipse.etrice.core.genmodel;bundle-version="1.1.0",
- org.eclipse.etrice.core.etmap;bundle-version="1.1.0",
- org.eclipse.etrice.core.etphys;bundle-version="1.1.0",
- org.eclipse.etrice.generator.fsm;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.1",
+ org.eclipse.etrice.core.genmodel;bundle-version="1.1.1",
+ org.eclipse.etrice.core.etmap;bundle-version="1.1.1",
+ org.eclipse.etrice.core.etphys;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.fsm;bundle-version="1.1.1",
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.emf.ecore;bundle-version="2.6.0";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="2.5.0",

plugins/org.eclipse.etrice.generator/pom.xml

diff --git a/plugins/org.eclipse.etrice.generator/pom.xml b/plugins/org.eclipse.etrice.generator/pom.xml
index fc37971..a18e188 100644
--- a/plugins/org.eclipse.etrice.generator/pom.xml
+++ b/plugins/org.eclipse.etrice.generator/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.etrice</groupId>
     <artifactId>java-generator</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
   </parent>
   

plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF
index 31607ca..549b5c7 100644
--- a/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Logging Fragment
 Bundle-SymbolicName: org.eclipse.etrice.logging
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-Vendor: Eclipse eTrice
 Fragment-Host: org.apache.log4j;bundle-version="1.2.15"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

plugins/org.eclipse.etrice.ui.behavior.actioneditor/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.ui.behavior.actioneditor/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.behavior.actioneditor/META-INF/MANIFEST.MF
index 3b1ae89..143ea42 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.actioneditor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.behavior.actioneditor/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ROOM Action Code Editor
 Bundle-SymbolicName: org.eclipse.etrice.ui.behavior.actioneditor;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-Activator: org.eclipse.etrice.ui.behavior.actioneditor.Activator
-Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.core.room;bundle-version="1.1.0",
- org.eclipse.etrice.ui.behavior;bundle-version="1.1.0",
- org.eclipse.etrice.ui.behavior.fsm;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.core.room;bundle-version="1.1.1",
+ org.eclipse.etrice.ui.behavior;bundle-version="1.1.1",
+ org.eclipse.etrice.ui.behavior.fsm;bundle-version="1.1.1",
  org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.emf.common,

plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF
index 9f28579..5234eac 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Abstract FSM Diagram Editor
 Bundle-SymbolicName: org.eclipse.etrice.ui.behavior.fsm;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-Activator: org.eclipse.etrice.ui.behavior.fsm.Activator
 Bundle-Vendor: eTrice
-Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="1.1.0",
- org.eclipse.etrice.ui.common.base;bundle-version="1.1.0",
- org.eclipse.etrice.core.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.core.fsm.ui;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="1.1.1",
+ org.eclipse.etrice.ui.common.base;bundle-version="1.1.1",
+ org.eclipse.etrice.core.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.core.fsm.ui;bundle-version="1.1.1",
  org.eclipse.graphiti;bundle-version="0.8.0",
  org.eclipse.graphiti.ui;bundle-version="0.8.0",
  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100",

plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF
index 0b3c027..ca6c014 100644
--- a/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Actor Behavior Diagram Editor
 Bundle-SymbolicName: org.eclipse.etrice.ui.behavior;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-Activator: org.eclipse.etrice.ui.behavior.Activator
-Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.0",
- org.eclipse.etrice.core.common.ui;bundle-version="1.1.0",
- org.eclipse.etrice.ui.common.base;bundle-version="1.1.0",
- org.eclipse.etrice.ui.common;bundle-version="1.1.0",
- org.eclipse.etrice.ui.behavior.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.core.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.core.fsm.ui;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.1",
+ org.eclipse.etrice.core.common.ui;bundle-version="1.1.1",
+ org.eclipse.etrice.ui.common.base;bundle-version="1.1.1",
+ org.eclipse.etrice.ui.common;bundle-version="1.1.1",
+ org.eclipse.etrice.ui.behavior.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.core.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.core.fsm.ui;bundle-version="1.1.1",
  org.eclipse.graphiti;bundle-version="0.8.0",
  org.eclipse.graphiti.ui;bundle-version="0.8.0",
  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100",
@@ -19,8 +19,8 @@
  org.eclipse.emf.transaction;bundle-version="1.4.0",
  org.eclipse.xtext.ui;bundle-version="2.6.0",
  org.eclipse.xtext.ui.shared;bundle-version="2.6.0",
- org.eclipse.etrice.abstractexec.behavior;bundle-version="1.1.0",
- org.eclipse.etrice.core.genmodel;bundle-version="1.1.0"
+ org.eclipse.etrice.abstractexec.behavior;bundle-version="1.1.1",
+ org.eclipse.etrice.core.genmodel;bundle-version="1.1.1"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: Eclipse eTrice

plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF
index bbcdb64..6771847 100644
--- a/plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Commands
 Bundle-SymbolicName: org.eclipse.etrice.ui.commands; singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-Activator: org.eclipse.etrice.ui.commands.Activator
 Bundle-Vendor: Eclipse eTrice
-Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.core.common.ui;bundle-version="1.1.0",
- org.eclipse.etrice.core.room.ui;bundle-version="1.1.0",
- org.eclipse.etrice.ui.common;bundle-version="1.1.0",
- org.eclipse.etrice.ui.common.base;bundle-version="1.1.0",
- org.eclipse.etrice.ui.structure;bundle-version="1.1.0",
- org.eclipse.etrice.ui.behavior.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.ui.behavior;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.core.common.ui;bundle-version="1.1.1",
+ org.eclipse.etrice.core.room.ui;bundle-version="1.1.1",
+ org.eclipse.etrice.ui.common;bundle-version="1.1.1",
+ org.eclipse.etrice.ui.common.base;bundle-version="1.1.1",
+ org.eclipse.etrice.ui.structure;bundle-version="1.1.1",
+ org.eclipse.etrice.ui.behavior.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.ui.behavior;bundle-version="1.1.1",
  org.eclipse.graphiti;bundle-version="0.8.0",
  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100",
  org.eclipse.xtext.ui;bundle-version="2.6.0",

plugins/org.eclipse.etrice.ui.common.base/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.ui.common.base/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.common.base/META-INF/MANIFEST.MF
index 317b50a..1447e44 100644
--- a/plugins/org.eclipse.etrice.ui.common.base/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.common.base/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Common Base for UI
 Bundle-SymbolicName: org.eclipse.etrice.ui.common.base;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-Activator: org.eclipse.etrice.ui.common.base.UIBaseActivator
 Bundle-Vendor: eTrice
-Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="1.1.0",
- org.eclipse.etrice.core.fsm.ui;bundle-version="1.1.0",
- org.eclipse.etrice.doc;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="1.1.1",
+ org.eclipse.etrice.core.fsm.ui;bundle-version="1.1.1",
+ org.eclipse.etrice.doc;bundle-version="1.1.1",
  org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.emf.transaction;bundle-version="1.4.0",

plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF
index 7109817..6878441 100644
--- a/plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: UI Common
 Bundle-SymbolicName: org.eclipse.etrice.ui.common;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-Vendor: Eclipse eTrice
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.core.room;bundle-version="1.1.0",
- org.eclipse.etrice.core.room.ui;bundle-version="1.1.0",
- org.eclipse.etrice.core.common.ui;bundle-version="1.1.0",
- org.eclipse.etrice.ui.common.base;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.core.room;bundle-version="1.1.1",
+ org.eclipse.etrice.core.room.ui;bundle-version="1.1.1",
+ org.eclipse.etrice.core.common.ui;bundle-version="1.1.1",
+ org.eclipse.etrice.ui.common.base;bundle-version="1.1.1",
  org.eclipse.emf.transaction;bundle-version="1.4.0",
  org.eclipse.graphiti;bundle-version="0.8.0",
  org.eclipse.ui.ide;bundle-version="3.6.0",

plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF
index d60b666..314713c 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: New Wizards for Runtime
 Bundle-SymbolicName: org.eclipse.etrice.ui.runtime;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-Vendor: Eclipse eTrice
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF

diff --git a/plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF
index 556213e..0ccd915 100644
--- a/plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Actor Structure Diagram Editor
 Bundle-SymbolicName: org.eclipse.etrice.ui.structure;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-Activator: org.eclipse.etrice.ui.structure.Activator
 Bundle-Vendor: Eclipse eTrice
-Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.core.room.ui;bundle-version="1.1.0",
- org.eclipse.etrice.core.common.ui;bundle-version="1.1.0",
- org.eclipse.etrice.ui.common.base;bundle-version="1.1.0",
- org.eclipse.etrice.ui.common;bundle-version="1.1.0",
- org.eclipse.etrice.ui.behavior;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.core.room.ui;bundle-version="1.1.1",
+ org.eclipse.etrice.core.common.ui;bundle-version="1.1.1",
+ org.eclipse.etrice.ui.common.base;bundle-version="1.1.1",
+ org.eclipse.etrice.ui.common;bundle-version="1.1.1",
+ org.eclipse.etrice.ui.behavior;bundle-version="1.1.1",
  org.eclipse.graphiti;bundle-version="0.8.0",
  org.eclipse.graphiti.ui;bundle-version="0.8.0",
  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100",

releng/org.eclipse.etrice.parent/pom.xml

diff --git a/releng/org.eclipse.etrice.parent/pom.xml b/releng/org.eclipse.etrice.parent/pom.xml
index 7cfedc6..8b1646a 100644
--- a/releng/org.eclipse.etrice.parent/pom.xml
+++ b/releng/org.eclipse.etrice.parent/pom.xml
@@ -10,7 +10,7 @@
 
 	<groupId>org.eclipse.etrice</groupId>
 	<artifactId>java-generator</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.1.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>eTrice Java generator</name>

releng/org.eclipse.etrice.site/buckminster.cspex

diff --git a/releng/org.eclipse.etrice.site/buckminster.cspex b/releng/org.eclipse.etrice.site/buckminster.cspex
index a3b7d61..aeb3763 100644
--- a/releng/org.eclipse.etrice.site/buckminster.cspex
+++ b/releng/org.eclipse.etrice.site/buckminster.cspex
@@ -2,7 +2,7 @@
 <cspecExtension
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0"
-	xmlns="http://www.eclipse.org/buckminster/CSpec-1.0" componentType="eclipse.feature" version="1.1.0">
+	xmlns="http://www.eclipse.org/buckminster/CSpec-1.0" componentType="eclipse.feature" version="1.1.1">
     <dependencies>
 		<dependency name="org.eclipse.equinox.executable" componentType="eclipse.feature"/>
 		<dependency name="org.eclipse.platform" componentType="eclipse.feature"/>

releng/org.eclipse.etrice.site/feature.xml

diff --git a/releng/org.eclipse.etrice.site/feature.xml b/releng/org.eclipse.etrice.site/feature.xml
index 7403541..1d2897d 100644
--- a/releng/org.eclipse.etrice.site/feature.xml
+++ b/releng/org.eclipse.etrice.site/feature.xml
@@ -11,8 +11,8 @@
 -->
 <feature
       id="org.eclipse.etrice.site"
-      label="eTrice 1.1.0 Update Site"
-      version="1.1.0.qualifier"
+      label="eTrice 1.1.1 Update Site"
+      version="1.1.1.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 

runtime/org.eclipse.etrice.modellib.java/META-INF/MANIFEST.MF

diff --git a/runtime/org.eclipse.etrice.modellib.java/META-INF/MANIFEST.MF b/runtime/org.eclipse.etrice.modellib.java/META-INF/MANIFEST.MF
index f74b28b..3a8c00d 100644
--- a/runtime/org.eclipse.etrice.modellib.java/META-INF/MANIFEST.MF
+++ b/runtime/org.eclipse.etrice.modellib.java/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Java ModelLib
 Bundle-SymbolicName: org.eclipse.etrice.modellib.java
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-Vendor: Eclipse eTrice
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

runtime/org.eclipse.etrice.modellib.java/pom.xml

diff --git a/runtime/org.eclipse.etrice.modellib.java/pom.xml b/runtime/org.eclipse.etrice.modellib.java/pom.xml
index 2b46557..33abbe4 100644
--- a/runtime/org.eclipse.etrice.modellib.java/pom.xml
+++ b/runtime/org.eclipse.etrice.modellib.java/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.etrice</groupId>
 		<artifactId>java-generator</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.1-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.etrice.parent</relativePath>
 	</parent>
 	
@@ -29,7 +29,7 @@
 		<dependency>
 			<groupId>org.eclipse.etrice</groupId>
 			<artifactId>org.eclipse.etrice.runtime.java</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file

runtime/org.eclipse.etrice.runtime.java.aspects/META-INF/MANIFEST.MF

diff --git a/runtime/org.eclipse.etrice.runtime.java.aspects/META-INF/MANIFEST.MF b/runtime/org.eclipse.etrice.runtime.java.aspects/META-INF/MANIFEST.MF
index f6dfb47..51bd67d 100644
--- a/runtime/org.eclipse.etrice.runtime.java.aspects/META-INF/MANIFEST.MF
+++ b/runtime/org.eclipse.etrice.runtime.java.aspects/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Java Runtime Aspects
 Bundle-SymbolicName: org.eclipse.etrice.runtime.java.aspects
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Export-Package: org.eclipse.etrice.runtime.java.aspects
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

runtime/org.eclipse.etrice.runtime.java/META-INF/MANIFEST.MF

diff --git a/runtime/org.eclipse.etrice.runtime.java/META-INF/MANIFEST.MF b/runtime/org.eclipse.etrice.runtime.java/META-INF/MANIFEST.MF
index 7aa7ae9..162424d 100644
--- a/runtime/org.eclipse.etrice.runtime.java/META-INF/MANIFEST.MF
+++ b/runtime/org.eclipse.etrice.runtime.java/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Java Runtime
 Bundle-SymbolicName: org.eclipse.etrice.runtime.java
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Export-Package: org.eclipse.etrice.runtime.java.config,
  org.eclipse.etrice.runtime.java.debugging,
  org.eclipse.etrice.runtime.java.etunit,

runtime/org.eclipse.etrice.runtime.java/pom.xml

diff --git a/runtime/org.eclipse.etrice.runtime.java/pom.xml b/runtime/org.eclipse.etrice.runtime.java/pom.xml
index 449a673..e9dba60 100644
--- a/runtime/org.eclipse.etrice.runtime.java/pom.xml
+++ b/runtime/org.eclipse.etrice.runtime.java/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.etrice</groupId>
 		<artifactId>java-generator</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.1-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.etrice.parent</relativePath>
 	</parent>
 

tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF

diff --git a/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF
index f066555..fb7b645 100644
--- a/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Abstract Execution for Behavior Tests
 Bundle-SymbolicName: org.eclipse.etrice.abstractexec.behavior.tests
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-Activator: org.eclipse.etrice.abstractexec.behavior.tests.Activator
 Bundle-Vendor: Eclipse eTrice
-Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.abstractexec.behavior;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.abstractexec.behavior;bundle-version="1.1.1",
  org.eclipse.core.runtime,
  org.eclipse.emf.ecore;bundle-version="2.7.0",
  com.google.inject;bundle-version="3.0.0",

tests/org.eclipse.etrice.core.common.tests/META-INF/MANIFEST.MF

diff --git a/tests/org.eclipse.etrice.core.common.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.common.tests/META-INF/MANIFEST.MF
index 29d75f7..84a2dac 100644
--- a/tests/org.eclipse.etrice.core.common.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.common.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for common eTrice grammar fragments and classes
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.common.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.etrice.core.common,

tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF

diff --git a/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF
index 1113af6..a453abb 100644
--- a/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Config DSL Tests
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.config.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.config;bundle-version="1.1.0",
- org.eclipse.etrice.core.config.ui;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.config;bundle-version="1.1.1",
+ org.eclipse.etrice.core.config.ui;bundle-version="1.1.1",
  org.eclipse.core.runtime,
  org.eclipse.xtext;bundle-version="2.6.0",
  org.eclipse.xtext.junit4;bundle-version="2.6.0",

tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF

diff --git a/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF
index 3d869a3..fb0ff78 100644
--- a/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.etrice.core.etmap.tests
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.etmap.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.etmap;bundle-version="1.1.0",
- org.eclipse.etrice.core.etmap.ui;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.etmap;bundle-version="1.1.1",
+ org.eclipse.etrice.core.etmap.ui;bundle-version="1.1.1",
  org.eclipse.core.runtime,
  org.eclipse.xtext.junit4;bundle-version="2.6.0",
  org.eclipse.ui.workbench;resolution:=optional,

tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF

diff --git a/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF
index 7b915a8..74fd17a 100644
--- a/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.etrice.core.etphys.tests
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.etphys.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.etphys;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.etphys;bundle-version="1.1.1",
  org.eclipse.etrice.core.etphys.ui,
  org.eclipse.core.runtime,
  org.eclipse.xtext.junit4;bundle-version="2.6.0",

tests/org.eclipse.etrice.core.fsm.tests/META-INF/MANIFEST.MF

diff --git a/tests/org.eclipse.etrice.core.fsm.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.fsm.tests/META-INF/MANIFEST.MF
index a1bc4bb..c4cefcd 100644
--- a/tests/org.eclipse.etrice.core.fsm.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.fsm.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: FSM DSL Tests
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.core.fsm.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.etrice.core.fsm,

tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/.gitignore

diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/.gitignore b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/.gitignore
new file mode 100644
index 0000000..0ab9915
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/.gitignore
@@ -0,0 +1,5 @@
+/FsmGenTestBase.java
+/TestFlatFSM.java
+/TestFlatInheritedFSM.java
+/TestHierFSM.java
+/TestHierInheritedFSM.java

tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/FSMGenModelTestsActivator.class

diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/FSMGenModelTestsActivator.class b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/FSMGenModelTestsActivator.class
new file mode 100644
index 0000000..fafc5bb
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/FSMGenModelTestsActivator.class
Binary files differ

tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/FsmGenTestBase$1.class

diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/FsmGenTestBase$1.class b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/FsmGenTestBase$1.class
new file mode 100644
index 0000000..d9a98ca
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/FsmGenTestBase$1.class
Binary files differ

tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/FsmGenTestBase.class

diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/FsmGenTestBase.class b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/FsmGenTestBase.class
new file mode 100644
index 0000000..ea2ee56
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/FsmGenTestBase.class
Binary files differ

tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/FsmGenTestBase.xtend

diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/FsmGenTestBase.xtend b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/FsmGenTestBase.xtend
new file mode 100644
index 0000000..57de115
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/FsmGenTestBase.xtend
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * 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:
+ * 		hrr@protos.de (initial contribution)
+ * 
+ *******************************************************************************/
+
+package org.eclipse.etrice.core.genmodel.fsm.tests
+
+import org.eclipse.emf.ecore.resource.Resource
+import org.eclipse.etrice.core.RoomStandaloneSetup
+import org.eclipse.etrice.core.TestBase
+import org.eclipse.etrice.core.genmodel.fsm.FsmGenBuilder
+import org.eclipse.etrice.core.room.ActorClass
+import org.eclipse.etrice.core.room.RoomModel
+import org.eclipse.etrice.core.genmodel.fsm.fsmgen.GraphContainer
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl
+import org.eclipse.emf.common.util.URI
+
+class FsmGenTestBase extends TestBase {
+
+	protected Resource res = null
+	protected ActorClass actor
+
+	protected def getGraphContainer(String roomFile, String actorName) {
+		prepare(FSMGenModelTestsActivator.getInstance().getBundle())
+		res = getResource(roomFile)
+		actor = (res.contents.get(0) as RoomModel).actorClasses.findFirst[name.equals(actorName)]
+		val injector = new RoomStandaloneSetup().createInjectorAndDoEMFRegistration()
+		val FsmGenBuilder builder = new FsmGenBuilder(injector)
+		builder.createTransformedModel(actor)
+	}
+	
+	protected def save(GraphContainer gc, String fileName) {
+		val rs = new ResourceSetImpl
+		val uri = URI.createFileURI("./output/" + fileName + ".fsmgen2")
+		val res = rs.createResource(uri)
+		res.contents.add(gc)
+		res.save(newHashMap)
+	}
+}
\ No newline at end of file

tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM$1.class

diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM$1.class b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM$1.class
new file mode 100644
index 0000000..15ed172
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM$1.class
Binary files differ

tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM$2.class

diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM$2.class b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM$2.class
new file mode 100644
index 0000000..a3d1db3
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM$2.class
Binary files differ

tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM$3.class

diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM$3.class b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM$3.class
new file mode 100644
index 0000000..a911ff8
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM$3.class
Binary files differ

tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM$4.class

diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM$4.class b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM$4.class
new file mode 100644
index 0000000..2d48d92
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM$4.class
Binary files differ

tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM$5.class

diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM$5.class b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM$5.class
new file mode 100644
index 0000000..b2746ac
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM$5.class
Binary files differ

tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM$6.class

diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM$6.class b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM$6.class
new file mode 100644
index 0000000..8678b3d
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM$6.class
Binary files differ

tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM.class

diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM.class b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM.class
new file mode 100644
index 0000000..aec653f
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM.class
Binary files differ

tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM.xtend

diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM.xtend b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM.xtend
new file mode 100644
index 0000000..977a8b0
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM.xtend
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2017 protos software gmbh (http://www.protos.de).
+ * 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:
+ * 		Henrik Rentz-Reichert (initial contribution)
+ * 
+ *******************************************************************************/
+
+package org.eclipse.etrice.core.genmodel.fsm.tests
+
+import org.eclipse.etrice.core.fsm.fSM.ChoicePoint
+import org.eclipse.etrice.core.fsm.fSM.State
+import org.eclipse.etrice.core.fsm.fSM.TrPoint
+import org.eclipse.etrice.core.genmodel.fsm.FsmGenChecker
+import org.eclipse.etrice.core.genmodel.fsm.NullLogger
+import org.eclipse.etrice.core.genmodel.fsm.fsmgen.GraphContainer
+import org.junit.Before
+import org.junit.Test
+
+import static org.junit.Assert.assertEquals
+import static org.junit.Assert.assertFalse
+import static org.junit.Assert.assertNotNull
+
+import static extension org.eclipse.etrice.core.genmodel.fsm.FsmGenExtensions.*
+
+class TestFlatFSM extends FsmGenTestBase {
+
+	GraphContainer gc
+	
+	@Before
+	def void SetUp() {
+		gc = getGraphContainer("FlatFSMExample.room", "TestActor")
+		assertNotNull("graph context was created", gc)
+		val logger = new NullLogger
+		FsmGenChecker.check(gc, logger)
+		assertFalse("logger has no errors", logger.hasErrors)
+	}
+	
+	@Test
+	def void testFlatFSMItemCounts() {
+		assertEquals("number of nodes", 6, gc.graph.nodes.size)
+		assertEquals("number of links", 6, gc.graph.links.size)
+		assertEquals("number of states", 4, gc.graph.nodes.filter[stateGraphNode instanceof State].size)
+		assertEquals("number of tr points", 1, gc.graph.nodes.filter[stateGraphNode instanceof TrPoint].size)
+		assertEquals("number of choice points", 1, gc.graph.nodes.filter[stateGraphNode instanceof ChoicePoint].size)
+	}
+	
+	@Test
+	def void testFlatFSMState1Connections() {
+		val s1 = gc.graph.stateNodes.filter[name.equals("state1")].head
+		assertNotNull("state found", s1)
+		
+		assertEquals("incoming links", 1, s1.incoming.size)
+		assertEquals("outgoing links", 1, s1.outgoing.size)
+	}
+	
+	@Test
+	def void testFlatFSMState3Connections() {
+		val s3 = gc.graph.stateNodes.filter[name.equals("state3")].head
+		assertNotNull("state found", s3)
+		
+		assertEquals("incoming links", 1, s3.incoming.size)
+		assertEquals("outgoing links", 0, s3.outgoing.size)
+	}
+	
+	@Test
+	def void testFlatFSMCPConnections() {
+		val cp = gc.graph.choicePointNodes.filter[name.equals("cp0")].head
+		assertNotNull("choice point found", cp)
+		
+		assertEquals("incoming links", 1, cp.incoming.size)
+		assertEquals("outgoing links", 2, cp.outgoing.size)
+	}
+}
\ No newline at end of file

tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatInheritedFSM$1.class

diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatInheritedFSM$1.class b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatInheritedFSM$1.class
new file mode 100644
index 0000000..b577a8b
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatInheritedFSM$1.class
Binary files differ

tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatInheritedFSM$2.class

diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatInheritedFSM$2.class b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatInheritedFSM$2.class
new file mode 100644
index 0000000..524155c
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatInheritedFSM$2.class
Binary files differ

tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatInheritedFSM$3.class

diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatInheritedFSM$3.class b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatInheritedFSM$3.class
new file mode 100644
index 0000000..c15a16c
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatInheritedFSM$3.class
Binary files differ

tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatInheritedFSM.class

diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatInheritedFSM.class b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatInheritedFSM.class
new file mode 100644
index 0000000..1dcb914
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatInheritedFSM.class
Binary files differ

tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatInheritedFSM.xtend

diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatInheritedFSM.xtend b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatInheritedFSM.xtend
new file mode 100644
index 0000000..fadf00a
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatInheritedFSM.xtend
@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * Copyright (c) 2017 protos software gmbh (http://www.protos.de).
+ * 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:
+ * 		Henrik Rentz-Reichert (initial contribution)
+ * 
+ *******************************************************************************/
+
+package org.eclipse.etrice.core.genmodel.fsm.tests
+
+import org.eclipse.etrice.core.fsm.fSM.RefinedState
+import org.eclipse.etrice.core.genmodel.fsm.fsmgen.GraphContainer
+import org.junit.Before
+import org.junit.Test
+
+import static org.junit.Assert.assertEquals
+import static org.junit.Assert.assertNotNull
+import static org.junit.Assert.assertTrue
+import static org.junit.Assert.assertFalse
+
+import static extension org.eclipse.etrice.core.genmodel.fsm.FsmGenExtensions.*
+import org.eclipse.etrice.core.genmodel.fsm.NullLogger
+import org.eclipse.etrice.core.genmodel.fsm.FsmGenChecker
+
+class TestFlatInheritedFSM extends FsmGenTestBase {
+	
+	GraphContainer gc
+	
+	@Before
+	def void SetUp() {
+		gc = getGraphContainer("FlatInheritedFSMExample.room", "TestActor")
+		assertNotNull("graph context was created", gc)
+		val logger = new NullLogger
+		FsmGenChecker.check(gc, logger)
+		assertFalse("logger has no errors", logger.hasErrors)
+	}
+	
+	@Test
+	def void testFlatInheritedFSMItemCounts() {
+		assertEquals("number of nodes", 6, gc.graph.nodes.size)
+		assertEquals("number of links", 6, gc.graph.links.size)
+		assertEquals("number of states", 6, gc.graph.stateNodes.size)
+		assertEquals("number of tr points", 0, gc.graph.trPointNodes.size)
+		assertEquals("number of choice points", 0, gc.graph.choicePointNodes.size)
+	}
+	
+	@Test
+	def void testFlatInheritedFSMState0Connections() {
+		val s = gc.graph.stateNodes.filter[name.equals("state0")].head
+		assertNotNull("state found", s)
+		
+		assertEquals("incoming links", 1, s.incoming.size)
+		assertEquals("outgoing links", 1, s.outgoing.size)
+	}
+	
+	@Test
+	def void testHierFSMPointersIntoOriginalFSM() {
+		val n = gc.graph.stateNodes.filter[name.equals("state1")].head
+		val s = actor.stateMachine.states.filter[name.equals("state1")].head
+		
+		assertNotNull("node found", n)
+		assertNotNull("state found", s)
+		assertTrue("RefinedState expected", n.stateGraphNode instanceof RefinedState)
+		assertEquals("correct target", s, n.stateGraphNode)
+	}
+}
\ No newline at end of file

tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM$1.class

diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM$1.class b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM$1.class
new file mode 100644
index 0000000..0565543
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM$1.class
Binary files differ

tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM$2.class

diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM$2.class b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM$2.class
new file mode 100644
index 0000000..477da27
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM$2.class
Binary files differ

tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM$3.class

diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM$3.class b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM$3.class
new file mode 100644
index 0000000..6140d18
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM$3.class
Binary files differ

tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM$4.class

diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM$4.class b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM$4.class
new file mode 100644
index 0000000..5f5352f
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM$4.class
Binary files differ

tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM$5.class

diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM$5.class b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM$5.class
new file mode 100644
index 0000000..a7a8c75
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM$5.class
Binary files differ

tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM.class

diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM.class b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM.class
new file mode 100644
index 0000000..fe327bc
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM.class
Binary files differ

tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM.xtend

diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM.xtend b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM.xtend
new file mode 100644
index 0000000..db37932
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM.xtend
@@ -0,0 +1,82 @@
+/*******************************************************************************
+ * Copyright (c) 2017 protos software gmbh (http://www.protos.de).
+ * 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:
+ * 		Henrik Rentz-Reichert (initial contribution)
+ * 
+ *******************************************************************************/
+
+package org.eclipse.etrice.core.genmodel.fsm.tests
+
+import org.eclipse.etrice.core.fsm.fSM.SimpleState
+import org.eclipse.etrice.core.genmodel.fsm.FsmGenChecker
+import org.eclipse.etrice.core.genmodel.fsm.NullLogger
+import org.eclipse.etrice.core.genmodel.fsm.fsmgen.GraphContainer
+import org.junit.Before
+import org.junit.Test
+
+import static org.junit.Assert.assertEquals
+import static org.junit.Assert.assertFalse
+import static org.junit.Assert.assertNotNull
+import static org.junit.Assert.assertTrue
+
+import static extension org.eclipse.etrice.core.genmodel.fsm.FsmGenExtensions.*
+
+class TestHierFSM extends FsmGenTestBase {
+	
+	GraphContainer gc
+	
+	@Before
+	def void SetUp() {
+		gc = getGraphContainer("HierFSMExample.room", "TestActor")
+		assertNotNull("graph context was created", gc)
+		val logger = new NullLogger
+		FsmGenChecker.check(gc, logger)
+		assertFalse("logger has no errors", logger.hasErrors)
+	}
+	
+	@Test
+	def void testHierFSMItemCounts() {
+		assertEquals("number of nodes", 3, gc.graph.nodes.size)
+		assertEquals("number of links", 4, gc.graph.links.size)
+		assertEquals("number of states", 3, gc.graph.stateNodes.size)
+		assertEquals("number of tr points", 0, gc.graph.trPointNodes.size)
+		assertEquals("number of choice points", 0, gc.graph.choicePointNodes.size)
+	}
+	
+	@Test
+	def void testHierFSMSubGraphItemCounts() {
+		val subGraph = gc.graph.stateNodes.filter[name.equals("state1")].head.subgraph
+		
+		assertEquals("number of nodes", 4, subGraph.nodes.size)
+		assertEquals("number of links", 4, subGraph.links.size)
+		assertEquals("number of states", 2, subGraph.stateNodes.size)
+		assertEquals("number of tr points", 2, subGraph.trPointNodes.size)
+		assertEquals("number of choice points", 0, subGraph.choicePointNodes.size)
+	}
+	
+	@Test
+	def void testHierFSMState1_1Connections() {
+		val subGraph = gc.graph.stateNodes.filter[name.equals("state1")].head.subgraph
+		val s1_1 = subGraph.stateNodes.filter[name.equals("state1_1")].head
+		assertNotNull("state found", s1_1)
+		
+		assertEquals("incoming links", 2, s1_1.incoming.size)
+		assertEquals("outgoing links", 1, s1_1.outgoing.size)
+	}
+	
+	@Test
+	def void testHierFSMPointersIntoOriginalFSM() {
+		val n = gc.graph.stateNodes.filter[name.equals("state1")].head
+		val s = actor.stateMachine.states.filter[name.equals("state1")].head
+		
+		assertNotNull("node found", n)
+		assertNotNull("state found", s)
+		assertTrue("State expected", n.stateGraphNode instanceof SimpleState)
+		assertEquals("correct target", s, n.stateGraphNode)
+	}
+}
\ No newline at end of file

tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM$1.class

diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM$1.class b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM$1.class
new file mode 100644
index 0000000..7061f55
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM$1.class
Binary files differ

tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM.class

diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM.class b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM.class
new file mode 100644
index 0000000..6c03aaa
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM.class
Binary files differ

tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM.xtend

diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM.xtend b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM.xtend
new file mode 100644
index 0000000..0392ef4
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM.xtend
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright (c) 2017 protos software gmbh (http://www.protos.de).
+ * 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:
+ * 		Henrik Rentz-Reichert (initial contribution)
+ * 
+ *******************************************************************************/
+
+package org.eclipse.etrice.core.genmodel.fsm.tests
+
+import org.eclipse.etrice.core.genmodel.fsm.FsmGenChecker
+import org.eclipse.etrice.core.genmodel.fsm.NullLogger
+import org.eclipse.etrice.core.genmodel.fsm.fsmgen.GraphContainer
+import org.junit.Before
+import org.junit.Test
+
+import static org.junit.Assert.assertEquals
+import static org.junit.Assert.assertFalse
+import static org.junit.Assert.assertNotNull
+
+import static extension org.eclipse.etrice.core.genmodel.fsm.FsmGenExtensions.*
+
+class TestHierInheritedFSM extends FsmGenTestBase {
+	
+	GraphContainer gc
+	
+	@Before
+	def void SetUp() {
+		gc = getGraphContainer("HierInheritedFSMExample.room", "TestActor")
+		assertNotNull("graph context was created", gc)
+		
+		val logger = new NullLogger
+		FsmGenChecker.check(gc, logger)
+		assertFalse("logger has no errors", logger.hasErrors)
+		
+		save(gc, "HierInheritedFSMExample")
+	}
+	
+	@Test
+	def void testHierInheritedFSMItemCounts() {
+		assertEquals("number of nodes", 4, gc.graph.nodes.size)
+		assertEquals("number of links", 6, gc.graph.links.size)
+		assertEquals("number of states", 4, gc.graph.stateNodes.size)
+		assertEquals("number of tr points", 0, gc.graph.trPointNodes.size)
+		assertEquals("number of choice points", 0, gc.graph.choicePointNodes.size)
+	}
+	
+	@Test
+	def void testHierInheritedFSMDeepItemCounts() {
+		assertEquals("number of nodes", 12, gc.graph.allNodes.size)
+		assertEquals("number of links", 14, gc.graph.allLinks.size)
+		assertEquals("number of states", 10, gc.graph.allStateNodes.size)
+		assertEquals("number of tr points", 2, gc.graph.allTrPointNodes.size)
+		assertEquals("number of choice points", 0, gc.graph.allChoicePointNodes.size)
+	}
+	
+	@Test
+	def void testHierInheritedFSMLinks() {
+		val s = gc.graph.allStateNodes.filter[name.equals("state1_0")].head
+		assertNotNull("state found", s)
+		
+		assertEquals("incoming links", 2, s.incoming.size)
+		assertEquals("outgoing links", 1, s.outgoing.size)
+	}
+}
\ No newline at end of file

tests/org.eclipse.etrice.core.genmodel.fsm.tests/xtend-gen/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM.java

diff --git a/tests/org.eclipse.etrice.core.genmodel.fsm.tests/xtend-gen/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM.java b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/xtend-gen/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM.java
new file mode 100644
index 0000000..38df45e
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/xtend-gen/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM.java
@@ -0,0 +1,115 @@
+/**
+ * Copyright (c) 2017 protos software gmbh (http://www.protos.de).
+ * 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:
+ * 		Henrik Rentz-Reichert (initial contribution)
+ */
+package org.eclipse.etrice.core.genmodel.fsm.tests;
+
+import java.util.Iterator;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.etrice.core.genmodel.fsm.FsmGenChecker;
+import org.eclipse.etrice.core.genmodel.fsm.FsmGenExtensions;
+import org.eclipse.etrice.core.genmodel.fsm.NullLogger;
+import org.eclipse.etrice.core.genmodel.fsm.fsmgen.Graph;
+import org.eclipse.etrice.core.genmodel.fsm.fsmgen.GraphContainer;
+import org.eclipse.etrice.core.genmodel.fsm.fsmgen.Link;
+import org.eclipse.etrice.core.genmodel.fsm.fsmgen.Node;
+import org.eclipse.etrice.core.genmodel.fsm.tests.FsmGenTestBase;
+import org.eclipse.xtext.xbase.lib.Functions.Function1;
+import org.eclipse.xtext.xbase.lib.IterableExtensions;
+import org.eclipse.xtext.xbase.lib.IteratorExtensions;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+@SuppressWarnings("all")
+public class TestHierInheritedFSM extends FsmGenTestBase {
+  private GraphContainer gc;
+  
+  @Before
+  public void SetUp() {
+    GraphContainer _graphContainer = this.getGraphContainer("HierInheritedFSMExample.room", "TestActor");
+    this.gc = _graphContainer;
+    Assert.assertNotNull("graph context was created", this.gc);
+    final NullLogger logger = new NullLogger();
+    FsmGenChecker.check(this.gc, logger);
+    boolean _hasErrors = logger.hasErrors();
+    Assert.assertFalse("logger has no errors", _hasErrors);
+    this.save(this.gc, "HierInheritedFSMExample");
+  }
+  
+  @Test
+  public void testHierInheritedFSMItemCounts() {
+    Graph _graph = this.gc.getGraph();
+    EList<Node> _nodes = _graph.getNodes();
+    int _size = _nodes.size();
+    Assert.assertEquals("number of nodes", 4, _size);
+    Graph _graph_1 = this.gc.getGraph();
+    EList<Link> _links = _graph_1.getLinks();
+    int _size_1 = _links.size();
+    Assert.assertEquals("number of links", 6, _size_1);
+    Graph _graph_2 = this.gc.getGraph();
+    Iterable<Node> _stateNodes = FsmGenExtensions.getStateNodes(_graph_2);
+    int _size_2 = IterableExtensions.size(_stateNodes);
+    Assert.assertEquals("number of states", 4, _size_2);
+    Graph _graph_3 = this.gc.getGraph();
+    Iterable<Node> _trPointNodes = FsmGenExtensions.getTrPointNodes(_graph_3);
+    int _size_3 = IterableExtensions.size(_trPointNodes);
+    Assert.assertEquals("number of tr points", 0, _size_3);
+    Graph _graph_4 = this.gc.getGraph();
+    Iterable<Node> _choicePointNodes = FsmGenExtensions.getChoicePointNodes(_graph_4);
+    int _size_4 = IterableExtensions.size(_choicePointNodes);
+    Assert.assertEquals("number of choice points", 0, _size_4);
+  }
+  
+  @Test
+  public void testHierInheritedFSMDeepItemCounts() {
+    Graph _graph = this.gc.getGraph();
+    Iterator<Node> _allNodes = FsmGenExtensions.getAllNodes(_graph);
+    int _size = IteratorExtensions.size(_allNodes);
+    Assert.assertEquals("number of nodes", 12, _size);
+    Graph _graph_1 = this.gc.getGraph();
+    Iterator<Link> _allLinks = FsmGenExtensions.getAllLinks(_graph_1);
+    int _size_1 = IteratorExtensions.size(_allLinks);
+    Assert.assertEquals("number of links", 14, _size_1);
+    Graph _graph_2 = this.gc.getGraph();
+    Iterator<Node> _allStateNodes = FsmGenExtensions.getAllStateNodes(_graph_2);
+    int _size_2 = IteratorExtensions.size(_allStateNodes);
+    Assert.assertEquals("number of states", 10, _size_2);
+    Graph _graph_3 = this.gc.getGraph();
+    Iterator<Node> _allTrPointNodes = FsmGenExtensions.getAllTrPointNodes(_graph_3);
+    int _size_3 = IteratorExtensions.size(_allTrPointNodes);
+    Assert.assertEquals("number of tr points", 2, _size_3);
+    Graph _graph_4 = this.gc.getGraph();
+    Iterator<Node> _allChoicePointNodes = FsmGenExtensions.getAllChoicePointNodes(_graph_4);
+    int _size_4 = IteratorExtensions.size(_allChoicePointNodes);
+    Assert.assertEquals("number of choice points", 0, _size_4);
+  }
+  
+  @Test
+  public void testHierInheritedFSMLinks() {
+    Graph _graph = this.gc.getGraph();
+    Iterator<Node> _allStateNodes = FsmGenExtensions.getAllStateNodes(_graph);
+    final Function1<Node, Boolean> _function = new Function1<Node, Boolean>() {
+      @Override
+      public Boolean apply(final Node it) {
+        String _name = FsmGenExtensions.getName(it);
+        return Boolean.valueOf(_name.equals("state1_0"));
+      }
+    };
+    Iterator<Node> _filter = IteratorExtensions.<Node>filter(_allStateNodes, _function);
+    final Node s = IteratorExtensions.<Node>head(_filter);
+    Assert.assertNotNull("state found", s);
+    EList<Link> _incoming = s.getIncoming();
+    int _size = _incoming.size();
+    Assert.assertEquals("incoming links", 2, _size);
+    EList<Link> _outgoing = s.getOutgoing();
+    int _size_1 = _outgoing.size();
+    Assert.assertEquals("outgoing links", 1, _size_1);
+  }
+}

tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF

diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF
index fa11a69..1de54d1 100644
--- a/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests
 Bundle-SymbolicName: org.eclipse.etrice.core.genmodel.tests
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-Vendor: Eclipse eTrice
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.0",
- org.eclipse.etrice.core.genmodel;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.1",
+ org.eclipse.etrice.core.genmodel;bundle-version="1.1.1",
  org.junit;bundle-version="4.8.1",
  org.eclipse.xtext;bundle-version="2.6.0",
  org.eclipse.core.runtime;bundle-version="3.7.0"

tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF

diff --git a/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF
index af58ecc..8accc12 100644
--- a/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Room Core Tests
 Bundle-SymbolicName: org.eclipse.etrice.core.room.tests
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: Eclipse eTrice
-Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.0",
- org.eclipse.etrice.core.common;bundle-version="1.1.0",
- org.eclipse.etrice.core.fsm;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.1",
+ org.eclipse.etrice.core.common;bundle-version="1.1.1",
+ org.eclipse.etrice.core.fsm;bundle-version="1.1.1",
  org.junit;bundle-version="4.8.1",
  org.eclipse.osgi;bundle-version="3.6.0",
  org.eclipse.xtext;bundle-version="2.6.0",

tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF

diff --git a/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF
index 14e9a24..54fee1a 100644
--- a/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: etUnit Converter Tests
 Bundle-SymbolicName: org.eclipse.etrice.etunit.converter.tests
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-Activator: org.eclipse.etrice.etunit.converter.tests.Activator
 Bundle-Vendor: Eclipse eTrice
-Require-Bundle: org.eclipse.etrice.etunit.converter;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.etunit.converter;bundle-version="1.1.1",
  org.eclipse.core.runtime,
  org.junit;bundle-version="4.8.2"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF

diff --git a/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF
index 94d5e97..18e599a 100644
--- a/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.etrice.generator.fsmtest.tests
 Bundle-Vendor: Eclipse eTrice
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-SymbolicName: org.eclipse.etrice.generator.fsmtest.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.generator.fsmtest;bundle-version="1.1.0",
- org.eclipse.etrice.generator.fsmtest.ui;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.generator.fsmtest;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.fsmtest.ui;bundle-version="1.1.1",
  org.eclipse.core.runtime,
  org.eclipse.xtext.junit4;bundle-version="2.6.0",
  org.eclipse.ui.workbench;resolution:=optional

tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF

diff --git a/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF
index 1460ce2..9f76c6d 100644
--- a/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Generator Model Tests
 Bundle-SymbolicName: org.eclipse.etrice.generator.tests
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: Eclipse eTrice
-Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.0",
- org.eclipse.etrice.core.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.core.room;bundle-version="1.1.0",
- org.eclipse.etrice.generator;bundle-version="1.1.0",
- org.eclipse.etrice.generator.fsm;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.common;bundle-version="1.1.1",
+ org.eclipse.etrice.core.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.core.room;bundle-version="1.1.1",
+ org.eclipse.etrice.generator;bundle-version="1.1.1",
+ org.eclipse.etrice.generator.fsm;bundle-version="1.1.1",
  org.junit;bundle-version="4.8.1",
  org.eclipse.osgi;bundle-version="3.6.0",
  org.eclipse.xtext;bundle-version="2.6.0",

tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF

diff --git a/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF
index 077ea38..dbe4db5 100644
--- a/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Behavior Diagram Tests
 Bundle-SymbolicName: org.eclipse.etrice.ui.behavior.tests
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-Activator: org.eclipse.etrice.ui.behavior.BehaviorTestActivator
 Bundle-Vendor: Eclipse eTrice
-Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.core.room;bundle-version="1.1.0",
- org.eclipse.etrice.ui.behavior;bundle-version="1.1.0",
- org.eclipse.etrice.ui.behavior.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.ui.common;bundle-version="1.1.0",
- org.eclipse.etrice.ui.common.base;bundle-version="1.1.0",
- org.eclipse.etrice.ui.tests.base;bundle-version="1.1.0",
+Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.core.room;bundle-version="1.1.1",
+ org.eclipse.etrice.ui.behavior;bundle-version="1.1.1",
+ org.eclipse.etrice.ui.behavior.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.ui.common;bundle-version="1.1.1",
+ org.eclipse.etrice.ui.common.base;bundle-version="1.1.1",
+ org.eclipse.etrice.ui.tests.base;bundle-version="1.1.1",
  org.eclipse.ui,
  org.eclipse.core.runtime,
  org.junit;bundle-version="4.8.1",

tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF

diff --git a/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF
index d7dabb4..198c69a 100644
--- a/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Structure Diagram Tests
 Bundle-SymbolicName: org.eclipse.etrice.ui.structure.tests
-Bundle-Version: 1.1.0.qualifier
-Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.0",
- org.eclipse.etrice.core.room;bundle-version="1.1.0",
- org.eclipse.etrice.ui.structure;bundle-version="1.1.0",
- org.eclipse.etrice.ui.common;bundle-version="1.1.0",
- org.eclipse.etrice.ui.common.base;bundle-version="1.1.0",
- org.eclipse.etrice.ui.tests.base;bundle-version="1.1.0",
+Bundle-Version: 1.1.1.qualifier
+Require-Bundle: org.eclipse.etrice.core.fsm;bundle-version="1.1.1",
+ org.eclipse.etrice.core.room;bundle-version="1.1.1",
+ org.eclipse.etrice.ui.structure;bundle-version="1.1.1",
+ org.eclipse.etrice.ui.common;bundle-version="1.1.1",
+ org.eclipse.etrice.ui.common.base;bundle-version="1.1.1",
+ org.eclipse.etrice.ui.tests.base;bundle-version="1.1.1",
  org.eclipse.ui,
  org.eclipse.core.runtime,
  org.junit;bundle-version="4.8.1",

tests/org.eclipse.etrice.ui.tests.base/META-INF/MANIFEST.MF

diff --git a/tests/org.eclipse.etrice.ui.tests.base/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.tests.base/META-INF/MANIFEST.MF
index 4b28b72..523cd53 100644
--- a/tests/org.eclipse.etrice.ui.tests.base/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.ui.tests.base/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: eTrice Diagram Test Base Classes
 Bundle-SymbolicName: org.eclipse.etrice.ui.tests.base
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Require-Bundle: org.junit;bundle-version="4.8.1",
  org.eclipse.core.runtime,
- org.eclipse.etrice.core.room;bundle-version="1.1.0",
- org.eclipse.etrice.ui.structure;bundle-version="1.1.0",
+ org.eclipse.etrice.core.room;bundle-version="1.1.1",
+ org.eclipse.etrice.ui.structure;bundle-version="1.1.1",
  org.eclipse.xtext;bundle-version="2.6.0",
  org.eclipse.graphiti;bundle-version="0.8.0"
 Bundle-Vendor: Eclipse eTrice