Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2017-02-13 03:50:58 -0500
committerHenrik Rentz-Reichert2017-02-13 03:50:58 -0500
commit6b1c32d38d47f066083053eec6d355bcffa8be04 (patch)
treecd83e650339d40e803992e325638ac2d48d8cd21
parentcde1fd1da9779f46e87e5c3258c6a5f2de809553 (diff)
downloadorg.eclipse.etrice-6b1c32d38d47f066083053eec6d355bcffa8be04.tar.gz
org.eclipse.etrice-6b1c32d38d47f066083053eec6d355bcffa8be04.tar.xz
org.eclipse.etrice-6b1c32d38d47f066083053eec6d355bcffa8be04.zip
switched version IDs from 1.1.0 to 1.1.1
-rw-r--r--examples/my.etrice.generator.launch/META-INF/MANIFEST.MF14
-rw-r--r--examples/my.etrice.generator/META-INF/MANIFEST.MF12
-rw-r--r--features/org.eclipse.etrice.cdt-integration.feature/feature.xml2
-rw-r--r--features/org.eclipse.etrice.feature/feature.xml60
-rw-r--r--features/org.eclipse.etrice.fsm.feature/feature.xml2
-rw-r--r--features/org.eclipse.etrice.tests.feature/feature.xml40
-rw-r--r--plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.etrice.core.common.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.core.common/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.core.common/pom.xml2
-rw-r--r--plugins/org.eclipse.etrice.core.config.ui/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.etrice.core.config/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.etrice.core.config/pom.xml2
-rw-r--r--plugins/org.eclipse.etrice.core.etmap.ui/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.etrice.core.etmap/META-INF/MANIFEST.MF14
-rw-r--r--plugins/org.eclipse.etrice.core.etmap/pom.xml2
-rw-r--r--plugins/org.eclipse.etrice.core.etphys.ui/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.etrice.core.etphys/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.etrice.core.etphys/pom.xml2
-rw-r--r--plugins/org.eclipse.etrice.core.fsm.ui/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.etrice.core.fsm/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.etrice.core.fsm/pom.xml2
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm/pom.xml2
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$1.classbin0 -> 2137 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$2.classbin0 -> 2137 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$3.classbin0 -> 2305 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$4.classbin0 -> 2289 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$5.classbin0 -> 2305 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$6.classbin0 -> 2314 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$7.classbin0 -> 2169 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$8.classbin0 -> 2194 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder.classbin0 -> 19170 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder.xtend163
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenChecker$1.classbin0 -> 2231 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenChecker$2.classbin0 -> 2225 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenChecker$3.classbin0 -> 2225 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenChecker.classbin0 -> 9930 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenChecker.xtend119
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$1.classbin0 -> 1775 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$2.classbin0 -> 1778 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$3.classbin0 -> 1787 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$4.classbin0 -> 1790 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$5.classbin0 -> 1779 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$6.classbin0 -> 1782 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$7.classbin0 -> 1627 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$8.classbin0 -> 1633 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$9.classbin0 -> 1637 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions.classbin0 -> 6660 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions.xtend71
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/ILogger.classbin0 -> 282 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/NullLogger.classbin0 -> 948 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/CommonTrigger.classbin0 -> 725 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/FsmGenFactory.classbin0 -> 1147 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/FsmGenPackage$Literals.classbin0 -> 3119 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/FsmGenPackage.classbin0 -> 3530 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/Graph.classbin0 -> 651 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/GraphContainer.classbin0 -> 494 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/GraphItem.classbin0 -> 238 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/Link.classbin0 -> 733 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/Node.classbin0 -> 935 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/CommonTriggerImpl.classbin0 -> 5518 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/FsmGenFactoryImpl.classbin0 -> 4389 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/FsmGenPackageImpl.classbin0 -> 9770 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/GraphContainerImpl.classbin0 -> 4689 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/GraphImpl.classbin0 -> 6301 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/GraphItemImpl.classbin0 -> 2803 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/LinkImpl.classbin0 -> 8862 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/NodeImpl.classbin0 -> 9545 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/util/FsmGenAdapterFactory$1.classbin0 -> 3786 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/util/FsmGenAdapterFactory.classbin0 -> 2526 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/util/FsmGenSwitch.classbin0 -> 4480 bytes
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/META-INF/MANIFEST.MF10
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/pom.xml2
-rw-r--r--plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF14
-rw-r--r--plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.etrice.core.room/pom.xml2
-rw-r--r--plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.etunit.converter/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF18
-rw-r--r--plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF14
-rw-r--r--plugins/org.eclipse.etrice.generator.config/pom.xml2
-rw-r--r--plugins/org.eclipse.etrice.generator.cpp/META-INF/MANIFEST.MF16
-rw-r--r--plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF14
-rw-r--r--plugins/org.eclipse.etrice.generator.doc/pom.xml2
-rw-r--r--plugins/org.eclipse.etrice.generator.fsm/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.etrice.generator.fsm/pom.xml2
-rw-r--r--plugins/org.eclipse.etrice.generator.fsmtest.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.generator.fsmtest/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.generator.gnuplot/META-INF/MANIFEST.MF24
-rw-r--r--plugins/org.eclipse.etrice.generator.java.mvn/pom.xml28
-rw-r--r--plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF16
-rw-r--r--plugins/org.eclipse.etrice.generator.java/pom.xml2
-rw-r--r--plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.etrice.generator.launch.cpp/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.etrice.generator.ui.cdt/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.etrice.generator.ui/META-INF/MANIFEST.MF22
-rw-r--r--plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.etrice.generator/pom.xml2
-rw-r--r--plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior.actioneditor/META-INF/MANIFEST.MF10
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF10
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF20
-rw-r--r--plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF18
-rw-r--r--plugins/org.eclipse.etrice.ui.common.base/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF14
-rw-r--r--releng/org.eclipse.etrice.parent/pom.xml2
-rw-r--r--releng/org.eclipse.etrice.site/buckminster.cspex2
-rw-r--r--releng/org.eclipse.etrice.site/feature.xml4
-rw-r--r--runtime/org.eclipse.etrice.modellib.java/META-INF/MANIFEST.MF2
-rw-r--r--runtime/org.eclipse.etrice.modellib.java/pom.xml4
-rw-r--r--runtime/org.eclipse.etrice.runtime.java.aspects/META-INF/MANIFEST.MF2
-rw-r--r--runtime/org.eclipse.etrice.runtime.java/META-INF/MANIFEST.MF2
-rw-r--r--runtime/org.eclipse.etrice.runtime.java/pom.xml2
-rw-r--r--tests/org.eclipse.etrice.abstractexec.behavior.tests/META-INF/MANIFEST.MF6
-rw-r--r--tests/org.eclipse.etrice.core.common.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF6
-rw-r--r--tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF6
-rw-r--r--tests/org.eclipse.etrice.core.etphys.tests/META-INF/MANIFEST.MF4
-rw-r--r--tests/org.eclipse.etrice.core.fsm.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/.gitignore5
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/FSMGenModelTestsActivator.classbin0 -> 1479 bytes
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/FsmGenTestBase$1.classbin0 -> 1954 bytes
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/FsmGenTestBase.classbin0 -> 5378 bytes
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/FsmGenTestBase.xtend46
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM$1.classbin0 -> 1929 bytes
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM$2.classbin0 -> 1931 bytes
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM$3.classbin0 -> 1935 bytes
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM$4.classbin0 -> 1999 bytes
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM$5.classbin0 -> 1999 bytes
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM$6.classbin0 -> 1992 bytes
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM.classbin0 -> 6511 bytes
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM.xtend78
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatInheritedFSM$1.classbin0 -> 2064 bytes
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatInheritedFSM$2.classbin0 -> 2061 bytes
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatInheritedFSM$3.classbin0 -> 1910 bytes
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatInheritedFSM.classbin0 -> 6857 bytes
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatInheritedFSM.xtend70
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM$1.classbin0 -> 2039 bytes
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM$2.classbin0 -> 2040 bytes
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM$3.classbin0 -> 2042 bytes
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM$4.classbin0 -> 2044 bytes
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM$5.classbin0 -> 1893 bytes
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM.classbin0 -> 7793 bytes
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM.xtend82
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM$1.classbin0 -> 2052 bytes
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM.classbin0 -> 6421 bytes
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM.xtend69
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.fsm.tests/xtend-gen/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM.java115
-rw-r--r--tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF6
-rw-r--r--tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF8
-rw-r--r--tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF4
-rw-r--r--tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF6
-rw-r--r--tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF12
-rw-r--r--tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF16
-rw-r--r--tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF14
-rw-r--r--tests/org.eclipse.etrice.ui.tests.base/META-INF/MANIFEST.MF6
161 files changed, 1173 insertions, 355 deletions
diff --git a/examples/my.etrice.generator.launch/META-INF/MANIFEST.MF b/examples/my.etrice.generator.launch/META-INF/MANIFEST.MF
index 104f2cc77..82a414742 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 @@ Manifest-Version: 1.0
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",
diff --git a/examples/my.etrice.generator/META-INF/MANIFEST.MF b/examples/my.etrice.generator/META-INF/MANIFEST.MF
index 017ffb650..2f43b6a68 100644
--- a/examples/my.etrice.generator/META-INF/MANIFEST.MF
+++ b/examples/my.etrice.generator/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
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
diff --git a/features/org.eclipse.etrice.cdt-integration.feature/feature.xml b/features/org.eclipse.etrice.cdt-integration.feature/feature.xml
index a245630b8..97c277b16 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"
diff --git a/features/org.eclipse.etrice.feature/feature.xml b/features/org.eclipse.etrice.feature/feature.xml
index 5ddbbbd76..c03fd9504 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 @@ http://www.eclipse.org/legal/epl-v10.html
</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 @@ http://www.eclipse.org/legal/epl-v10.html
<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"/>
diff --git a/features/org.eclipse.etrice.fsm.feature/feature.xml b/features/org.eclipse.etrice.fsm.feature/feature.xml
index 4cd6db8d4..dba7836a4 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">
diff --git a/features/org.eclipse.etrice.tests.feature/feature.xml b/features/org.eclipse.etrice.tests.feature/feature.xml
index 274ba9564..729dbbd88 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 @@ http://www.eclipse.org/legal/epl-v10.html
</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"/>
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 4cf6a729a..65c84c7f3 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 @@ Manifest-Version: 1.0
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
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 8ebb3315e..50ffb5bc8 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 @@ Manifest-Version: 1.0
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,
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 c5cdd142d..7189642ba 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 @@ Manifest-Version: 1.0
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,
diff --git a/plugins/org.eclipse.etrice.core.common/pom.xml b/plugins/org.eclipse.etrice.core.common/pom.xml
index d7a931d92..f029dc758 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>
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 9650edcfc..19a607d30 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 @@ Manifest-Version: 1.0
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",
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 5a8f2907f..843a84641 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 @@ Manifest-Version: 1.0
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,
diff --git a/plugins/org.eclipse.etrice.core.config/pom.xml b/plugins/org.eclipse.etrice.core.config/pom.xml
index 114410200..9d9923952 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>
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 b9dff0e02..30f091a23 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 @@ Manifest-Version: 1.0
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 @@ Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.0",
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,
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 d2b821d74..02823cfa9 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 @@ Manifest-Version: 1.0
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,
diff --git a/plugins/org.eclipse.etrice.core.etmap/pom.xml b/plugins/org.eclipse.etrice.core.etmap/pom.xml
index d3a6cee55..af56e61d7 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>
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 2d2d8dbd0..fdc94c1c9 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 @@ Manifest-Version: 1.0
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 @@ Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.0",
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,
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 e512bd988..e1e7c7c7f 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 @@ Manifest-Version: 1.0
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 @@ Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.0",
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
diff --git a/plugins/org.eclipse.etrice.core.etphys/pom.xml b/plugins/org.eclipse.etrice.core.etphys/pom.xml
index 5fb7c8363..82d2536df 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>
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 78b11ef45..d001afbea 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 @@ Manifest-Version: 1.0
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",
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 9e8dbcb9f..55ef53ded 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 @@ Manifest-Version: 1.0
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,
diff --git a/plugins/org.eclipse.etrice.core.fsm/pom.xml b/plugins/org.eclipse.etrice.core.fsm/pom.xml
index 09e05ac39..712b74627 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>
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 7bc07469c..643502d9d 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 @@ Manifest-Version: 1.0
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
diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm/pom.xml b/plugins/org.eclipse.etrice.core.genmodel.fsm/pom.xml
index 5c02923b3..0895761d6 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>
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 000000000..f151c7fc3
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$1.class
Binary files differ
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 000000000..ef7efc911
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$2.class
Binary files differ
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 000000000..c9139e54d
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$3.class
Binary files differ
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 000000000..2eb52018d
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$4.class
Binary files differ
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 000000000..58a284ca2
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$5.class
Binary files differ
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 000000000..80b203f93
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$6.class
Binary files differ
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 000000000..8e446a172
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$7.class
Binary files differ
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 000000000..6d230691a
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder$8.class
Binary files differ
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 000000000..e79228e7d
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenBuilder.class
Binary files differ
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 000000000..7bce74511
--- /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
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 000000000..6fa109ea2
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenChecker$1.class
Binary files differ
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 000000000..befdfe9ca
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenChecker$2.class
Binary files differ
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 000000000..c4d68294b
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenChecker$3.class
Binary files differ
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 000000000..e850ba5d3
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenChecker.class
Binary files differ
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 000000000..214d6f915
--- /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
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 000000000..b786008d8
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$1.class
Binary files differ
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 000000000..41d7397e8
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$2.class
Binary files differ
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 000000000..9fb133494
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$3.class
Binary files differ
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 000000000..3939f3301
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$4.class
Binary files differ
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 000000000..a5421624b
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$5.class
Binary files differ
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 000000000..fe7523d91
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$6.class
Binary files differ
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 000000000..88600cb3a
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$7.class
Binary files differ
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 000000000..eaa7c44cc
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$8.class
Binary files differ
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 000000000..0a4c1691c
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions$9.class
Binary files differ
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 000000000..6a667e0a1
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/FsmGenExtensions.class
Binary files differ
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 000000000..ded58d176
--- /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
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 000000000..59f97137e
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/ILogger.class
Binary files differ
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 000000000..8b7d680c1
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/NullLogger.class
Binary files differ
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 000000000..1160c1214
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/CommonTrigger.class
Binary files differ
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 000000000..9f303afb5
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/FsmGenFactory.class
Binary files differ
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 000000000..b42368b6f
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/FsmGenPackage$Literals.class
Binary files differ
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 000000000..66cec139b
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/FsmGenPackage.class
Binary files differ
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 000000000..744507c55
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/Graph.class
Binary files differ
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 000000000..a4fe8a4c3
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/GraphContainer.class
Binary files differ
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 000000000..50b642b20
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/GraphItem.class
Binary files differ
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 000000000..13f2de3f2
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/Link.class
Binary files differ
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 000000000..328bc4b4e
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/Node.class
Binary files differ
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 000000000..780d273d2
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/CommonTriggerImpl.class
Binary files differ
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 000000000..df3eac9ed
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/FsmGenFactoryImpl.class
Binary files differ
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 000000000..4f30cde4b
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/FsmGenPackageImpl.class
Binary files differ
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 000000000..7efe7a9ee
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/GraphContainerImpl.class
Binary files differ
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 000000000..f8b380180
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/GraphImpl.class
Binary files differ
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 000000000..c744c1404
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/GraphItemImpl.class
Binary files differ
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 000000000..9c5d8698e
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/LinkImpl.class
Binary files differ
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 000000000..7a4c485ae
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/impl/NodeImpl.class
Binary files differ
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 000000000..cd0d7fe3e
--- /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
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 000000000..4d258ae2e
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/util/FsmGenAdapterFactory.class
Binary files differ
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 000000000..14214a08f
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm2/bin/org/eclipse/etrice/core/genmodel/fsm/fsmgen/util/FsmGenSwitch.class
Binary files differ
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 0f97fcf8d..c6fec3bca 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 @@ Manifest-Version: 1.0
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 @@ Export-Package: org.eclipse.etrice.core.genmodel,
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
diff --git a/plugins/org.eclipse.etrice.core.genmodel/pom.xml b/plugins/org.eclipse.etrice.core.genmodel/pom.xml
index c1bce5b17..572e2f0d0 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>
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 cc5db80ae..9d5f484c0 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 @@ Manifest-Version: 1.0
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",
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 e5571ab93..8f403b04c 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 @@ Manifest-Version: 1.0
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",
diff --git a/plugins/org.eclipse.etrice.core.room/pom.xml b/plugins/org.eclipse.etrice.core.room/pom.xml
index 410b87702..9d047ead4 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>
diff --git a/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF
index 2f10635d2..3429b3f25 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 @@ Manifest-Version: 1.0
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,
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 3442afa9c..19a7bf74a 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 @@ Manifest-Version: 1.0
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
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 31a47961e..3f3c61c07 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 @@ Manifest-Version: 1.0
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"
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 ec63617c6..80755366a 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 @@ Manifest-Version: 1.0
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"
diff --git a/plugins/org.eclipse.etrice.generator.config/pom.xml b/plugins/org.eclipse.etrice.generator.config/pom.xml
index 9f7e920f6..a03704eae 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>
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 e4027af21..82b87e106 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 @@ Manifest-Version: 1.0
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"
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 5a3746398..2bb7bbe4a 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 @@ Manifest-Version: 1.0
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",
diff --git a/plugins/org.eclipse.etrice.generator.doc/pom.xml b/plugins/org.eclipse.etrice.generator.doc/pom.xml
index 10a4c5bc4..263ba6cec 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>
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 847bf11f2..07b2ef509 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 @@ Manifest-Version: 1.0
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",
diff --git a/plugins/org.eclipse.etrice.generator.fsm/pom.xml b/plugins/org.eclipse.etrice.generator.fsm/pom.xml
index 111fbd259..94e44bdd0 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>
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 39ae98800..3501c5075 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 @@ Manifest-Version: 1.0
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,
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 856d73228..f7b48330c 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 @@ Manifest-Version: 1.0
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,
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 84a21abeb..f166e8630 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 @@ Manifest-Version: 1.0
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
diff --git a/plugins/org.eclipse.etrice.generator.java.mvn/pom.xml b/plugins/org.eclipse.etrice.generator.java.mvn/pom.xml
index 57a80acd0..f171f4763 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
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 b99cbab2d..e6c07cddd 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 @@ Manifest-Version: 1.0
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"
diff --git a/plugins/org.eclipse.etrice.generator.java/pom.xml b/plugins/org.eclipse.etrice.generator.java/pom.xml
index d87451a6f..a0500296e 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>
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 ca0b2fc67..ea01fef30 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 @@ Manifest-Version: 1.0
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 @@ Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.0",
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,
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 8b3f109c7..796f80a3f 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 @@ Manifest-Version: 1.0
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 @@ Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.0",
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,
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 839212cc0..939e4a9e0 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 @@ Manifest-Version: 1.0
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 @@ Require-Bundle: org.eclipse.etrice.generator;bundle-version="1.1.0",
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,
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 383b79b50..8313fc010 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 @@ Manifest-Version: 1.0
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",
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 a405d9042..f97fd5e9b 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 @@ Manifest-Version: 1.0
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",
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 27f7aee69..ce678650d 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 @@ Manifest-Version: 1.0
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,
diff --git a/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF
index 27201840b..7430c0344 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 @@ Manifest-Version: 1.0
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",
diff --git a/plugins/org.eclipse.etrice.generator/pom.xml b/plugins/org.eclipse.etrice.generator/pom.xml
index fc3797138..a18e1880b 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>
diff --git a/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF
index 31607cae1..549b5c7be 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 @@ Manifest-Version: 1.0
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
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 3b1ae892f..143ea4233 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 @@ Manifest-Version: 1.0
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,
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 9f28579e5..5234eaccb 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 @@ Manifest-Version: 1.0
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",
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 0b3c02717..ca6c01454 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 @@ Manifest-Version: 1.0
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 @@ Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="1.1.0",
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
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 bbcdb64cf..6771847da 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 @@ Manifest-Version: 1.0
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",
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 317b50a29..1447e447e 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 @@ Manifest-Version: 1.0
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",
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 710981778..6878441e4 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 @@ Manifest-Version: 1.0
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",
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 d60b66682..314713ce5 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 @@ Manifest-Version: 1.0
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,
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 556213e0b..0ccd915f2 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 @@ Manifest-Version: 1.0
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",
diff --git a/releng/org.eclipse.etrice.parent/pom.xml b/releng/org.eclipse.etrice.parent/pom.xml
index 7cfedc6d0..8b1646af9 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>
diff --git a/releng/org.eclipse.etrice.site/buckminster.cspex b/releng/org.eclipse.etrice.site/buckminster.cspex
index a3b7d61a2..aeb37636e 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"/>
diff --git a/releng/org.eclipse.etrice.site/feature.xml b/releng/org.eclipse.etrice.site/feature.xml
index 740354118..1d2897daf 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">
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 f74b28b2f..3a8c00d71 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 @@ Manifest-Version: 1.0
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
diff --git a/runtime/org.eclipse.etrice.modellib.java/pom.xml b/runtime/org.eclipse.etrice.modellib.java/pom.xml
index 2b46557e6..33abbe471 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
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 f6dfb47e1..51bd67dc3 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 @@ Manifest-Version: 1.0
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
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 7aa7ae98d..162424d23 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 @@ Manifest-Version: 1.0
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,
diff --git a/runtime/org.eclipse.etrice.runtime.java/pom.xml b/runtime/org.eclipse.etrice.runtime.java/pom.xml
index 449a67385..e9dba60dc 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>
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 f06655559..fb7b64556 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 @@ Manifest-Version: 1.0
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",
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 29d75f774..84a2dac9c 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 @@ Manifest-Version: 1.0
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,
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 1113af6bd..a453abb49 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 @@ Manifest-Version: 1.0
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",
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 3d869a3b7..fb0ff786b 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 @@ Manifest-Version: 1.0
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,
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 7b915a800..74fd17a91 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 @@ Manifest-Version: 1.0
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",
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 a1bc4bb28..c4cefcdc8 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 @@ Manifest-Version: 1.0
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,
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 000000000..0ab9915f8
--- /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
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 000000000..fafc5bbb6
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/FSMGenModelTestsActivator.class
Binary files differ
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 000000000..d9a98ca10
--- /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
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 000000000..ea2ee56a0
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/FsmGenTestBase.class
Binary files differ
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 000000000..57de115da
--- /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
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 000000000..15ed17236
--- /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
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 000000000..a3d1db3f0
--- /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
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 000000000..a911ff87c
--- /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
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 000000000..2d48d9298
--- /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
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 000000000..b2746ac19
--- /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
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 000000000..8678b3d0b
--- /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
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 000000000..aec653fc7
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatFSM.class
Binary files differ
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 000000000..977a8b0ea
--- /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
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 000000000..b577a8bf9
--- /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
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 000000000..524155c11
--- /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
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 000000000..c15a16c13
--- /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
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 000000000..1dcb914b3
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestFlatInheritedFSM.class
Binary files differ
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 000000000..fadf00a4d
--- /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
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 000000000..0565543d1
--- /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
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 000000000..477da27ea
--- /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
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 000000000..6140d18ac
--- /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
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 000000000..5f5352f7f
--- /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
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 000000000..a7a8c75da
--- /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
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 000000000..fe327bccc
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierFSM.class
Binary files differ
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 000000000..db3793243
--- /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
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 000000000..7061f55ff
--- /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
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 000000000..6c03aaa30
--- /dev/null
+++ b/tests/org.eclipse.etrice.core.genmodel.fsm.tests/bin/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM.class
Binary files differ
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 000000000..0392ef48c
--- /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
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 000000000..38df45e96
--- /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);
+ }
+}
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 fa11a6901..1de54d1d0 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 @@ Manifest-Version: 1.0
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"
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 af58eccb0..8accc1229 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 @@ Manifest-Version: 1.0
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",
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 14e9a24f0..54fee1a61 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 @@ Manifest-Version: 1.0
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
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 94d5e976a..18e599ae6 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 @@ Manifest-Version: 1.0
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
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 1460ce243..9f76c6d9a 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 @@ Manifest-Version: 1.0
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",
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 077ea3884..dbe4db5b7 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 @@ Manifest-Version: 1.0
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",
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 d7dabb407..198c69a56 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 @@ Manifest-Version: 1.0
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",
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 4b28b7254..523cd5351 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 @@ Manifest-Version: 1.0
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

Back to the top