From 2b3ac6e99310df76f704e7231748bcc236e708a6 Mon Sep 17 00:00:00 2001
From: Jan Belle
Date: Thu, 31 Aug 2017 16:47:34 +0200
Subject: Bug 521698 - Tycho build
maven tycho build for plugins, plugin tests, features, update site
Change-Id: Ic16d1fee6913a4b31c69c2d865b62931a421abfe
---
.gitignore | 1 +
.mvn/extensions.xml | 8 +
.../build.properties | 1 -
.../org.eclipse.etrice.feature/build.properties | 1 -
.../build.properties | 7 +-
.../org.eclipse.etrice.tests.feature/feature.xml | 27 +-
features/pom.xml | 16 +
plugins/org.eclipse.etrice.core.common/pom.xml | 16 -
plugins/org.eclipse.etrice.core.config/pom.xml | 16 -
plugins/org.eclipse.etrice.core.etmap/pom.xml | 15 -
plugins/org.eclipse.etrice.core.etphys/pom.xml | 15 -
plugins/org.eclipse.etrice.core.fsm/pom.xml | 15 -
.../org.eclipse.etrice.core.genmodel.fsm/pom.xml | 15 -
plugins/org.eclipse.etrice.core.genmodel/pom.xml | 15 -
.../build.properties | 1 -
.../META-INF/MANIFEST.MF | 1 +
plugins/org.eclipse.etrice.core.room/plugin.xml | 4 -
plugins/org.eclipse.etrice.core.room/pom.xml | 15 -
.../META-INF/MANIFEST.MF | 4 +-
.../build.properties | 1 -
.../org.eclipse.etrice.generator.config/pom.xml | 15 -
.../build.properties | 1 -
plugins/org.eclipse.etrice.generator.doc/pom.xml | 15 -
plugins/org.eclipse.etrice.generator.fsm/pom.xml | 15 -
.../build.properties | 1 -
plugins/org.eclipse.etrice.generator.java/pom.xml | 15 -
plugins/org.eclipse.etrice.generator/pom.xml | 15 -
plugins/pom.xml | 16 +
releng/org.eclipse.etrice.parent/pom.xml | 425 ++++++---------------
releng/org.eclipse.etrice.site/category.xml | 7 +-
releng/org.eclipse.etrice.site/pom.xml | 15 +
.../build.properties | 3 +-
tests/org.eclipse.etrice.ui.base.tests/.classpath | 7 +
tests/org.eclipse.etrice.ui.base.tests/.gitignore | 1 +
tests/org.eclipse.etrice.ui.base.tests/.project | 34 ++
.../META-INF/MANIFEST.MF | 20 +
tests/org.eclipse.etrice.ui.base.tests/about.html | 28 ++
.../build.properties | 4 +
.../org/eclipse/etrice/tests/base/TestBase.java | 89 +++++
.../META-INF/MANIFEST.MF | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
tests/org.eclipse.etrice.ui.tests.base/.classpath | 7 -
tests/org.eclipse.etrice.ui.tests.base/.gitignore | 1 -
tests/org.eclipse.etrice.ui.tests.base/.project | 34 --
.../META-INF/MANIFEST.MF | 20 -
tests/org.eclipse.etrice.ui.tests.base/about.html | 28 --
.../build.properties | 4 -
.../org/eclipse/etrice/tests/base/TestBase.java | 89 -----
tests/pom.xml | 29 ++
49 files changed, 403 insertions(+), 733 deletions(-)
create mode 100644 .mvn/extensions.xml
create mode 100644 features/pom.xml
delete mode 100644 plugins/org.eclipse.etrice.core.common/pom.xml
delete mode 100644 plugins/org.eclipse.etrice.core.config/pom.xml
delete mode 100644 plugins/org.eclipse.etrice.core.etmap/pom.xml
delete mode 100644 plugins/org.eclipse.etrice.core.etphys/pom.xml
delete mode 100644 plugins/org.eclipse.etrice.core.fsm/pom.xml
delete mode 100644 plugins/org.eclipse.etrice.core.genmodel.fsm/pom.xml
delete mode 100644 plugins/org.eclipse.etrice.core.genmodel/pom.xml
delete mode 100644 plugins/org.eclipse.etrice.core.room/pom.xml
delete mode 100644 plugins/org.eclipse.etrice.generator.config/pom.xml
delete mode 100644 plugins/org.eclipse.etrice.generator.doc/pom.xml
delete mode 100644 plugins/org.eclipse.etrice.generator.fsm/pom.xml
delete mode 100644 plugins/org.eclipse.etrice.generator.java/pom.xml
delete mode 100644 plugins/org.eclipse.etrice.generator/pom.xml
create mode 100644 plugins/pom.xml
create mode 100644 releng/org.eclipse.etrice.site/pom.xml
create mode 100644 tests/org.eclipse.etrice.ui.base.tests/.classpath
create mode 100644 tests/org.eclipse.etrice.ui.base.tests/.gitignore
create mode 100644 tests/org.eclipse.etrice.ui.base.tests/.project
create mode 100644 tests/org.eclipse.etrice.ui.base.tests/META-INF/MANIFEST.MF
create mode 100644 tests/org.eclipse.etrice.ui.base.tests/about.html
create mode 100644 tests/org.eclipse.etrice.ui.base.tests/build.properties
create mode 100644 tests/org.eclipse.etrice.ui.base.tests/src/org/eclipse/etrice/tests/base/TestBase.java
delete mode 100644 tests/org.eclipse.etrice.ui.tests.base/.classpath
delete mode 100644 tests/org.eclipse.etrice.ui.tests.base/.gitignore
delete mode 100644 tests/org.eclipse.etrice.ui.tests.base/.project
delete mode 100644 tests/org.eclipse.etrice.ui.tests.base/META-INF/MANIFEST.MF
delete mode 100644 tests/org.eclipse.etrice.ui.tests.base/about.html
delete mode 100644 tests/org.eclipse.etrice.ui.tests.base/build.properties
delete mode 100644 tests/org.eclipse.etrice.ui.tests.base/src/org/eclipse/etrice/tests/base/TestBase.java
create mode 100644 tests/pom.xml
diff --git a/.gitignore b/.gitignore
index 6dda95abc..cb6f85480 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ gerritKeys.pub
*._trace
*.xtendbin
language.settings.xml
+target/
\ No newline at end of file
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
new file mode 100644
index 000000000..f62dee9d1
--- /dev/null
+++ b/.mvn/extensions.xml
@@ -0,0 +1,8 @@
+
+
+ org.eclipse.tycho.extras
+ tycho-pomless
+ 1.0.0
+
+
+
diff --git a/features/org.eclipse.etrice.cdt-integration.feature/build.properties b/features/org.eclipse.etrice.cdt-integration.feature/build.properties
index 724093182..6f1a9556b 100644
--- a/features/org.eclipse.etrice.cdt-integration.feature/build.properties
+++ b/features/org.eclipse.etrice.cdt-integration.feature/build.properties
@@ -5,5 +5,4 @@ bin.includes = feature.xml,\
about.properties,\
build.properties,\
feature.properties,\
- modeling32.png,\
eTrice32.png
diff --git a/features/org.eclipse.etrice.feature/build.properties b/features/org.eclipse.etrice.feature/build.properties
index bc3cc5571..a259f22bb 100644
--- a/features/org.eclipse.etrice.feature/build.properties
+++ b/features/org.eclipse.etrice.feature/build.properties
@@ -5,6 +5,5 @@ bin.includes = about.html,\
about.properties,\
feature.xml,\
feature.properties,\
- modeling32.png,\
eTrice32.png
sourcePlugin = true
diff --git a/features/org.eclipse.etrice.tests.feature/build.properties b/features/org.eclipse.etrice.tests.feature/build.properties
index bfd6aa0c4..818b4b15e 100644
--- a/features/org.eclipse.etrice.tests.feature/build.properties
+++ b/features/org.eclipse.etrice.tests.feature/build.properties
@@ -1,13 +1,8 @@
# NLS_MESSAGEFORMAT_VAR
-bin.includes = plugin.xml,\
- plugin.properties,\
- about.html,\
+bin.includes = about.html,\
about.ini,\
about.mappings,\
about.properties,\
- modeling32.png,\
- src/,\
- META-INF/,\
feature.xml,\
epl-v10.html,\
license.html,\
diff --git a/features/org.eclipse.etrice.tests.feature/feature.xml b/features/org.eclipse.etrice.tests.feature/feature.xml
index 729dbbd88..80e0a9f0c 100644
--- a/features/org.eclipse.etrice.tests.feature/feature.xml
+++ b/features/org.eclipse.etrice.tests.feature/feature.xml
@@ -27,18 +27,17 @@ http://www.eclipse.org/legal/epl-v10.html
+
-
-
@@ -48,7 +47,6 @@ http://www.eclipse.org/legal/epl-v10.html
-
@@ -65,7 +63,14 @@ http://www.eclipse.org/legal/epl-v10.html
-
+
+
+
+
+
+
+
+
-
-
+
+
diff --git a/features/pom.xml b/features/pom.xml
new file mode 100644
index 000000000..70f4af747
--- /dev/null
+++ b/features/pom.xml
@@ -0,0 +1,16 @@
+
+
+ 4.0.0
+
+ org.eclipse.etrice
+ org.eclipse.etrice.parent
+ 1.0.0-SNAPSHOT
+ ../releng/org.eclipse.etrice.parent
+
+ org.eclipse.etrice
+ org.eclipse.etrice.features
+ 1.0.0-SNAPSHOT
+ pom
+
\ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.core.common/pom.xml b/plugins/org.eclipse.etrice.core.common/pom.xml
deleted file mode 100644
index f029dc758..000000000
--- a/plugins/org.eclipse.etrice.core.common/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- 4.0.0
-
-
- org.eclipse.etrice
- java-generator
- 1.1.1-SNAPSHOT
- ../../releng/org.eclipse.etrice.parent/pom.xml
-
-
- org.eclipse.etrice.core.common
- eclipse-plugin
-
-
diff --git a/plugins/org.eclipse.etrice.core.config/pom.xml b/plugins/org.eclipse.etrice.core.config/pom.xml
deleted file mode 100644
index 9d9923952..000000000
--- a/plugins/org.eclipse.etrice.core.config/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- 4.0.0
-
-
- org.eclipse.etrice
- java-generator
- 1.1.1-SNAPSHOT
- ../../releng/org.eclipse.etrice.parent/pom.xml
-
-
- org.eclipse.etrice.core.config
- eclipse-plugin
-
-
diff --git a/plugins/org.eclipse.etrice.core.etmap/pom.xml b/plugins/org.eclipse.etrice.core.etmap/pom.xml
deleted file mode 100644
index af56e61d7..000000000
--- a/plugins/org.eclipse.etrice.core.etmap/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 4.0.0
-
-
- org.eclipse.etrice
- java-generator
- 1.1.1-SNAPSHOT
- ../../releng/org.eclipse.etrice.parent/pom.xml
-
-
- org.eclipse.etrice.core.etmap
- eclipse-plugin
-
diff --git a/plugins/org.eclipse.etrice.core.etphys/pom.xml b/plugins/org.eclipse.etrice.core.etphys/pom.xml
deleted file mode 100644
index 82d2536df..000000000
--- a/plugins/org.eclipse.etrice.core.etphys/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 4.0.0
-
-
- org.eclipse.etrice
- java-generator
- 1.1.1-SNAPSHOT
- ../../releng/org.eclipse.etrice.parent/pom.xml
-
-
- org.eclipse.etrice.core.etphys
- eclipse-plugin
-
diff --git a/plugins/org.eclipse.etrice.core.fsm/pom.xml b/plugins/org.eclipse.etrice.core.fsm/pom.xml
deleted file mode 100644
index 712b74627..000000000
--- a/plugins/org.eclipse.etrice.core.fsm/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 4.0.0
-
-
- org.eclipse.etrice
- java-generator
- 1.1.1-SNAPSHOT
- ../../releng/org.eclipse.etrice.parent/pom.xml
-
-
- org.eclipse.etrice.core.fsm
- eclipse-plugin
-
diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm/pom.xml b/plugins/org.eclipse.etrice.core.genmodel.fsm/pom.xml
deleted file mode 100644
index 0895761d6..000000000
--- a/plugins/org.eclipse.etrice.core.genmodel.fsm/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 4.0.0
-
-
- org.eclipse.etrice
- java-generator
- 1.1.1-SNAPSHOT
- ../../releng/org.eclipse.etrice.parent/pom.xml
-
-
- org.eclipse.etrice.core.genmodel.fsm
- eclipse-plugin
-
diff --git a/plugins/org.eclipse.etrice.core.genmodel/pom.xml b/plugins/org.eclipse.etrice.core.genmodel/pom.xml
deleted file mode 100644
index 572e2f0d0..000000000
--- a/plugins/org.eclipse.etrice.core.genmodel/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 4.0.0
-
-
- org.eclipse.etrice
- java-generator
- 1.1.1-SNAPSHOT
- ../../releng/org.eclipse.etrice.parent/pom.xml
-
-
- org.eclipse.etrice.core.genmodel
- eclipse-plugin
-
diff --git a/plugins/org.eclipse.etrice.core.room.ui/build.properties b/plugins/org.eclipse.etrice.core.room.ui/build.properties
index 437fbd8b2..2d720f777 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/build.properties
+++ b/plugins/org.eclipse.etrice.core.room.ui/build.properties
@@ -6,6 +6,5 @@ bin.includes = META-INF/,\
plugin.xml,\
icons/,\
templates/,\
- eTriceKeywordHoverStyle.css,\
css/
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 d5c06ad3f..d8f6d3100 100644
--- a/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF
@@ -10,6 +10,7 @@ Require-Bundle: org.eclipse.etrice.core.common;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",
+ org.eclipse.xtext.xbase.lib,
org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,
org.eclipse.emf.codegen.ecore;bundle-version="[2.6.0,3.0.0)";resolution:=optional,
org.eclipse.emf.mwe.utils;bundle-version="1.0.1";resolution:=optional,
diff --git a/plugins/org.eclipse.etrice.core.room/plugin.xml b/plugins/org.eclipse.etrice.core.room/plugin.xml
index 7d8870dd5..ddb11311d 100644
--- a/plugins/org.eclipse.etrice.core.room/plugin.xml
+++ b/plugins/org.eclipse.etrice.core.room/plugin.xml
@@ -12,8 +12,4 @@
-
-
-
-
diff --git a/plugins/org.eclipse.etrice.core.room/pom.xml b/plugins/org.eclipse.etrice.core.room/pom.xml
deleted file mode 100644
index 9d047ead4..000000000
--- a/plugins/org.eclipse.etrice.core.room/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 4.0.0
-
-
- org.eclipse.etrice
- java-generator
- 1.1.1-SNAPSHOT
- ../../releng/org.eclipse.etrice.parent/pom.xml
-
-
- org.eclipse.etrice.core.room
- eclipse-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 e6340905d..d075329b9 100644
--- a/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF
@@ -12,10 +12,10 @@ Require-Bundle: org.eclipse.etrice.core.genmodel;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"
+ org.eclipse.xtext.util;bundle-version="2.6.0",
+ org.eclipse.etrice.generator.gnuplot;bundle-version="1.1.1"
Import-Package: org.apache.log4j
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.etrice.generator.c,
diff --git a/plugins/org.eclipse.etrice.generator.c/build.properties b/plugins/org.eclipse.etrice.generator.c/build.properties
index 56a059e42..7738abf49 100644
--- a/plugins/org.eclipse.etrice.generator.c/build.properties
+++ b/plugins/org.eclipse.etrice.generator.c/build.properties
@@ -3,4 +3,3 @@ source.. = src/,\
bin.includes = META-INF/,\
.,\
icons/
-jre.compilation.profile = JavaSE-1.6
diff --git a/plugins/org.eclipse.etrice.generator.config/pom.xml b/plugins/org.eclipse.etrice.generator.config/pom.xml
deleted file mode 100644
index a03704eae..000000000
--- a/plugins/org.eclipse.etrice.generator.config/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 4.0.0
-
-
- org.eclipse.etrice
- java-generator
- 1.1.1-SNAPSHOT
- ../../releng/org.eclipse.etrice.parent/pom.xml
-
-
- org.eclipse.etrice.generator.config
- eclipse-plugin
-
diff --git a/plugins/org.eclipse.etrice.generator.doc/build.properties b/plugins/org.eclipse.etrice.generator.doc/build.properties
index 56a059e42..7738abf49 100644
--- a/plugins/org.eclipse.etrice.generator.doc/build.properties
+++ b/plugins/org.eclipse.etrice.generator.doc/build.properties
@@ -3,4 +3,3 @@ source.. = src/,\
bin.includes = META-INF/,\
.,\
icons/
-jre.compilation.profile = JavaSE-1.6
diff --git a/plugins/org.eclipse.etrice.generator.doc/pom.xml b/plugins/org.eclipse.etrice.generator.doc/pom.xml
deleted file mode 100644
index 263ba6cec..000000000
--- a/plugins/org.eclipse.etrice.generator.doc/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 4.0.0
-
-
- org.eclipse.etrice
- java-generator
- 1.1.1-SNAPSHOT
- ../../releng/org.eclipse.etrice.parent/pom.xml
-
-
- org.eclipse.etrice.generator.doc
- eclipse-plugin
-
diff --git a/plugins/org.eclipse.etrice.generator.fsm/pom.xml b/plugins/org.eclipse.etrice.generator.fsm/pom.xml
deleted file mode 100644
index 94e44bdd0..000000000
--- a/plugins/org.eclipse.etrice.generator.fsm/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 4.0.0
-
-
- org.eclipse.etrice
- java-generator
- 1.1.1-SNAPSHOT
- ../../releng/org.eclipse.etrice.parent/pom.xml
-
-
- org.eclipse.etrice.generator.fsm
- eclipse-plugin
-
diff --git a/plugins/org.eclipse.etrice.generator.java/build.properties b/plugins/org.eclipse.etrice.generator.java/build.properties
index 8519769ca..ea832598c 100644
--- a/plugins/org.eclipse.etrice.generator.java/build.properties
+++ b/plugins/org.eclipse.etrice.generator.java/build.properties
@@ -2,4 +2,3 @@ source.. = src/,\
xtend-gen/
bin.includes = META-INF/,\
.
-jre.compilation.profile = JavaSE-1.6
diff --git a/plugins/org.eclipse.etrice.generator.java/pom.xml b/plugins/org.eclipse.etrice.generator.java/pom.xml
deleted file mode 100644
index a0500296e..000000000
--- a/plugins/org.eclipse.etrice.generator.java/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 4.0.0
-
-
- org.eclipse.etrice
- java-generator
- 1.1.1-SNAPSHOT
- ../../releng/org.eclipse.etrice.parent/pom.xml
-
-
- org.eclipse.etrice.generator.java
- eclipse-plugin
-
diff --git a/plugins/org.eclipse.etrice.generator/pom.xml b/plugins/org.eclipse.etrice.generator/pom.xml
deleted file mode 100644
index a18e1880b..000000000
--- a/plugins/org.eclipse.etrice.generator/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- 4.0.0
-
-
- org.eclipse.etrice
- java-generator
- 1.1.1-SNAPSHOT
- ../../releng/org.eclipse.etrice.parent/pom.xml
-
-
- org.eclipse.etrice.generator
- eclipse-plugin
-
diff --git a/plugins/pom.xml b/plugins/pom.xml
new file mode 100644
index 000000000..cd18cfb23
--- /dev/null
+++ b/plugins/pom.xml
@@ -0,0 +1,16 @@
+
+
+ 4.0.0
+
+ org.eclipse.etrice
+ org.eclipse.etrice.parent
+ 1.0.0-SNAPSHOT
+ ../releng/org.eclipse.etrice.parent
+
+ org.eclipse.etrice
+ org.eclipse.etrice.plugins
+ 1.0.0-SNAPSHOT
+ pom
+
\ No newline at end of file
diff --git a/releng/org.eclipse.etrice.parent/pom.xml b/releng/org.eclipse.etrice.parent/pom.xml
index 8b1646af9..da916c785 100644
--- a/releng/org.eclipse.etrice.parent/pom.xml
+++ b/releng/org.eclipse.etrice.parent/pom.xml
@@ -3,196 +3,111 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4.0.0
-
-
- 3.0
-
-
org.eclipse.etrice
- java-generator
- 1.1.1-SNAPSHOT
+ org.eclipse.etrice.parent
+ 1.0.0-SNAPSHOT
pom
- eTrice Java generator
-
- code generator from ROOM (Real-Time Object Oriented Modeling)
- models to the Java target language
- http://eclipse.org/etrice
- 2010
-
+
+
+ ../../plugins/org.eclipse.etrice.abstractexec.behavior
+ ../../plugins/org.eclipse.etrice.core.common
+ ../../plugins/org.eclipse.etrice.core.common.ui
+ ../../plugins/org.eclipse.etrice.core.config
+ ../../plugins/org.eclipse.etrice.core.config.ui
+ ../../plugins/org.eclipse.etrice.core.etmap
+ ../../plugins/org.eclipse.etrice.core.etmap.ui
+ ../../plugins/org.eclipse.etrice.core.etphys
+ ../../plugins/org.eclipse.etrice.core.etphys.ui
+ ../../plugins/org.eclipse.etrice.core.fsm
+ ../../plugins/org.eclipse.etrice.core.fsm.ui
+ ../../plugins/org.eclipse.etrice.core.genmodel
+ ../../plugins/org.eclipse.etrice.core.genmodel.fsm
+ ../../plugins/org.eclipse.etrice.core.room
+ ../../plugins/org.eclipse.etrice.core.room.ui
+ ../../plugins/org.eclipse.etrice.doc
+ ../../plugins/org.eclipse.etrice.etunit.converter
+ ../../plugins/org.eclipse.etrice.expressions.ui
+ ../../plugins/org.eclipse.etrice.generator
+ ../../plugins/org.eclipse.etrice.generator.c
+ ../../plugins/org.eclipse.etrice.generator.config
+ ../../plugins/org.eclipse.etrice.generator.cpp
+ ../../plugins/org.eclipse.etrice.generator.doc
+ ../../plugins/org.eclipse.etrice.generator.fsm
+ ../../plugins/org.eclipse.etrice.generator.fsmtest
+ ../../plugins/org.eclipse.etrice.generator.fsmtest.ui
+ ../../plugins/org.eclipse.etrice.generator.gnuplot
+ ../../plugins/org.eclipse.etrice.generator.java
+ ../../plugins/org.eclipse.etrice.generator.launch
+ ../../plugins/org.eclipse.etrice.generator.launch.c
+ ../../plugins/org.eclipse.etrice.generator.launch.cpp
+ ../../plugins/org.eclipse.etrice.generator.launch.java
+ ../../plugins/org.eclipse.etrice.generator.ui
+ ../../plugins/org.eclipse.etrice.generator.ui.cdt
+ ../../plugins/org.eclipse.etrice.logging
+ ../../plugins/org.eclipse.etrice.ui.behavior
+ ../../plugins/org.eclipse.etrice.ui.behavior.actioneditor
+ ../../plugins/org.eclipse.etrice.ui.behavior.fsm
+ ../../plugins/org.eclipse.etrice.ui.commands
+ ../../plugins/org.eclipse.etrice.ui.common
+ ../../plugins/org.eclipse.etrice.ui.common.base
+ ../../plugins/org.eclipse.etrice.ui.runtime
+ ../../plugins/org.eclipse.etrice.ui.structure
+
+
+ ../../tests/org.eclipse.etrice.abstractexec.behavior.tests
+ ../../tests/org.eclipse.etrice.core.common.tests
+ ../../tests/org.eclipse.etrice.core.config.tests
+ ../../tests/org.eclipse.etrice.core.etmap.tests
+ ../../tests/org.eclipse.etrice.core.etphys.tests
+ ../../tests/org.eclipse.etrice.core.fsm.tests
+ ../../tests/org.eclipse.etrice.core.genmodel.tests
+ ../../tests/org.eclipse.etrice.core.room.tests
+ ../../tests/org.eclipse.etrice.etunit.converter.tests
+ ../../tests/org.eclipse.etrice.generator.fsmtest.tests
+ ../../tests/org.eclipse.etrice.generator.tests
+ ../../tests/org.eclipse.etrice.ui.base.tests
+ ../../tests/org.eclipse.etrice.ui.behavior.tests
+ ../../tests/org.eclipse.etrice.ui.structure.tests
+
+
+ ../../features/org.eclipse.etrice.cdt-integration.feature
+ ../../features/org.eclipse.etrice.feature
+ ../../features/org.eclipse.etrice.fsm.feature
+ ../../features/org.eclipse.etrice.tests.feature
+
+
+ ../../releng/org.eclipse.etrice.site
+
+
+
- Cp1252
-
- ${project.version}
-
- 0.19.0
- ${tycho.version}
-
-
- http://download.eclipse.org/releases/luna
-
- http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository
+ 2.10.0
+ 1.0.0
+
+ http://download.eclipse.org/releases/oxygen
+ http://download.eclipse.org/cbi/updates/license
+ http://download.eclipse.org/tools/orbit/R-builds/R20170516192513/repository
-
-
- Protos Software GmbH
- http://www.protos.de
-
-
-
-
- Eclipse Public License - v 1.0
- http://www.eclipse.org/legal/epl-v10.html
-
-
-
-
- Bugzilla
- https://bugs.eclipse.org/bugs/enter_bug.cgi?product=eTrice
-
-
- Hudson
- https://hudson.eclipse.org/etrice/job/etrice-maven3/
-
-
-
- http://git.eclipse.org/c/etrice/org.eclipse.etrice.git/
- http://git.eclipse.org/gitroot/etrice/org.eclipse.etrice.git
- ssh://userid@git.eclipse.org/gitroot/etrice/org.eclipse.etrice.git
-
-
-
-
- Thomas Schuetz
-
-
- Henrik Rentz-Reichert
-
-
- Thomas Jung
-
-
- Juergen Haug
-
-
- Eyrak Paen
-
-
- Peter Karlitschek
-
-
-
eclipse
+ ${eclipse.url}
p2
- ${eclipse-repo.url}
- orbit
+ license
+ ${license.url}
p2
- ${orbit-site}
- repository.jboss.org-public
- JBoss.org Maven repository
- https://repository.jboss.org/nexus/content/groups/public
+ orbit
+ ${orbit.url}
+ p2
-
-
-
- repo.eclipse.org.cbi-releases
- https://repo.eclipse.org/content/repositories/cbi-releases/
-
-
-
-
- ../../plugins/org.eclipse.etrice.core.common
- ../../plugins/org.eclipse.etrice.core.fsm
- ../../plugins/org.eclipse.etrice.core.room
- ../../plugins/org.eclipse.etrice.core.config
- ../../plugins/org.eclipse.etrice.core.etphys
- ../../plugins/org.eclipse.etrice.core.etmap
- ../../plugins/org.eclipse.etrice.core.genmodel.fsm
- ../../plugins/org.eclipse.etrice.core.genmodel
- ../../plugins/org.eclipse.etrice.generator.fsm
- ../../plugins/org.eclipse.etrice.generator
- ../../plugins/org.eclipse.etrice.generator.config
- ../../plugins/org.eclipse.etrice.generator.doc
- ../../plugins/org.eclipse.etrice.generator.java
- ../../plugins/org.eclipse.etrice.generator.java.mvn
- ../../runtime/org.eclipse.etrice.modellib.java
- ../../runtime/org.eclipse.etrice.runtime.java
-
-
-
-
- fast
-
- true
-
-
-
- full
-
-
-
- org.apache.maven.plugins
- maven-source-plugin
- 2.2.1
-
-
- attach-sources
-
- jar
-
-
-
-
-
- org.apache.maven.plugins
- maven-javadoc-plugin
- 2.9.1
-
-
-
- generated
- a
- Generated:
-
-
- ordered
- X
- Ordered:
-
-
- model
- X
- Model:
-
-
- parameter
- X
- Parameter:
-
-
-
-
-
- attach-javadocs
-
- jar
-
-
-
-
-
-
-
-
-
+
@@ -201,148 +116,26 @@
${tycho.version}
true
+
-
-
-
- maven-compiler-plugin
- 3.1
-
- 1.6
- 1.6
-
-
-
- org.eclipse.tycho
- target-platform-configuration
- ${tycho.version}
-
-
- org.eclipse.tycho
- tycho-compiler-plugin
- ${tycho.version}
-
-
-
- **/*.ecore
-
-
-
- ISO-8859-1
-
-
-
-
- org.eclipse.tycho
- tycho-packaging-plugin
- ${tycho.version}
-
-
- org.eclipse.tycho.extras
- tycho-buildtimestamp-jgit
- ${tycho-extras.version}
-
-
-
- false
- 'v'yyyyMMdd-HHmm
- jgit
-
-
-
-
-
- org.eclipse.tycho
- tycho-p2-director-plugin
- ${tycho.version}
-
-
- org.eclipse.tycho
- tycho-p2-repository-plugin
- ${tycho.version}
-
-
- org.eclipse.tycho
- tycho-p2-plugin
- ${tycho.version}
-
- warn
- none
-
-
- http://download.eclipse.org/eclipse/updates/4.2
-
-
-
-
-
-
- org.eclipse.m2e
- lifecycle-mapping
- 1.0.0
-
-
-
-
-
-
- org.eclipse.tycho
-
-
- tycho-packaging-plugin
-
-
- [0.19.0,)
-
-
- validate-id
- validate-version
- build-qualifier
-
-
-
-
-
-
-
-
-
- org.eclipse.tycho
-
-
- tycho-compiler-plugin
-
-
- [0.19.0,)
-
-
- compile
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- repo.eclipse.org
- eTrice Repository - Releases
- https://repo.eclipse.org/content/repositories/etrice-releases/
-
-
- repo.eclipse.org
- eTrice Repository - Snapshots
- https://repo.eclipse.org/content/repositories/etrice-snapshots/
- true
-
-
+
diff --git a/releng/org.eclipse.etrice.site/category.xml b/releng/org.eclipse.etrice.site/category.xml
index 54ec264e2..b09fe076d 100644
--- a/releng/org.eclipse.etrice.site/category.xml
+++ b/releng/org.eclipse.etrice.site/category.xml
@@ -1,12 +1,9 @@
-
+
-
-
-
-
+
diff --git a/releng/org.eclipse.etrice.site/pom.xml b/releng/org.eclipse.etrice.site/pom.xml
new file mode 100644
index 000000000..77bcbfd22
--- /dev/null
+++ b/releng/org.eclipse.etrice.site/pom.xml
@@ -0,0 +1,15 @@
+
+
+ 4.0.0
+
+ org.eclipse.etrice
+ org.eclipse.etrice.parent
+ 1.0.0-SNAPSHOT
+ ../../releng/org.eclipse.etrice.parent/pom.xml
+
+ org.eclipse.etrice
+ org.eclipse.etrice.site
+ 1.0.0-SNAPSHOT
+ eclipse-repository
+
diff --git a/tests/org.eclipse.etrice.core.room.tests/build.properties b/tests/org.eclipse.etrice.core.room.tests/build.properties
index 774ee5239..bd036ffc6 100644
--- a/tests/org.eclipse.etrice.core.room.tests/build.properties
+++ b/tests/org.eclipse.etrice.core.room.tests/build.properties
@@ -1,5 +1,6 @@
source.. = src/,\
- xtend-gen/
+ xtend-gen/,\
+ src-gen/
output.. = bin/
bin.includes = META-INF/,\
.,\
diff --git a/tests/org.eclipse.etrice.ui.base.tests/.classpath b/tests/org.eclipse.etrice.ui.base.tests/.classpath
new file mode 100644
index 000000000..1fa3e6803
--- /dev/null
+++ b/tests/org.eclipse.etrice.ui.base.tests/.classpath
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/tests/org.eclipse.etrice.ui.base.tests/.gitignore b/tests/org.eclipse.etrice.ui.base.tests/.gitignore
new file mode 100644
index 000000000..ba077a403
--- /dev/null
+++ b/tests/org.eclipse.etrice.ui.base.tests/.gitignore
@@ -0,0 +1 @@
+bin
diff --git a/tests/org.eclipse.etrice.ui.base.tests/.project b/tests/org.eclipse.etrice.ui.base.tests/.project
new file mode 100644
index 000000000..0d2614b47
--- /dev/null
+++ b/tests/org.eclipse.etrice.ui.base.tests/.project
@@ -0,0 +1,34 @@
+
+
+ org.eclipse.etrice.ui.base.tests
+
+
+
+
+
+ org.eclipse.xtext.ui.shared.xtextBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.pde.ManifestBuilder
+
+
+
+
+ org.eclipse.pde.SchemaBuilder
+
+
+
+
+
+ org.eclipse.pde.PluginNature
+ org.eclipse.jdt.core.javanature
+ org.eclipse.xtext.ui.shared.xtextNature
+
+
diff --git a/tests/org.eclipse.etrice.ui.base.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.base.tests/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..edc780d96
--- /dev/null
+++ b/tests/org.eclipse.etrice.ui.base.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,20 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: eTrice Diagram Test Base Classes
+Bundle-SymbolicName: org.eclipse.etrice.ui.base.tests
+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.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",
+ org.eclipse.etrice.ui.common.base,
+ com.google.guava,
+ org.eclipse.xtext.xbase.lib,
+ org.eclipse.xtend.lib,
+ org.eclipse.xtend.lib.macro
+Bundle-Vendor: Eclipse eTrice
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.etrice.tests.base
+
diff --git a/tests/org.eclipse.etrice.ui.base.tests/about.html b/tests/org.eclipse.etrice.ui.base.tests/about.html
new file mode 100644
index 000000000..c258ef55d
--- /dev/null
+++ b/tests/org.eclipse.etrice.ui.base.tests/about.html
@@ -0,0 +1,28 @@
+
+
+
+
+About
+
+
+About This Content
+
+June 5, 2006
+License
+
+The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
+at http://www.eclipse.org/legal/epl-v10.html .
+For purposes of the EPL, "Program" will mean the Content.
+
+If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at http://www.eclipse.org .
+
+
+
\ No newline at end of file
diff --git a/tests/org.eclipse.etrice.ui.base.tests/build.properties b/tests/org.eclipse.etrice.ui.base.tests/build.properties
new file mode 100644
index 000000000..34d2e4d2d
--- /dev/null
+++ b/tests/org.eclipse.etrice.ui.base.tests/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
diff --git a/tests/org.eclipse.etrice.ui.base.tests/src/org/eclipse/etrice/tests/base/TestBase.java b/tests/org.eclipse.etrice.ui.base.tests/src/org/eclipse/etrice/tests/base/TestBase.java
new file mode 100644
index 000000000..73a95af74
--- /dev/null
+++ b/tests/org.eclipse.etrice.ui.base.tests/src/org/eclipse/etrice/tests/base/TestBase.java
@@ -0,0 +1,89 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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:
+ * Thomas Schuetz and Henrik Rentz-Reichert (initial contribution)
+ *
+ *******************************************************************************/
+
+package org.eclipse.etrice.tests.base;
+
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.util.LinkedList;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.etrice.core.room.RoomModel;
+import org.eclipse.graphiti.mm.algorithms.styles.Color;
+import org.eclipse.graphiti.util.IColorConstant;
+import org.eclipse.xtext.resource.XtextResource;
+import org.eclipse.xtext.resource.XtextResourceSet;
+
+public abstract class TestBase {
+
+ private String basePath;
+ private LinkedList models = new LinkedList();
+
+ protected void loadModelFile() {
+ try {
+ URL modelsDir = getModelsDirectoy();
+ URL fileURL = FileLocator.toFileURL(modelsDir);
+ basePath = fileURL.getFile();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ loadModels(getModelFileName());
+ }
+
+ protected void removeDiagramsDirectory() {
+ File diagDir = new File(basePath+File.separator+"diagrams");
+ if (diagDir.isDirectory()) {
+ File[] files = diagDir.listFiles();
+ if (files!=null)
+ for (int i = 0; i < files.length; i++) {
+ files[i].delete();
+ }
+ diagDir.delete();
+ }
+ }
+
+ private void loadModels(String modelName) {
+ XtextResourceSet rs = new XtextResourceSet();
+ rs.addLoadOption(XtextResource.OPTION_RESOLVE_ALL, Boolean.TRUE);
+ String path = basePath + modelName;
+ URI uri = URI.createFileURI(path);
+ Resource resource = rs.getResource(uri, true);
+ Object root = resource.getContents().get(0);
+ if (root instanceof RoomModel)
+ models.add((RoomModel) root);
+ else
+ fail("File contains no RoomModel as root object");
+ }
+
+ public LinkedList getModels() {
+ return models;
+ }
+
+ protected abstract String getModelFileName();
+ protected abstract URL getModelsDirectoy();
+
+ protected boolean isEqual(Color c, IColorConstant cc) {
+ if (c.getRed()!=cc.getRed())
+ return false;
+ if (c.getGreen()!=cc.getGreen())
+ return false;
+ if (c.getBlue()!=cc.getBlue())
+ return false;
+ return true;
+ }
+}
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 b82c1517a..1ac3fd4e5 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
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.etrice.core.fsm;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.etrice.ui.base.tests;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 64de37617..6ab01c2a4 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
@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.etrice.core.fsm;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.etrice.ui.base.tests;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/.classpath b/tests/org.eclipse.etrice.ui.tests.base/.classpath
deleted file mode 100644
index 1fa3e6803..000000000
--- a/tests/org.eclipse.etrice.ui.tests.base/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/tests/org.eclipse.etrice.ui.tests.base/.gitignore b/tests/org.eclipse.etrice.ui.tests.base/.gitignore
deleted file mode 100644
index ba077a403..000000000
--- a/tests/org.eclipse.etrice.ui.tests.base/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/tests/org.eclipse.etrice.ui.tests.base/.project b/tests/org.eclipse.etrice.ui.tests.base/.project
deleted file mode 100644
index a9cfde5ad..000000000
--- a/tests/org.eclipse.etrice.ui.tests.base/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
- org.eclipse.etrice.ui.tests.base
-
-
-
-
-
- org.eclipse.xtext.ui.shared.xtextBuilder
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.pde.ManifestBuilder
-
-
-
-
- org.eclipse.pde.SchemaBuilder
-
-
-
-
-
- org.eclipse.pde.PluginNature
- org.eclipse.jdt.core.javanature
- org.eclipse.xtext.ui.shared.xtextNature
-
-
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
deleted file mode 100644
index 20e03aaaa..000000000
--- a/tests/org.eclipse.etrice.ui.tests.base/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-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.1.qualifier
-Require-Bundle: org.junit;bundle-version="4.8.1",
- org.eclipse.core.runtime,
- 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",
- org.eclipse.etrice.ui.common.base,
- com.google.guava,
- org.eclipse.xtext.xbase.lib,
- org.eclipse.xtend.lib,
- org.eclipse.xtend.lib.macro
-Bundle-Vendor: Eclipse eTrice
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.etrice.tests.base
-
diff --git a/tests/org.eclipse.etrice.ui.tests.base/about.html b/tests/org.eclipse.etrice.ui.tests.base/about.html
deleted file mode 100644
index c258ef55d..000000000
--- a/tests/org.eclipse.etrice.ui.tests.base/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-About
-
-
-About This Content
-
-June 5, 2006
-License
-
-The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at http://www.eclipse.org/legal/epl-v10.html .
-For purposes of the EPL, "Program" will mean the Content.
-
-If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at http://www.eclipse.org .
-
-
-
\ No newline at end of file
diff --git a/tests/org.eclipse.etrice.ui.tests.base/build.properties b/tests/org.eclipse.etrice.ui.tests.base/build.properties
deleted file mode 100644
index 34d2e4d2d..000000000
--- a/tests/org.eclipse.etrice.ui.tests.base/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .
diff --git a/tests/org.eclipse.etrice.ui.tests.base/src/org/eclipse/etrice/tests/base/TestBase.java b/tests/org.eclipse.etrice.ui.tests.base/src/org/eclipse/etrice/tests/base/TestBase.java
deleted file mode 100644
index 73a95af74..000000000
--- a/tests/org.eclipse.etrice.ui.tests.base/src/org/eclipse/etrice/tests/base/TestBase.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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:
- * Thomas Schuetz and Henrik Rentz-Reichert (initial contribution)
- *
- *******************************************************************************/
-
-package org.eclipse.etrice.tests.base;
-
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.LinkedList;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.etrice.core.room.RoomModel;
-import org.eclipse.graphiti.mm.algorithms.styles.Color;
-import org.eclipse.graphiti.util.IColorConstant;
-import org.eclipse.xtext.resource.XtextResource;
-import org.eclipse.xtext.resource.XtextResourceSet;
-
-public abstract class TestBase {
-
- private String basePath;
- private LinkedList models = new LinkedList();
-
- protected void loadModelFile() {
- try {
- URL modelsDir = getModelsDirectoy();
- URL fileURL = FileLocator.toFileURL(modelsDir);
- basePath = fileURL.getFile();
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- loadModels(getModelFileName());
- }
-
- protected void removeDiagramsDirectory() {
- File diagDir = new File(basePath+File.separator+"diagrams");
- if (diagDir.isDirectory()) {
- File[] files = diagDir.listFiles();
- if (files!=null)
- for (int i = 0; i < files.length; i++) {
- files[i].delete();
- }
- diagDir.delete();
- }
- }
-
- private void loadModels(String modelName) {
- XtextResourceSet rs = new XtextResourceSet();
- rs.addLoadOption(XtextResource.OPTION_RESOLVE_ALL, Boolean.TRUE);
- String path = basePath + modelName;
- URI uri = URI.createFileURI(path);
- Resource resource = rs.getResource(uri, true);
- Object root = resource.getContents().get(0);
- if (root instanceof RoomModel)
- models.add((RoomModel) root);
- else
- fail("File contains no RoomModel as root object");
- }
-
- public LinkedList getModels() {
- return models;
- }
-
- protected abstract String getModelFileName();
- protected abstract URL getModelsDirectoy();
-
- protected boolean isEqual(Color c, IColorConstant cc) {
- if (c.getRed()!=cc.getRed())
- return false;
- if (c.getGreen()!=cc.getGreen())
- return false;
- if (c.getBlue()!=cc.getBlue())
- return false;
- return true;
- }
-}
diff --git a/tests/pom.xml b/tests/pom.xml
new file mode 100644
index 000000000..2614046e0
--- /dev/null
+++ b/tests/pom.xml
@@ -0,0 +1,29 @@
+
+
+ 4.0.0
+
+ org.eclipse.etrice
+ org.eclipse.etrice.parent
+ 1.0.0-SNAPSHOT
+ ../releng/org.eclipse.etrice.parent
+
+ org.eclipse.etrice
+ org.eclipse.etrice.tests
+ 1.0.0-SNAPSHOT
+ pom
+
+
+
+
+ org.eclipse.tycho
+ tycho-surefire-plugin
+ ${tycho.version}
+
+ false
+
+
+
+
+
\ No newline at end of file
--
cgit v1.2.3
From 2312786d9c8b27fe97fd361e0aeeef99fe0e67de Mon Sep 17 00:00:00 2001
From: Jan Belle
Date: Thu, 31 Aug 2017 18:06:02 +0200
Subject: Bug 521698 - Tycho build
generate xtend files
Change-Id: Ifc0808742d7f72da305cb0879384af6f7da85581
---
.gitignore | 3 +-
.../model/BaseTokenTypeToPartitionMapper.java | 30 -
.../ui/labeling/BaseDescriptionLabelProvider.java | 22 -
.../core/common/ui/labeling/BaseLabelProvider.java | 95 -
.../common/ui/outline/BaseOutlineTreeProvider.java | 22 -
.../common/ui/quickfix/BaseQuickfixProvider.java | 22 -
.../core/common/converter/CCStringIndentation.java | 403 ---
.../core/common/formatting2/BaseFormatter.java | 251 --
.../core/common/formatting2/CCStringReplacer.java | 70 -
.../core/common/generator/BaseGenerator.java | 27 -
.../common/postprocessing/DocuPostprocessor.java | 227 --
.../postprocessing/PostprocessingHelpers.java | 100 -
.../core/common/scoping/BaseScopeProvider.java | 23 -
.../core/common/scoping/BaseTestScopeProvider.java | 22 -
.../core/common/validation/ValidationHelpers.java | 136 -
.../etrice/core/generator/ConfigGenerator.java | 15 -
.../core/postprocessing/DocuPostprocessor.java | 423 ---
.../core/postprocessing/ImplPostProcessing.java | 108 -
.../core/etmap/generator/ETMapGenerator.java | 15 -
.../etmap/postprocessing/DocuPostprocessor.java | 112 -
.../core/etphys/generator/ETPhysGenerator.java | 15 -
.../etphys/postprocessing/DocuPostprocessor.java | 200 --
.../fsm/ui/contentassist/FSMProposalProvider.java | 13 -
.../ui/labeling/FSMDescriptionLabelProvider.java | 15 -
.../core/fsm/ui/labeling/FSMLabelProvider.java | 62 -
.../fsm/ui/outline/FSMOutlineTreeProvider.java | 15 -
.../core/fsm/ui/quickfix/FSMQuickfixProvider.java | 74 -
.../etrice/core/fsm/formatting2/FSMFormatter.java | 270 --
.../etrice/core/fsm/generator/FSMGenerator.java | 20 -
.../core/fsm/postprocessing/DocuPostprocessor.java | 697 -----
.../core/fsm/postprocessing/ImplPostprocessor.java | 82 -
.../etrice/core/fsm/scoping/FSMScopeProvider.java | 341 ---
.../fsm/validation/FSMValidationUtilXtend.java | 157 --
.../etrice/core/ui/hover/RoomHoverProvider.java | 45 -
.../core/ui/quickfix/DetailCodeIndentHelper.java | 105 -
.../etrice/core/formatting2/RoomFormatter.java | 349 ---
.../core/postprocessing/DocuPostprocessor.java | 1504 -----------
.../core/postprocessing/ImplPostprocessor.java | 246 --
.../DefaultDetailExpressionProvider.java | 209 --
.../detailcode/DetailExpressionAssistParser.java | 221 --
.../detailcode/GuardDetailExpressionProvider.java | 248 --
.../detailcode/IDetailExpressionProvider.java | 96 -
.../RuntimeDetailExpressionProvider.java | 67 -
.../expressions/ui/DetailExpressionUIProvider.java | 324 ---
.../etrice/expressions/ui/HighlightConstants.java | 32 -
.../ui/contentassist/RoomExpressionProposals.java | 153 --
.../ui/highlight/RoomExpressionHighlighter.java | 65 -
.../etrice/generator/c/gen/ActorClassGen.java | 1287 ---------
.../etrice/generator/c/gen/CExtensions.java | 816 ------
.../etrice/generator/c/gen/DataClassGen.java | 398 ---
.../etrice/generator/c/gen/EnumerationTypeGen.java | 234 --
.../etrice/generator/c/gen/Initialization.java | 308 ---
.../eclipse/etrice/generator/c/gen/MainGen.java | 74 -
.../eclipse/etrice/generator/c/gen/NodeGen.java | 2751 --------------------
.../etrice/generator/c/gen/NodeRunnerGen.java | 273 --
.../etrice/generator/c/gen/ProtocolClassGen.java | 1532 -----------
.../etrice/generator/c/gen/StateMachineGen.java | 222 --
.../etrice/generator/config/DataConfiguration.java | 458 ----
.../etrice/generator/cpp/gen/ActorClassGen.java | 1157 --------
.../etrice/generator/cpp/gen/ConfigGenAddon.java | 570 ----
.../etrice/generator/cpp/gen/CppExtensions.java | 614 -----
.../generator/cpp/gen/CppProcedureHelpers.java | 116 -
.../etrice/generator/cpp/gen/DataClassGen.java | 662 -----
.../etrice/generator/cpp/gen/Initialization.java | 173 --
.../eclipse/etrice/generator/cpp/gen/MainGen.java | 69 -
.../eclipse/etrice/generator/cpp/gen/NodeGen.java | 902 -------
.../etrice/generator/cpp/gen/NodeRunnerGen.java | 301 ---
.../etrice/generator/cpp/gen/ProtocolClassGen.java | 1616 ------------
.../etrice/generator/cpp/gen/StateMachineGen.java | 171 --
.../eclipse/etrice/generator/doc/gen/DocGen.java | 1625 ------------
.../generator/doc/gen/InstanceDiagramGen.java | 276 --
.../eclipse/etrice/generator/doc/gen/MainGen.java | 49 -
.../fsm/generic/AbstractStateMachineGenerator.java | 1765 -------------
.../generator/fsm/generic/FSMExtensions.java | 213 --
.../generator/generator/FSMtestGenerator.java | 15 -
.../.settings/org.eclipse.core.resources.prefs | 2 -
.../generator/gnuplot/GnuplotScriptGenerator.xtend | 28 +-
.../generator/gnuplot/GnuplotScriptGenerator.java | 415 ---
.../generator/java/gen/ActorClassDataGen.java | 236 --
.../etrice/generator/java/gen/ActorClassGen.java | 1772 -------------
.../etrice/generator/java/gen/ConfigGenAddon.java | 478 ----
.../etrice/generator/java/gen/DataClassGen.java | 442 ----
.../generator/java/gen/EnumerationTypeGen.java | 106 -
.../etrice/generator/java/gen/Initialization.java | 361 ---
.../etrice/generator/java/gen/JavaExtensions.java | 597 -----
.../eclipse/etrice/generator/java/gen/MainGen.java | 94 -
.../eclipse/etrice/generator/java/gen/NodeGen.java | 844 ------
.../etrice/generator/java/gen/NodeRunnerGen.java | 183 --
.../java/gen/OptionalActorFactoryGen.java | 231 --
.../java/gen/OptionalActorInterfaceGen.java | 235 --
.../generator/java/gen/ProtocolClassGen.java | 1079 --------
.../etrice/generator/java/gen/StateMachineGen.java | 157 --
.../generator/java/gen/VariableServiceGen.java | 954 -------
.../generator/ui/wizard/ProjectFileFragments.java | 977 -------
.../generator/base/GlobalGeneratorSettings.java | 127 -
.../generic/GenericActorClassGenerator.java | 132 -
.../generic/GenericProtocolClassGenerator.java | 155 --
.../generic/GenericStateMachineGenerator.java | 441 ----
.../generator/generic/PrepareFileSystem.java | 132 -
.../etrice/generator/generic/ProcedureHelpers.java | 912 -------
.../etrice/generator/generic/RoomExtensions.java | 646 -----
.../generator/generic/TestInstanceCreator.java | 291 ---
.../etrice/generator/generic/TypeHelpers.java | 198 --
.../sourceviewer/CustomCompletionProposal.java | 67 -
.../sourceviewer/DetailExpressionAssistParser.java | 206 --
.../sourceviewer/DetailExpressionUIProvider.java | 374 ---
releng/org.eclipse.etrice.parent/pom.xml | 6 +-
.../core/common/tests/DetailCodeParseTest.java | 325 ---
.../core/common/tests/RelativeFileURITest.java | 122 -
.../genmodel/fsm/tests/TestHierInheritedFSM.java | 115 -
.../org/eclipse/etrice/core/FormatterTest.java | 161 --
.../org/eclipse/etrice/core/TestNames.java | 179 --
112 files changed, 20 insertions(+), 40158 deletions(-)
delete mode 100644 plugins/org.eclipse.etrice.core.common.ui/xtend-gen/org/eclipse/etrice/core/common/ui/editor/model/BaseTokenTypeToPartitionMapper.java
delete mode 100644 plugins/org.eclipse.etrice.core.common.ui/xtend-gen/org/eclipse/etrice/core/common/ui/labeling/BaseDescriptionLabelProvider.java
delete mode 100644 plugins/org.eclipse.etrice.core.common.ui/xtend-gen/org/eclipse/etrice/core/common/ui/labeling/BaseLabelProvider.java
delete mode 100644 plugins/org.eclipse.etrice.core.common.ui/xtend-gen/org/eclipse/etrice/core/common/ui/outline/BaseOutlineTreeProvider.java
delete mode 100644 plugins/org.eclipse.etrice.core.common.ui/xtend-gen/org/eclipse/etrice/core/common/ui/quickfix/BaseQuickfixProvider.java
delete mode 100644 plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/converter/CCStringIndentation.java
delete mode 100644 plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/formatting2/BaseFormatter.java
delete mode 100644 plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/formatting2/CCStringReplacer.java
delete mode 100644 plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/generator/BaseGenerator.java
delete mode 100644 plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/postprocessing/DocuPostprocessor.java
delete mode 100644 plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/postprocessing/PostprocessingHelpers.java
delete mode 100644 plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/scoping/BaseScopeProvider.java
delete mode 100644 plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/scoping/BaseTestScopeProvider.java
delete mode 100644 plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/validation/ValidationHelpers.java
delete mode 100644 plugins/org.eclipse.etrice.core.config/xtend-gen/org/eclipse/etrice/core/generator/ConfigGenerator.java
delete mode 100644 plugins/org.eclipse.etrice.core.config/xtend-gen/org/eclipse/etrice/core/postprocessing/DocuPostprocessor.java
delete mode 100644 plugins/org.eclipse.etrice.core.config/xtend-gen/org/eclipse/etrice/core/postprocessing/ImplPostProcessing.java
delete mode 100644 plugins/org.eclipse.etrice.core.etmap/xtend-gen/org/eclipse/etrice/core/etmap/generator/ETMapGenerator.java
delete mode 100644 plugins/org.eclipse.etrice.core.etmap/xtend-gen/org/eclipse/etrice/core/etmap/postprocessing/DocuPostprocessor.java
delete mode 100644 plugins/org.eclipse.etrice.core.etphys/xtend-gen/org/eclipse/etrice/core/etphys/generator/ETPhysGenerator.java
delete mode 100644 plugins/org.eclipse.etrice.core.etphys/xtend-gen/org/eclipse/etrice/core/etphys/postprocessing/DocuPostprocessor.java
delete mode 100644 plugins/org.eclipse.etrice.core.fsm.ui/xtend-gen/org/eclipse/etrice/core/fsm/ui/contentassist/FSMProposalProvider.java
delete mode 100644 plugins/org.eclipse.etrice.core.fsm.ui/xtend-gen/org/eclipse/etrice/core/fsm/ui/labeling/FSMDescriptionLabelProvider.java
delete mode 100644 plugins/org.eclipse.etrice.core.fsm.ui/xtend-gen/org/eclipse/etrice/core/fsm/ui/labeling/FSMLabelProvider.java
delete mode 100644 plugins/org.eclipse.etrice.core.fsm.ui/xtend-gen/org/eclipse/etrice/core/fsm/ui/outline/FSMOutlineTreeProvider.java
delete mode 100644 plugins/org.eclipse.etrice.core.fsm.ui/xtend-gen/org/eclipse/etrice/core/fsm/ui/quickfix/FSMQuickfixProvider.java
delete mode 100644 plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/formatting2/FSMFormatter.java
delete mode 100644 plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/generator/FSMGenerator.java
delete mode 100644 plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/postprocessing/DocuPostprocessor.java
delete mode 100644 plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/postprocessing/ImplPostprocessor.java
delete mode 100644 plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/scoping/FSMScopeProvider.java
delete mode 100644 plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/validation/FSMValidationUtilXtend.java
delete mode 100644 plugins/org.eclipse.etrice.core.room.ui/xtend-gen/org/eclipse/etrice/core/ui/hover/RoomHoverProvider.java
delete mode 100644 plugins/org.eclipse.etrice.core.room.ui/xtend-gen/org/eclipse/etrice/core/ui/quickfix/DetailCodeIndentHelper.java
delete mode 100644 plugins/org.eclipse.etrice.core.room/xtend-gen/org/eclipse/etrice/core/formatting2/RoomFormatter.java
delete mode 100644 plugins/org.eclipse.etrice.core.room/xtend-gen/org/eclipse/etrice/core/postprocessing/DocuPostprocessor.java
delete mode 100644 plugins/org.eclipse.etrice.core.room/xtend-gen/org/eclipse/etrice/core/postprocessing/ImplPostprocessor.java
delete mode 100644 plugins/org.eclipse.etrice.expressions.ui/xtend-gen/org/eclipse/etrice/expressions/detailcode/DefaultDetailExpressionProvider.java
delete mode 100644 plugins/org.eclipse.etrice.expressions.ui/xtend-gen/org/eclipse/etrice/expressions/detailcode/DetailExpressionAssistParser.java
delete mode 100644 plugins/org.eclipse.etrice.expressions.ui/xtend-gen/org/eclipse/etrice/expressions/detailcode/GuardDetailExpressionProvider.java
delete mode 100644 plugins/org.eclipse.etrice.expressions.ui/xtend-gen/org/eclipse/etrice/expressions/detailcode/IDetailExpressionProvider.java
delete mode 100644 plugins/org.eclipse.etrice.expressions.ui/xtend-gen/org/eclipse/etrice/expressions/detailcode/RuntimeDetailExpressionProvider.java
delete mode 100644 plugins/org.eclipse.etrice.expressions.ui/xtend-gen/org/eclipse/etrice/expressions/ui/DetailExpressionUIProvider.java
delete mode 100644 plugins/org.eclipse.etrice.expressions.ui/xtend-gen/org/eclipse/etrice/expressions/ui/HighlightConstants.java
delete mode 100644 plugins/org.eclipse.etrice.expressions.ui/xtend-gen/org/eclipse/etrice/expressions/ui/contentassist/RoomExpressionProposals.java
delete mode 100644 plugins/org.eclipse.etrice.expressions.ui/xtend-gen/org/eclipse/etrice/expressions/ui/highlight/RoomExpressionHighlighter.java
delete mode 100644 plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java
delete mode 100644 plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/CExtensions.java
delete mode 100644 plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/DataClassGen.java
delete mode 100644 plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/EnumerationTypeGen.java
delete mode 100644 plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/Initialization.java
delete mode 100644 plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/MainGen.java
delete mode 100644 plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/NodeGen.java
delete mode 100644 plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/NodeRunnerGen.java
delete mode 100644 plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java
delete mode 100644 plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/StateMachineGen.java
delete mode 100644 plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/DataConfiguration.java
delete mode 100644 plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.java
delete mode 100644 plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ConfigGenAddon.java
delete mode 100644 plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/CppExtensions.java
delete mode 100644 plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/CppProcedureHelpers.java
delete mode 100644 plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/DataClassGen.java
delete mode 100644 plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/Initialization.java
delete mode 100644 plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/MainGen.java
delete mode 100644 plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/NodeGen.java
delete mode 100644 plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/NodeRunnerGen.java
delete mode 100644 plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ProtocolClassGen.java
delete mode 100644 plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/StateMachineGen.java
delete mode 100644 plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/DocGen.java
delete mode 100644 plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/InstanceDiagramGen.java
delete mode 100644 plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/MainGen.java
delete mode 100644 plugins/org.eclipse.etrice.generator.fsm/xtend-gen/org/eclipse/etrice/generator/fsm/generic/AbstractStateMachineGenerator.java
delete mode 100644 plugins/org.eclipse.etrice.generator.fsm/xtend-gen/org/eclipse/etrice/generator/fsm/generic/FSMExtensions.java
delete mode 100644 plugins/org.eclipse.etrice.generator.fsmtest/xtend-gen/org/eclipse/etrice/generator/generator/FSMtestGenerator.java
delete mode 100644 plugins/org.eclipse.etrice.generator.gnuplot/.settings/org.eclipse.core.resources.prefs
delete mode 100644 plugins/org.eclipse.etrice.generator.gnuplot/xtend-gen/org/eclipse/etrice/generator/gnuplot/GnuplotScriptGenerator.java
delete mode 100644 plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassDataGen.java
delete mode 100644 plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java
delete mode 100644 plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ConfigGenAddon.java
delete mode 100644 plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/DataClassGen.java
delete mode 100644 plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/EnumerationTypeGen.java
delete mode 100644 plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/Initialization.java
delete mode 100644 plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/JavaExtensions.java
delete mode 100644 plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/MainGen.java
delete mode 100644 plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/NodeGen.java
delete mode 100644 plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/NodeRunnerGen.java
delete mode 100644 plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/OptionalActorFactoryGen.java
delete mode 100644 plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/OptionalActorInterfaceGen.java
delete mode 100644 plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.java
delete mode 100644 plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/StateMachineGen.java
delete mode 100644 plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/VariableServiceGen.java
delete mode 100644 plugins/org.eclipse.etrice.generator.ui/xtend-gen/org/eclipse/etrice/generator/ui/wizard/ProjectFileFragments.java
delete mode 100644 plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/base/GlobalGeneratorSettings.java
delete mode 100644 plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericActorClassGenerator.java
delete mode 100644 plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericProtocolClassGenerator.java
delete mode 100644 plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java
delete mode 100644 plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/PrepareFileSystem.java
delete mode 100644 plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java
delete mode 100644 plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/RoomExtensions.java
delete mode 100644 plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/TestInstanceCreator.java
delete mode 100644 plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/TypeHelpers.java
delete mode 100644 plugins/org.eclipse.etrice.ui.behavior.actioneditor/xtend-gen/org/eclipse/etrice/ui/behavior/actioneditor/sourceviewer/CustomCompletionProposal.java
delete mode 100644 plugins/org.eclipse.etrice.ui.behavior.actioneditor/xtend-gen/org/eclipse/etrice/ui/behavior/actioneditor/sourceviewer/DetailExpressionAssistParser.java
delete mode 100644 plugins/org.eclipse.etrice.ui.behavior.actioneditor/xtend-gen/org/eclipse/etrice/ui/behavior/actioneditor/sourceviewer/DetailExpressionUIProvider.java
delete mode 100644 tests/org.eclipse.etrice.core.common.tests/xtend-gen/org/eclipse/etrice/core/common/tests/DetailCodeParseTest.java
delete mode 100644 tests/org.eclipse.etrice.core.common.tests/xtend-gen/org/eclipse/etrice/core/common/tests/RelativeFileURITest.java
delete mode 100644 tests/org.eclipse.etrice.core.genmodel.fsm.tests/xtend-gen/org/eclipse/etrice/core/genmodel/fsm/tests/TestHierInheritedFSM.java
delete mode 100644 tests/org.eclipse.etrice.core.room.tests/xtend-gen/org/eclipse/etrice/core/FormatterTest.java
delete mode 100644 tests/org.eclipse.etrice.core.room.tests/xtend-gen/org/eclipse/etrice/core/TestNames.java
diff --git a/.gitignore b/.gitignore
index cb6f85480..5899d5def 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ gerritKeys.pub
*._trace
*.xtendbin
language.settings.xml
-target/
\ No newline at end of file
+target/
+xtend-gen/
\ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.core.common.ui/xtend-gen/org/eclipse/etrice/core/common/ui/editor/model/BaseTokenTypeToPartitionMapper.java b/plugins/org.eclipse.etrice.core.common.ui/xtend-gen/org/eclipse/etrice/core/common/ui/editor/model/BaseTokenTypeToPartitionMapper.java
deleted file mode 100644
index f3a151c15..000000000
--- a/plugins/org.eclipse.etrice.core.common.ui/xtend-gen/org/eclipse/etrice/core/common/ui/editor/model/BaseTokenTypeToPartitionMapper.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * 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:
- * Juergen Haug (initial contribution)
- */
-package org.eclipse.etrice.core.common.ui.editor.model;
-
-import org.eclipse.xtext.ui.editor.model.TerminalsTokenTypeToPartitionMapper;
-
-@SuppressWarnings("all")
-public class BaseTokenTypeToPartitionMapper extends TerminalsTokenTypeToPartitionMapper {
- @Override
- protected String calculateId(final String tokenName, final int tokenType) {
- String _switchResult = null;
- switch (tokenName) {
- case "RULE_CC_STRING":
- _switchResult = TerminalsTokenTypeToPartitionMapper.STRING_LITERAL_PARTITION;
- break;
- default:
- _switchResult = super.calculateId(tokenName, tokenType);
- break;
- }
- return _switchResult;
- }
-}
diff --git a/plugins/org.eclipse.etrice.core.common.ui/xtend-gen/org/eclipse/etrice/core/common/ui/labeling/BaseDescriptionLabelProvider.java b/plugins/org.eclipse.etrice.core.common.ui/xtend-gen/org/eclipse/etrice/core/common/ui/labeling/BaseDescriptionLabelProvider.java
deleted file mode 100644
index 884ec5eae..000000000
--- a/plugins/org.eclipse.etrice.core.common.ui/xtend-gen/org/eclipse/etrice/core/common/ui/labeling/BaseDescriptionLabelProvider.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- * Eyrak Paen (initial contribution)
- */
-package org.eclipse.etrice.core.common.ui.labeling;
-
-import org.eclipse.xtext.ui.label.DefaultDescriptionLabelProvider;
-
-/**
- * Provides labels for a IEObjectDescriptions and IResourceDescriptions.
- *
- * see http://www.eclipse.org/Xtext/documentation.html#labelProvider
- */
-@SuppressWarnings("all")
-public class BaseDescriptionLabelProvider extends DefaultDescriptionLabelProvider {
-}
diff --git a/plugins/org.eclipse.etrice.core.common.ui/xtend-gen/org/eclipse/etrice/core/common/ui/labeling/BaseLabelProvider.java b/plugins/org.eclipse.etrice.core.common.ui/xtend-gen/org/eclipse/etrice/core/common/ui/labeling/BaseLabelProvider.java
deleted file mode 100644
index c805788d2..000000000
--- a/plugins/org.eclipse.etrice.core.common.ui/xtend-gen/org/eclipse/etrice/core/common/ui/labeling/BaseLabelProvider.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- * Eyrak Paen (initial contribution)
- */
-package org.eclipse.etrice.core.common.ui.labeling;
-
-import com.google.common.base.Objects;
-import com.google.inject.Inject;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.etrice.core.common.base.Import;
-import org.eclipse.jface.resource.ColorRegistry;
-import org.eclipse.jface.resource.FontDescriptor;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.viewers.StyledString;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider;
-import org.eclipse.xtext.ui.label.StylerFactory;
-
-/**
- * Provides labels for a EObjects.
- *
- * see http://www.eclipse.org/Xtext/documentation.html#labelProvider
- */
-@SuppressWarnings("all")
-public class BaseLabelProvider extends DefaultEObjectLabelProvider {
- protected final static String KEYWORD_COLOR = "KEYWORD_COLOR";
-
- @Inject
- protected StylerFactory stylerFactory;
-
- protected StyledString.Styler keywordStyler = null;
-
- protected StyledString.Styler typeStyler = null;
-
- @Inject
- public BaseLabelProvider(final AdapterFactoryLabelProvider delegate) {
- super(delegate);
- ColorRegistry _colorRegistry = JFaceResources.getColorRegistry();
- RGB _rGB = new RGB(50, 50, 50);
- _colorRegistry.put(BaseLabelProvider.KEYWORD_COLOR, _rGB);
- }
-
- public String image(final Import mdl) {
- return null;
- }
-
- public StyledString text(final Import im) {
- String _importedNamespace = im.getImportedNamespace();
- boolean _equals = Objects.equal(_importedNamespace, null);
- if (_equals) {
- String _importURI = im.getImportURI();
- String _plus = ("import model " + _importURI);
- StyledString txt = new StyledString(_plus);
- StyledString.Styler _keywordStyler = this.getKeywordStyler();
- txt.setStyle(0, 12, _keywordStyler);
- return txt;
- } else {
- String _importedNamespace_1 = im.getImportedNamespace();
- String _plus_1 = ("import ns " + _importedNamespace_1);
- StyledString txt_1 = new StyledString(_plus_1);
- StyledString.Styler _keywordStyler_1 = this.getKeywordStyler();
- txt_1.setStyle(0, 9, _keywordStyler_1);
- return txt_1;
- }
- }
-
- protected StyledString.Styler getKeywordStyler() {
- boolean _equals = Objects.equal(this.keywordStyler, null);
- if (_equals) {
- FontDescriptor font = JFaceResources.getFontDescriptor(JFaceResources.TEXT_FONT);
- FontDescriptor boldFont = font.setStyle(SWT.BOLD);
- StyledString.Styler _createStyler = this.stylerFactory.createStyler(boldFont, BaseLabelProvider.KEYWORD_COLOR, null);
- this.keywordStyler = _createStyler;
- }
- return this.keywordStyler;
- }
-
- protected StyledString.Styler getTypeStyler() {
- boolean _equals = Objects.equal(this.typeStyler, null);
- if (_equals) {
- FontDescriptor font = JFaceResources.getFontDescriptor(JFaceResources.TEXT_FONT);
- FontDescriptor italicFont = font.setStyle(SWT.ITALIC);
- StyledString.Styler _createStyler = this.stylerFactory.createStyler(italicFont, null, null);
- this.typeStyler = _createStyler;
- }
- return this.typeStyler;
- }
-}
diff --git a/plugins/org.eclipse.etrice.core.common.ui/xtend-gen/org/eclipse/etrice/core/common/ui/outline/BaseOutlineTreeProvider.java b/plugins/org.eclipse.etrice.core.common.ui/xtend-gen/org/eclipse/etrice/core/common/ui/outline/BaseOutlineTreeProvider.java
deleted file mode 100644
index 99fbc0dec..000000000
--- a/plugins/org.eclipse.etrice.core.common.ui/xtend-gen/org/eclipse/etrice/core/common/ui/outline/BaseOutlineTreeProvider.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- * Eyrak Paen (initial contribution)
- */
-package org.eclipse.etrice.core.common.ui.outline;
-
-import org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider;
-
-/**
- * Customization of the default outline structure.
- *
- * see http://www.eclipse.org/Xtext/documentation.html#outline
- */
-@SuppressWarnings("all")
-public class BaseOutlineTreeProvider extends DefaultOutlineTreeProvider {
-}
diff --git a/plugins/org.eclipse.etrice.core.common.ui/xtend-gen/org/eclipse/etrice/core/common/ui/quickfix/BaseQuickfixProvider.java b/plugins/org.eclipse.etrice.core.common.ui/xtend-gen/org/eclipse/etrice/core/common/ui/quickfix/BaseQuickfixProvider.java
deleted file mode 100644
index 12517532d..000000000
--- a/plugins/org.eclipse.etrice.core.common.ui/xtend-gen/org/eclipse/etrice/core/common/ui/quickfix/BaseQuickfixProvider.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- * Eyrak Paen (initial contribution)
- */
-package org.eclipse.etrice.core.common.ui.quickfix;
-
-import org.eclipse.xtext.ui.editor.quickfix.DefaultQuickfixProvider;
-
-/**
- * Custom quickfixes.
- *
- * see http://www.eclipse.org/Xtext/documentation.html#quickfixes
- */
-@SuppressWarnings("all")
-public class BaseQuickfixProvider extends DefaultQuickfixProvider {
-}
diff --git a/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/converter/CCStringIndentation.java b/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/converter/CCStringIndentation.java
deleted file mode 100644
index 2f771fd7f..000000000
--- a/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/converter/CCStringIndentation.java
+++ /dev/null
@@ -1,403 +0,0 @@
-/**
- * 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:
- * Juergen Haug (initial contribution)
- */
-package org.eclipse.etrice.core.common.converter;
-
-import com.google.common.collect.ImmutableList;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.eclipse.xtend.lib.annotations.AccessorType;
-import org.eclipse.xtend.lib.annotations.Accessors;
-import org.eclipse.xtext.util.Strings;
-import org.eclipse.xtext.xbase.lib.CollectionLiterals;
-import org.eclipse.xtext.xbase.lib.Conversions;
-import org.eclipse.xtext.xbase.lib.Functions.Function1;
-import org.eclipse.xtext.xbase.lib.Functions.Function2;
-import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.ListExtensions;
-import org.eclipse.xtext.xbase.lib.ObjectExtensions;
-import org.eclipse.xtext.xbase.lib.Pair;
-import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
-import org.eclipse.xtext.xbase.lib.Pure;
-
-/**
- * TODO: Handling mixed line endings
- *
- * Improvement: Too much strings matching => use token scanner
- */
-@SuppressWarnings("all")
-public class CCStringIndentation {
- private final static String JAVA_NL = Strings.newLine();
-
- private final static String CRLF = "\r\n";
-
- private final static String LF = "\n";
-
- private final static String CR = "\r";
-
- public static boolean hasLineBreak(final String nodeText) {
- int _countLineBreaks = Strings.countLineBreaks(nodeText);
- return (_countLineBreaks > 0);
- }
-
- public static String getLineEnding(final String it) {
- String _switchResult = null;
- boolean _matched = false;
- int _indexOf = it.indexOf(CCStringIndentation.CRLF);
- boolean _greaterEqualsThan = (_indexOf >= 0);
- if (_greaterEqualsThan) {
- _matched=true;
- _switchResult = CCStringIndentation.CRLF;
- }
- if (!_matched) {
- int _indexOf_1 = it.indexOf(CCStringIndentation.LF);
- boolean _greaterEqualsThan_1 = (_indexOf_1 >= 0);
- if (_greaterEqualsThan_1) {
- _matched=true;
- _switchResult = CCStringIndentation.LF;
- }
- }
- if (!_matched) {
- int _indexOf_2 = it.indexOf(CCStringIndentation.CR);
- boolean _greaterEqualsThan_2 = (_indexOf_2 >= 0);
- if (_greaterEqualsThan_2) {
- _matched=true;
- _switchResult = CCStringIndentation.CR;
- }
- }
- if (!_matched) {
- _switchResult = CCStringIndentation.JAVA_NL;
- }
- return _switchResult;
- }
-
- private final String ccString;
-
- private final String lineEnding;
-
- @Accessors(AccessorType.PUBLIC_GETTER)
- private final ImmutableList splittedLines;
-
- @Accessors(AccessorType.PUBLIC_GETTER)
- private final boolean ignoreFirst;
-
- @Accessors(AccessorType.PUBLIC_GETTER)
- private final boolean ignoreLast;
-
- /**
- * CCString without delimiters. Caller should handle their own delims.
- */
- public CCStringIndentation(final String ccString) {
- this.ccString = ccString;
- String _lineEnding = CCStringIndentation.getLineEnding(ccString);
- this.lineEnding = _lineEnding;
- ArrayList _newArrayList = CollectionLiterals.newArrayList();
- final Procedure1> _function = (ArrayList lines) -> {
- Pattern _compile = Pattern.compile(this.lineEnding);
- final Matcher matcher = _compile.matcher(ccString);
- int lastOffset = 0;
- while (matcher.find()) {
- {
- int _start = matcher.start();
- String _substring = ccString.substring(lastOffset, _start);
- lines.add(_substring);
- int _end = matcher.end();
- lastOffset = _end;
- }
- }
- int _length = ccString.length();
- boolean _lessThan = (lastOffset < _length);
- if (_lessThan) {
- String _substring = ccString.substring(lastOffset);
- lines.add(_substring);
- } else {
- boolean _endsWith = ccString.endsWith(this.lineEnding);
- if (_endsWith) {
- lines.add("");
- }
- }
- };
- ArrayList _doubleArrow = ObjectExtensions.>operator_doubleArrow(_newArrayList, _function);
- ImmutableList _copyOf = ImmutableList.copyOf(_doubleArrow);
- this.splittedLines = _copyOf;
- this.ignoreFirst = ((this.splittedLines.size() >= 2) && IterableExtensions.head(this.splittedLines).trim().isEmpty());
- this.ignoreLast = ((this.splittedLines.size() >= 2) && IterableExtensions.last(this.splittedLines).trim().isEmpty());
- }
-
- /**
- * Returns ccString without editor white space and delims.
- *
- * @see #highlight()
- */
- public String removeEditorWhiteSpace() {
- return this.removeEditorWhiteSpace("");
- }
-
- protected String removeEditorWhiteSpace(final String indent) {
- List> _highlight = this.highlight();
- final Function2, String> _function = (String lines, Pair offsetLength) -> {
- Integer _key = offsetLength.getKey();
- Integer _key_1 = offsetLength.getKey();
- Integer _value = offsetLength.getValue();
- int _plus = ((_key_1).intValue() + (_value).intValue());
- String _substring = this.ccString.substring((_key).intValue(), _plus);
- return ((lines + indent) + _substring);
- };
- return IterableExtensions., String>fold(_highlight, "", _function);
- }
-
- /**
- * Returns whether editor indentation can be removed safely.
- */
- public boolean canRemoveEditorIndentation() {
- return (((this.splittedLines.size() >= 2) && this.ignoreFirst) && this.hasConsistentIndentation());
- }
-
- /**
- * Returns ccString replaced with given indentation if possible. Ignored lines are trimmed. No delims included.
- *
- * @see #highlight()
- */
- public String replaceEditorIndentation(final String indentation) {
- String _xblockexpression = null;
- {
- String _xifexpression = null;
- if ((indentation == null)) {
- _xifexpression = "";
- } else {
- _xifexpression = indentation;
- }
- final String indent = _xifexpression;
- String _xifexpression_1 = null;
- boolean _canRemoveEditorIndentation = this.canRemoveEditorIndentation();
- if (_canRemoveEditorIndentation) {
- String _xifexpression_2 = null;
- if ((this.ignoreFirst && (this.splittedLines.size() == 2))) {
- _xifexpression_2 = this.removeEditorWhiteSpace("");
- } else {
- String _xifexpression_3 = null;
- if (this.ignoreFirst) {
- _xifexpression_3 = this.lineEnding;
- } else {
- _xifexpression_3 = "";
- }
- String _removeEditorWhiteSpace = this.removeEditorWhiteSpace(indent);
- _xifexpression_2 = (_xifexpression_3 + _removeEditorWhiteSpace);
- }
- _xifexpression_1 = _xifexpression_2;
- } else {
- String _xblockexpression_1 = null;
- {
- LinkedList _newLinkedList = CollectionLiterals.newLinkedList(((String[])Conversions.unwrapArray(this.splittedLines, String.class)));
- final Procedure1> _function = (LinkedList it) -> {
- if (this.ignoreFirst) {
- it.set(0, "");
- }
- if (this.ignoreLast) {
- int _size = it.size();
- int _minus = (_size - 1);
- it.set(_minus, "");
- }
- };
- final LinkedList lines = ObjectExtensions.>operator_doubleArrow(_newLinkedList, _function);
- _xblockexpression_1 = IterableExtensions.join(lines, this.lineEnding);
- }
- _xifexpression_1 = _xblockexpression_1;
- }
- _xblockexpression = _xifexpression_1;
- }
- return _xblockexpression;
- }
-
- /**
- * Returns highlighted positions without editor's indentation.
- * Positions are pairs of (offset, length) relative to {@link #CCStringIndentation(String)}
- *
- * @see #removeEditorWhiteSpace()
- */
- public List> highlight() {
- final ArrayList> offsetLengthLines = CollectionLiterals.>newArrayList();
- final String editorIndent = this.computeEditorIndent(false);
- final int skip = editorIndent.length();
- int offset = 0;
- for (int i = 0; (i < ((Object[])Conversions.unwrapArray(this.splittedLines, Object.class)).length); i++) {
- {
- final String line = this.splittedLines.get(i);
- if (((i == 0) && this.ignoreFirst)) {
- int _offset = offset;
- int _length = line.length();
- int _length_1 = this.lineEnding.length();
- int _plus = (_length + _length_1);
- offset = (_offset + _plus);
- } else {
- if (((i == (this.splittedLines.size() - 1)) && this.ignoreLast)) {
- } else {
- Pair _xblockexpression = null;
- {
- int _xifexpression = (int) 0;
- int _size = this.splittedLines.size();
- int _minus = (_size - 1);
- boolean _lessThan = (i < _minus);
- if (_lessThan) {
- _xifexpression = this.lineEnding.length();
- } else {
- _xifexpression = 0;
- }
- final int NL = _xifexpression;
- Pair _xifexpression_1 = null;
- boolean _startsWith = line.startsWith(editorIndent);
- if (_startsWith) {
- int _length_2 = line.length();
- int _minus_1 = (_length_2 - skip);
- int _plus_1 = (_minus_1 + NL);
- _xifexpression_1 = Pair.of(Integer.valueOf((offset + skip)), Integer.valueOf(_plus_1));
- } else {
- int _length_3 = line.length();
- int _plus_2 = (_length_3 + NL);
- _xifexpression_1 = Pair.of(Integer.valueOf(offset), Integer.valueOf(_plus_2));
- }
- _xblockexpression = _xifexpression_1;
- }
- offsetLengthLines.add(_xblockexpression);
- int _offset_1 = offset;
- int _length_2 = line.length();
- int _length_3 = this.lineEnding.length();
- int _plus_1 = (_length_2 + _length_3);
- offset = (_offset_1 + _plus_1);
- }
- }
- }
- }
- return offsetLengthLines;
- }
-
- /**
- * Check consistent indentation
- */
- public boolean hasConsistentIndentation() {
- String _computeEditorIndent = this.computeEditorIndent(true);
- return (_computeEditorIndent != null);
- }
-
- protected String computeEditorIndent(final boolean consistentOnly) {
- String _xblockexpression = null;
- {
- if (((this.splittedLines.size() <= 1) || (!this.ignoreFirst))) {
- return "";
- }
- List> _xblockexpression_1 = null;
- {
- int _xifexpression = (int) 0;
- if (this.ignoreFirst) {
- _xifexpression = 1;
- } else {
- _xifexpression = 0;
- }
- final int begin = _xifexpression;
- int _size = this.splittedLines.size();
- int _xifexpression_1 = (int) 0;
- if (this.ignoreLast) {
- _xifexpression_1 = 1;
- } else {
- _xifexpression_1 = 0;
- }
- final int end = (_size - _xifexpression_1);
- ImmutableList _subList = this.splittedLines.subList(begin, end);
- final Function1> _function = (String line) -> {
- String _leadingWhiteSpace = Strings.getLeadingWhiteSpace(line);
- return Pair.of(_leadingWhiteSpace, line);
- };
- List> _map = ListExtensions.>map(_subList, _function);
- _xblockexpression_1 = IterableExtensions.>toList(_map);
- }
- final List> wsLinePairs = _xblockexpression_1;
- final Function1, String> _function = (Iterable it) -> {
- String _xifexpression = null;
- boolean _isEmpty = IterableExtensions.isEmpty(it);
- if (_isEmpty) {
- _xifexpression = "";
- } else {
- _xifexpression = IterableExtensions.min(it);
- }
- return _xifexpression;
- };
- final Function1 super Iterable, ? extends String> minWSComputor = _function;
- final Function1, Boolean> _function_1 = (Pair it) -> {
- String _value = it.getValue();
- String _trim = _value.trim();
- boolean _isEmpty = _trim.isEmpty();
- return Boolean.valueOf((!_isEmpty));
- };
- Iterable> _filter = IterableExtensions.>filter(wsLinePairs, _function_1);
- final Function1, String> _function_2 = (Pair it) -> {
- return it.getKey();
- };
- Iterable _map = IterableExtensions., String>map(_filter, _function_2);
- final String textIndent = minWSComputor.apply(_map);
- final Function1, String> _function_3 = (Pair it) -> {
- return it.getKey();
- };
- List _map_1 = ListExtensions., String>map(wsLinePairs, _function_3);
- final Function1 _function_4 = (String it) -> {
- boolean _isEmpty = it.isEmpty();
- return Boolean.valueOf((!_isEmpty));
- };
- Iterable _filter_1 = IterableExtensions.filter(_map_1, _function_4);
- final Function1 _function_5 = (String nonEmptyIndent) -> {
- return Boolean.valueOf(nonEmptyIndent.startsWith(textIndent));
- };
- final boolean consistent = IterableExtensions.forall(_filter_1, _function_5);
- String _switchResult = null;
- boolean _matched = false;
- if (consistent) {
- _matched=true;
- _switchResult = textIndent;
- }
- if (!_matched) {
- if (consistentOnly) {
- _matched=true;
- _switchResult = null;
- }
- }
- if (!_matched) {
- final Function1, String> _function_6 = (Pair it) -> {
- return it.getKey();
- };
- List _map_2 = ListExtensions., String>map(wsLinePairs, _function_6);
- final Function1 _function_7 = (String it) -> {
- boolean _isEmpty = it.isEmpty();
- return Boolean.valueOf((!_isEmpty));
- };
- Iterable _filter_2 = IterableExtensions.filter(_map_2, _function_7);
- _switchResult = minWSComputor.apply(_filter_2);
- }
- _xblockexpression = _switchResult;
- }
- return _xblockexpression;
- }
-
- @Pure
- public ImmutableList getSplittedLines() {
- return this.splittedLines;
- }
-
- @Pure
- public boolean isIgnoreFirst() {
- return this.ignoreFirst;
- }
-
- @Pure
- public boolean isIgnoreLast() {
- return this.ignoreLast;
- }
-}
diff --git a/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/formatting2/BaseFormatter.java b/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/formatting2/BaseFormatter.java
deleted file mode 100644
index 1294b1e2e..000000000
--- a/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/formatting2/BaseFormatter.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/**
- * 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:
- * Juergen Haug (initial contribution)
- */
-package org.eclipse.etrice.core.common.formatting2;
-
-import com.google.inject.Inject;
-import java.util.Arrays;
-import java.util.List;
-import java.util.function.Consumer;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.etrice.core.common.base.Annotation;
-import org.eclipse.etrice.core.common.base.AnnotationAttribute;
-import org.eclipse.etrice.core.common.base.AnnotationType;
-import org.eclipse.etrice.core.common.base.Documentation;
-import org.eclipse.etrice.core.common.base.Import;
-import org.eclipse.etrice.core.common.base.KeyValue;
-import org.eclipse.etrice.core.common.services.BaseGrammarAccess;
-import org.eclipse.xtext.Keyword;
-import org.eclipse.xtext.formatting2.AbstractFormatter2;
-import org.eclipse.xtext.formatting2.IFormattableDocument;
-import org.eclipse.xtext.formatting2.IHiddenRegionFormatter;
-import org.eclipse.xtext.formatting2.regionaccess.IHiddenRegion;
-import org.eclipse.xtext.formatting2.regionaccess.ISemanticRegion;
-import org.eclipse.xtext.formatting2.regionaccess.ISemanticRegionsFinder;
-import org.eclipse.xtext.resource.XtextResource;
-import org.eclipse.xtext.xbase.lib.Extension;
-import org.eclipse.xtext.xbase.lib.Pair;
-import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
-
-@SuppressWarnings("all")
-public class BaseFormatter extends AbstractFormatter2 {
- @Inject
- @Extension
- private BaseGrammarAccess _baseGrammarAccess;
-
- /**
- * recursive keyword formatting
- */
- protected void formatAllByKeywords(final EObject it, @Extension final IFormattableDocument document) {
- ISemanticRegionsFinder _allRegionsFor = this.textRegionExtensions.allRegionsFor(it);
- List> _keywordPairs = _allRegionsFor.keywordPairs("{", "}");
- final Consumer> _function = (Pair it_1) -> {
- ISemanticRegion _key = it_1.getKey();
- final Procedure1 _function_1 = (IHiddenRegionFormatter it_2) -> {
- it_2.oneSpace();
- };
- document.prepend(_key, _function_1);
- final Procedure1 _function_2 = (IHiddenRegionFormatter it_2) -> {
- it_2.indent();
- };
- document.interior(it_1, _function_2);
- ISemanticRegion _value = it_1.getValue();
- final Procedure1 _function_3 = (IHiddenRegionFormatter it_2) -> {
- it_2.newLine();
- };
- document.prepend(_value, _function_3);
- };
- _keywordPairs.forEach(_function);
- ISemanticRegionsFinder _allRegionsFor_1 = this.textRegionExtensions.allRegionsFor(it);
- List> _keywordPairs_1 = _allRegionsFor_1.keywordPairs("(", ")");
- final Consumer> _function_1 = (Pair it_1) -> {
- final Procedure1 _function_2 = (IHiddenRegionFormatter it_2) -> {
- it_2.noSpace();
- };
- document.interior(it_1, _function_2);
- };
- _keywordPairs_1.forEach(_function_1);
- ISemanticRegionsFinder _allRegionsFor_2 = this.textRegionExtensions.allRegionsFor(it);
- ISemanticRegion _keyword = _allRegionsFor_2.keyword("(");
- final Procedure1 _function_2 = (IHiddenRegionFormatter it_1) -> {
- it_1.noSpace();
- it_1.lowPriority();
- };
- document.prepend(_keyword, _function_2);
- ISemanticRegionsFinder _allRegionsFor_3 = this.textRegionExtensions.allRegionsFor(it);
- List _keywords = _allRegionsFor_3.keywords(",");
- final Consumer _function_3 = (ISemanticRegion it_1) -> {
- final Procedure1 _function_4 = (IHiddenRegionFormatter it_2) -> {
- it_2.oneSpace();
- };
- document.append(it_1, _function_4);
- };
- _keywords.forEach(_function_3);
- ISemanticRegionsFinder _allRegionsFor_4 = this.textRegionExtensions.allRegionsFor(it);
- List _keywords_1 = _allRegionsFor_4.keywords(".");
- final Consumer _function_4 = (ISemanticRegion it_1) -> {
- final Procedure1 _function_5 = (IHiddenRegionFormatter it_2) -> {
- it_2.noSpace();
- };
- document.surround(it_1, _function_5);
- };
- _keywords_1.forEach(_function_4);
- ISemanticRegionsFinder _allRegionsFor_5 = this.textRegionExtensions.allRegionsFor(it);
- List _keywords_2 = _allRegionsFor_5.keywords(":");
- final Consumer _function_5 = (ISemanticRegion it_1) -> {
- final Procedure1 _function_6 = (IHiddenRegionFormatter it_2) -> {
- it_2.noSpace();
- };
- document.prepend(it_1, _function_6);
- final Procedure1 _function_7 = (IHiddenRegionFormatter it_2) -> {
- it_2.oneSpace();
- };
- document.append(it_1, _function_7);
- };
- _keywords_2.forEach(_function_5);
- ISemanticRegionsFinder _allRegionsFor_6 = this.textRegionExtensions.allRegionsFor(it);
- BaseGrammarAccess.TIMEElements _tIMEAccess = this._baseGrammarAccess.getTIMEAccess();
- Keyword _sKeyword_0_1 = _tIMEAccess.getSKeyword_0_1();
- BaseGrammarAccess.TIMEElements _tIMEAccess_1 = this._baseGrammarAccess.getTIMEAccess();
- Keyword _msKeyword_1_1 = _tIMEAccess_1.getMsKeyword_1_1();
- BaseGrammarAccess.TIMEElements _tIMEAccess_2 = this._baseGrammarAccess.getTIMEAccess();
- Keyword _usKeyword_2_1 = _tIMEAccess_2.getUsKeyword_2_1();
- BaseGrammarAccess.TIMEElements _tIMEAccess_3 = this._baseGrammarAccess.getTIMEAccess();
- Keyword _nsKeyword_3_1 = _tIMEAccess_3.getNsKeyword_3_1();
- List _keywords_3 = _allRegionsFor_6.keywords(_sKeyword_0_1, _msKeyword_1_1, _usKeyword_2_1, _nsKeyword_3_1);
- final Consumer _function_6 = (ISemanticRegion it_1) -> {
- IHiddenRegion _previousHiddenRegion = it_1.getPreviousHiddenRegion();
- int _length = _previousHiddenRegion.getLength();
- boolean _greaterThan = (_length > 1);
- if (_greaterThan) {
- final Procedure1 _function_7 = (IHiddenRegionFormatter it_2) -> {
- it_2.oneSpace();
- };
- document.prepend(it_1, _function_7);
- } else {
- final Procedure1 _function_8 = (IHiddenRegionFormatter it_2) -> {
- it_2.noSpace();
- };
- document.prepend(it_1, _function_8);
- }
- final Procedure1 _function_9 = (IHiddenRegionFormatter it_2) -> {
- it_2.oneSpace();
- it_2.lowPriority();
- };
- document.append(it_1, _function_9);
- };
- _keywords_3.forEach(_function_6);
- }
-
- protected void _format(final Documentation it, @Extension final IFormattableDocument document) {
- }
-
- protected void _format(final Import it, @Extension final IFormattableDocument document) {
- ISemanticRegionsFinder _regionFor = this.textRegionExtensions.regionFor(it);
- BaseGrammarAccess.ImportElements _importAccess = this._baseGrammarAccess.getImportAccess();
- Keyword _importKeyword_0 = _importAccess.getImportKeyword_0();
- BaseGrammarAccess.ImportElements _importAccess_1 = this._baseGrammarAccess.getImportAccess();
- Keyword _modelKeyword_1_1 = _importAccess_1.getModelKeyword_1_1();
- List _keywords = _regionFor.keywords(_importKeyword_0, _modelKeyword_1_1);
- final Consumer _function = (ISemanticRegion it_1) -> {
- final Procedure1 _function_1 = (IHiddenRegionFormatter it_2) -> {
- it_2.oneSpace();
- };
- document.append(it_1, _function_1);
- };
- _keywords.forEach(_function);
- ISemanticRegionsFinder _regionFor_1 = this.textRegionExtensions.regionFor(it);
- BaseGrammarAccess.ImportElements _importAccess_2 = this._baseGrammarAccess.getImportAccess();
- Keyword _fromKeyword_1_0_1 = _importAccess_2.getFromKeyword_1_0_1();
- ISemanticRegion _keyword = _regionFor_1.keyword(_fromKeyword_1_0_1);
- final Procedure1 _function_1 = (IHiddenRegionFormatter it_1) -> {
- it_1.oneSpace();
- };
- document.surround(_keyword, _function_1);
- }
-
- protected void _format(final AnnotationType it, @Extension final IFormattableDocument document) {
- ISemanticRegionsFinder _regionFor = this.textRegionExtensions.regionFor(it);
- BaseGrammarAccess.AnnotationTypeElements _annotationTypeAccess = this._baseGrammarAccess.getAnnotationTypeAccess();
- Keyword _annotationTypeKeyword_0 = _annotationTypeAccess.getAnnotationTypeKeyword_0();
- ISemanticRegion _keyword = _regionFor.keyword(_annotationTypeKeyword_0);
- final Procedure1 _function = (IHiddenRegionFormatter it_1) -> {
- it_1.oneSpace();
- };
- document.append(_keyword, _function);
- ISemanticRegionsFinder _regionFor_1 = this.textRegionExtensions.regionFor(it);
- BaseGrammarAccess.AnnotationTypeElements _annotationTypeAccess_1 = this._baseGrammarAccess.getAnnotationTypeAccess();
- Keyword _targetKeyword_4 = _annotationTypeAccess_1.getTargetKeyword_4();
- ISemanticRegion _keyword_1 = _regionFor_1.keyword(_targetKeyword_4);
- final Procedure1 _function_1 = (IHiddenRegionFormatter it_1) -> {
- it_1.newLine();
- };
- document.prepend(_keyword_1, _function_1);
- EList _attributes = it.getAttributes();
- final Consumer _function_2 = (AnnotationAttribute it_1) -> {
- final Procedure1 _function_3 = (IHiddenRegionFormatter it_2) -> {
- it_2.newLine();
- };
- document.prepend(it_1, _function_3);
- };
- _attributes.forEach(_function_2);
- }
-
- protected void _format(final Annotation it, @Extension final IFormattableDocument document) {
- ISemanticRegionsFinder _regionFor = this.textRegionExtensions.regionFor(it);
- BaseGrammarAccess.AnnotationElements _annotationAccess = this._baseGrammarAccess.getAnnotationAccess();
- Keyword _commercialAtKeyword_0 = _annotationAccess.getCommercialAtKeyword_0();
- ISemanticRegion _keyword = _regionFor.keyword(_commercialAtKeyword_0);
- final Procedure1 _function = (IHiddenRegionFormatter it_1) -> {
- it_1.noSpace();
- };
- document.append(_keyword, _function);
- EList _attributes = it.getAttributes();
- final Consumer _function_1 = (KeyValue it_1) -> {
- final Procedure1 _function_2 = (IHiddenRegionFormatter it_2) -> {
- it_2.newLine();
- };
- document.prepend(it_1, _function_2);
- };
- _attributes.forEach(_function_1);
- }
-
- public void format(final Object it, final IFormattableDocument document) {
- if (it instanceof XtextResource) {
- _format((XtextResource)it, document);
- return;
- } else if (it instanceof Annotation) {
- _format((Annotation)it, document);
- return;
- } else if (it instanceof AnnotationType) {
- _format((AnnotationType)it, document);
- return;
- } else if (it instanceof Documentation) {
- _format((Documentation)it, document);
- return;
- } else if (it instanceof Import) {
- _format((Import)it, document);
- return;
- } else if (it instanceof EObject) {
- _format((EObject)it, document);
- return;
- } else if (it == null) {
- _format((Void)null, document);
- return;
- } else if (it != null) {
- _format(it, document);
- return;
- } else {
- throw new IllegalArgumentException("Unhandled parameter types: " +
- Arrays.asList(it, document).toString());
- }
- }
-}
diff --git a/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/formatting2/CCStringReplacer.java b/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/formatting2/CCStringReplacer.java
deleted file mode 100644
index 87dba2255..000000000
--- a/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/formatting2/CCStringReplacer.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * 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:
- * Juergen Haug (initial contribution)
- */
-package org.eclipse.etrice.core.common.formatting2;
-
-import org.eclipse.etrice.core.common.converter.CCStringConverter;
-import org.eclipse.etrice.core.common.converter.CCStringIndentation;
-import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor;
-import org.eclipse.xtext.formatting2.IFormattableDocument;
-import org.eclipse.xtext.formatting2.ITextReplacerContext;
-import org.eclipse.xtext.formatting2.internal.AbstractTextReplacer;
-import org.eclipse.xtext.formatting2.regionaccess.ITextReplacement;
-import org.eclipse.xtext.formatting2.regionaccess.ITextSegment;
-import org.eclipse.xtext.xbase.lib.ObjectExtensions;
-import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
-
-@FinalFieldsConstructor
-@SuppressWarnings("all")
-public class CCStringReplacer extends AbstractTextReplacer {
- private final CCStringConverter converter;
-
- @Override
- public ITextReplacerContext createReplacements(final ITextReplacerContext context) {
- ITextSegment _region = this.getRegion();
- boolean _isMultiline = _region.isMultiline();
- if (_isMultiline) {
- ITextSegment _region_1 = this.getRegion();
- String _text = _region_1.getText();
- String _trim = _text.trim();
- String _stripDelim = this.converter.stripDelim(_trim);
- final CCStringIndentation ccIndent = new CCStringIndentation(_stripDelim);
- String _xifexpression = null;
- boolean _isIgnoreLast = ccIndent.isIgnoreLast();
- if (_isIgnoreLast) {
- _xifexpression = context.getIndentationString();
- } else {
- _xifexpression = "";
- }
- final String endIndent = _xifexpression;
- int _indentation = context.getIndentation();
- int _plus = (_indentation + 1);
- String _indentationString = context.getIndentationString(_plus);
- String _replaceEditorIndentation = ccIndent.replaceEditorIndentation(_indentationString);
- final String replacement = (_replaceEditorIndentation + endIndent);
- final Procedure1 _function = (ITextReplacerContext it) -> {
- ITextSegment _region_2 = this.getRegion();
- String _delim = this.converter.getDelim();
- String _plus_1 = (_delim + replacement);
- String _delim_1 = this.converter.getDelim();
- String _plus_2 = (_plus_1 + _delim_1);
- ITextReplacement _replaceWith = _region_2.replaceWith(_plus_2);
- it.addReplacement(_replaceWith);
- };
- ObjectExtensions.operator_doubleArrow(context, _function);
- }
- return context;
- }
-
- public CCStringReplacer(final IFormattableDocument document, final ITextSegment region, final CCStringConverter converter) {
- super(document, region);
- this.converter = converter;
- }
-}
diff --git a/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/generator/BaseGenerator.java b/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/generator/BaseGenerator.java
deleted file mode 100644
index c3ecaf691..000000000
--- a/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/generator/BaseGenerator.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- * Eyrak Paen (initial contribution)
- */
-package org.eclipse.etrice.core.common.generator;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.xtext.generator.IFileSystemAccess;
-import org.eclipse.xtext.generator.IGenerator;
-
-/**
- * Generates code from your model files on save.
- *
- * see http://www.eclipse.org/Xtext/documentation.html#TutorialCodeGeneration
- */
-@SuppressWarnings("all")
-public class BaseGenerator implements IGenerator {
- @Override
- public void doGenerate(final Resource resource, final IFileSystemAccess fsa) {
- }
-}
diff --git a/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/postprocessing/DocuPostprocessor.java b/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/postprocessing/DocuPostprocessor.java
deleted file mode 100644
index c9d45f6da..000000000
--- a/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/postprocessing/DocuPostprocessor.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- * Juergen Haug (initial contribution)
- * Eyrak Paen
- */
-package org.eclipse.etrice.core.common.postprocessing;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.etrice.core.common.postprocessing.PostprocessingHelpers;
-import org.eclipse.xtend2.lib.StringConcatenation;
-import org.eclipse.xtext.GeneratedMetamodel;
-
-@SuppressWarnings("all")
-public class DocuPostprocessor {
- public void process(final GeneratedMetamodel metamodel) {
- final EPackage pckg = metamodel.getEPackage();
- EClass cls = PostprocessingHelpers.getClass(pckg, "Import");
- StringConcatenation _builder = new StringConcatenation();
- _builder.append("The import declares an imported {@link org.eclipse.etrice.core.room.RoomModel room model} (given as a URI) and");
- _builder.newLine();
- _builder.append("an optional imported namespace.");
- _builder.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder.toString());
- EAttribute _attribute = PostprocessingHelpers.getAttribute(cls, "importedNamespace");
- StringConcatenation _builder_1 = new StringConcatenation();
- _builder_1.append("The imported name space has to be a dot separated qualified name followed by .*.");
- _builder_1.newLine();
- _builder_1.append("Example: my.namespace.*");
- _builder_1.newLine();
- PostprocessingHelpers.setDocumentation(_attribute, _builder_1.toString());
- EAttribute _attribute_1 = PostprocessingHelpers.getAttribute(cls, "importURI");
- StringConcatenation _builder_2 = new StringConcatenation();
- _builder_2.append("The import URI can be a relative or absolute file system path.");
- _builder_2.newLine();
- _builder_2.append("It may contain environment variables in ${} which will be expanded.");
- _builder_2.newLine();
- _builder_2.append("");
- _builder_2.newLine();
- _builder_2.append("Examples:");
- _builder_2.newLine();
- _builder_2.append("
");
- _builder_2.newLine();
- _builder_2.append(" ");
- _builder_2.append("import model \"AnotherModel.room\" ");
- _builder_2.newLine();
- _builder_2.append(" ");
- _builder_2.append("import my.namespace.* from \"AnotherModel.room\" ");
- _builder_2.newLine();
- _builder_2.append(" ");
- _builder_2.append("import my.namespace.* from \"../../AnotherProject/models/AnotherModel.room\" ");
- _builder_2.newLine();
- _builder_2.append(" ");
- _builder_2.append("import my.namespace.* from \"/${ROOM_MODELS}/SomeModel.room\" ");
- _builder_2.newLine();
- _builder_2.append(" ");
- _builder_2.newLine();
- _builder_2.append("
");
- _builder_2.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_1, _builder_2.toString());
- EClass _class = PostprocessingHelpers.getClass(pckg, "LiteralArray");
- cls = _class;
- StringConcatenation _builder_3 = new StringConcatenation();
- _builder_3.append("Aggregates one or more {@link Literal literals}.\t\t");
- _builder_3.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_3.toString());
- EReference _reference = PostprocessingHelpers.getReference(cls, "literals");
- StringConcatenation _builder_4 = new StringConcatenation();
- _builder_4.append("This is a list of literals.");
- _builder_4.newLine();
- PostprocessingHelpers.setDocumentation(_reference, _builder_4.toString());
- EClass _class_1 = PostprocessingHelpers.getClass(pckg, "Literal");
- cls = _class_1;
- StringConcatenation _builder_5 = new StringConcatenation();
- _builder_5.append("It is the super class of");
- _builder_5.newLine();
- _builder_5.append("");
- _builder_5.newLine();
- _builder_5.append("\t");
- _builder_5.append("{@link BooleanLiteral} ");
- _builder_5.newLine();
- _builder_5.append("\t");
- _builder_5.append("{@link NumberLiteral} ");
- _builder_5.newLine();
- _builder_5.append("\t");
- _builder_5.append("{@link StringLiteral} ");
- _builder_5.newLine();
- _builder_5.append(" ");
- _builder_5.newLine();
- _builder_5.append("that represents a primitive value.");
- _builder_5.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_5.toString());
- EClass _class_2 = PostprocessingHelpers.getClass(pckg, "Documentation");
- cls = _class_2;
- StringConcatenation _builder_6 = new StringConcatenation();
- _builder_6.append("A piece of documentation that can be optionally attached at");
- _builder_6.newLine();
- _builder_6.append("certain places in the model.");
- _builder_6.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_6.toString());
- EAttribute _attribute_2 = PostprocessingHelpers.getAttribute(cls, "lines");
- StringConcatenation _builder_7 = new StringConcatenation();
- _builder_7.append("This is the documentation\'s contents.");
- _builder_7.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_2, _builder_7.toString());
- EClass _class_3 = PostprocessingHelpers.getClass(pckg, "Annotation");
- cls = _class_3;
- StringConcatenation _builder_8 = new StringConcatenation();
- _builder_8.append("An annotation similar to Java annotations that can be used");
- _builder_8.newLine();
- _builder_8.append("to add {@link KeyValue} pairs to certain model items. The structure ");
- _builder_8.newLine();
- _builder_8.append("of Annotations are defined by {@link AnnotationType}s.");
- _builder_8.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_8.toString());
- EReference _reference_1 = PostprocessingHelpers.getReference(cls, "type");
- StringConcatenation _builder_9 = new StringConcatenation();
- _builder_9.append("The {@link AnnotationType} that defines the structure of ");
- _builder_9.newLine();
- _builder_9.append("the annotation.");
- _builder_9.newLine();
- PostprocessingHelpers.setDocumentation(_reference_1, _builder_9.toString());
- EReference _reference_2 = PostprocessingHelpers.getReference(cls, "attributes");
- StringConcatenation _builder_10 = new StringConcatenation();
- _builder_10.append("This is a list of key/value pairs.");
- _builder_10.newLine();
- PostprocessingHelpers.setDocumentation(_reference_2, _builder_10.toString());
- EClass _class_4 = PostprocessingHelpers.getClass(pckg, "KeyValue");
- cls = _class_4;
- StringConcatenation _builder_11 = new StringConcatenation();
- _builder_11.append("A key/value pair.");
- _builder_11.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_11.toString());
- EAttribute _attribute_3 = PostprocessingHelpers.getAttribute(cls, "key");
- StringConcatenation _builder_12 = new StringConcatenation();
- _builder_12.append("This is the key of the pair.");
- _builder_12.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_3, _builder_12.toString());
- EReference _reference_3 = PostprocessingHelpers.getReference(cls, "value");
- StringConcatenation _builder_13 = new StringConcatenation();
- _builder_13.append("This is the value of the pair.");
- _builder_13.newLine();
- PostprocessingHelpers.setDocumentation(_reference_3, _builder_13.toString());
- EClass _class_5 = PostprocessingHelpers.getClass(pckg, "AnnotationType");
- cls = _class_5;
- StringConcatenation _builder_14 = new StringConcatenation();
- _builder_14.append("Defines the structure of {@link Annotation}s.");
- PostprocessingHelpers.setDocumentation(cls, _builder_14.toString());
- EAttribute _attribute_4 = PostprocessingHelpers.getAttribute(cls, "name");
- StringConcatenation _builder_15 = new StringConcatenation();
- _builder_15.append("The name of the AnnotationType");
- PostprocessingHelpers.setDocumentation(_attribute_4, _builder_15.toString());
- EAttribute _attribute_5 = PostprocessingHelpers.getAttribute(cls, "targets");
- StringConcatenation _builder_16 = new StringConcatenation();
- _builder_16.append("A list of names representing the locations in which ");
- _builder_16.newLine();
- _builder_16.append("\t\t\t");
- _builder_16.append("{@link Annotation}s of this AnnotationType can occur");
- PostprocessingHelpers.setDocumentation(_attribute_5, _builder_16.toString());
- EReference _reference_4 = PostprocessingHelpers.getReference(cls, "docu");
- StringConcatenation _builder_17 = new StringConcatenation();
- _builder_17.append("Optional model-level documentation");
- PostprocessingHelpers.setDocumentation(_reference_4, _builder_17.toString());
- EReference _reference_5 = PostprocessingHelpers.getReference(cls, "attributes");
- StringConcatenation _builder_18 = new StringConcatenation();
- _builder_18.append("Defines the {@link AnnotationAttribute}s that are required or allowed in ");
- _builder_18.newLine();
- _builder_18.append("\t\t\t");
- _builder_18.append("{@link Annotation} instances of this AnnotationType");
- PostprocessingHelpers.setDocumentation(_reference_5, _builder_18.toString());
- EClass _class_6 = PostprocessingHelpers.getClass(pckg, "AnnotationAttribute");
- cls = _class_6;
- StringConcatenation _builder_19 = new StringConcatenation();
- _builder_19.append("Defines an attribute in an {@link AnnotationType}. This attribute ");
- _builder_19.newLine();
- _builder_19.append("\t\t\t");
- _builder_19.append("can then be declared in respective {@link Annotation} instances.");
- PostprocessingHelpers.setDocumentation(cls, _builder_19.toString());
- EAttribute _attribute_6 = PostprocessingHelpers.getAttribute(cls, "optional");
- StringConcatenation _builder_20 = new StringConcatenation();
- _builder_20.append("Specifies whether the attribute should be optional or not. If the ");
- _builder_20.newLine();
- _builder_20.append("\t\t\t");
- _builder_20.append("attribute is optional, it can be omitted by {@link Annotation}s of ");
- _builder_20.newLine();
- _builder_20.append("\t\t\t");
- _builder_20.append("the same {@link AnnotationType}.");
- _builder_20.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_6, _builder_20.toString());
- EAttribute _attribute_7 = PostprocessingHelpers.getAttribute(cls, "name");
- StringConcatenation _builder_21 = new StringConcatenation();
- _builder_21.append("The name of the attribute");
- PostprocessingHelpers.setDocumentation(_attribute_7, _builder_21.toString());
- EClass _class_7 = PostprocessingHelpers.getClass(pckg, "SimpleAnnotationAttribute");
- cls = _class_7;
- StringConcatenation _builder_22 = new StringConcatenation();
- _builder_22.append("An {@link AnnotationAttribute} that is associated with a ");
- _builder_22.newLine();
- _builder_22.append("\t\t\t");
- _builder_22.append("{@link LiteralType}.");
- PostprocessingHelpers.setDocumentation(cls, _builder_22.toString());
- EAttribute _attribute_8 = PostprocessingHelpers.getAttribute(cls, "type");
- StringConcatenation _builder_23 = new StringConcatenation();
- _builder_23.append("The type of the attribute");
- PostprocessingHelpers.setDocumentation(_attribute_8, _builder_23.toString());
- EClass _class_8 = PostprocessingHelpers.getClass(pckg, "EnumAnnotationAttribute");
- cls = _class_8;
- StringConcatenation _builder_24 = new StringConcatenation();
- _builder_24.append("An {@link AnnotationAttribute} whose possible values are defined ");
- _builder_24.newLine();
- _builder_24.append("\t\t\t");
- _builder_24.append("by a list of String values.");
- PostprocessingHelpers.setDocumentation(cls, _builder_24.toString());
- EAttribute _attribute_9 = PostprocessingHelpers.getAttribute(cls, "values");
- StringConcatenation _builder_25 = new StringConcatenation();
- _builder_25.append("A list of values that define the enumeration");
- PostprocessingHelpers.setDocumentation(_attribute_9, _builder_25.toString());
- }
-}
diff --git a/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/postprocessing/PostprocessingHelpers.java b/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/postprocessing/PostprocessingHelpers.java
deleted file mode 100644
index 6281fdc5d..000000000
--- a/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/postprocessing/PostprocessingHelpers.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * Copyright (c) 2012 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:
- * Juergen Haug
- */
-package org.eclipse.etrice.core.common.postprocessing;
-
-import com.google.common.base.Objects;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.ETypedElement;
-import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.xtext.xbase.lib.Functions.Function1;
-import org.eclipse.xtext.xbase.lib.IterableExtensions;
-
-@SuppressWarnings("all")
-public class PostprocessingHelpers {
- public static int UNBOUNDED_MULTIPLICITY = ETypedElement.UNBOUNDED_MULTIPLICITY;
-
- public static String JAVADOC_NEWLINE = " ";
-
- public static EClass getClass(final EPackage pckg, final String name) {
- EClassifier _eClassifier = pckg.getEClassifier(name);
- return ((EClass) _eClassifier);
- }
-
- public static void setDocumentation(final EModelElement eModelElement, final String documentation) {
- EcoreUtil.setDocumentation(eModelElement, (PostprocessingHelpers.JAVADOC_NEWLINE + documentation));
- }
-
- public static EAttribute getAttribute(final EClass cls, final String name) {
- EList _eAllAttributes = cls.getEAllAttributes();
- final Function1 _function = (EAttribute a) -> {
- String _name = a.getName();
- return Boolean.valueOf(_name.equals(name));
- };
- return IterableExtensions.findFirst(_eAllAttributes, _function);
- }
-
- public static EReference getReference(final EClass cls, final String name) {
- EList _eAllReferences = cls.getEAllReferences();
- final Function1 _function = (EReference a) -> {
- String _name = a.getName();
- return Boolean.valueOf(_name.equals(name));
- };
- return IterableExtensions.findFirst(_eAllReferences, _function);
- }
-
- public static boolean addOperation(final EClass owner, final String name, final EClassifier type) {
- return PostprocessingHelpers.addOperation(owner, name, type, Integer.valueOf(1), null);
- }
-
- public static boolean addOperation(final EClass owner, final String name, final EClassifier type, final String body) {
- return PostprocessingHelpers.addOperation(owner, name, type, Integer.valueOf(1), body);
- }
-
- public static boolean addOperation(final EClass owner, final String name, final EClassifier type, final Integer upperBound, final String body) {
- boolean _xblockexpression = false;
- {
- final EOperation op = EcoreFactory.eINSTANCE.createEOperation();
- op.setName(name);
- op.setEType(type);
- op.setUpperBound((upperBound).intValue());
- boolean _notEquals = (!Objects.equal(body, null));
- if (_notEquals) {
- final EAnnotation anno = EcoreFactory.eINSTANCE.createEAnnotation();
- anno.setSource("http://www.eclipse.org/emf/2002/GenModel");
- EMap _details = anno.getDetails();
- _details.put("body", body);
- EList _eAnnotations = op.getEAnnotations();
- _eAnnotations.add(anno);
- }
- EList _eOperations = owner.getEOperations();
- _xblockexpression = _eOperations.add(op);
- }
- return _xblockexpression;
- }
-
- public static EClass addClass(final EPackage pck, final String name) {
- final EClass cls = EcoreFactory.eINSTANCE.createEClass();
- cls.setName(name);
- EList _eClassifiers = pck.getEClassifiers();
- _eClassifiers.add(cls);
- return cls;
- }
-}
diff --git a/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/scoping/BaseScopeProvider.java b/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/scoping/BaseScopeProvider.java
deleted file mode 100644
index 84b499b84..000000000
--- a/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/scoping/BaseScopeProvider.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- * Eyrak Paen (initial contribution)
- */
-package org.eclipse.etrice.core.common.scoping;
-
-import org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider;
-
-/**
- * This class contains custom scoping description.
- *
- * see : http://www.eclipse.org/Xtext/documentation.html#scoping
- * on how and when to use it
- */
-@SuppressWarnings("all")
-public class BaseScopeProvider extends AbstractDeclarativeScopeProvider {
-}
diff --git a/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/scoping/BaseTestScopeProvider.java b/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/scoping/BaseTestScopeProvider.java
deleted file mode 100644
index 0f423f1cf..000000000
--- a/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/scoping/BaseTestScopeProvider.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright (c) 2013 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
- *
- * generated by Xtext
- */
-package org.eclipse.etrice.core.common.scoping;
-
-import org.eclipse.etrice.core.common.scoping.BaseScopeProvider;
-
-/**
- * This class contains custom scoping description.
- *
- * see : http://www.eclipse.org/Xtext/documentation.html#scoping
- * on how and when to use it
- */
-@SuppressWarnings("all")
-public class BaseTestScopeProvider extends BaseScopeProvider {
-}
diff --git a/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/validation/ValidationHelpers.java b/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/validation/ValidationHelpers.java
deleted file mode 100644
index 7510e4031..000000000
--- a/plugins/org.eclipse.etrice.core.common/xtend-gen/org/eclipse/etrice/core/common/validation/ValidationHelpers.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/**
- * Copyright (c) 2014 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:
- * hrentz (initial contribution)
- */
-package org.eclipse.etrice.core.common.validation;
-
-import com.google.common.base.Function;
-import com.google.common.base.Objects;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.function.Consumer;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.xtend.lib.Property;
-import org.eclipse.xtext.xbase.lib.CollectionLiterals;
-import org.eclipse.xtext.xbase.lib.Functions.Function1;
-import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.Pure;
-
-/**
- * @author hrentz
- */
-@SuppressWarnings("all")
-public class ValidationHelpers {
- public static class NamedObject {
- @Property
- private String _name;
-
- @Property
- private EObject _obj;
-
- @Property
- private EStructuralFeature _feature;
-
- public NamedObject(final String name, final EObject obj, final EStructuralFeature feature) {
- this.setName(name);
- this.setObj(obj);
- this.setFeature(feature);
- }
-
- @Pure
- public String getName() {
- return this._name;
- }
-
- public void setName(final String name) {
- this._name = name;
- }
-
- @Pure
- public EObject getObj() {
- return this._obj;
- }
-
- public void setObj(final EObject obj) {
- this._obj = obj;
- }
-
- @Pure
- public EStructuralFeature getFeature() {
- return this._feature;
- }
-
- public void setFeature(final EStructuralFeature feature) {
- this._feature = feature;
- }
- }
-
- public static class NamedObjectList extends ArrayList {
- public void addAll(final List extends EObject> items, final EStructuralFeature feature) {
- final Consumer _function = (EObject it) -> {
- Object _eGet = it.eGet(feature);
- ValidationHelpers.NamedObject _namedObject = new ValidationHelpers.NamedObject(((String) _eGet), it, feature);
- this.add(_namedObject);
- };
- items.forEach(_function);
- }
- }
-
- public static Iterable removeUniques(final List items) {
- Iterable _xblockexpression = null;
- {
- final Set allOfName = CollectionLiterals.newHashSet();
- final Set duplicateNames = CollectionLiterals.newHashSet();
- for (final ValidationHelpers.NamedObject i : items) {
- String _name = i.getName();
- boolean _contains = allOfName.contains(_name);
- if (_contains) {
- String _name_1 = i.getName();
- duplicateNames.add(_name_1);
- } else {
- String _name_2 = i.getName();
- allOfName.add(_name_2);
- }
- }
- final Function1 _function = (ValidationHelpers.NamedObject i_1) -> {
- String _name_3 = i_1.getName();
- return Boolean.valueOf(duplicateNames.contains(_name_3));
- };
- _xblockexpression = IterableExtensions.filter(items, _function);
- }
- return _xblockexpression;
- }
-
- public static Iterable inSameResource(final Iterable items, final Resource resource) {
- final Function1 _function = (ValidationHelpers.NamedObject i) -> {
- EObject _obj = i.getObj();
- Resource _eResource = _obj.eResource();
- return Boolean.valueOf(Objects.equal(_eResource, resource));
- };
- return IterableExtensions.filter(items, _function);
- }
-
- /**
- * Visitor for inheritance, safeguards from null, eProxy and circular issues.
- *
- * @param start EObject, may be null
- * @param function return null to exit
- */
- public static void saveRecursiveVisitor(final E start, final Function function) {
- final Set visited = CollectionLiterals.newHashSet();
- E next = start;
- while ((((!Objects.equal(next, null)) && (!next.eIsProxy())) && visited.add(next))) {
- E _apply = function.apply(next);
- next = _apply;
- }
- }
-}
diff --git a/plugins/org.eclipse.etrice.core.config/xtend-gen/org/eclipse/etrice/core/generator/ConfigGenerator.java b/plugins/org.eclipse.etrice.core.config/xtend-gen/org/eclipse/etrice/core/generator/ConfigGenerator.java
deleted file mode 100644
index 9a5cd6ec6..000000000
--- a/plugins/org.eclipse.etrice.core.config/xtend-gen/org/eclipse/etrice/core/generator/ConfigGenerator.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * generated by Xtext
- */
-package org.eclipse.etrice.core.generator;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.xtext.generator.IFileSystemAccess;
-import org.eclipse.xtext.generator.IGenerator;
-
-@SuppressWarnings("all")
-public class ConfigGenerator implements IGenerator {
- @Override
- public void doGenerate(final Resource resource, final IFileSystemAccess fsa) {
- }
-}
diff --git a/plugins/org.eclipse.etrice.core.config/xtend-gen/org/eclipse/etrice/core/postprocessing/DocuPostprocessor.java b/plugins/org.eclipse.etrice.core.config/xtend-gen/org/eclipse/etrice/core/postprocessing/DocuPostprocessor.java
deleted file mode 100644
index 0de457200..000000000
--- a/plugins/org.eclipse.etrice.core.config/xtend-gen/org/eclipse/etrice/core/postprocessing/DocuPostprocessor.java
+++ /dev/null
@@ -1,423 +0,0 @@
-/**
- * Copyright (c) 2012 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:
- * Juergen Haug (initial contribution)
- */
-package org.eclipse.etrice.core.postprocessing;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.etrice.core.common.postprocessing.PostprocessingHelpers;
-import org.eclipse.xtend2.lib.StringConcatenation;
-import org.eclipse.xtext.GeneratedMetamodel;
-
-@SuppressWarnings("all")
-public class DocuPostprocessor {
- public void process(final GeneratedMetamodel metamodel) {
- final EPackage pckg = metamodel.getEPackage();
- EClass cls = PostprocessingHelpers.getClass(pckg, "ConfigModel");
- StringConcatenation _builder = new StringConcatenation();
- _builder.append("The root object for the ROOM Config model. It gives access to");
- _builder.newLine();
- _builder.append("the {@link SubSystemConfig sub system class},");
- _builder.newLine();
- _builder.append("{@link ActorClassConfig actor class}, {@link ProtocolClassConfig protocol class} and");
- _builder.newLine();
- _builder.append("{@link ActorInstanceConfig actor instance} configurations and the room model {@link Import imports}.");
- _builder.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder.toString());
- EAttribute _attribute = PostprocessingHelpers.getAttribute(cls, "name");
- StringConcatenation _builder_1 = new StringConcatenation();
- _builder_1.append("The model name is a dot separated fully qualified name and is");
- _builder_1.newLine();
- _builder_1.append("used to provide a name space.");
- _builder_1.newLine();
- PostprocessingHelpers.setDocumentation(_attribute, _builder_1.toString());
- EReference _reference = PostprocessingHelpers.getReference(cls, "imports");
- StringConcatenation _builder_2 = new StringConcatenation();
- _builder_2.append("This is a list of all imported room models. The config elements reference these imports.");
- _builder_2.newLine();
- PostprocessingHelpers.setDocumentation(_reference, _builder_2.toString());
- EReference _reference_1 = PostprocessingHelpers.getReference(cls, "configElements");
- StringConcatenation _builder_3 = new StringConcatenation();
- _builder_3.append("This is a list of all top level config elements");
- _builder_3.newLine();
- PostprocessingHelpers.setDocumentation(_reference_1, _builder_3.toString());
- EClass _class = PostprocessingHelpers.getClass(pckg, "ConfigElement");
- cls = _class;
- StringConcatenation _builder_4 = new StringConcatenation();
- _builder_4.append("This is the super class of the top level config elements");
- _builder_4.newLine();
- _builder_4.append("");
- _builder_4.newLine();
- _builder_4.append("\t");
- _builder_4.append("{@link SubSystemConfig} ");
- _builder_4.newLine();
- _builder_4.append("\t");
- _builder_4.append("{@link ActorClassConfig} ");
- _builder_4.newLine();
- _builder_4.append("\t");
- _builder_4.append("{@link ActorInstanceConfig} ");
- _builder_4.newLine();
- _builder_4.append("\t");
- _builder_4.append("{@link ProtocolClassConfig} ");
- _builder_4.newLine();
- _builder_4.append(" ");
- _builder_4.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_4.toString());
- EClass _class_1 = PostprocessingHelpers.getClass(pckg, "SubSystemConfig");
- cls = _class_1;
- StringConcatenation _builder_5 = new StringConcatenation();
- _builder_5.append("This class defines settings with a sub system scope.");
- _builder_5.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_5.toString());
- EReference _reference_2 = PostprocessingHelpers.getReference(cls, "root");
- StringConcatenation _builder_6 = new StringConcatenation();
- _builder_6.append("This is the logical system that contains the {@link org.eclipse.etrice.core.room.SubSystemRef sub system reference}.");
- _builder_6.newLine();
- PostprocessingHelpers.setDocumentation(_reference_2, _builder_6.toString());
- EReference _reference_3 = PostprocessingHelpers.getReference(cls, "subSystem");
- StringConcatenation _builder_7 = new StringConcatenation();
- _builder_7.append("This is the sub system reference.");
- _builder_7.newLine();
- PostprocessingHelpers.setDocumentation(_reference_3, _builder_7.toString());
- EReference _reference_4 = PostprocessingHelpers.getReference(cls, "dynConfig");
- StringConcatenation _builder_8 = new StringConcatenation();
- _builder_8.append("This is the dynamic configuration. It is available within the {@link #getSubSystem sub system}.");
- _builder_8.newLine();
- PostprocessingHelpers.setDocumentation(_reference_4, _builder_8.toString());
- EClass _class_2 = PostprocessingHelpers.getClass(pckg, "DynamicConfig");
- cls = _class_2;
- StringConcatenation _builder_9 = new StringConcatenation();
- _builder_9.append("The dynamic configuration provides a configuration at runtime.");
- _builder_9.newLine();
- _builder_9.append("The source of the configuration is abstracted by an interface.");
- _builder_9.newLine();
- _builder_9.append(" ");
- _builder_9.newLine();
- _builder_9.append("This feature is experimental and implemented for target language java only.");
- _builder_9.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_9.toString());
- EAttribute _attribute_1 = PostprocessingHelpers.getAttribute(cls, "filePath");
- StringConcatenation _builder_10 = new StringConcatenation();
- _builder_10.append("This is the file path of the configuration. In this case the source of the configuration is a simple file.");
- _builder_10.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_1, _builder_10.toString());
- EAttribute _attribute_2 = PostprocessingHelpers.getAttribute(cls, "userCode1");
- StringConcatenation _builder_11 = new StringConcatenation();
- _builder_11.append("Defines the import statement for the implemenation of the configuration source.");
- _builder_11.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_2, _builder_11.toString());
- EAttribute _attribute_3 = PostprocessingHelpers.getAttribute(cls, "userCode2");
- StringConcatenation _builder_12 = new StringConcatenation();
- _builder_12.append("This is the constructor statement for the implemenation of the configuration source.");
- _builder_12.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_3, _builder_12.toString());
- EAttribute _attribute_4 = PostprocessingHelpers.getAttribute(cls, "polling");
- StringConcatenation _builder_13 = new StringConcatenation();
- _builder_13.append("Defines the time interval in milliseconds to query changes from the configuration source.");
- _builder_13.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_4, _builder_13.toString());
- EClass _class_3 = PostprocessingHelpers.getClass(pckg, "ActorClassConfig");
- cls = _class_3;
- StringConcatenation _builder_14 = new StringConcatenation();
- _builder_14.append("This class models a configuration for an {@link org.eclipse.etrice.core.room.ActorClass actor class}.");
- _builder_14.newLine();
- _builder_14.append("The configuration defines the default values for all instances of the {@link #getActor actor}.");
- _builder_14.newLine();
- _builder_14.append("The values are applied at generation time.");
- _builder_14.newLine();
- _builder_14.append("The config sub elements are:");
- _builder_14.newLine();
- _builder_14.append("");
- _builder_14.newLine();
- _builder_14.append("\t");
- _builder_14.append("{@link AttrClassConfig attribute class config} ");
- _builder_14.newLine();
- _builder_14.append(" \t\t\t\t");
- _builder_14.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_14.toString());
- EReference _reference_5 = PostprocessingHelpers.getReference(cls, "actor");
- StringConcatenation _builder_15 = new StringConcatenation();
- _builder_15.append("This is the actor class.");
- _builder_15.newLine();
- PostprocessingHelpers.setDocumentation(_reference_5, _builder_15.toString());
- EReference _reference_6 = PostprocessingHelpers.getReference(cls, "attributes");
- StringConcatenation _builder_16 = new StringConcatenation();
- _builder_16.append("This is a list of all attribute configurations.");
- _builder_16.newLine();
- PostprocessingHelpers.setDocumentation(_reference_6, _builder_16.toString());
- EClass _class_4 = PostprocessingHelpers.getClass(pckg, "ProtocolClassConfig");
- cls = _class_4;
- StringConcatenation _builder_17 = new StringConcatenation();
- _builder_17.append("This class models a configuration for an {@link org.eclipse.etrice.core.room.ProtocolClass protocol class}.");
- _builder_17.newLine();
- _builder_17.append("The config sub elements are:");
- _builder_17.newLine();
- _builder_17.append("");
- _builder_17.newLine();
- _builder_17.append("\t");
- _builder_17.append("a {@link PortClassConfig port class config} for the regular port class ");
- _builder_17.newLine();
- _builder_17.append("\t");
- _builder_17.append("a {@link PortClassConfig port class config} for the conjugate port class ");
- _builder_17.newLine();
- _builder_17.append(" ");
- _builder_17.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_17.toString());
- EReference _reference_7 = PostprocessingHelpers.getReference(cls, "protocol");
- StringConcatenation _builder_18 = new StringConcatenation();
- _builder_18.append("This is the protocol class.");
- _builder_18.newLine();
- PostprocessingHelpers.setDocumentation(_reference_7, _builder_18.toString());
- EReference _reference_8 = PostprocessingHelpers.getReference(cls, "regular");
- StringConcatenation _builder_19 = new StringConcatenation();
- _builder_19.append("This is the configuration for the regular part of the protocol.");
- _builder_19.newLine();
- PostprocessingHelpers.setDocumentation(_reference_8, _builder_19.toString());
- EReference _reference_9 = PostprocessingHelpers.getReference(cls, "conjugated");
- StringConcatenation _builder_20 = new StringConcatenation();
- _builder_20.append("This is the configuration for the conjugated part of the protocol.");
- _builder_20.newLine();
- PostprocessingHelpers.setDocumentation(_reference_9, _builder_20.toString());
- EClass _class_5 = PostprocessingHelpers.getClass(pckg, "PortClassConfig");
- cls = _class_5;
- StringConcatenation _builder_21 = new StringConcatenation();
- _builder_21.append("This class models a configuration for an {@link org.eclipse.etrice.core.room.PortClass port class}.");
- _builder_21.newLine();
- _builder_21.append("The configuration defines the default values for all instances of the port.");
- _builder_21.newLine();
- _builder_21.append("The values are applied at generation time.");
- _builder_21.newLine();
- _builder_21.append("The config sub elements are:");
- _builder_21.newLine();
- _builder_21.append("");
- _builder_21.newLine();
- _builder_21.append("\t");
- _builder_21.append("{@link AttrClassConfig attribute class config} ");
- _builder_21.newLine();
- _builder_21.append(" ");
- _builder_21.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_21.toString());
- EReference _reference_10 = PostprocessingHelpers.getReference(cls, "attributes");
- StringConcatenation _builder_22 = new StringConcatenation();
- _builder_22.append("This is a list of all attribute configurations.");
- _builder_22.newLine();
- PostprocessingHelpers.setDocumentation(_reference_10, _builder_22.toString());
- EClass _class_6 = PostprocessingHelpers.getClass(pckg, "ActorInstanceConfig");
- cls = _class_6;
- StringConcatenation _builder_23 = new StringConcatenation();
- _builder_23.append("This class models a configuration for an {@link org.eclipse.etrice.core.room.ActorRef actor instance}.");
- _builder_23.newLine();
- _builder_23.append("The configuration defines values for this actor instance and overrides the default values from the corresponding class config.");
- _builder_23.newLine();
- _builder_23.append("The values are applied at generation time.");
- _builder_23.newLine();
- _builder_23.append("The config sub elements are:");
- _builder_23.newLine();
- _builder_23.append("");
- _builder_23.newLine();
- _builder_23.append("\t");
- _builder_23.append("{@link AttrInstanceConfig attribute instance config} ");
- _builder_23.newLine();
- _builder_23.append(" \t\t\t\t");
- _builder_23.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_23.toString());
- EReference _reference_11 = PostprocessingHelpers.getReference(cls, "root");
- StringConcatenation _builder_24 = new StringConcatenation();
- _builder_24.append("This is the logical system that contains the {@link #getSubSystem sub system}.");
- _builder_24.newLine();
- PostprocessingHelpers.setDocumentation(_reference_11, _builder_24.toString());
- EReference _reference_12 = PostprocessingHelpers.getReference(cls, "subSystem");
- StringConcatenation _builder_25 = new StringConcatenation();
- _builder_25.append("This is the sub system that contains the {@link #getPath actor instance}.");
- _builder_25.newLine();
- PostprocessingHelpers.setDocumentation(_reference_12, _builder_25.toString());
- EReference _reference_13 = PostprocessingHelpers.getReference(cls, "path");
- StringConcatenation _builder_26 = new StringConcatenation();
- _builder_26.append("This is the path of the actor instance relative to the {@link #getSubSystem sub system}.");
- _builder_26.newLine();
- PostprocessingHelpers.setDocumentation(_reference_13, _builder_26.toString());
- EReference _reference_14 = PostprocessingHelpers.getReference(cls, "attributes");
- StringConcatenation _builder_27 = new StringConcatenation();
- _builder_27.append("This is a list of all attribute configurations.");
- _builder_27.newLine();
- PostprocessingHelpers.setDocumentation(_reference_14, _builder_27.toString());
- EReference _reference_15 = PostprocessingHelpers.getReference(cls, "ports");
- StringConcatenation _builder_28 = new StringConcatenation();
- _builder_28.append("This is a list of all port configurations.");
- _builder_28.newLine();
- PostprocessingHelpers.setDocumentation(_reference_15, _builder_28.toString());
- EClass _class_7 = PostprocessingHelpers.getClass(pckg, "PortInstanceConfig");
- cls = _class_7;
- StringConcatenation _builder_29 = new StringConcatenation();
- _builder_29.append("This class models a configuration for an {@link org.eclipse.etrice.core.room.InterfaceItem interface item} (e.g. port instance).");
- _builder_29.newLine();
- _builder_29.append("The configuration defines values for this interface item and overrides the default values from the corresponding class config.");
- _builder_29.newLine();
- _builder_29.append("The values are applied at generation time.");
- _builder_29.newLine();
- _builder_29.append("The config sub elements are:");
- _builder_29.newLine();
- _builder_29.append("");
- _builder_29.newLine();
- _builder_29.append("\t");
- _builder_29.append("{@link AttrInstanceConfig attribute instance config} ");
- _builder_29.newLine();
- _builder_29.append(" \t\t\t\t");
- _builder_29.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_29.toString());
- EReference _reference_16 = PostprocessingHelpers.getReference(cls, "item");
- StringConcatenation _builder_30 = new StringConcatenation();
- _builder_30.append("This is the interface item.");
- _builder_30.newLine();
- PostprocessingHelpers.setDocumentation(_reference_16, _builder_30.toString());
- EReference _reference_17 = PostprocessingHelpers.getReference(cls, "attributes");
- StringConcatenation _builder_31 = new StringConcatenation();
- _builder_31.append("This is a list of all attribute configurations.");
- _builder_31.newLine();
- PostprocessingHelpers.setDocumentation(_reference_17, _builder_31.toString());
- EClass _class_8 = PostprocessingHelpers.getClass(pckg, "AttrConfig");
- cls = _class_8;
- StringConcatenation _builder_32 = new StringConcatenation();
- _builder_32.append("It is the super class of");
- _builder_32.newLine();
- _builder_32.append("");
- _builder_32.newLine();
- _builder_32.append("\t");
- _builder_32.append("{@link AttrClassConfig} ");
- _builder_32.newLine();
- _builder_32.append("\t");
- _builder_32.append("{@link AttrInstanceConfig} ");
- _builder_32.newLine();
- _builder_32.append(" \t\t\t\t");
- _builder_32.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_32.toString());
- EReference _reference_18 = PostprocessingHelpers.getReference(cls, "attribute");
- StringConcatenation _builder_33 = new StringConcatenation();
- _builder_33.append("This is the attribute.");
- _builder_33.newLine();
- PostprocessingHelpers.setDocumentation(_reference_18, _builder_33.toString());
- EReference _reference_19 = PostprocessingHelpers.getReference(cls, "value");
- StringConcatenation _builder_34 = new StringConcatenation();
- _builder_34.append("This is the value of {@link #getAttribute attribute}.");
- _builder_34.newLine();
- PostprocessingHelpers.setDocumentation(_reference_19, _builder_34.toString());
- EClass _class_9 = PostprocessingHelpers.getClass(pckg, "AttrClassConfig");
- cls = _class_9;
- StringConcatenation _builder_35 = new StringConcatenation();
- _builder_35.append("This class models a configuration for an {@link org.eclipse.etrice.core.room.Attribute attribute}.");
- _builder_35.newLine();
- _builder_35.append("The configuration defines a default value for all instances of the attribute.");
- _builder_35.newLine();
- _builder_35.append("The values are applied at generation time.");
- _builder_35.newLine();
- _builder_35.append(" If the type of the given {@link org.eclipse.etrice.core.config.AttrConfig#getAttribute attribute} is");
- _builder_35.newLine();
- _builder_35.append("");
- _builder_35.newLine();
- _builder_35.append("\t");
- _builder_35.append("primitive, then a {@link org.eclipse.etrice.core.config.AttrConfig#getValue value} might exist and {@link #getAttributes attributes} is empty ");
- _builder_35.newLine();
- _builder_35.append("\t");
- _builder_35.append("compound attribute (e.g. {@link org.eclipse.etrice.core.room.DataClass data class}), then {@link org.eclipse.etrice.core.config.AttrConfig#getValue value} is null and configurations for children {@link #getAttributes attributes} might exist ");
- _builder_35.newLine();
- _builder_35.append(" \t\t\t\t");
- _builder_35.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_35.toString());
- EReference _reference_20 = PostprocessingHelpers.getReference(cls, "attributes");
- StringConcatenation _builder_36 = new StringConcatenation();
- _builder_36.append("This is a list of attribute configurations of children attributes, in case the {@link org.eclipse.etrice.core.config.AttrConfig#getAttribute attribute} is compound.");
- _builder_36.newLine();
- PostprocessingHelpers.setDocumentation(_reference_20, _builder_36.toString());
- EReference _reference_21 = PostprocessingHelpers.getReference(cls, "min");
- StringConcatenation _builder_37 = new StringConcatenation();
- _builder_37.append("This is the lower bound of {@link org.eclipse.etrice.core.config.AttrConfig#getValue value} , in case the {@link org.eclipse.etrice.core.config.AttrConfig#getAttribute attribute} has a numerical value.");
- _builder_37.newLine();
- PostprocessingHelpers.setDocumentation(_reference_21, _builder_37.toString());
- EReference _reference_22 = PostprocessingHelpers.getReference(cls, "max");
- StringConcatenation _builder_38 = new StringConcatenation();
- _builder_38.append("This is the upper bound of {@link org.eclipse.etrice.core.config.AttrConfig#getValue value} , in case the {@link org.eclipse.etrice.core.config.AttrConfig#getAttribute attribute} has a numerical value.");
- _builder_38.newLine();
- PostprocessingHelpers.setDocumentation(_reference_22, _builder_38.toString());
- EClass _class_10 = PostprocessingHelpers.getClass(pckg, "AttrInstanceConfig");
- cls = _class_10;
- StringConcatenation _builder_39 = new StringConcatenation();
- _builder_39.append("This class models a configuration for an {@link org.eclipse.etrice.core.room.Attribute attribute}.");
- _builder_39.newLine();
- _builder_39.append("The configuration defines values for this attribute instance and overrides the default values from the corresponding class config.");
- _builder_39.newLine();
- _builder_39.append("The values are applied at generation time.");
- _builder_39.newLine();
- _builder_39.append(" If the type of the given {@link org.eclipse.etrice.core.config.AttrConfig#getAttribute attribute} is");
- _builder_39.newLine();
- _builder_39.append("");
- _builder_39.newLine();
- _builder_39.append("\t");
- _builder_39.append("primitive, then a {@link org.eclipse.etrice.core.config.AttrConfig#getValue value} might exist and {@link #getAttributes attributes} is empty ");
- _builder_39.newLine();
- _builder_39.append("\t");
- _builder_39.append("compound attribute (e.g. {@link org.eclipse.etrice.core.room.DataClass data class}), then {@link org.eclipse.etrice.core.config.AttrConfig#getValue value} is null and configurations for children {@link #getAttributes attributes} might exist ");
- _builder_39.newLine();
- _builder_39.append(" \t\t\t\t");
- _builder_39.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_39.toString());
- EReference _reference_23 = PostprocessingHelpers.getReference(cls, "attributes");
- StringConcatenation _builder_40 = new StringConcatenation();
- _builder_40.append("This is a list of attribute configurations of children attributes, in case the {@link org.eclipse.etrice.core.config.AttrConfig#getAttribute attribute} is compound.");
- _builder_40.newLine();
- PostprocessingHelpers.setDocumentation(_reference_23, _builder_40.toString());
- EAttribute _attribute_5 = PostprocessingHelpers.getAttribute(cls, "dynConfig");
- StringConcatenation _builder_41 = new StringConcatenation();
- _builder_41.append("If the dynamic configuration options is activated for this attribute, then the values are set at runtime by the means of the {@link DynamicConfig dynamic config}.");
- _builder_41.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_5, _builder_41.toString());
- EAttribute _attribute_6 = PostprocessingHelpers.getAttribute(cls, "readOnly");
- StringConcatenation _builder_42 = new StringConcatenation();
- _builder_42.append("Controls the behavior of the dynamic configuration. If set to false, then {@link org.eclipse.etrice.core.config.AttrConfig#getValue value} is updated (overwritten) if changes occur in the external configuration, ");
- _builder_42.newLine();
- _builder_42.append("otherwise set to true, then changes in {@link org.eclipse.etrice.core.config.AttrConfig#getValue value} (that occur from within the system) are recorded to the external configuration.");
- _builder_42.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_6, _builder_42.toString());
- EClass _class_11 = PostprocessingHelpers.getClass(pckg, "RefPath");
- cls = _class_11;
- StringConcatenation _builder_43 = new StringConcatenation();
- _builder_43.append("A path of strings that are interpreted as {@link org.eclipse.etrice.core.room.ActorRef}s starting at a {@link org.eclipse.etrice.core.room.SubSystemClass}.");
- _builder_43.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_43.toString());
- EReference _reference_24 = PostprocessingHelpers.getReference(cls, "refs");
- StringConcatenation _builder_44 = new StringConcatenation();
- _builder_44.append("This is a path in the instance tree where each segment corresponds to the name of the");
- _builder_44.newLine();
- _builder_44.append("corresponding {@link {@link org.eclipse.etrice.core.room.ActorContainerRef}}.");
- _builder_44.newLine();
- PostprocessingHelpers.setDocumentation(_reference_24, _builder_44.toString());
- EClass _class_12 = PostprocessingHelpers.getClass(pckg, "RefSegment");
- cls = _class_12;
- StringConcatenation _builder_45 = new StringConcatenation();
- _builder_45.append("A segment of a {@link RefPath}. It consists of a name and an optional index.");
- _builder_45.newLine();
- _builder_45.append("If the index is not set it will be {@code -1}.");
- _builder_45.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_45.toString());
- EAttribute _attribute_7 = PostprocessingHelpers.getAttribute(cls, "ref");
- StringConcatenation _builder_46 = new StringConcatenation();
- _builder_46.append("The segment name corresponding to an actor reference.");
- _builder_46.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_7, _builder_46.toString());
- EAttribute _attribute_8 = PostprocessingHelpers.getAttribute(cls, "idx");
- StringConcatenation _builder_47 = new StringConcatenation();
- _builder_47.append("The optional index of the reference (for replicated actors).");
- _builder_47.newLine();
- _builder_47.append("If not set the index is {@code -1}.");
- _builder_47.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_8, _builder_47.toString());
- }
-}
diff --git a/plugins/org.eclipse.etrice.core.config/xtend-gen/org/eclipse/etrice/core/postprocessing/ImplPostProcessing.java b/plugins/org.eclipse.etrice.core.config/xtend-gen/org/eclipse/etrice/core/postprocessing/ImplPostProcessing.java
deleted file mode 100644
index be12d889f..000000000
--- a/plugins/org.eclipse.etrice.core.config/xtend-gen/org/eclipse/etrice/core/postprocessing/ImplPostProcessing.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * Copyright (c) 2012 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:
- * Juergen Haug
- */
-package org.eclipse.etrice.core.postprocessing;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.etrice.core.common.postprocessing.PostprocessingHelpers;
-import org.eclipse.xtend2.lib.StringConcatenation;
-import org.eclipse.xtext.GeneratedMetamodel;
-
-@SuppressWarnings("all")
-public class ImplPostProcessing {
- public boolean process(final GeneratedMetamodel metamodel) {
- boolean _xblockexpression = false;
- {
- final EPackage configPackage = metamodel.getEPackage();
- final EClass configModel = PostprocessingHelpers.getClass(configPackage, "ConfigModel");
- EClassifier _eClassifier = configPackage.getEClassifier("ActorClassConfig");
- StringConcatenation _builder = new StringConcatenation();
- _builder.append("EList list = new org.eclipse.emf.common.util.BasicEList();");
- _builder.newLine();
- _builder.append("for(ConfigElement element : this.getConfigElements())");
- _builder.newLine();
- _builder.append("\t");
- _builder.append("if(element instanceof ActorClassConfig)");
- _builder.newLine();
- _builder.append("\t\t");
- _builder.append("list.add((ActorClassConfig) element);");
- _builder.newLine();
- _builder.append("return list;");
- _builder.newLine();
- PostprocessingHelpers.addOperation(configModel,
- "getActorClassConfigs", _eClassifier,
- Integer.valueOf(PostprocessingHelpers.UNBOUNDED_MULTIPLICITY), _builder.toString());
- EClassifier _eClassifier_1 = configPackage.getEClassifier("ActorInstanceConfig");
- StringConcatenation _builder_1 = new StringConcatenation();
- _builder_1.append("EList list = new org.eclipse.emf.common.util.BasicEList();");
- _builder_1.newLine();
- _builder_1.append("for(ConfigElement element : this.getConfigElements())");
- _builder_1.newLine();
- _builder_1.append("\t");
- _builder_1.append("if(element instanceof ActorInstanceConfig)");
- _builder_1.newLine();
- _builder_1.append("\t\t");
- _builder_1.append("list.add((ActorInstanceConfig) element);");
- _builder_1.newLine();
- _builder_1.append("return list;");
- PostprocessingHelpers.addOperation(configModel,
- "getActorInstanceConfigs", _eClassifier_1,
- Integer.valueOf(PostprocessingHelpers.UNBOUNDED_MULTIPLICITY), _builder_1.toString());
- EClassifier _eClassifier_2 = configPackage.getEClassifier("ProtocolClassConfig");
- StringConcatenation _builder_2 = new StringConcatenation();
- _builder_2.append("EList list = new org.eclipse.emf.common.util.BasicEList();");
- _builder_2.newLine();
- _builder_2.append("for(ConfigElement element : this.getConfigElements())");
- _builder_2.newLine();
- _builder_2.append("\t");
- _builder_2.append("if(element instanceof ProtocolClassConfig)");
- _builder_2.newLine();
- _builder_2.append("\t\t");
- _builder_2.append("list.add((ProtocolClassConfig) element);");
- _builder_2.newLine();
- _builder_2.append("return list;");
- _builder_2.newLine();
- PostprocessingHelpers.addOperation(configModel,
- "getProtocolClassConfigs", _eClassifier_2,
- Integer.valueOf(PostprocessingHelpers.UNBOUNDED_MULTIPLICITY), _builder_2.toString());
- EClassifier _eClassifier_3 = configPackage.getEClassifier("SubSystemConfig");
- StringConcatenation _builder_3 = new StringConcatenation();
- _builder_3.append("EList list = new org.eclipse.emf.common.util.BasicEList();");
- _builder_3.newLine();
- _builder_3.append("for(ConfigElement element : this.getConfigElements())");
- _builder_3.newLine();
- _builder_3.append("\t");
- _builder_3.append("if(element instanceof SubSystemConfig)");
- _builder_3.newLine();
- _builder_3.append("\t\t");
- _builder_3.append("list.add((SubSystemConfig) element);");
- _builder_3.newLine();
- _builder_3.append("return list;");
- PostprocessingHelpers.addOperation(configModel,
- "getSubSystemConfigs", _eClassifier_3,
- Integer.valueOf(PostprocessingHelpers.UNBOUNDED_MULTIPLICITY), _builder_3.toString());
- final EClass refSeg = PostprocessingHelpers.getClass(configPackage, "RefSegment");
- EAttribute _attribute = PostprocessingHelpers.getAttribute(refSeg, "idx");
- _attribute.setDefaultValueLiteral("-1");
- EClassifier _eClassifier_4 = EcorePackage.eINSTANCE.getEClassifier("EString");
- StringConcatenation _builder_4 = new StringConcatenation();
- _builder_4.append("return getRef() + ((getIdx()>=0)? \":\"+getIdx() : \"\");");
- _builder_4.newLine();
- _xblockexpression = PostprocessingHelpers.addOperation(refSeg,
- "toString", _eClassifier_4,
- Integer.valueOf(1), _builder_4.toString());
- }
- return _xblockexpression;
- }
-}
diff --git a/plugins/org.eclipse.etrice.core.etmap/xtend-gen/org/eclipse/etrice/core/etmap/generator/ETMapGenerator.java b/plugins/org.eclipse.etrice.core.etmap/xtend-gen/org/eclipse/etrice/core/etmap/generator/ETMapGenerator.java
deleted file mode 100644
index 4239a3a4f..000000000
--- a/plugins/org.eclipse.etrice.core.etmap/xtend-gen/org/eclipse/etrice/core/etmap/generator/ETMapGenerator.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * generated by Xtext
- */
-package org.eclipse.etrice.core.etmap.generator;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.xtext.generator.IFileSystemAccess;
-import org.eclipse.xtext.generator.IGenerator;
-
-@SuppressWarnings("all")
-public class ETMapGenerator implements IGenerator {
- @Override
- public void doGenerate(final Resource resource, final IFileSystemAccess fsa) {
- }
-}
diff --git a/plugins/org.eclipse.etrice.core.etmap/xtend-gen/org/eclipse/etrice/core/etmap/postprocessing/DocuPostprocessor.java b/plugins/org.eclipse.etrice.core.etmap/xtend-gen/org/eclipse/etrice/core/etmap/postprocessing/DocuPostprocessor.java
deleted file mode 100644
index e26d66fff..000000000
--- a/plugins/org.eclipse.etrice.core.etmap/xtend-gen/org/eclipse/etrice/core/etmap/postprocessing/DocuPostprocessor.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/**
- * Copyright (c) 2012 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:
- * Juergen Haug (initial contribution)
- */
-package org.eclipse.etrice.core.etmap.postprocessing;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.etrice.core.common.postprocessing.PostprocessingHelpers;
-import org.eclipse.xtend2.lib.StringConcatenation;
-import org.eclipse.xtext.GeneratedMetamodel;
-
-@SuppressWarnings("all")
-public class DocuPostprocessor {
- public void process(final GeneratedMetamodel metamodel) {
- final EPackage pckg = metamodel.getEPackage();
- EClass cls = PostprocessingHelpers.getClass(pckg, "MappingModel");
- StringConcatenation _builder = new StringConcatenation();
- _builder.append("The root object for the mapping model. It gives access to the mappings defined.");
- _builder.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder.toString());
- EAttribute _attribute = PostprocessingHelpers.getAttribute(cls, "name");
- StringConcatenation _builder_1 = new StringConcatenation();
- _builder_1.append("The model name is a dot separated fully qualified name and is");
- _builder_1.newLine();
- _builder_1.append("used to provide a name space.");
- _builder_1.newLine();
- PostprocessingHelpers.setDocumentation(_attribute, _builder_1.toString());
- EReference _reference = PostprocessingHelpers.getReference(cls, "imports");
- StringConcatenation _builder_2 = new StringConcatenation();
- _builder_2.append("A list of all imported models.");
- _builder_2.newLine();
- PostprocessingHelpers.setDocumentation(_reference, _builder_2.toString());
- EReference _reference_1 = PostprocessingHelpers.getReference(cls, "mappings");
- StringConcatenation _builder_3 = new StringConcatenation();
- _builder_3.append("A list of all defined mappings.");
- _builder_3.newLine();
- PostprocessingHelpers.setDocumentation(_reference_1, _builder_3.toString());
- EClass _class = PostprocessingHelpers.getClass(pckg, "Mapping");
- cls = _class;
- StringConcatenation _builder_4 = new StringConcatenation();
- _builder_4.append("This is the mapping of a logical system (defined in a ROOM model) to a");
- _builder_4.newLine();
- _builder_4.append("physical system (defined in a physical model).");
- _builder_4.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_4.toString());
- EReference _reference_2 = PostprocessingHelpers.getReference(cls, "logicalSys");
- StringConcatenation _builder_5 = new StringConcatenation();
- _builder_5.append("This is the logical system being mapped.");
- _builder_5.newLine();
- PostprocessingHelpers.setDocumentation(_reference_2, _builder_5.toString());
- EReference _reference_3 = PostprocessingHelpers.getReference(cls, "physicalSys");
- StringConcatenation _builder_6 = new StringConcatenation();
- _builder_6.append("This is the physical system being mapped to.");
- _builder_6.newLine();
- PostprocessingHelpers.setDocumentation(_reference_3, _builder_6.toString());
- EReference _reference_4 = PostprocessingHelpers.getReference(cls, "subsysMappings");
- StringConcatenation _builder_7 = new StringConcatenation();
- _builder_7.append("This is a list of nested mappings of the sub systems of this system.");
- _builder_7.newLine();
- PostprocessingHelpers.setDocumentation(_reference_4, _builder_7.toString());
- EClass _class_1 = PostprocessingHelpers.getClass(pckg, "SubSystemMapping");
- cls = _class_1;
- StringConcatenation _builder_8 = new StringConcatenation();
- _builder_8.append("This is the mapping of a sub system (defined in a ROOM model) to a");
- _builder_8.newLine();
- _builder_8.append("node (defined in a physical model).");
- _builder_8.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_8.toString());
- EReference _reference_5 = PostprocessingHelpers.getReference(cls, "logicalSubSys");
- StringConcatenation _builder_9 = new StringConcatenation();
- _builder_9.append("This is the logical sub system being mapped.");
- _builder_9.newLine();
- PostprocessingHelpers.setDocumentation(_reference_5, _builder_9.toString());
- EReference _reference_6 = PostprocessingHelpers.getReference(cls, "node");
- StringConcatenation _builder_10 = new StringConcatenation();
- _builder_10.append("This is the node being mapped to.");
- _builder_10.newLine();
- PostprocessingHelpers.setDocumentation(_reference_6, _builder_10.toString());
- EReference _reference_7 = PostprocessingHelpers.getReference(cls, "threadMappings");
- StringConcatenation _builder_11 = new StringConcatenation();
- _builder_11.append("This is a list of nested mappings of logical to physical threads.");
- _builder_11.newLine();
- PostprocessingHelpers.setDocumentation(_reference_7, _builder_11.toString());
- EClass _class_2 = PostprocessingHelpers.getClass(pckg, "ThreadMapping");
- cls = _class_2;
- StringConcatenation _builder_12 = new StringConcatenation();
- _builder_12.append("This is the mapping of a logical thread (defined in a ROOM model) to a");
- _builder_12.newLine();
- _builder_12.append("physical thread (defined in a physical model).");
- _builder_12.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_12.toString());
- EReference _reference_8 = PostprocessingHelpers.getReference(cls, "logicalThread");
- StringConcatenation _builder_13 = new StringConcatenation();
- _builder_13.append("This is the logical thread being mapped.");
- _builder_13.newLine();
- PostprocessingHelpers.setDocumentation(_reference_8, _builder_13.toString());
- EReference _reference_9 = PostprocessingHelpers.getReference(cls, "physicalThread");
- StringConcatenation _builder_14 = new StringConcatenation();
- _builder_14.append("This is the physical thread being mapped to.");
- _builder_14.newLine();
- PostprocessingHelpers.setDocumentation(_reference_9, _builder_14.toString());
- }
-}
diff --git a/plugins/org.eclipse.etrice.core.etphys/xtend-gen/org/eclipse/etrice/core/etphys/generator/ETPhysGenerator.java b/plugins/org.eclipse.etrice.core.etphys/xtend-gen/org/eclipse/etrice/core/etphys/generator/ETPhysGenerator.java
deleted file mode 100644
index b0e8640b9..000000000
--- a/plugins/org.eclipse.etrice.core.etphys/xtend-gen/org/eclipse/etrice/core/etphys/generator/ETPhysGenerator.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * generated by Xtext
- */
-package org.eclipse.etrice.core.etphys.generator;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.xtext.generator.IFileSystemAccess;
-import org.eclipse.xtext.generator.IGenerator;
-
-@SuppressWarnings("all")
-public class ETPhysGenerator implements IGenerator {
- @Override
- public void doGenerate(final Resource resource, final IFileSystemAccess fsa) {
- }
-}
diff --git a/plugins/org.eclipse.etrice.core.etphys/xtend-gen/org/eclipse/etrice/core/etphys/postprocessing/DocuPostprocessor.java b/plugins/org.eclipse.etrice.core.etphys/xtend-gen/org/eclipse/etrice/core/etphys/postprocessing/DocuPostprocessor.java
deleted file mode 100644
index 0efefbd53..000000000
--- a/plugins/org.eclipse.etrice.core.etphys/xtend-gen/org/eclipse/etrice/core/etphys/postprocessing/DocuPostprocessor.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/**
- * Copyright (c) 2012 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:
- * Juergen Haug (initial contribution)
- */
-package org.eclipse.etrice.core.etphys.postprocessing;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.etrice.core.common.postprocessing.PostprocessingHelpers;
-import org.eclipse.xtend2.lib.StringConcatenation;
-import org.eclipse.xtext.GeneratedMetamodel;
-
-@SuppressWarnings("all")
-public class DocuPostprocessor {
- public void process(final GeneratedMetamodel metamodel) {
- final EPackage pckg = metamodel.getEPackage();
- EClass cls = PostprocessingHelpers.getClass(pckg, "PhysicalModel");
- StringConcatenation _builder = new StringConcatenation();
- _builder.append("The root object for the physical model. It gives access to the systems, node classes");
- _builder.newLine();
- _builder.append("and runtimes defined.");
- _builder.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder.toString());
- EAttribute _attribute = PostprocessingHelpers.getAttribute(cls, "name");
- StringConcatenation _builder_1 = new StringConcatenation();
- _builder_1.append("The model name is a dot separated fully qualified name and is");
- _builder_1.newLine();
- _builder_1.append("used to provide a name space.");
- _builder_1.newLine();
- PostprocessingHelpers.setDocumentation(_attribute, _builder_1.toString());
- EReference _reference = PostprocessingHelpers.getReference(cls, "imports");
- StringConcatenation _builder_2 = new StringConcatenation();
- _builder_2.append("A list of all imported models.");
- _builder_2.newLine();
- PostprocessingHelpers.setDocumentation(_reference, _builder_2.toString());
- EReference _reference_1 = PostprocessingHelpers.getReference(cls, "systems");
- StringConcatenation _builder_3 = new StringConcatenation();
- _builder_3.append("A list of all defined physical systems.");
- _builder_3.newLine();
- PostprocessingHelpers.setDocumentation(_reference_1, _builder_3.toString());
- EReference _reference_2 = PostprocessingHelpers.getReference(cls, "nodeClasses");
- StringConcatenation _builder_4 = new StringConcatenation();
- _builder_4.append("A list of all defined node classes.");
- _builder_4.newLine();
- PostprocessingHelpers.setDocumentation(_reference_2, _builder_4.toString());
- EReference _reference_3 = PostprocessingHelpers.getReference(cls, "runtimeClasses");
- StringConcatenation _builder_5 = new StringConcatenation();
- _builder_5.append("A list of all defined runtime classes.");
- _builder_5.newLine();
- PostprocessingHelpers.setDocumentation(_reference_3, _builder_5.toString());
- EClass _class = PostprocessingHelpers.getClass(pckg, "PhysicalSystem");
- cls = _class;
- StringConcatenation _builder_6 = new StringConcatenation();
- _builder_6.append("This model object represents a complete physical system.");
- _builder_6.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_6.toString());
- EAttribute _attribute_1 = PostprocessingHelpers.getAttribute(cls, "name");
- StringConcatenation _builder_7 = new StringConcatenation();
- _builder_7.append("The name of the physical system by which it is referred to in the model.");
- _builder_7.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_1, _builder_7.toString());
- EReference _reference_4 = PostprocessingHelpers.getReference(cls, "nodeRefs");
- StringConcatenation _builder_8 = new StringConcatenation();
- _builder_8.append("A list of referenced nodes.");
- _builder_8.newLine();
- PostprocessingHelpers.setDocumentation(_reference_4, _builder_8.toString());
- EReference _reference_5 = PostprocessingHelpers.getReference(cls, "docu");
- StringConcatenation _builder_9 = new StringConcatenation();
- _builder_9.append("This is an optional documentation.");
- _builder_9.newLine();
- PostprocessingHelpers.setDocumentation(_reference_5, _builder_9.toString());
- EClass _class_1 = PostprocessingHelpers.getClass(pckg, "NodeRef");
- cls = _class_1;
- StringConcatenation _builder_10 = new StringConcatenation();
- _builder_10.append("This stands for a node instance in a specific role.");
- _builder_10.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_10.toString());
- EAttribute _attribute_2 = PostprocessingHelpers.getAttribute(cls, "name");
- StringConcatenation _builder_11 = new StringConcatenation();
- _builder_11.append("The name of the reference by which it is referred to in the model.");
- _builder_11.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_2, _builder_11.toString());
- EReference _reference_6 = PostprocessingHelpers.getReference(cls, "type");
- StringConcatenation _builder_12 = new StringConcatenation();
- _builder_12.append("The node class of this reference.");
- _builder_12.newLine();
- PostprocessingHelpers.setDocumentation(_reference_6, _builder_12.toString());
- EReference _reference_7 = PostprocessingHelpers.getReference(cls, "docu");
- StringConcatenation _builder_13 = new StringConcatenation();
- _builder_13.append("This is an optional documentation.");
- _builder_13.newLine();
- PostprocessingHelpers.setDocumentation(_reference_7, _builder_13.toString());
- EClass _class_2 = PostprocessingHelpers.getClass(pckg, "NodeClass");
- cls = _class_2;
- StringConcatenation _builder_14 = new StringConcatenation();
- _builder_14.append("This defines a node class.");
- _builder_14.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_14.toString());
- EAttribute _attribute_3 = PostprocessingHelpers.getAttribute(cls, "name");
- StringConcatenation _builder_15 = new StringConcatenation();
- _builder_15.append("The name of the node class by which it is referred to in the model.");
- _builder_15.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_3, _builder_15.toString());
- EReference _reference_8 = PostprocessingHelpers.getReference(cls, "docu");
- StringConcatenation _builder_16 = new StringConcatenation();
- _builder_16.append("This is an optional documentation.");
- _builder_16.newLine();
- PostprocessingHelpers.setDocumentation(_reference_8, _builder_16.toString());
- EReference _reference_9 = PostprocessingHelpers.getReference(cls, "runtime");
- StringConcatenation _builder_17 = new StringConcatenation();
- _builder_17.append("This is the associated runtime class.");
- _builder_17.newLine();
- PostprocessingHelpers.setDocumentation(_reference_9, _builder_17.toString());
- EAttribute _attribute_4 = PostprocessingHelpers.getAttribute(cls, "priomin");
- StringConcatenation _builder_18 = new StringConcatenation();
- _builder_18.append("This is the minimal thread priority for this node type.");
- _builder_18.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_4, _builder_18.toString());
- EAttribute _attribute_5 = PostprocessingHelpers.getAttribute(cls, "priomax");
- StringConcatenation _builder_19 = new StringConcatenation();
- _builder_19.append("This is the maximum thread priority for this node type.");
- _builder_19.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_5, _builder_19.toString());
- EReference _reference_10 = PostprocessingHelpers.getReference(cls, "threads");
- StringConcatenation _builder_20 = new StringConcatenation();
- _builder_20.append("This is a list of all threads defined for this node.");
- _builder_20.newLine();
- PostprocessingHelpers.setDocumentation(_reference_10, _builder_20.toString());
- EClass _class_3 = PostprocessingHelpers.getClass(pckg, "PhysicalThread");
- cls = _class_3;
- StringConcatenation _builder_21 = new StringConcatenation();
- _builder_21.append("This defines a physical thread running in a node.");
- _builder_21.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_21.toString());
- EAttribute _attribute_6 = PostprocessingHelpers.getAttribute(cls, "name");
- StringConcatenation _builder_22 = new StringConcatenation();
- _builder_22.append("The name of the thread by which it is referred to in the model.");
- _builder_22.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_6, _builder_22.toString());
- EAttribute _attribute_7 = PostprocessingHelpers.getAttribute(cls, "default");
- StringConcatenation _builder_23 = new StringConcatenation();
- _builder_23.append("If this is {@code true} then this is the default thread.");
- _builder_23.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_7, _builder_23.toString());
- EAttribute _attribute_8 = PostprocessingHelpers.getAttribute(cls, "execmode");
- StringConcatenation _builder_24 = new StringConcatenation();
- _builder_24.append("This is the execution mode of the thread.");
- _builder_24.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_8, _builder_24.toString());
- EAttribute _attribute_9 = PostprocessingHelpers.getAttribute(cls, "prio");
- StringConcatenation _builder_25 = new StringConcatenation();
- _builder_25.append("This is the priority of the thread.");
- _builder_25.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_9, _builder_25.toString());
- EAttribute _attribute_10 = PostprocessingHelpers.getAttribute(cls, "stacksize");
- StringConcatenation _builder_26 = new StringConcatenation();
- _builder_26.append("This is the stacksize of the thread.");
- _builder_26.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_10, _builder_26.toString());
- EAttribute _attribute_11 = PostprocessingHelpers.getAttribute(cls, "msgblocksize");
- StringConcatenation _builder_27 = new StringConcatenation();
- _builder_27.append("This is the msgblocksize of the thread.");
- _builder_27.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_11, _builder_27.toString());
- EAttribute _attribute_12 = PostprocessingHelpers.getAttribute(cls, "msgpoolsize");
- StringConcatenation _builder_28 = new StringConcatenation();
- _builder_28.append("This is the msgpoolsize of the thread.");
- _builder_28.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_12, _builder_28.toString());
- EClass _class_4 = PostprocessingHelpers.getClass(pckg, "RuntimeClass");
- cls = _class_4;
- StringConcatenation _builder_29 = new StringConcatenation();
- _builder_29.append("This defines a runtime class.");
- _builder_29.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_29.toString());
- EAttribute _attribute_13 = PostprocessingHelpers.getAttribute(cls, "name");
- StringConcatenation _builder_30 = new StringConcatenation();
- _builder_30.append("The name of the runtime class by which it is referred to in the model.");
- _builder_30.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_13, _builder_30.toString());
- EReference _reference_11 = PostprocessingHelpers.getReference(cls, "docu");
- StringConcatenation _builder_31 = new StringConcatenation();
- _builder_31.append("This is an optional documentation.");
- _builder_31.newLine();
- PostprocessingHelpers.setDocumentation(_reference_11, _builder_31.toString());
- EAttribute _attribute_14 = PostprocessingHelpers.getAttribute(cls, "threadModel");
- StringConcatenation _builder_32 = new StringConcatenation();
- _builder_32.append("This distinguishes single and multi threaded.");
- _builder_32.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_14, _builder_32.toString());
- }
-}
diff --git a/plugins/org.eclipse.etrice.core.fsm.ui/xtend-gen/org/eclipse/etrice/core/fsm/ui/contentassist/FSMProposalProvider.java b/plugins/org.eclipse.etrice.core.fsm.ui/xtend-gen/org/eclipse/etrice/core/fsm/ui/contentassist/FSMProposalProvider.java
deleted file mode 100644
index cc5aa2625..000000000
--- a/plugins/org.eclipse.etrice.core.fsm.ui/xtend-gen/org/eclipse/etrice/core/fsm/ui/contentassist/FSMProposalProvider.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * generated by Xtext
- */
-package org.eclipse.etrice.core.fsm.ui.contentassist;
-
-import org.eclipse.etrice.core.fsm.ui.contentassist.AbstractFSMProposalProvider;
-
-/**
- * see http://www.eclipse.org/Xtext/documentation.html#contentAssist on how to customize content assistant
- */
-@SuppressWarnings("all")
-public class FSMProposalProvider extends AbstractFSMProposalProvider {
-}
diff --git a/plugins/org.eclipse.etrice.core.fsm.ui/xtend-gen/org/eclipse/etrice/core/fsm/ui/labeling/FSMDescriptionLabelProvider.java b/plugins/org.eclipse.etrice.core.fsm.ui/xtend-gen/org/eclipse/etrice/core/fsm/ui/labeling/FSMDescriptionLabelProvider.java
deleted file mode 100644
index 761a61041..000000000
--- a/plugins/org.eclipse.etrice.core.fsm.ui/xtend-gen/org/eclipse/etrice/core/fsm/ui/labeling/FSMDescriptionLabelProvider.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * generated by Xtext
- */
-package org.eclipse.etrice.core.fsm.ui.labeling;
-
-import org.eclipse.xtext.ui.label.DefaultDescriptionLabelProvider;
-
-/**
- * Provides labels for a IEObjectDescriptions and IResourceDescriptions.
- *
- * see http://www.eclipse.org/Xtext/documentation.html#labelProvider
- */
-@SuppressWarnings("all")
-public class FSMDescriptionLabelProvider extends DefaultDescriptionLabelProvider {
-}
diff --git a/plugins/org.eclipse.etrice.core.fsm.ui/xtend-gen/org/eclipse/etrice/core/fsm/ui/labeling/FSMLabelProvider.java b/plugins/org.eclipse.etrice.core.fsm.ui/xtend-gen/org/eclipse/etrice/core/fsm/ui/labeling/FSMLabelProvider.java
deleted file mode 100644
index f51ce9bad..000000000
--- a/plugins/org.eclipse.etrice.core.fsm.ui/xtend-gen/org/eclipse/etrice/core/fsm/ui/labeling/FSMLabelProvider.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * generated by Xtext
- */
-package org.eclipse.etrice.core.fsm.ui.labeling;
-
-import com.google.inject.Inject;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.etrice.core.common.ui.labeling.BaseLabelProvider;
-import org.eclipse.etrice.core.fsm.fSM.ModelComponent;
-import org.eclipse.etrice.core.fsm.fSM.RefinedState;
-import org.eclipse.etrice.core.fsm.fSM.SimpleState;
-import org.eclipse.etrice.core.fsm.fSM.State;
-import org.eclipse.etrice.core.fsm.fSM.StateGraph;
-import org.eclipse.etrice.core.fsm.fSM.Transition;
-import org.eclipse.etrice.core.fsm.fSM.Trigger;
-
-/**
- * Provides labels for a EObjects.
- *
- * see http://www.eclipse.org/Xtext/documentation.html#labelProvider
- */
-@SuppressWarnings("all")
-public class FSMLabelProvider extends BaseLabelProvider {
- @Inject
- public FSMLabelProvider(final AdapterFactoryLabelProvider delegate) {
- super(delegate);
- }
-
- public String image(final SimpleState state) {
- return "State.gif";
- }
-
- public String image(final RefinedState state) {
- return "RefinedState.gif";
- }
-
- public String text(final State s) {
- String _name = s.getName();
- return ("state " + _name);
- }
-
- public String text(final Transition trans) {
- String _name = trans.getName();
- return ("transition " + _name);
- }
-
- public String text(final Trigger tr) {
- return "trigger";
- }
-
- public String text(final StateGraph sm) {
- String _xifexpression = null;
- EObject _eContainer = sm.eContainer();
- if ((_eContainer instanceof ModelComponent)) {
- _xifexpression = "state machine";
- } else {
- _xifexpression = "state graph";
- }
- return _xifexpression;
- }
-}
diff --git a/plugins/org.eclipse.etrice.core.fsm.ui/xtend-gen/org/eclipse/etrice/core/fsm/ui/outline/FSMOutlineTreeProvider.java b/plugins/org.eclipse.etrice.core.fsm.ui/xtend-gen/org/eclipse/etrice/core/fsm/ui/outline/FSMOutlineTreeProvider.java
deleted file mode 100644
index 4f50df02f..000000000
--- a/plugins/org.eclipse.etrice.core.fsm.ui/xtend-gen/org/eclipse/etrice/core/fsm/ui/outline/FSMOutlineTreeProvider.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * generated by Xtext
- */
-package org.eclipse.etrice.core.fsm.ui.outline;
-
-import org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider;
-
-/**
- * Customization of the default outline structure.
- *
- * see http://www.eclipse.org/Xtext/documentation.html#outline
- */
-@SuppressWarnings("all")
-public class FSMOutlineTreeProvider extends DefaultOutlineTreeProvider {
-}
diff --git a/plugins/org.eclipse.etrice.core.fsm.ui/xtend-gen/org/eclipse/etrice/core/fsm/ui/quickfix/FSMQuickfixProvider.java b/plugins/org.eclipse.etrice.core.fsm.ui/xtend-gen/org/eclipse/etrice/core/fsm/ui/quickfix/FSMQuickfixProvider.java
deleted file mode 100644
index 44856ab8e..000000000
--- a/plugins/org.eclipse.etrice.core.fsm.ui/xtend-gen/org/eclipse/etrice/core/fsm/ui/quickfix/FSMQuickfixProvider.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * generated by Xtext
- */
-package org.eclipse.etrice.core.fsm.ui.quickfix;
-
-import com.google.inject.Inject;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.etrice.core.common.converter.BaseConverterService;
-import org.eclipse.etrice.core.common.converter.CCStringConverter;
-import org.eclipse.etrice.core.fsm.fSM.DetailCode;
-import org.eclipse.etrice.core.fsm.validation.FSMJavaValidator;
-import org.eclipse.xtext.formatting.ILineSeparatorInformation;
-import org.eclipse.xtext.formatting.IWhitespaceInformationProvider;
-import org.eclipse.xtext.nodemodel.ICompositeNode;
-import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
-import org.eclipse.xtext.ui.editor.model.IXtextDocument;
-import org.eclipse.xtext.ui.editor.model.edit.IModificationContext;
-import org.eclipse.xtext.ui.editor.model.edit.ISemanticModification;
-import org.eclipse.xtext.ui.editor.quickfix.DefaultQuickfixProvider;
-import org.eclipse.xtext.ui.editor.quickfix.Fix;
-import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor;
-import org.eclipse.xtext.validation.Issue;
-import org.eclipse.xtext.xbase.lib.Exceptions;
-import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.ObjectExtensions;
-import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
-
-/**
- * Custom quickfixes.
- *
- * see http://www.eclipse.org/Xtext/documentation.html#quickfixes
- */
-@SuppressWarnings("all")
-public class FSMQuickfixProvider extends DefaultQuickfixProvider {
- @Inject
- private BaseConverterService converterService;
-
- @Inject
- private IWhitespaceInformationProvider whitespaceProvider;
-
- @Fix(FSMJavaValidator.PLAIN_STRING_DETAILCODE)
- public void fixMultiLineDetailCode(final Issue issue, final IssueResolutionAcceptor acceptor) {
- final ISemanticModification _function = (EObject element, IModificationContext context) -> {
- final Procedure1 _function_1 = (DetailCode it) -> {
- EList _lines = it.getLines();
- Resource _eResource = it.eResource();
- URI _uRI = _eResource.getURI();
- ILineSeparatorInformation _lineSeparatorInformation = this.whitespaceProvider.getLineSeparatorInformation(_uRI);
- String _lineSeparator = _lineSeparatorInformation.getLineSeparator();
- final String ccString = IterableExtensions.join(_lines, _lineSeparator);
- ICompositeNode _findActualNodeFor = NodeModelUtils.findActualNodeFor(it);
- final Procedure1 _function_2 = (ICompositeNode it_1) -> {
- try {
- IXtextDocument _xtextDocument = context.getXtextDocument();
- int _offset = it_1.getOffset();
- int _length = it_1.getLength();
- CCStringConverter _cC_StringConverter = this.converterService.getCC_StringConverter();
- String _addDelim = _cC_StringConverter.addDelim(ccString);
- _xtextDocument.replace(_offset, _length, _addDelim);
- } catch (Throwable _e) {
- throw Exceptions.sneakyThrow(_e);
- }
- };
- ObjectExtensions.operator_doubleArrow(_findActualNodeFor, _function_2);
- };
- ObjectExtensions.operator_doubleArrow(
- ((DetailCode) element), _function_1);
- };
- acceptor.accept(issue, "Convert to smart string", "", "correction_change.gif", _function);
- }
-}
diff --git a/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/formatting2/FSMFormatter.java b/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/formatting2/FSMFormatter.java
deleted file mode 100644
index be1448dbb..000000000
--- a/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/formatting2/FSMFormatter.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/**
- * 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:
- * Juergen Haug (initial contribution)
- */
-package org.eclipse.etrice.core.fsm.formatting2;
-
-import com.google.inject.Inject;
-import java.util.Arrays;
-import java.util.List;
-import java.util.function.Consumer;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.etrice.core.common.base.Annotation;
-import org.eclipse.etrice.core.common.base.AnnotationType;
-import org.eclipse.etrice.core.common.base.Documentation;
-import org.eclipse.etrice.core.common.base.Import;
-import org.eclipse.etrice.core.common.converter.BaseConverterService;
-import org.eclipse.etrice.core.common.converter.CCStringConverter;
-import org.eclipse.etrice.core.common.formatting2.BaseFormatter;
-import org.eclipse.etrice.core.common.formatting2.CCStringReplacer;
-import org.eclipse.etrice.core.fsm.fSM.DetailCode;
-import org.eclipse.etrice.core.fsm.fSM.ProtocolSemantics;
-import org.eclipse.etrice.core.fsm.fSM.SemanticsRule;
-import org.eclipse.etrice.core.fsm.fSM.State;
-import org.eclipse.etrice.core.fsm.fSM.StateGraph;
-import org.eclipse.etrice.core.fsm.fSM.Transition;
-import org.eclipse.etrice.core.fsm.fSM.Trigger;
-import org.eclipse.etrice.core.fsm.fSM.TriggeredTransition;
-import org.eclipse.etrice.core.fsm.services.FSMGrammarAccess;
-import org.eclipse.xtext.Assignment;
-import org.eclipse.xtext.formatting2.IFormattableDocument;
-import org.eclipse.xtext.formatting2.IHiddenRegionFormatter;
-import org.eclipse.xtext.formatting2.regionaccess.IHiddenRegion;
-import org.eclipse.xtext.formatting2.regionaccess.ISemanticRegion;
-import org.eclipse.xtext.formatting2.regionaccess.ISemanticRegionsFinder;
-import org.eclipse.xtext.resource.XtextResource;
-import org.eclipse.xtext.xbase.lib.Extension;
-import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.Pair;
-import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
-
-@SuppressWarnings("all")
-public class FSMFormatter extends BaseFormatter {
- @Inject
- @Extension
- private FSMGrammarAccess _fSMGrammarAccess;
-
- @Override
- public void formatAllByKeywords(final EObject it, @Extension final IFormattableDocument document) {
- super.formatAllByKeywords(it, document);
- ISemanticRegionsFinder _allRegionsFor = this.textRegionExtensions.allRegionsFor(it);
- List _keywords = _allRegionsFor.keywords("->", "extends", "=", "or", "|");
- final Consumer _function = (ISemanticRegion it_1) -> {
- final Procedure1 _function_1 = (IHiddenRegionFormatter it_2) -> {
- it_2.oneSpace();
- };
- document.surround(it_1, _function_1);
- };
- _keywords.forEach(_function);
- }
-
- protected EObject prependDefaultNewLines(final EObject it, @Extension final IFormattableDocument document) {
- EObject _xifexpression = null;
- if (((this.textRegionExtensions.previousHiddenRegion(it) != null) && (this.textRegionExtensions.previousHiddenRegion(it).getLineCount() > 2))) {
- final Procedure1 _function = (IHiddenRegionFormatter it_1) -> {
- it_1.setNewLines(2);
- };
- _xifexpression = document.prepend(it, _function);
- } else {
- final Procedure1 _function_1 = (IHiddenRegionFormatter it_1) -> {
- it_1.newLine();
- };
- _xifexpression = document.prepend(it, _function_1);
- }
- return _xifexpression;
- }
-
- protected ISemanticRegion prependDefaultNewLines(final ISemanticRegion it, @Extension final IFormattableDocument document) {
- ISemanticRegion _xifexpression = null;
- IHiddenRegion _previousHiddenRegion = it.getPreviousHiddenRegion();
- int _lineCount = _previousHiddenRegion.getLineCount();
- boolean _greaterThan = (_lineCount > 2);
- if (_greaterThan) {
- final Procedure1 _function = (IHiddenRegionFormatter it_1) -> {
- it_1.setNewLines(2);
- };
- _xifexpression = document.prepend(it, _function);
- } else {
- final Procedure1 _function_1 = (IHiddenRegionFormatter it_1) -> {
- it_1.newLine();
- };
- _xifexpression = document.prepend(it, _function_1);
- }
- return _xifexpression;
- }
-
- protected void _format(final StateGraph it, @Extension final IFormattableDocument document) {
- EList _eContents = it.eContents();
- final Consumer _function = (EObject it_1) -> {
- this.prependDefaultNewLines(it_1, document);
- };
- _eContents.forEach(_function);
- }
-
- protected void _format(final State it, @Extension final IFormattableDocument document) {
- ISemanticRegionsFinder _regionFor = this.textRegionExtensions.regionFor(it);
- List _keywords = _regionFor.keywords("entry", "exit", "do", "subgraph");
- final Consumer _function = (ISemanticRegion it_1) -> {
- this.prependDefaultNewLines(it_1, document);
- final Procedure1 _function_1 = (IHiddenRegionFormatter it_2) -> {
- it_2.oneSpace();
- };
- document.append(it_1, _function_1);
- };
- _keywords.forEach(_function);
- }
-
- protected void _format(final Transition it, @Extension final IFormattableDocument document) {
- ISemanticRegionsFinder _regionFor = this.textRegionExtensions.regionFor(it);
- List _keywords = _regionFor.keywords("action", "guard", "cond");
- final Consumer _function = (ISemanticRegion it_1) -> {
- this.prependDefaultNewLines(it_1, document);
- final Procedure1 _function_1 = (IHiddenRegionFormatter it_2) -> {
- it_2.oneSpace();
- };
- document.append(it_1, _function_1);
- };
- _keywords.forEach(_function);
- }
-
- protected void _format(final TriggeredTransition it, @Extension final IFormattableDocument document) {
- ISemanticRegionsFinder _regionFor = this.textRegionExtensions.regionFor(it);
- List _keywords = _regionFor.keywords("action", "guard", "cond", "triggers");
- final Consumer _function = (ISemanticRegion it_1) -> {
- this.prependDefaultNewLines(it_1, document);
- final Procedure1 _function_1 = (IHiddenRegionFormatter it_2) -> {
- it_2.oneSpace();
- };
- document.append(it_1, _function_1);
- };
- _keywords.forEach(_function);
- EList _triggers = it.getTriggers();
- Trigger _head = IterableExtensions.head(_triggers);
- final Procedure1 _function_1 = (IHiddenRegionFormatter it_1) -> {
- it_1.newLine();
- };
- document.prepend(_head, _function_1);
- EList _triggers_1 = it.getTriggers();
- Iterable _tail = IterableExtensions.tail(_triggers_1);
- final Consumer _function_2 = (Trigger it_1) -> {
- final Procedure1 _function_3 = (IHiddenRegionFormatter it_2) -> {
- it_2.oneSpace();
- };
- document.prepend(it_1, _function_3);
- };
- _tail.forEach(_function_2);
- }
-
- protected void _format(final Trigger it, @Extension final IFormattableDocument document) {
- ISemanticRegionsFinder _regionFor = this.textRegionExtensions.regionFor(it);
- List> _keywordPairs = _regionFor.keywordPairs("<", ">");
- final Consumer> _function = (Pair it_1) -> {
- final Procedure1 _function_1 = (IHiddenRegionFormatter it_2) -> {
- it_2.noSpace();
- };
- document.interior(it_1, _function_1);
- };
- _keywordPairs.forEach(_function);
- }
-
- protected void _format(final ProtocolSemantics it, @Extension final IFormattableDocument document) {
- EList _rules = it.getRules();
- final Consumer _function = (SemanticsRule it_1) -> {
- this.prependDefaultNewLines(it_1, document);
- };
- _rules.forEach(_function);
- }
-
- @Inject
- private BaseConverterService converterService;
-
- protected void _format(final DetailCode detailcode, @Extension final IFormattableDocument document) {
- ISemanticRegionsFinder _regionFor = this.textRegionExtensions.regionFor(detailcode);
- FSMGrammarAccess.DetailCodeElements _detailCodeAccess = this._fSMGrammarAccess.getDetailCodeAccess();
- Assignment _linesAssignment_0_1 = _detailCodeAccess.getLinesAssignment_0_1();
- final ISemanticRegion ccRegion = _regionFor.assignment(_linesAssignment_0_1);
- if ((ccRegion != null)) {
- final Procedure1 _function = (IHiddenRegionFormatter it) -> {
- it.oneSpace();
- };
- document.prepend(detailcode, _function);
- boolean _isMultiline = this.textRegionExtensions.isMultiline(detailcode);
- if (_isMultiline) {
- CCStringConverter _cC_StringConverter = this.converterService.getCC_StringConverter();
- CCStringReplacer _cCStringReplacer = new CCStringReplacer(document, ccRegion, _cC_StringConverter);
- document.addReplacer(_cCStringReplacer);
- }
- } else {
- ISemanticRegionsFinder _regionFor_1 = this.textRegionExtensions.regionFor(detailcode);
- FSMGrammarAccess.DetailCodeElements _detailCodeAccess_1 = this._fSMGrammarAccess.getDetailCodeAccess();
- Assignment _linesAssignment_1_1 = _detailCodeAccess_1.getLinesAssignment_1_1();
- List _assignments = _regionFor_1.assignments(_linesAssignment_1_1);
- final Consumer _function_1 = (ISemanticRegion it) -> {
- final Procedure1 _function_2 = (IHiddenRegionFormatter it_1) -> {
- it_1.newLine();
- };
- document.prepend(it, _function_2);
- };
- _assignments.forEach(_function_1);
- }
- }
-
- public void format(final Object it, final IFormattableDocument document) {
- if (it instanceof TriggeredTransition) {
- _format((TriggeredTransition)it, document);
- return;
- } else if (it instanceof State) {
- _format((State)it, document);
- return;
- } else if (it instanceof XtextResource) {
- _format((XtextResource)it, document);
- return;
- } else if (it instanceof Transition) {
- _format((Transition)it, document);
- return;
- } else if (it instanceof Annotation) {
- _format((Annotation)it, document);
- return;
- } else if (it instanceof AnnotationType) {
- _format((AnnotationType)it, document);
- return;
- } else if (it instanceof Documentation) {
- _format((Documentation)it, document);
- return;
- } else if (it instanceof Import) {
- _format((Import)it, document);
- return;
- } else if (it instanceof DetailCode) {
- _format((DetailCode)it, document);
- return;
- } else if (it instanceof ProtocolSemantics) {
- _format((ProtocolSemantics)it, document);
- return;
- } else if (it instanceof StateGraph) {
- _format((StateGraph)it, document);
- return;
- } else if (it instanceof Trigger) {
- _format((Trigger)it, document);
- return;
- } else if (it instanceof EObject) {
- _format((EObject)it, document);
- return;
- } else if (it == null) {
- _format((Void)null, document);
- return;
- } else if (it != null) {
- _format(it, document);
- return;
- } else {
- throw new IllegalArgumentException("Unhandled parameter types: " +
- Arrays.asList(it, document).toString());
- }
- }
-}
diff --git a/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/generator/FSMGenerator.java b/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/generator/FSMGenerator.java
deleted file mode 100644
index 5c2dbb93f..000000000
--- a/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/generator/FSMGenerator.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * generated by Xtext
- */
-package org.eclipse.etrice.core.fsm.generator;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.xtext.generator.IFileSystemAccess;
-import org.eclipse.xtext.generator.IGenerator;
-
-/**
- * Generates code from your model files on save.
- *
- * see http://www.eclipse.org/Xtext/documentation.html#TutorialCodeGeneration
- */
-@SuppressWarnings("all")
-public class FSMGenerator implements IGenerator {
- @Override
- public void doGenerate(final Resource resource, final IFileSystemAccess fsa) {
- }
-}
diff --git a/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/postprocessing/DocuPostprocessor.java b/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/postprocessing/DocuPostprocessor.java
deleted file mode 100644
index b4dcb88ad..000000000
--- a/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/postprocessing/DocuPostprocessor.java
+++ /dev/null
@@ -1,697 +0,0 @@
-/**
- * Copyright (c) 2014 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
- */
-package org.eclipse.etrice.core.fsm.postprocessing;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.etrice.core.common.postprocessing.PostprocessingHelpers;
-import org.eclipse.xtend2.lib.StringConcatenation;
-import org.eclipse.xtext.GeneratedMetamodel;
-
-/**
- * This post processor adds documentation to the generated EMF model.
- * By intention no {@code null} checks are performed. This way developers
- * find easier if the referenced class, attribute or reference isn't found.
- */
-@SuppressWarnings("all")
-public class DocuPostprocessor {
- public void process(final GeneratedMetamodel metamodel) {
- final EPackage pckg = metamodel.getEPackage();
- EClass cls = PostprocessingHelpers.getClass(pckg, "AbstractInterfaceItem");
- StringConcatenation _builder = new StringConcatenation();
- _builder.append("An abstract interface item to be overridden in derived grammars.");
- _builder.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder.toString());
- EAttribute _attribute = PostprocessingHelpers.getAttribute(cls, "name");
- StringConcatenation _builder_1 = new StringConcatenation();
- _builder_1.append("By this name the interface item is referred to in the model.");
- _builder_1.newLine();
- PostprocessingHelpers.setDocumentation(_attribute, _builder_1.toString());
- EClass _class = PostprocessingHelpers.getClass(pckg, "StateGraphNode");
- cls = _class;
- StringConcatenation _builder_2 = new StringConcatenation();
- _builder_2.append("The super class of");
- _builder_2.newLine();
- _builder_2.append("");
- _builder_2.newLine();
- _builder_2.append(" ");
- _builder_2.append("{@link State} ");
- _builder_2.newLine();
- _builder_2.append(" ");
- _builder_2.append("{@link ChoicePoint} ");
- _builder_2.newLine();
- _builder_2.append(" ");
- _builder_2.append("{@link TrPoint} ");
- _builder_2.newLine();
- _builder_2.append(" ");
- _builder_2.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_2.toString());
- EClass _class_1 = PostprocessingHelpers.getClass(pckg, "StateGraphItem");
- cls = _class_1;
- StringConcatenation _builder_3 = new StringConcatenation();
- _builder_3.append("The super class of");
- _builder_3.newLine();
- _builder_3.append("");
- _builder_3.newLine();
- _builder_3.append(" ");
- _builder_3.append("{@link StateGraphNode} ");
- _builder_3.newLine();
- _builder_3.append(" ");
- _builder_3.append("{@link Transition} ");
- _builder_3.newLine();
- _builder_3.append(" ");
- _builder_3.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_3.toString());
- EClass _class_2 = PostprocessingHelpers.getClass(pckg, "State");
- cls = _class_2;
- StringConcatenation _builder_4 = new StringConcatenation();
- _builder_4.append("The super class of");
- _builder_4.newLine();
- _builder_4.append("");
- _builder_4.newLine();
- _builder_4.append(" ");
- _builder_4.append("{@link SimpleState} ");
- _builder_4.newLine();
- _builder_4.append(" ");
- _builder_4.append("{@link RefinedState} ");
- _builder_4.newLine();
- _builder_4.append(" ");
- _builder_4.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_4.toString());
- EReference _reference = PostprocessingHelpers.getReference(cls, "docu");
- StringConcatenation _builder_5 = new StringConcatenation();
- _builder_5.append("This is an optional documentation.");
- _builder_5.newLine();
- PostprocessingHelpers.setDocumentation(_reference, _builder_5.toString());
- EReference _reference_1 = PostprocessingHelpers.getReference(cls, "entryCode");
- StringConcatenation _builder_6 = new StringConcatenation();
- _builder_6.append("This is an optional entry code written in the code generator\'s target language.");
- _builder_6.newLine();
- _builder_6.append("It is executed when the state is entered.");
- _builder_6.newLine();
- PostprocessingHelpers.setDocumentation(_reference_1, _builder_6.toString());
- EReference _reference_2 = PostprocessingHelpers.getReference(cls, "exitCode");
- StringConcatenation _builder_7 = new StringConcatenation();
- _builder_7.append("This is an optional entry code written in the code generator\'s target language.");
- _builder_7.newLine();
- _builder_7.append("It is executed when the state is left.");
- _builder_7.newLine();
- PostprocessingHelpers.setDocumentation(_reference_2, _builder_7.toString());
- EReference _reference_3 = PostprocessingHelpers.getReference(cls, "doCode");
- StringConcatenation _builder_8 = new StringConcatenation();
- _builder_8.append("This is an optional do code written in the code generator\'s target language.");
- _builder_8.newLine();
- _builder_8.append("It is executed whenever the actor instance is polled (applies only to");
- _builder_8.newLine();
- _builder_8.append("data driven and sync actor classes).");
- _builder_8.newLine();
- PostprocessingHelpers.setDocumentation(_reference_3, _builder_8.toString());
- EReference _reference_4 = PostprocessingHelpers.getReference(cls, "subgraph");
- StringConcatenation _builder_9 = new StringConcatenation();
- _builder_9.append("This is an optional sub state graph of this state.");
- _builder_9.newLine();
- PostprocessingHelpers.setDocumentation(_reference_4, _builder_9.toString());
- EClass _class_3 = PostprocessingHelpers.getClass(pckg, "StateGraph");
- cls = _class_3;
- StringConcatenation _builder_10 = new StringConcatenation();
- _builder_10.append("A state graph is a directed graph composed of");
- _builder_10.newLine();
- _builder_10.append("{@link StateGraphNode}s as nodes and {@link Transition}s as edges.");
- _builder_10.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_10.toString());
- EReference _reference_5 = PostprocessingHelpers.getReference(cls, "states");
- StringConcatenation _builder_11 = new StringConcatenation();
- _builder_11.append("This is a list of all states of this state graph.");
- _builder_11.newLine();
- PostprocessingHelpers.setDocumentation(_reference_5, _builder_11.toString());
- EReference _reference_6 = PostprocessingHelpers.getReference(cls, "trPoints");
- StringConcatenation _builder_12 = new StringConcatenation();
- _builder_12.append("This is a list of all transition, entry and exit points of this state graph.");
- _builder_12.newLine();
- PostprocessingHelpers.setDocumentation(_reference_6, _builder_12.toString());
- EReference _reference_7 = PostprocessingHelpers.getReference(cls, "chPoints");
- StringConcatenation _builder_13 = new StringConcatenation();
- _builder_13.append("This is a list of all choice points of this state graph.");
- _builder_13.newLine();
- PostprocessingHelpers.setDocumentation(_reference_7, _builder_13.toString());
- EReference _reference_8 = PostprocessingHelpers.getReference(cls, "transitions");
- StringConcatenation _builder_14 = new StringConcatenation();
- _builder_14.append("This is a list of all transitions of this state graph.");
- _builder_14.newLine();
- PostprocessingHelpers.setDocumentation(_reference_8, _builder_14.toString());
- EReference _reference_9 = PostprocessingHelpers.getReference(cls, "refinedTransitions");
- StringConcatenation _builder_15 = new StringConcatenation();
- _builder_15.append("This is a list of all refined transitions of this state graph.");
- _builder_15.newLine();
- PostprocessingHelpers.setDocumentation(_reference_9, _builder_15.toString());
- EClass _class_4 = PostprocessingHelpers.getClass(pckg, "SimpleState");
- cls = _class_4;
- StringConcatenation _builder_16 = new StringConcatenation();
- _builder_16.append("A simple state is the standard case of a @link State}.");
- _builder_16.newLine();
- _builder_16.append("It comprises and entry , exit and do code");
- _builder_16.newLine();
- _builder_16.append("and it can contain another {@link StateGraph} as sub state");
- _builder_16.newLine();
- _builder_16.append("graph.");
- _builder_16.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_16.toString());
- EAttribute _attribute_1 = PostprocessingHelpers.getAttribute(cls, "name");
- StringConcatenation _builder_17 = new StringConcatenation();
- _builder_17.append("By this name the state is referred to in the model.");
- _builder_17.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_1, _builder_17.toString());
- EClass _class_5 = PostprocessingHelpers.getClass(pckg, "RefinedState");
- cls = _class_5;
- StringConcatenation _builder_18 = new StringConcatenation();
- _builder_18.append("A refined state can be used only in a derived {@link ActorClass}.");
- _builder_18.newLine();
- _builder_18.append("It refers to a {@link State} in the inherited state machine");
- _builder_18.newLine();
- _builder_18.append("which is refined by adding detail code and/or");
- _builder_18.newLine();
- _builder_18.append("{@link StateGraphItem}s in the sub state graph.");
- _builder_18.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_18.toString());
- EReference _reference_10 = PostprocessingHelpers.getReference(cls, "target");
- StringConcatenation _builder_19 = new StringConcatenation();
- _builder_19.append("This is the referenced state in the base class state machine.");
- _builder_19.newLine();
- PostprocessingHelpers.setDocumentation(_reference_10, _builder_19.toString());
- EClass _class_6 = PostprocessingHelpers.getClass(pckg, "DetailCode");
- cls = _class_6;
- StringConcatenation _builder_20 = new StringConcatenation();
- _builder_20.append("The detail code contains a list of strings which");
- _builder_20.newLine();
- _builder_20.append("are considered verbatim code of the code generator");
- _builder_20.newLine();
- _builder_20.append("target language.");
- _builder_20.newLine();
- _builder_20.newLine();
- _builder_20.append("");
- _builder_20.newLine();
- _builder_20.append("The detail code is parsed by the {@link org.eclipse.etrice.generator.base.DetailCodeTranslator}");
- _builder_20.newLine();
- _builder_20.append("which replaces certain frequent constructs like access of members");
- _builder_20.newLine();
- _builder_20.append("and sending a message via a port by target language specific code.");
- _builder_20.newLine();
- _builder_20.append("
");
- _builder_20.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_20.toString());
- EAttribute _attribute_2 = PostprocessingHelpers.getAttribute(cls, "lines");
- StringConcatenation _builder_21 = new StringConcatenation();
- _builder_21.append("This is a list of commands in the code generator\'s target language.");
- _builder_21.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_2, _builder_21.toString());
- EClass _class_7 = PostprocessingHelpers.getClass(pckg, "TrPoint");
- cls = _class_7;
- StringConcatenation _builder_22 = new StringConcatenation();
- _builder_22.append("The super class of");
- _builder_22.newLine();
- _builder_22.append("");
- _builder_22.newLine();
- _builder_22.append(" ");
- _builder_22.append("{@link TransitionPoint} ");
- _builder_22.newLine();
- _builder_22.append(" ");
- _builder_22.append("{@link EntryPoint} ");
- _builder_22.newLine();
- _builder_22.append(" ");
- _builder_22.append("{@link ExitPoint} ");
- _builder_22.newLine();
- _builder_22.append(" ");
- _builder_22.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_22.toString());
- EAttribute _attribute_3 = PostprocessingHelpers.getAttribute(cls, "name");
- StringConcatenation _builder_23 = new StringConcatenation();
- _builder_23.append("By this name the transition, entry or exit point is referred to in the model.");
- _builder_23.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_3, _builder_23.toString());
- EClass _class_8 = PostprocessingHelpers.getClass(pckg, "TransitionPoint");
- cls = _class_8;
- StringConcatenation _builder_24 = new StringConcatenation();
- _builder_24.append("A transition point is located at the border of a {@link State}");
- _builder_24.newLine();
- _builder_24.append("and is not visible or accessible outside. It is used");
- _builder_24.newLine();
- _builder_24.append("to globally handle messages. If a {@link Transition} starting");
- _builder_24.newLine();
- _builder_24.append("at a transition point triggers then exit and entry codes");
- _builder_24.newLine();
- _builder_24.append("are executed as usual as long as the handler flag of the");
- _builder_24.newLine();
- _builder_24.append("transition point isn\'t set.");
- _builder_24.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_24.toString());
- EAttribute _attribute_4 = PostprocessingHelpers.getAttribute(cls, "handler");
- StringConcatenation _builder_25 = new StringConcatenation();
- _builder_25.append("If this flag is {@code true} then for a transition triggerd from this point");
- _builder_25.newLine();
- _builder_25.append("no exit and entry codes of the states left and entered are executed.");
- _builder_25.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_4, _builder_25.toString());
- EClass _class_9 = PostprocessingHelpers.getClass(pckg, "EntryPoint");
- cls = _class_9;
- StringConcatenation _builder_26 = new StringConcatenation();
- _builder_26.append("An entry point is located at the border of a {@link State}");
- _builder_26.newLine();
- _builder_26.append("and is visible and accessible outside. Outside");
- _builder_26.newLine();
- _builder_26.append("it can be the target of a {@link Transition} and inside the source.");
- _builder_26.newLine();
- _builder_26.append("If it is not connected in the interior then it is a");
- _builder_26.newLine();
- _builder_26.append("transition to history .");
- _builder_26.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_26.toString());
- EClass _class_10 = PostprocessingHelpers.getClass(pckg, "ExitPoint");
- cls = _class_10;
- StringConcatenation _builder_27 = new StringConcatenation();
- _builder_27.append("An exit point is located at the border of a {@link State}");
- _builder_27.newLine();
- _builder_27.append("and is visible and accessible outside. Outside");
- _builder_27.newLine();
- _builder_27.append("it can be the source of a {@link Transition} and inside the target.");
- _builder_27.newLine();
- _builder_27.append("If it is not connected in the interior then it is a");
- _builder_27.newLine();
- _builder_27.append("group transition .");
- _builder_27.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_27.toString());
- EClass _class_11 = PostprocessingHelpers.getClass(pckg, "ChoicePoint");
- cls = _class_11;
- StringConcatenation _builder_28 = new StringConcatenation();
- _builder_28.append("A choice point corresponds to an {@code if else} construct.");
- _builder_28.newLine();
- _builder_28.append("It is the target of one or more {@link Transition}s and the");
- _builder_28.newLine();
- _builder_28.append("source of several {@link Transition}s.");
- _builder_28.newLine();
- _builder_28.append("One outgoing transitions must be a {@link ContinuationTransition}");
- _builder_28.newLine();
- _builder_28.append("and corresponds to the final else. It is called the");
- _builder_28.newLine();
- _builder_28.append("default branch of the choice point.");
- _builder_28.newLine();
- _builder_28.append("All other outgoing transitions have to be {@link CPBranchTransition}s.");
- _builder_28.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_28.toString());
- EAttribute _attribute_5 = PostprocessingHelpers.getAttribute(cls, "name");
- StringConcatenation _builder_29 = new StringConcatenation();
- _builder_29.append("By this name the choice point is referred to in the model.");
- _builder_29.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_5, _builder_29.toString());
- EReference _reference_11 = PostprocessingHelpers.getReference(cls, "docu");
- StringConcatenation _builder_30 = new StringConcatenation();
- _builder_30.append("This is an optional documentation.");
- _builder_30.newLine();
- PostprocessingHelpers.setDocumentation(_reference_11, _builder_30.toString());
- EClass _class_12 = PostprocessingHelpers.getClass(pckg, "Transition");
- cls = _class_12;
- StringConcatenation _builder_31 = new StringConcatenation();
- _builder_31.append("The super class of");
- _builder_31.newLine();
- _builder_31.append("");
- _builder_31.newLine();
- _builder_31.append(" ");
- _builder_31.append("{@link InitialTransition} ");
- _builder_31.newLine();
- _builder_31.append(" ");
- _builder_31.append("{@link NonInitialTransition} ");
- _builder_31.newLine();
- _builder_31.append(" ");
- _builder_31.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_31.toString());
- EAttribute _attribute_6 = PostprocessingHelpers.getAttribute(cls, "name");
- StringConcatenation _builder_32 = new StringConcatenation();
- _builder_32.append("This is an optional name of the transition.");
- _builder_32.newLine();
- PostprocessingHelpers.setDocumentation(_attribute_6, _builder_32.toString());
- EReference _reference_12 = PostprocessingHelpers.getReference(cls, "docu");
- StringConcatenation _builder_33 = new StringConcatenation();
- _builder_33.append("This is an optional documentation.");
- _builder_33.newLine();
- PostprocessingHelpers.setDocumentation(_reference_12, _builder_33.toString());
- EReference _reference_13 = PostprocessingHelpers.getReference(cls, "to");
- StringConcatenation _builder_34 = new StringConcatenation();
- _builder_34.append("This is the target node of the transition.");
- _builder_34.newLine();
- PostprocessingHelpers.setDocumentation(_reference_13, _builder_34.toString());
- EReference _reference_14 = PostprocessingHelpers.getReference(cls, "action");
- StringConcatenation _builder_35 = new StringConcatenation();
- _builder_35.append("This is an optional code in the code generator\'s target language.");
- _builder_35.newLine();
- _builder_35.append("It is execute when the transition fires.");
- _builder_35.newLine();
- PostprocessingHelpers.setDocumentation(_reference_14, _builder_35.toString());
- EClass _class_13 = PostprocessingHelpers.getClass(pckg, "NonInitialTransition");
- cls = _class_13;
- StringConcatenation _builder_36 = new StringConcatenation();
- _builder_36.append("The super class of");
- _builder_36.newLine();
- _builder_36.append("");
- _builder_36.newLine();
- _builder_36.append(" ");
- _builder_36.append("{@link TransitionChainStartTransition} ");
- _builder_36.newLine();
- _builder_36.append(" ");
- _builder_36.append("{@link ContinuationTransition} ");
- _builder_36.newLine();
- _builder_36.append(" ");
- _builder_36.append("{@link CPBranchTransition} ");
- _builder_36.newLine();
- _builder_36.append(" ");
- _builder_36.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_36.toString());
- EReference _reference_15 = PostprocessingHelpers.getReference(cls, "from");
- StringConcatenation _builder_37 = new StringConcatenation();
- _builder_37.append("This is the source node of the transition.");
- _builder_37.newLine();
- PostprocessingHelpers.setDocumentation(_reference_15, _builder_37.toString());
- EClass _class_14 = PostprocessingHelpers.getClass(pckg, "TransitionChainStartTransition");
- cls = _class_14;
- StringConcatenation _builder_38 = new StringConcatenation();
- _builder_38.append("The super class of");
- _builder_38.newLine();
- _builder_38.append("");
- _builder_38.newLine();
- _builder_38.append(" ");
- _builder_38.append("{@link TriggeredTransition} ");
- _builder_38.newLine();
- _builder_38.append(" ");
- _builder_38.append("{@link GuardedTransition} ");
- _builder_38.newLine();
- _builder_38.append(" ");
- _builder_38.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_38.toString());
- EClass _class_15 = PostprocessingHelpers.getClass(pckg, "InitialTransition");
- cls = _class_15;
- StringConcatenation _builder_39 = new StringConcatenation();
- _builder_39.append("There can be at most one initial transition in a {@link StateGraph}.");
- _builder_39.newLine();
- _builder_39.append("It defines the starting point of the state graph and is traversed");
- _builder_39.newLine();
- _builder_39.append("exactly once when the state graph is accessed for the first time.");
- _builder_39.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_39.toString());
- EClass _class_16 = PostprocessingHelpers.getClass(pckg, "ContinuationTransition");
- cls = _class_16;
- StringConcatenation _builder_40 = new StringConcatenation();
- _builder_40.append("Continuation transitions start at entry or exit points");
- _builder_40.newLine();
- _builder_40.append("({@link EntryPoint}s or {@link ExitPoint}s) or form");
- _builder_40.newLine();
- _builder_40.append("the default branch of a {@link ChoicePoint}.");
- _builder_40.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_40.toString());
- EClass _class_17 = PostprocessingHelpers.getClass(pckg, "TriggeredTransition");
- cls = _class_17;
- StringConcatenation _builder_41 = new StringConcatenation();
- _builder_41.append("Triggered transitions start at a {@link State} or a {@link TransitionPoint}.");
- _builder_41.newLine();
- _builder_41.append("It defines a list of {@link Trigger}s that specify the conditions");
- _builder_41.newLine();
- _builder_41.append("when the transition fires and is traversed. This kind of");
- _builder_41.newLine();
- _builder_41.append("transition is only allowed in event driven and mixed (async) state");
- _builder_41.newLine();
- _builder_41.append("machines.");
- _builder_41.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_41.toString());
- EReference _reference_16 = PostprocessingHelpers.getReference(cls, "triggers");
- StringConcatenation _builder_42 = new StringConcatenation();
- _builder_42.append("This is a list of all triggers of the transition.");
- _builder_42.newLine();
- PostprocessingHelpers.setDocumentation(_reference_16, _builder_42.toString());
- EClass _class_18 = PostprocessingHelpers.getClass(pckg, "GuardedTransition");
- cls = _class_18;
- StringConcatenation _builder_43 = new StringConcatenation();
- _builder_43.append("A guarded transition is very similar to a {@link CPBranchTransition}.");
- _builder_43.newLine();
- _builder_43.append("It defines a guard condition which lets the transition fire if");
- _builder_43.newLine();
- _builder_43.append("evaluated to {@code true}. This kind of transition is only");
- _builder_43.newLine();
- _builder_43.append("allowed in data driven or moixed (async) state machines.");
- _builder_43.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_43.toString());
- EReference _reference_17 = PostprocessingHelpers.getReference(cls, "guard");
- StringConcatenation _builder_44 = new StringConcatenation();
- _builder_44.append("This is the guard condition of the transition specified in the code generator\'s target language.");
- _builder_44.newLine();
- _builder_44.append("It has to evaluate to a boolean value.");
- _builder_44.newLine();
- PostprocessingHelpers.setDocumentation(_reference_17, _builder_44.toString());
- EClass _class_19 = PostprocessingHelpers.getClass(pckg, "CPBranchTransition");
- cls = _class_19;
- StringConcatenation _builder_45 = new StringConcatenation();
- _builder_45.append("The choice point branch transitions is allowed only as outgoing");
- _builder_45.newLine();
- _builder_45.append("transition of {@link ChoicePoint}s.");
- _builder_45.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_45.toString());
- EReference _reference_18 = PostprocessingHelpers.getReference(cls, "condition");
- StringConcatenation _builder_46 = new StringConcatenation();
- _builder_46.append("This is the condition of the choice point branch specified in the code generator\'s target language.");
- _builder_46.newLine();
- _builder_46.append("It has to evaluate to a boolean value.");
- _builder_46.newLine();
- PostprocessingHelpers.setDocumentation(_reference_18, _builder_46.toString());
- EClass _class_20 = PostprocessingHelpers.getClass(pckg, "RefinedTransition");
- cls = _class_20;
- StringConcatenation _builder_47 = new StringConcatenation();
- _builder_47.append("The refined transition is only allowed in {@link StateGraph}s");
- _builder_47.newLine();
- _builder_47.append("of derived {@link ActorClass}es. It targets a {@link Transition}");
- _builder_47.newLine();
- _builder_47.append("of the base class state machine.");
- _builder_47.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_47.toString());
- EReference _reference_19 = PostprocessingHelpers.getReference(cls, "action");
- StringConcatenation _builder_48 = new StringConcatenation();
- _builder_48.append("This is an optional code in the code generator\'s target language.");
- _builder_48.newLine();
- _builder_48.append("It is execute when the transition fires.");
- _builder_48.newLine();
- PostprocessingHelpers.setDocumentation(_reference_19, _builder_48.toString());
- EReference _reference_20 = PostprocessingHelpers.getReference(cls, "target");
- StringConcatenation _builder_49 = new StringConcatenation();
- _builder_49.append("This is the referenced transition in the base class state machine.");
- _builder_49.newLine();
- PostprocessingHelpers.setDocumentation(_reference_20, _builder_49.toString());
- EReference _reference_21 = PostprocessingHelpers.getReference(cls, "docu");
- StringConcatenation _builder_50 = new StringConcatenation();
- _builder_50.append("This is an optional documentation.");
- _builder_50.newLine();
- PostprocessingHelpers.setDocumentation(_reference_21, _builder_50.toString());
- EClass _class_21 = PostprocessingHelpers.getClass(pckg, "TransitionTerminal");
- cls = _class_21;
- StringConcatenation _builder_51 = new StringConcatenation();
- _builder_51.append("The super class of");
- _builder_51.newLine();
- _builder_51.append("");
- _builder_51.newLine();
- _builder_51.append(" ");
- _builder_51.append("{@link StateTerminal} ");
- _builder_51.newLine();
- _builder_51.append(" ");
- _builder_51.append("{@link TrPointTerminal} ");
- _builder_51.newLine();
- _builder_51.append(" ");
- _builder_51.append("{@link SubStateTrPointTerminal} ");
- _builder_51.newLine();
- _builder_51.append(" ");
- _builder_51.append("{@link ChoicepointTerminal} ");
- _builder_51.newLine();
- _builder_51.append(" ");
- _builder_51.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_51.toString());
- EClass _class_22 = PostprocessingHelpers.getClass(pckg, "StateTerminal");
- cls = _class_22;
- StringConcatenation _builder_52 = new StringConcatenation();
- _builder_52.append("The terminal point (source or target) of a transition ending");
- _builder_52.newLine();
- _builder_52.append("at a {@link State}.");
- _builder_52.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_52.toString());
- EReference _reference_22 = PostprocessingHelpers.getReference(cls, "state");
- StringConcatenation _builder_53 = new StringConcatenation();
- _builder_53.append("This is the target state.");
- _builder_53.newLine();
- PostprocessingHelpers.setDocumentation(_reference_22, _builder_53.toString());
- EClass _class_23 = PostprocessingHelpers.getClass(pckg, "TrPointTerminal");
- cls = _class_23;
- StringConcatenation _builder_54 = new StringConcatenation();
- _builder_54.append("The terminal point (source or target) of a transition ending");
- _builder_54.newLine();
- _builder_54.append("at a local {@link TrPoint}.");
- _builder_54.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_54.toString());
- EReference _reference_23 = PostprocessingHelpers.getReference(cls, "trPoint");
- StringConcatenation _builder_55 = new StringConcatenation();
- _builder_55.append("This is the target transition, entry or exit point.");
- _builder_55.newLine();
- PostprocessingHelpers.setDocumentation(_reference_23, _builder_55.toString());
- EClass _class_24 = PostprocessingHelpers.getClass(pckg, "SubStateTrPointTerminal");
- cls = _class_24;
- StringConcatenation _builder_56 = new StringConcatenation();
- _builder_56.append("The terminal point (source or target) of a transition ending");
- _builder_56.newLine();
- _builder_56.append("at a {@link TrPoint} of a sub {@link State}.");
- _builder_56.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_56.toString());
- EReference _reference_24 = PostprocessingHelpers.getReference(cls, "state");
- StringConcatenation _builder_57 = new StringConcatenation();
- _builder_57.append("This is the target state.");
- _builder_57.newLine();
- PostprocessingHelpers.setDocumentation(_reference_24, _builder_57.toString());
- EReference _reference_25 = PostprocessingHelpers.getReference(cls, "trPoint");
- StringConcatenation _builder_58 = new StringConcatenation();
- _builder_58.append("This is the target entry or exit point contained in the target state.");
- _builder_58.newLine();
- PostprocessingHelpers.setDocumentation(_reference_25, _builder_58.toString());
- EClass _class_25 = PostprocessingHelpers.getClass(pckg, "ChoicepointTerminal");
- cls = _class_25;
- StringConcatenation _builder_59 = new StringConcatenation();
- _builder_59.append("The terminal point (source or target) of a transition ending");
- _builder_59.newLine();
- _builder_59.append("at a {@link ChoicepointTerminal}.");
- _builder_59.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_59.toString());
- EReference _reference_26 = PostprocessingHelpers.getReference(cls, "cp");
- StringConcatenation _builder_60 = new StringConcatenation();
- _builder_60.append("This is the target choice point.");
- _builder_60.newLine();
- PostprocessingHelpers.setDocumentation(_reference_26, _builder_60.toString());
- EClass _class_26 = PostprocessingHelpers.getClass(pckg, "Trigger");
- cls = _class_26;
- StringConcatenation _builder_61 = new StringConcatenation();
- _builder_61.append("A transition trigger is a list of {@link MessageFromIf} pairs");
- _builder_61.newLine();
- _builder_61.append("and an optional {@link Guard}.");
- _builder_61.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_61.toString());
- EReference _reference_27 = PostprocessingHelpers.getReference(cls, "msgFromIfPairs");
- StringConcatenation _builder_62 = new StringConcatenation();
- _builder_62.append("This is a list of message/interface item pairs.");
- _builder_62.newLine();
- PostprocessingHelpers.setDocumentation(_reference_27, _builder_62.toString());
- EReference _reference_28 = PostprocessingHelpers.getReference(cls, "guard");
- StringConcatenation _builder_63 = new StringConcatenation();
- _builder_63.append("This is an optional guard condition of the trigger specified in the code generator\'s target language.");
- _builder_63.newLine();
- _builder_63.append("It has to evaluate to a boolean value.");
- _builder_63.newLine();
- PostprocessingHelpers.setDocumentation(_reference_28, _builder_63.toString());
- EClass _class_27 = PostprocessingHelpers.getClass(pckg, "MessageFromIf");
- cls = _class_27;
- StringConcatenation _builder_64 = new StringConcatenation();
- _builder_64.append("A pair consisting of a {@link Message} arising from an");
- _builder_64.newLine();
- _builder_64.append("{@link InterfaceItem}.");
- _builder_64.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_64.toString());
- EReference _reference_29 = PostprocessingHelpers.getReference(cls, "message");
- StringConcatenation _builder_65 = new StringConcatenation();
- _builder_65.append("This is the triggerering message (or event).");
- _builder_65.newLine();
- PostprocessingHelpers.setDocumentation(_reference_29, _builder_65.toString());
- EReference _reference_30 = PostprocessingHelpers.getReference(cls, "from");
- StringConcatenation _builder_66 = new StringConcatenation();
- _builder_66.append("This is the interface item where the message occurred.");
- _builder_66.newLine();
- PostprocessingHelpers.setDocumentation(_reference_30, _builder_66.toString());
- EClass _class_28 = PostprocessingHelpers.getClass(pckg, "Guard");
- cls = _class_28;
- StringConcatenation _builder_67 = new StringConcatenation();
- _builder_67.append("A detail code that evaluates to a boolean in the target");
- _builder_67.newLine();
- _builder_67.append("language.");
- _builder_67.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_67.toString());
- EReference _reference_31 = PostprocessingHelpers.getReference(cls, "guard");
- StringConcatenation _builder_68 = new StringConcatenation();
- _builder_68.append("This is a guard condition specified in the code generator\'s target language.");
- _builder_68.newLine();
- _builder_68.append("It has to evaluate to a boolean value.");
- _builder_68.newLine();
- PostprocessingHelpers.setDocumentation(_reference_31, _builder_68.toString());
- EClass _class_29 = PostprocessingHelpers.getClass(pckg, "ProtocolSemantics");
- cls = _class_29;
- StringConcatenation _builder_69 = new StringConcatenation();
- _builder_69.append("An optional semantics specification as part of a {@link ProtocolClass}.");
- _builder_69.newLine();
- _builder_69.append("The semantic is defined as a legal execution tree .");
- _builder_69.newLine();
- _builder_69.append("This tree is composed of incoming and outgoing messages and each path through");
- _builder_69.newLine();
- _builder_69.append("this tree is a valid sequence of messages exchanged through a port instance.");
- _builder_69.newLine();
- _builder_69.newLine();
- _builder_69.append("");
- _builder_69.newLine();
- _builder_69.append("The semantics are composed using {@link SemanticsRule}s.");
- _builder_69.newLine();
- _builder_69.append("
");
- _builder_69.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_69.toString());
- EReference _reference_32 = PostprocessingHelpers.getReference(cls, "rules");
- StringConcatenation _builder_70 = new StringConcatenation();
- _builder_70.append("This is a list of semantic rules.");
- _builder_70.newLine();
- PostprocessingHelpers.setDocumentation(_reference_32, _builder_70.toString());
- EClass _class_30 = PostprocessingHelpers.getClass(pckg, "SemanticsRule");
- cls = _class_30;
- StringConcatenation _builder_71 = new StringConcatenation();
- _builder_71.append("The super class of");
- _builder_71.newLine();
- _builder_71.append("");
- _builder_71.newLine();
- _builder_71.append(" ");
- _builder_71.append("{@link InSemanticsRule} ");
- _builder_71.newLine();
- _builder_71.append(" ");
- _builder_71.append("{@link OutSemanticsRule} ");
- _builder_71.newLine();
- _builder_71.append(" ");
- _builder_71.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_71.toString());
- EReference _reference_33 = PostprocessingHelpers.getReference(cls, "msg");
- StringConcatenation _builder_72 = new StringConcatenation();
- _builder_72.append("The message to which this rule applies.");
- _builder_72.newLine();
- PostprocessingHelpers.setDocumentation(_reference_33, _builder_72.toString());
- EReference _reference_34 = PostprocessingHelpers.getReference(cls, "followUps");
- StringConcatenation _builder_73 = new StringConcatenation();
- _builder_73.append("The possible follow up rules.");
- _builder_73.newLine();
- PostprocessingHelpers.setDocumentation(_reference_34, _builder_73.toString());
- EClass _class_31 = PostprocessingHelpers.getClass(pckg, "InSemanticsRule");
- cls = _class_31;
- StringConcatenation _builder_74 = new StringConcatenation();
- _builder_74.append("A {@link SemanticsRule} for incoming messages.");
- _builder_74.newLine();
- _builder_74.append("The rule points to an incoming messages and allows follow-up rules.");
- _builder_74.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_74.toString());
- EClass _class_32 = PostprocessingHelpers.getClass(pckg, "OutSemanticsRule");
- cls = _class_32;
- StringConcatenation _builder_75 = new StringConcatenation();
- _builder_75.append("A {@link SemanticsRule} for outgoing messages.");
- _builder_75.newLine();
- _builder_75.append("The rule points to an outgoing messages and allows follow-up rules.");
- _builder_75.newLine();
- PostprocessingHelpers.setDocumentation(cls, _builder_75.toString());
- }
-}
diff --git a/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/postprocessing/ImplPostprocessor.java b/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/postprocessing/ImplPostprocessor.java
deleted file mode 100644
index 3c6306ffc..000000000
--- a/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/postprocessing/ImplPostprocessor.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Copyright (c) 2014 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
- */
-package org.eclipse.etrice.core.fsm.postprocessing;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.etrice.core.common.postprocessing.PostprocessingHelpers;
-import org.eclipse.xtend2.lib.StringConcatenation;
-import org.eclipse.xtext.GeneratedMetamodel;
-
-@SuppressWarnings("all")
-public class ImplPostprocessor {
- public boolean process(final GeneratedMetamodel metamodel) {
- boolean _xblockexpression = false;
- {
- final EPackage fsmPackage = metamodel.getEPackage();
- final EClass state = PostprocessingHelpers.getClass(fsmPackage, "State");
- StringConcatenation _builder = new StringConcatenation();
- _builder.append("return (this instanceof <%org.eclipse.etrice.core.fsm.fSM.SimpleState%>)? ((SimpleState)this).getName() :(this instanceof <%org.eclipse.etrice.core.fsm.fSM.RefinedState%>)? (((RefinedState)this).getTarget()==null? \"\":((RefinedState)this).getTarget().getName()) :\"\";");
- PostprocessingHelpers.addOperation(state, "getName", EcorePackage.Literals.ESTRING, Integer.valueOf(1), _builder.toString());
- final EClass stateGraphItem = PostprocessingHelpers.getClass(fsmPackage, "StateGraphItem");
- EClassifier _eClassifier = EcorePackage.eINSTANCE.getEClassifier("EString");
- StringConcatenation _builder_1 = new StringConcatenation();
- _builder_1.append("if (this instanceof <%org.eclipse.etrice.core.fsm.fSM.State%>) ");
- _builder_1.newLine();
- _builder_1.append("\t");
- _builder_1.append("return ((State)this).getName();");
- _builder_1.newLine();
- _builder_1.append("else if (this instanceof <%org.eclipse.etrice.core.fsm.fSM.TrPoint%>)");
- _builder_1.newLine();
- _builder_1.append("\t");
- _builder_1.append("return ((TrPoint)this).getName();");
- _builder_1.newLine();
- _builder_1.append("else if (this instanceof <%org.eclipse.etrice.core.fsm.fSM.ChoicePoint%>)");
- _builder_1.newLine();
- _builder_1.append("\t");
- _builder_1.append("return ((ChoicePoint)this).getName();");
- _builder_1.newLine();
- _builder_1.append("else if (this instanceof <%org.eclipse.etrice.core.fsm.fSM.Transition%>)");
- _builder_1.newLine();
- _builder_1.append("\t");
- _builder_1.append("return ((Transition)this).getName();");
- _builder_1.newLine();
- _builder_1.append("return \"\";");
- _builder_1.newLine();
- PostprocessingHelpers.addOperation(stateGraphItem, "getName", _eClassifier, Integer.valueOf(1), _builder_1.toString());
- final EClass ifItem = PostprocessingHelpers.getClass(fsmPackage, "AbstractInterfaceItem");
- EClassifier _eClassifier_1 = EcorePackage.eINSTANCE.getEClassifier("EString");
- StringConcatenation _builder_2 = new StringConcatenation();
- _builder_2.append("return getName();");
- _builder_2.newLine();
- PostprocessingHelpers.addOperation(ifItem, "getDisplayName", _eClassifier_1, Integer.valueOf(1), _builder_2.toString());
- EClassifier _eClassifier_2 = fsmPackage.getEClassifier("ProtocolSemantics");
- PostprocessingHelpers.addOperation(ifItem, "getSemantics", _eClassifier_2);
- PostprocessingHelpers.addOperation(ifItem, "getAllIncomingAbstractMessages", EcorePackage.Literals.EOBJECT, Integer.valueOf((-1)), null);
- PostprocessingHelpers.addOperation(ifItem, "getAllOutgoingAbstractMessages", EcorePackage.Literals.EOBJECT, Integer.valueOf((-1)), null);
- PostprocessingHelpers.addOperation(ifItem, "isEventDriven", EcorePackage.Literals.EBOOLEAN, Integer.valueOf(1), "return true;");
- final EClass itemOwner = PostprocessingHelpers.addClass(fsmPackage, "IInterfaceItemOwner");
- itemOwner.setAbstract(true);
- itemOwner.setInterface(true);
- EClassifier _eClassifier_3 = fsmPackage.getEClassifier("AbstractInterfaceItem");
- PostprocessingHelpers.addOperation(itemOwner, "getAbstractInterfaceItems", _eClassifier_3, Integer.valueOf((-1)), null);
- EClassifier _eClassifier_4 = fsmPackage.getEClassifier("AbstractInterfaceItem");
- PostprocessingHelpers.addOperation(itemOwner, "getAllAbstractInterfaceItems", _eClassifier_4, Integer.valueOf((-1)), null);
- final EClass comp = PostprocessingHelpers.getClass(fsmPackage, "ModelComponent");
- EList _eSuperTypes = comp.getESuperTypes();
- _xblockexpression = _eSuperTypes.add(itemOwner);
- }
- return _xblockexpression;
- }
-}
diff --git a/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/scoping/FSMScopeProvider.java b/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/scoping/FSMScopeProvider.java
deleted file mode 100644
index fe823650a..000000000
--- a/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/scoping/FSMScopeProvider.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/**
- * generated by Xtext
- */
-package org.eclipse.etrice.core.fsm.scoping;
-
-import com.google.common.base.Objects;
-import com.google.inject.Inject;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.TreeIterator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.etrice.core.fsm.fSM.ChoicePoint;
-import org.eclipse.etrice.core.fsm.fSM.ChoicepointTerminal;
-import org.eclipse.etrice.core.fsm.fSM.ModelComponent;
-import org.eclipse.etrice.core.fsm.fSM.RefinedState;
-import org.eclipse.etrice.core.fsm.fSM.RefinedTransition;
-import org.eclipse.etrice.core.fsm.fSM.SimpleState;
-import org.eclipse.etrice.core.fsm.fSM.State;
-import org.eclipse.etrice.core.fsm.fSM.StateGraph;
-import org.eclipse.etrice.core.fsm.fSM.StateTerminal;
-import org.eclipse.etrice.core.fsm.fSM.SubStateTrPointTerminal;
-import org.eclipse.etrice.core.fsm.fSM.TrPoint;
-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.xtext.naming.IQualifiedNameProvider;
-import org.eclipse.xtext.naming.QualifiedName;
-import org.eclipse.xtext.resource.EObjectDescription;
-import org.eclipse.xtext.resource.IEObjectDescription;
-import org.eclipse.xtext.scoping.IScope;
-import org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider;
-import org.eclipse.xtext.scoping.impl.SimpleScope;
-import org.eclipse.xtext.xbase.lib.CollectionLiterals;
-import org.eclipse.xtext.xbase.lib.Extension;
-
-/**
- * This class contains custom scoping description.
- *
- * see : http://www.eclipse.org/Xtext/documentation.html#scoping
- * on how and when to use it
- */
-@SuppressWarnings("all")
-public class FSMScopeProvider extends AbstractDeclarativeScopeProvider {
- @Inject
- @Extension
- private FSMHelpers _fSMHelpers;
-
- @Inject
- @Extension
- private IQualifiedNameProvider _iQualifiedNameProvider;
-
- /**
- * returns a flat list of State scopes for a {@link StateTerminal}
- * @param st - the transition endpoint or terminal
- * @param ref - not used
- * @return a list of scopes
- */
- public IScope scope_StateTerminal_state(final StateTerminal st, final EReference ref) {
- final List scopes = CollectionLiterals.newArrayList();
- final StateGraph parent = this.getStateGraph(st);
- this.getStateScopes(parent, scopes);
- return new SimpleScope(IScope.NULLSCOPE, scopes);
- }
-
- /**
- * returns a flat list of TransitionPoint scopes for a {@link TrPointTerminal}
- * @param ep - the transition endpoint or terminal
- * @param ref - not used
- * @return a list of scopes
- */
- public IScope scope_TrPointTerminal_trPoint(final TrPointTerminal ep, final EReference ref) {
- final List scopes = CollectionLiterals.newArrayList();
- final StateGraph parent = this.getStateGraph(ep);
- final List tps = this._fSMHelpers.getAllTrPoints(parent);
- for (final TrPoint tp : tps) {
- String _name = tp.getName();
- IEObjectDescription _create = EObjectDescription.create(_name, tp);
- scopes.add(_create);
- }
- return new SimpleScope(IScope.NULLSCOPE, scopes);
- }
-
- /**
- * returns a flat list of TransitionPoint scopes for a {@link SubStateTrPointTerminal}
- * @param ep - the transition endpoint or terminal
- * @param ref - not used
- * @return a list of scopes
- */
- public IScope scope_SubStateTrPointTerminal_trPoint(final SubStateTrPointTerminal ep, final EReference ref) {
- final List scopes = CollectionLiterals.newArrayList();
- final StateGraph parent = this.getStateGraph(ep);
- State _state = ep.getState();
- boolean _notEquals = (!Objects.equal(_state, null));
- if (_notEquals) {
- State epState = ep.getState();
- State _refinedStateFor = this._fSMHelpers.getRefinedStateFor(parent, epState);
- epState = _refinedStateFor;
- StateGraph _subgraph = epState.getSubgraph();
- boolean _notEquals_1 = (!Objects.equal(_subgraph, null));
- if (_notEquals_1) {
- StateGraph _subgraph_1 = epState.getSubgraph();
- final List tps = this._fSMHelpers.getAllTrPoints(_subgraph_1);
- for (final TrPoint tp : tps) {
- String _name = tp.getName();
- IEObjectDescription _create = EObjectDescription.create(_name, tp);
- scopes.add(_create);
- }
- }
- }
- return new SimpleScope(IScope.NULLSCOPE, scopes);
- }
-
- /**
- * returns a flat list of State scopes for a {@link SubStateTrPointTerminal}
- * @param st - the transition endpoint or terminal
- * @param ref - not used
- * @return a list of scopes
- */
- public IScope scope_SubStateTrPointTerminal_state(final SubStateTrPointTerminal st, final EReference ref) {
- final List scopes = CollectionLiterals.newArrayList();
- final StateGraph parent = this.getStateGraph(st);
- this.getStateScopes(parent, scopes);
- return new SimpleScope(IScope.NULLSCOPE, scopes);
- }
-
- /**
- * returns a flat list of Choicepoint scopes for a {@link SubStateTrPointTerminal}
- * @param ct - the transition endpoint or terminal
- * @param ref - not used
- * @return a list of scopes
- */
- public IScope scope_ChoicepointTerminal_cp(final ChoicepointTerminal ct, final EReference ref) {
- final List scopes = CollectionLiterals.newArrayList();
- final StateGraph parent = this.getStateGraph(ct);
- final List choicePoints = this._fSMHelpers.getAllChoicePoints(parent);
- for (final ChoicePoint cp : choicePoints) {
- String _name = cp.getName();
- IEObjectDescription _create = EObjectDescription.create(_name, cp);
- scopes.add(_create);
- }
- return new SimpleScope(IScope.NULLSCOPE, scopes);
- }
-
- /**
- * returns a flat list of BaseState scopes for a {@link RefinedState}
- * @param rs - the refined state
- * @param ref - not used
- * @return a list of scopes
- */
- public IScope scope_RefinedState_target(final RefinedState rs, final EReference ref) {
- final List scopes = CollectionLiterals.newArrayList();
- StateGraph sg = this.getStateGraph(rs);
- EObject _eContainer = sg.eContainer();
- if ((_eContainer instanceof ModelComponent)) {
- EObject _eContainer_1 = sg.eContainer();
- ModelComponent comp = ((ModelComponent) _eContainer_1);
- if (((!Objects.equal(comp.getBase(), null)) && (!this._fSMHelpers.isCircularClassHierarchy(comp)))) {
- ModelComponent _base = comp.getBase();
- comp = _base;
- final HashSet covered = CollectionLiterals.newHashSet();
- final ArrayList states = CollectionLiterals.newArrayList();
- while ((!Objects.equal(comp, null))) {
- {
- StateGraph _stateMachine = comp.getStateMachine();
- this.recursivelyAddStates(_stateMachine, covered, states);
- ModelComponent _base_1 = comp.getBase();
- comp = _base_1;
- }
- }
- for (final State s : states) {
- QualifiedName _statePath = this.getStatePath(s);
- IEObjectDescription _create = EObjectDescription.create(_statePath, s);
- scopes.add(_create);
- }
- }
- } else {
- EObject _eContainer_2 = sg.eContainer();
- if ((_eContainer_2 instanceof RefinedState)) {
- EObject _eContainer_3 = sg.eContainer();
- State _target = ((RefinedState) _eContainer_3).getTarget();
- StateGraph _subgraph = _target.getSubgraph();
- sg = _subgraph;
- boolean _notEquals = (!Objects.equal(sg, null));
- if (_notEquals) {
- EList _states = sg.getStates();
- for (final State s_1 : _states) {
- String _name = s_1.getName();
- IEObjectDescription _create_1 = EObjectDescription.create(_name, s_1);
- scopes.add(_create_1);
- }
- }
- }
- }
- return new SimpleScope(IScope.NULLSCOPE, scopes);
- }
-
- /**
- * returns a flat list of Transition scopes for a {@link RefinedTransition}
- * @param trans - the refined transition
- * @param ref - not used
- * @return a list of scopes
- */
- public IScope scope_RefinedTransition_target(final RefinedTransition trans, final EReference ref) {
- final List scopes = CollectionLiterals.newArrayList();
- EObject _eContainer = trans.eContainer();
- EObject _eContainer_1 = _eContainer.eContainer();
- ModelComponent comp = ((ModelComponent) _eContainer_1);
- boolean _isCircularClassHierarchy = this._fSMHelpers.isCircularClassHierarchy(comp);
- boolean _not = (!_isCircularClassHierarchy);
- if (_not) {
- ModelComponent _base = comp.getBase();
- comp = _base;
- while ((!Objects.equal(comp, null))) {
- {
- StateGraph _stateMachine = comp.getStateMachine();
- boolean _notEquals = (!Objects.equal(_stateMachine, null));
- if (_notEquals) {
- QualifiedName _fullyQualifiedName = this._iQualifiedNameProvider.getFullyQualifiedName(comp);
- final int acNameSegments = _fullyQualifiedName.getSegmentCount();
- StateGraph _stateMachine_1 = comp.getStateMachine();
- final TreeIterator iter = _stateMachine_1.eAllContents();
- while (iter.hasNext()) {
- {
- final EObject obj = iter.next();
- if ((obj instanceof Transition)) {
- QualifiedName _fullyQualifiedName_1 = this._iQualifiedNameProvider.getFullyQualifiedName(obj);
- QualifiedName _skipFirst = _fullyQualifiedName_1.skipFirst((acNameSegments + 1));
- IEObjectDescription _create = EObjectDescription.create(_skipFirst, obj);
- scopes.add(_create);
- }
- }
- }
- }
- ModelComponent _base_1 = comp.getBase();
- comp = _base_1;
- }
- }
- }
- return new SimpleScope(IScope.NULLSCOPE, scopes);
- }
-
- /**
- * @param sg
- * @param covered
- * @param states
- */
- private void recursivelyAddStates(final StateGraph sg, final HashSet covered, final ArrayList states) {
- EList _states = sg.getStates();
- for (final State s : _states) {
- if (((s instanceof SimpleState) && (!covered.contains(s)))) {
- states.add(s);
- } else {
- if (((s instanceof RefinedState) && (!covered.contains(s)))) {
- states.add(s);
- State _target = ((RefinedState) s).getTarget();
- covered.add(_target);
- }
- }
- }
- EList _states_1 = sg.getStates();
- for (final State s_1 : _states_1) {
- StateGraph _subgraph = s_1.getSubgraph();
- boolean _notEquals = (!Objects.equal(_subgraph, null));
- if (_notEquals) {
- StateGraph _subgraph_1 = s_1.getSubgraph();
- this.recursivelyAddStates(_subgraph_1, covered, states);
- }
- }
- }
-
- /**
- * first container of type {@link StateGraph} ({@link State}, {@link StateMachine})
- * @param obj
- * @return StateGraph Container
- */
- private StateGraph getStateGraph(final EObject obj) {
- EObject ctx = obj.eContainer();
- while (((!(ctx instanceof StateGraph)) && (!Objects.equal(ctx.eContainer(), null)))) {
- EObject _eContainer = ctx.eContainer();
- ctx = _eContainer;
- }
- if ((ctx instanceof StateGraph)) {
- return ((StateGraph)ctx);
- }
- return null;
- }
-
- /**
- * compute the path of a {@link BaseState}
- * @param bs
- * @return the path
- */
- private QualifiedName getStatePath(final State bs) {
- EObject _eContainer = bs.eContainer();
- final EObject parent = _eContainer.eContainer();
- if ((parent instanceof SimpleState)) {
- QualifiedName _statePath = this.getStatePath(((SimpleState) parent));
- String _name = bs.getName();
- return _statePath.append(_name);
- } else {
- if ((parent instanceof RefinedState)) {
- final State target = ((RefinedState) parent).getTarget();
- boolean _notEquals = (!Objects.equal(target, null));
- if (_notEquals) {
- QualifiedName _statePath_1 = this.getStatePath(target);
- String _name_1 = bs.getName();
- return _statePath_1.append(_name_1);
- }
- }
- }
- String _name_2 = bs.getName();
- return QualifiedName.create(_name_2);
- }
-
- /**
- * @param parent
- * @param scopes
- */
- private void getStateScopes(final StateGraph parent, final List scopes) {
- final List states = this._fSMHelpers.getAllStates(parent);
- final HashMap name2state = CollectionLiterals.newHashMap();
- for (final State s : states) {
- String _name = s.getName();
- SimpleState _baseState = this._fSMHelpers.getBaseState(s);
- name2state.put(_name, _baseState);
- }
- Set> _entrySet = name2state.entrySet();
- for (final Map.Entry entry : _entrySet) {
- String _key = entry.getKey();
- SimpleState _value = entry.getValue();
- IEObjectDescription _create = EObjectDescription.create(_key, _value);
- scopes.add(_create);
- }
- }
-}
diff --git a/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/validation/FSMValidationUtilXtend.java b/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/validation/FSMValidationUtilXtend.java
deleted file mode 100644
index 543e0a6b7..000000000
--- a/plugins/org.eclipse.etrice.core.fsm/xtend-gen/org/eclipse/etrice/core/fsm/validation/FSMValidationUtilXtend.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * Copyright (c) 2014 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:
- * Mirza Klimenta (initial contribution)
- */
-package org.eclipse.etrice.core.fsm.validation;
-
-import com.google.common.base.Objects;
-import com.google.inject.Inject;
-import java.util.ArrayList;
-import java.util.HashMap;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.etrice.core.fsm.fSM.AbstractInterfaceItem;
-import org.eclipse.etrice.core.fsm.fSM.FSMPackage;
-import org.eclipse.etrice.core.fsm.fSM.Guard;
-import org.eclipse.etrice.core.fsm.fSM.MessageFromIf;
-import org.eclipse.etrice.core.fsm.fSM.State;
-import org.eclipse.etrice.core.fsm.fSM.StateGraph;
-import org.eclipse.etrice.core.fsm.fSM.StateTerminal;
-import org.eclipse.etrice.core.fsm.fSM.Transition;
-import org.eclipse.etrice.core.fsm.fSM.Trigger;
-import org.eclipse.etrice.core.fsm.fSM.TriggeredTransition;
-import org.eclipse.etrice.core.fsm.naming.FSMNameProvider;
-import org.eclipse.xtext.xbase.lib.CollectionLiterals;
-import org.eclipse.xtext.xbase.lib.Extension;
-import org.eclipse.xtext.xbase.lib.Functions.Function1;
-import org.eclipse.xtext.xbase.lib.IterableExtensions;
-
-@SuppressWarnings("all")
-public class FSMValidationUtilXtend {
- public static class Result {
- private boolean ok;
-
- private String msg;
-
- private EObject source;
-
- private EStructuralFeature feature;
-
- private int index;
-
- public static FSMValidationUtilXtend.Result ok() {
- return new FSMValidationUtilXtend.Result(true, "", null, null, 0);
- }
-
- public static FSMValidationUtilXtend.Result error(final String msg) {
- return new FSMValidationUtilXtend.Result(false, msg, null, null, (-1));
- }
-
- public static FSMValidationUtilXtend.Result error(final String msg, final EObject source, final EStructuralFeature feature) {
- return new FSMValidationUtilXtend.Result(false, msg, source, feature, (-1));
- }
-
- public static FSMValidationUtilXtend.Result error(final String msg, final EObject source, final EStructuralFeature feature, final int index) {
- return new FSMValidationUtilXtend.Result(false, msg, source, feature, index);
- }
-
- public Result(final boolean ok, final String msg, final EObject source, final EStructuralFeature feature, final int index) {
- this.ok = ok;
- this.msg = msg;
- this.source = source;
- this.feature = feature;
- this.index = index;
- }
-
- public boolean isOk() {
- return this.ok;
- }
-
- public String getMsg() {
- return this.msg;
- }
-
- public EObject getSource() {
- return this.source;
- }
-
- public EStructuralFeature getFeature() {
- return this.feature;
- }
-
- public int getIndex() {
- return this.index;
- }
- }
-
- @Inject
- @Extension
- private FSMNameProvider _fSMNameProvider;
-
- public ArrayList uniqueOriginTriggers(final State myState) {
- final StateGraph parent = this.getStateGraph(myState);
- final HashMap trig2trans = CollectionLiterals.newHashMap();
- final ArrayList result = CollectionLiterals.newArrayList();
- EList _transitions = parent.getTransitions();
- final Function1 _function = (Transition t) -> {
- return Boolean.valueOf((((t instanceof TriggeredTransition) && (((TriggeredTransition) t).getFrom() instanceof StateTerminal)) && Objects.equal(myState, ((StateTerminal) ((TriggeredTransition) t).getFrom()).getState())));
- };
- Iterable _filter = IterableExtensions.filter(_transitions, _function);
- for (final Transition t : _filter) {
- EList _triggers = ((TriggeredTransition) t).getTriggers();
- final Function1 _function_1 = (Trigger k) -> {
- Guard _guard = k.getGuard();
- return Boolean.valueOf(Objects.equal(_guard, null));
- };
- Iterable _filter_1 = IterableExtensions.filter(_triggers, _function_1);
- for (final Trigger k : _filter_1) {
- EList _msgFromIfPairs = k.getMsgFromIfPairs();
- for (final MessageFromIf specMethod : _msgFromIfPairs) {
- {
- final String triggerName = this.getTriggerName(specMethod);
- boolean _containsKey = trig2trans.containsKey(triggerName);
- if (_containsKey) {
- final TriggeredTransition ot = trig2trans.get(triggerName);
- FSMValidationUtilXtend.Result _error = FSMValidationUtilXtend.Result.error("Triggers originating from a state should be unique.", t, FSMPackage.Literals.TRIGGERED_TRANSITION__TRIGGERS);
- result.add(_error);
- FSMValidationUtilXtend.Result _error_1 = FSMValidationUtilXtend.Result.error("Triggers originating from a state should be unique.", ot, FSMPackage.Literals.TRIGGERED_TRANSITION__TRIGGERS);
- result.add(_error_1);
- }
- trig2trans.put(triggerName, ((TriggeredTransition) t));
- }
- }
- }
- }
- return result;
- }
-
- private String getTriggerName(final MessageFromIf mif) {
- AbstractInterfaceItem _from = mif.getFrom();
- String _name = _from.getName();
- String _plus = (_name + "#");
- EObject _message = mif.getMessage();
- String _messageName = this._fSMNameProvider.getMessageName(_message);
- return (_plus + _messageName);
- }
-
- public StateGraph getStateGraph(final EObject obj) {
- EObject parent = obj.eContainer();
- while ((!Objects.equal(parent, null))) {
- {
- if ((parent instanceof StateGraph)) {
- return ((StateGraph) parent);
- }
- EObject _eContainer = parent.eContainer();
- parent = _eContainer;
- }
- }
- return null;
- }
-}
diff --git a/plugins/org.eclipse.etrice.core.room.ui/xtend-gen/org/eclipse/etrice/core/ui/hover/RoomHoverProvider.java b/plugins/org.eclipse.etrice.core.room.ui/xtend-gen/org/eclipse/etrice/core/ui/hover/RoomHoverProvider.java
deleted file mode 100644
index 04fbae275..000000000
--- a/plugins/org.eclipse.etrice.core.room.ui/xtend-gen/org/eclipse/etrice/core/ui/hover/RoomHoverProvider.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * 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:
- * Juergen Haug (initial contribution)
- */
-package org.eclipse.etrice.core.ui.hover;
-
-import com.google.inject.Inject;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.etrice.core.common.ui.hover.KeywordEObjectTextHover;
-import org.eclipse.etrice.core.room.ActorClass;
-import org.eclipse.etrice.core.services.RoomGrammarAccess;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.xtext.resource.XtextResource;
-import org.eclipse.xtext.util.Pair;
-
-@SuppressWarnings("all")
-public class RoomHoverProvider extends KeywordEObjectTextHover {
- @Inject
- private RoomGrammarAccess grammar;
-
- @Override
- protected Pair getXtextElementAt(final XtextResource resource, final int offset) {
- return super.getXtextElementAt(resource, offset);
- }
-
- private ActorClass findActorClass(final EObject model) {
- EObject parent = model;
- while ((parent != null)) {
- {
- if ((parent instanceof ActorClass)) {
- return ((ActorClass) parent);
- }
- EObject _eContainer = parent.eContainer();
- parent = _eContainer;
- }
- }
- return null;
- }
-}
diff --git a/plugins/org.eclipse.etrice.core.room.ui/xtend-gen/org/eclipse/etrice/core/ui/quickfix/DetailCodeIndentHelper.java b/plugins/org.eclipse.etrice.core.room.ui/xtend-gen/org/eclipse/etrice/core/ui/quickfix/DetailCodeIndentHelper.java
deleted file mode 100644
index 8d0443612..000000000
--- a/plugins/org.eclipse.etrice.core.room.ui/xtend-gen/org/eclipse/etrice/core/ui/quickfix/DetailCodeIndentHelper.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package org.eclipse.etrice.core.ui.quickfix;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.xtend2.lib.StringConcatenation;
-import org.eclipse.xtext.ui.editor.model.IXtextDocument;
-import org.eclipse.xtext.util.Strings;
-import org.eclipse.xtext.validation.Issue;
-import org.eclipse.xtext.xbase.lib.Exceptions;
-import org.eclipse.xtext.xbase.lib.Functions.Function1;
-import org.eclipse.xtext.xbase.lib.IntegerRange;
-import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.Procedures.Procedure2;
-
-@SuppressWarnings("all")
-public class DetailCodeIndentHelper {
- /**
- * Converts the issued multi line string to single line strings
- * - line with least indentation is adjusted to first line
- * - lines are enclosed with " or '
- * - lines get editor indentation of first line
- * -
- */
- public static String convertToSingleLines(final IXtextDocument document, final Issue issue) {
- try {
- Integer _offset = issue.getOffset();
- final IRegion issuedRegion = document.getLineInformationOfOffset((_offset).intValue());
- int _offset_1 = issuedRegion.getOffset();
- int _length = issuedRegion.getLength();
- final String firstEditorLine = document.get(_offset_1, _length);
- final String editorIndent = Strings.getLeadingWhiteSpace(firstEditorLine);
- Integer _offset_2 = issue.getOffset();
- Integer _length_1 = issue.getLength();
- final String editorString = document.get((_offset_2).intValue(), (_length_1).intValue());
- char _charAt = editorString.charAt(0);
- final String mark = Character.valueOf(_charAt).toString();
- String _newLine = Strings.newLine();
- final List editorLines = Strings.split(editorString, _newLine);
- int _size = editorLines.size();
- boolean _lessEqualsThan = (_size <= 1);
- if (_lessEqualsThan) {
- return editorString;
- }
- Iterable _tail = IterableExtensions.tail(editorLines);
- final Function1 _function = (String it) -> {
- return Integer.valueOf(DetailCodeIndentHelper.countIndent(it));
- };
- List _sortBy = IterableExtensions.sortBy(_tail, _function);
- String _head = IterableExtensions.head(_sortBy);
- final int minIndent = DetailCodeIndentHelper.countIndent(_head);
- final ArrayList newEditorLines = new ArrayList();
- final Procedure2 _function_1 = (String line, Integer lineCount) -> {
- String _xifexpression = null;
- if (((lineCount).intValue() != 0)) {
- _xifexpression = (editorIndent + mark);
- }
- String front = _xifexpression;
- int _countIndent = DetailCodeIndentHelper.countIndent(line);
- int indentCount = (_countIndent - minIndent);
- String _xifexpression_1 = null;
- if ((((lineCount).intValue() != 0) && (indentCount > 0))) {
- StringConcatenation _builder = new StringConcatenation();
- {
- IntegerRange _upTo = new IntegerRange(1, indentCount);
- for(final Integer i : _upTo) {
- _builder.append("\t");
- }
- }
- _xifexpression_1 = _builder.toString();
- }
- String indent = _xifexpression_1;
- String noneWSLine = Strings.removeLeadingWhitespace(line);
- String _xifexpression_2 = null;
- int _size_1 = editorLines.size();
- int _minus = (_size_1 - 1);
- boolean _notEquals = ((lineCount).intValue() != _minus);
- if (_notEquals) {
- _xifexpression_2 = mark;
- }
- String end = _xifexpression_2;
- StringConcatenation _builder_1 = new StringConcatenation();
- _builder_1.append(front, "");
- _builder_1.append(indent, "");
- _builder_1.append(noneWSLine, "");
- _builder_1.append(end, "");
- String newEditorLine = _builder_1.toString();
- newEditorLines.add(newEditorLine);
- };
- IterableExtensions.forEach(editorLines, _function_1);
- String _newLine_1 = Strings.newLine();
- return Strings.concat(_newLine_1, newEditorLines);
- } catch (Throwable _e) {
- throw Exceptions.sneakyThrow(_e);
- }
- }
-
- private static int countIndent(final String line) {
- String _leadingWhiteSpace = Strings.getLeadingWhiteSpace(line);
- String _replace = _leadingWhiteSpace.replace("\t", " ");
- String _replace_1 = _replace.replace(" ", "\t");
- String _replaceAll = _replace_1.replaceAll("!\\t", "");
- return _replaceAll.length();
- }
-}
diff --git a/plugins/org.eclipse.etrice.core.room/xtend-gen/org/eclipse/etrice/core/formatting2/RoomFormatter.java b/plugins/org.eclipse.etrice.core.room/xtend-gen/org/eclipse/etrice/core/formatting2/RoomFormatter.java
deleted file mode 100644
index 83b7bc5e6..000000000
--- a/plugins/org.eclipse.etrice.core.room/xtend-gen/org/eclipse/etrice/core/formatting2/RoomFormatter.java
+++ /dev/null
@@ -1,349 +0,0 @@
-/**
- * generated by Xtext
- */
-package org.eclipse.etrice.core.formatting2;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Iterators;
-import com.google.inject.Inject;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.function.Consumer;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.TreeIterator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.etrice.core.common.base.Annotation;
-import org.eclipse.etrice.core.common.base.AnnotationType;
-import org.eclipse.etrice.core.common.base.Documentation;
-import org.eclipse.etrice.core.common.base.Import;
-import org.eclipse.etrice.core.fsm.fSM.DetailCode;
-import org.eclipse.etrice.core.fsm.fSM.ProtocolSemantics;
-import org.eclipse.etrice.core.fsm.fSM.State;
-import org.eclipse.etrice.core.fsm.fSM.StateGraph;
-import org.eclipse.etrice.core.fsm.fSM.Transition;
-import org.eclipse.etrice.core.fsm.fSM.Trigger;
-import org.eclipse.etrice.core.fsm.fSM.TriggeredTransition;
-import org.eclipse.etrice.core.fsm.formatting2.FSMFormatter;
-import org.eclipse.etrice.core.room.ActorClass;
-import org.eclipse.etrice.core.room.Attribute;
-import org.eclipse.etrice.core.room.DataClass;
-import org.eclipse.etrice.core.room.EnumerationType;
-import org.eclipse.etrice.core.room.ExternalType;
-import org.eclipse.etrice.core.room.GeneralProtocolClass;
-import org.eclipse.etrice.core.room.Operation;
-import org.eclipse.etrice.core.room.PortClass;
-import org.eclipse.etrice.core.room.PrimitiveType;
-import org.eclipse.etrice.core.room.RoomClass;
-import org.eclipse.etrice.core.room.RoomModel;
-import org.eclipse.etrice.core.room.SubSystemClass;
-import org.eclipse.etrice.core.room.VarDecl;
-import org.eclipse.etrice.core.services.RoomGrammarAccess;
-import org.eclipse.xtext.AbstractRule;
-import org.eclipse.xtext.Grammar;
-import org.eclipse.xtext.GrammarUtil;
-import org.eclipse.xtext.Keyword;
-import org.eclipse.xtext.formatting2.IFormattableDocument;
-import org.eclipse.xtext.formatting2.IHiddenRegionFormatter;
-import org.eclipse.xtext.formatting2.regionaccess.ISemanticRegion;
-import org.eclipse.xtext.formatting2.regionaccess.ISemanticRegionsFinder;
-import org.eclipse.xtext.resource.XtextResource;
-import org.eclipse.xtext.xbase.lib.Conversions;
-import org.eclipse.xtext.xbase.lib.Extension;
-import org.eclipse.xtext.xbase.lib.Functions.Function1;
-import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-import org.eclipse.xtext.xbase.lib.ListExtensions;
-import org.eclipse.xtext.xbase.lib.Pair;
-import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
-
-@SuppressWarnings("all")
-public class RoomFormatter extends FSMFormatter {
- @Inject
- @Extension
- private RoomGrammarAccess _roomGrammarAccess;
-
- @Override
- public void formatAllByKeywords(final EObject it, @Extension final IFormattableDocument document) {
- super.formatAllByKeywords(it, document);
- ISemanticRegionsFinder _allRegionsFor = this.textRegionExtensions.allRegionsFor(it);
- List _keywords = _allRegionsFor.keywords("default", "void", "sends", "sub", "of", "and", "satisfied_by");
- final Consumer _function = (ISemanticRegion it_1) -> {
- final Procedure1 _function_1 = (IHiddenRegionFormatter it_2) -> {
- it_2.oneSpace();
- };
- document.surround(it_1, _function_1);
- };
- _keywords.forEach(_function);
- ISemanticRegionsFinder _allRegionsFor_1 = this.textRegionExtensions.allRegionsFor(it);
- List _keywords_1 = _allRegionsFor_1.keywords("/");
- final Consumer _function_1 = (ISemanticRegion it_1) -> {
- final Procedure1 _function_2 = (IHiddenRegionFormatter it_2) -> {
- it_2.noSpace();
- };
- document.surround(it_1, _function_2);
- };
- _keywords_1.forEach(_function_1);
- Grammar _grammar = this._roomGrammarAccess.getGrammar();
- List _allRules = GrammarUtil.allRules(_grammar);
- final Function1> _function_2 = (AbstractRule it_1) -> {
- TreeIterator _eAllContents = it_1.eAllContents();
- Iterator _filter = Iterators.filter(_eAllContents, Keyword.class);
- final Function1 _function_3 = (Keyword it_2) -> {
- String _value = it_2.getValue();
- return Boolean.valueOf((!Objects.equal(_value, "ref")));
- };
- Iterator _filter_1 = IteratorExtensions.filter(_filter, _function_3);
- final Function1 _function_4 = (Keyword it_2) -> {
- String _value = it_2.getValue();
- char[] _charArray = _value.toCharArray();
- final Function1 _function_5 = (Character it_3) -> {
- return Boolean.valueOf(Character.isLetter((it_3).charValue()));
- };
- return Boolean.valueOf(IterableExtensions.forall(((Iterable)Conversions.doWrapArray(_charArray)), _function_5));
- };
- Iterator _filter_2 = IteratorExtensions.filter(_filter_1, _function_4);
- return IteratorExtensions.toIterable(_filter_2);
- };
- List> _map = ListExtensions.>map(_allRules, _function_2);
- final Iterable textKeywords = Iterables.concat(_map);
- ISemanticRegionsFinder _allRegionsFor_2 = this.textRegionExtensions.allRegionsFor(it);
- List _keywords_2 = _allRegionsFor_2.keywords(((Keyword[])Conversions.unwrapArray(textKeywords, Keyword.class)));
- final Consumer _function_3 = (ISemanticRegion it_1) -> {
- final Procedure1 _function_4 = (IHiddenRegionFormatter it_2) -> {
- it_2.oneSpace();
- };
- document.append(it_1, _function_4);
- };
- _keywords_2.forEach(_function_3);
- }
-
- protected void _format(final RoomModel it, @Extension final IFormattableDocument document) {
- this.formatAllByKeywords(it, document);
- EList _eContents = it.eContents();
- EObject _head = IterableExtensions.head(_eContents);
- final Procedure1 _function = (IHiddenRegionFormatter it_1) -> {
- it_1.setNewLines(2);
- };
- document.prepend(_head, _function);
- EList _eContents_1 = it.eContents();
- Iterable _tail = IterableExtensions.tail(_eContents_1);
- Iterable _filter = Iterables.filter(_tail, DataClass.class);
- final Consumer _function_1 = (DataClass it_1) -> {
- final Procedure1 _function_2 = (IHiddenRegionFormatter it_2) -> {
- it_2.setNewLines(2);
- };
- document.prepend(it_1, _function_2);
- };
- _filter.forEach(_function_1);
- EList _eContents_2 = it.eContents();
- Iterable _tail_1 = IterableExtensions.tail(_eContents_2);
- Iterable _filter_1 = Iterables.filter(_tail_1, GeneralProtocolClass.class);
- final Consumer _function_2 = (GeneralProtocolClass it_1) -> {
- final Procedure1 _function_3 = (IHiddenRegionFormatter it_2) -> {
- it_2.setNewLines(2);
- };
- document.prepend(it_1, _function_3);
- };
- _filter_1.forEach(_function_2);
- EList _eContents_3 = it.eContents();
- Iterable _tail_2 = IterableExtensions.tail(_eContents_3);
- Iterable _filter_2 = Iterables.filter(_tail_2, ActorClass.class);
- final Consumer _function_3 = (ActorClass it_1) -> {
- final Procedure1 _function_4 = (IHiddenRegionFormatter it_2) -> {
- it_2.setNewLines(2);
- };
- document.prepend(it_1, _function_4);
- };
- _filter_2.forEach(_function_3);
- EList _eContents_4 = it.eContents();
- Iterable _tail_3 = IterableExtensions.tail(_eContents_4);
- Iterable _filter_3 = Iterables.filter(_tail_3, SubSystemClass.class);
- final Consumer _function_4 = (SubSystemClass it_1) -> {
- final Procedure1 _function_5 = (IHiddenRegionFormatter it_2) -> {
- it_2.setNewLines(2);
- };
- document.prepend(it_1, _function_5);
- };
- _filter_3.forEach(_function_4);
- EList _eContents_5 = it.eContents();
- Iterable _tail_4 = IterableExtensions.tail(_eContents_5);
- Iterable _filter_4 = Iterables.filter(_tail_4, AnnotationType.class);
- final Consumer _function_5 = (AnnotationType it_1) -> {
- final Procedure1 _function_6 = (IHiddenRegionFormatter it_2) -> {
- it_2.setNewLines(2);
- };
- document.prepend(it_1, _function_6);
- };
- _filter_4.forEach(_function_5);
- EList _eContents_6 = it.eContents();
- Iterable _tail_5 = IterableExtensions.tail(_eContents_6);
- Iterable _filter_5 = Iterables.filter(_tail_5, AnnotationType.class);
- final Consumer _function_6 = (AnnotationType it_1) -> {
- final Procedure1 _function_7 = (IHiddenRegionFormatter it_2) -> {
- it_2.setNewLines(2);
- };
- document.prepend(it_1, _function_7);
- };
- _filter_5.forEach(_function_6);
- EList _eContents_7 = it.eContents();
- Iterable _tail_6 = IterableExtensions.tail(_eContents_7);
- Iterable _filter_6 = Iterables.filter(_tail_6, Import.class);
- final Consumer _function_7 = (Import it_1) -> {
- this.prependDefaultNewLines(it_1, document);
- };
- _filter_6.forEach(_function_7);
- EList _eContents_8 = it.eContents();
- Iterable _tail_7 = IterableExtensions.tail(_eContents_8);
- Iterable _filter_7 = Iterables.filter(_tail_7, PrimitiveType.class);
- final Consumer _function_8 = (PrimitiveType it_1) -> {
- this.prependDefaultNewLines(it_1, document);
- };
- _filter_7.forEach(_function_8);
- EList _eContents_9 = it.eContents();
- Iterable _tail_8 = IterableExtensions.tail(_eContents_9);
- Iterable _filter_8 = Iterables.filter(_tail_8, EnumerationType.class);
- final Consumer _function_9 = (EnumerationType it_1) -> {
- this.prependDefaultNewLines(it_1, document);
- };
- _filter_8.forEach(_function_9);
- EList _eContents_10 = it.eContents();
- Iterable _tail_9 = IterableExtensions.tail(_eContents_10);
- Iterable _filter_9 = Iterables.filter(_tail_9, ExternalType.class);
- final Consumer _function_10 = (ExternalType it_1) -> {
- this.prependDefaultNewLines(it_1, document);
- };
- _filter_9.forEach(_function_10);
- TreeIterator _eAllContents = it.eAllContents();
- final Procedure1 _function_11 = (EObject it_1) -> {
- document.format(it_1);
- };
- IteratorExtensions.forEach(_eAllContents, _function_11);
- }
-
- protected void _format(final RoomClass it, @Extension final IFormattableDocument document) {
- EList