Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortjung2012-03-15 11:13:46 +0000
committertjung2012-03-15 11:13:46 +0000
commitd94dd3bdf845f1f842e3bfc10b74cfef0717e346 (patch)
treefb5ab585ed0247d13d8071abd0e07c1c2dc750f4
parent2ad3ac371d0ee82f766ea1e07f0fa08c7bf787f9 (diff)
parent94b8d72f871afa4625f7d5a8cc0e5efa568f5657 (diff)
downloadorg.eclipse.etrice-v_0.2.0.M1.tar.gz
org.eclipse.etrice-v_0.2.0.M1.tar.xz
org.eclipse.etrice-v_0.2.0.M1.zip
Merge branch 'master' of ssh://git.eclipse.org/gitroot/etrice/org.eclipse.etricev_0.2.0.M1
-rw-r--r--features/org.eclipse.etrice.feature/feature.xml2
-rw-r--r--features/org.eclipse.etrice.tests.feature/feature.xml2
-rw-r--r--plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend2
-rw-r--r--plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/DataClassGen.xtend4
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java2
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/DataClassGen.java38
-rw-r--r--plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.generator.launch/src/org/eclipse/etrice/generator/launch/GeneratorLaunchConfigurationDelegate.java26
-rw-r--r--plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/ProcedureHelpers.xtend13
-rw-r--r--plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java109
-rw-r--r--plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/dialogs/ChoicePointPropertyDialog.java63
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/ChoicePointSupport.java115
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/StateSupport.java1
-rw-r--r--plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zipbin115886 -> 115874 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF2
-rw-r--r--releng/org.eclipse.etrice.site/feature.xml2
-rw-r--r--runtime/org.eclipse.etrice.modellib/doc-gen/room.basic.types.java.tex140
-rw-r--r--runtime/org.eclipse.etrice.modellib/src-gen/org/eclipse/etrice/modellib/Socket/DSocketConfiguration.java5
-rw-r--r--runtime/org.eclipse.etrice.modellib/src-gen/org/eclipse/etrice/modellib/Socket/DSocketData.java2
-rw-r--r--runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/ALogService.java4
-rw-r--r--runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/InternalLogData.java3
-rw-r--r--runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/ATimingService.java4
-rw-r--r--tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.etrice.integration.tests/buckminster.cspec11
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTester.java4
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPUser.java4
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerUser.java4
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/Tester.java4
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPingActor.java4
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor1.java4
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor2.java4
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPingActor.java4
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPongActor1.java4
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPing.java8
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPong.java4
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/PingPongData.java6
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/PingPongDataDeep.java12
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM.java4
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM_Tester.java4
-rw-r--r--tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.etrice.ui.tests.base/META-INF/MANIFEST.MF2
57 files changed, 438 insertions, 226 deletions
diff --git a/features/org.eclipse.etrice.feature/feature.xml b/features/org.eclipse.etrice.feature/feature.xml
index 829f788e9..56d1c4725 100644
--- a/features/org.eclipse.etrice.feature/feature.xml
+++ b/features/org.eclipse.etrice.feature/feature.xml
@@ -17,7 +17,7 @@
<feature
id="org.eclipse.etrice.feature"
label="%featureName"
- version="0.1.0.qualifier"
+ version="0.2.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.etrice.core.room.ui"
license-feature="org.eclipse.license"
diff --git a/features/org.eclipse.etrice.tests.feature/feature.xml b/features/org.eclipse.etrice.tests.feature/feature.xml
index 073b78fff..670690526 100644
--- a/features/org.eclipse.etrice.tests.feature/feature.xml
+++ b/features/org.eclipse.etrice.tests.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.etrice.tests.feature"
label="%featureName"
- version="0.1.0.qualifier"
+ version="0.2.0.qualifier"
provider-name="%providerName">
<description>
diff --git a/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF
index 0a416c6bc..f2faa5d91 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.room.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: ROOM DSL UI
Bundle-Vendor: eTrice (Incubation)
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0.qualifier
Bundle-SymbolicName: org.eclipse.etrice.core.room.ui;singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.etrice.core.room;bundle-version="0.1.0";visibility:=reexport,
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 26ff04f59..ccdb91a8e 100644
--- a/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.core.room/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: ROOM DSL
Bundle-Vendor: eTrice (Incubation)
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0.qualifier
Bundle-SymbolicName: org.eclipse.etrice.core.room;singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext;bundle-version="2.1.1",
diff --git a/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF
index fd81b3ed8..5e508c247 100644
--- a/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: eTrice Documentation
Bundle-SymbolicName: org.eclipse.etrice.doc; singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0.qualifier
Bundle-Vendor: eTrice (Incubation)
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
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 b4da0a598..aebeed132 100644
--- a/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: eTrice C Generator
Bundle-Vendor: eTrice (Incubation)
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0.qualifier
Bundle-SymbolicName: org.eclipse.etrice.generator.c;singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="0.1.0",
diff --git a/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF
index daacd9f14..96542f37e 100644
--- a/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: eTrice Document Generator
Bundle-Vendor: eTrice (Incubation)
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0.qualifier
Bundle-SymbolicName: org.eclipse.etrice.generator.doc;singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="0.1.0",
diff --git a/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF
index 17578ddd5..51f0b15d7 100644
--- a/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.java/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: eTrice Java Generator
Bundle-Vendor: eTrice (Incubation)
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0.qualifier
Bundle-SymbolicName: org.eclipse.etrice.generator.java;singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="0.1.0",
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend
index 727329c66..052396bf3 100644
--- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend
@@ -101,7 +101,7 @@ class ActorClassGen extends GenericActorClassGenerator {
«ENDIF»
setClassName("«ac.name»");
- «ac.attributes.attributeInitialization»
+ «ac.attributes.attributeInitialization(false)»
// own ports
«FOR ep : ac.getEndPorts()»
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/DataClassGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/DataClassGen.xtend
index 13e64d428..ce153b883 100644
--- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/DataClassGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/DataClassGen.xtend
@@ -70,7 +70,7 @@ class DataClassGen {
public «dc.name»() {
super();
- «dc.attributes.attributeInitialization»
+ «dc.attributes.attributeInitialization(true)»
}
// constructor using fields
@@ -157,4 +157,4 @@ class DataClassGen {
«ENDFOR»
'''
}
-} \ No newline at end of file
+}
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java
index 6f4952d48..3f10fa4b3 100644
--- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java
@@ -271,7 +271,7 @@ public class ActorClassGen extends GenericActorClassGenerator {
_builder.newLine();
_builder.append("\t\t");
EList<Attribute> _attributes_2 = ac.getAttributes();
- StringConcatenation _attributeInitialization = this.helpers.attributeInitialization(_attributes_2);
+ StringConcatenation _attributeInitialization = this.helpers.attributeInitialization(_attributes_2, false);
_builder.append(_attributeInitialization, " ");
_builder.newLineIfNotEmpty();
_builder.newLine();
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/DataClassGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/DataClassGen.java
index fafac19ed..7373ff7a9 100644
--- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/DataClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/DataClassGen.java
@@ -156,7 +156,7 @@ public class DataClassGen {
_builder.newLine();
_builder.append("\t\t");
EList<Attribute> _attributes_3 = dc.getAttributes();
- StringConcatenation _attributeInitialization = this.helpers.attributeInitialization(_attributes_3);
+ StringConcatenation _attributeInitialization = this.helpers.attributeInitialization(_attributes_3, true);
_builder.append(_attributeInitialization, " ");
_builder.newLineIfNotEmpty();
_builder.append("\t");
@@ -358,17 +358,17 @@ public class DataClassGen {
_builder.newLineIfNotEmpty();
} else {
_builder.append("for (int i=0;i<");
- int _size_1 = a.getSize();
- _builder.append(_size_1, "");
- _builder.append(";i++){");
+ String _name_2 = a.getName();
+ _builder.append(_name_2, "");
+ _builder.append(".length;i++){");
_builder.newLineIfNotEmpty();
_builder.append("\t");
_builder.append("copy.");
- String _name_2 = a.getName();
- _builder.append(_name_2, " ");
- _builder.append("[i] = ");
String _name_3 = a.getName();
_builder.append(_name_3, " ");
+ _builder.append("[i] = ");
+ String _name_4 = a.getName();
+ _builder.append(_name_4, " ");
_builder.append("[i].deepCopy();");
_builder.newLineIfNotEmpty();
_builder.append("}");
@@ -377,30 +377,30 @@ public class DataClassGen {
}
} else {
{
- int _size_2 = a.getSize();
- boolean _operator_equals_1 = ObjectExtensions.operator_equals(((Integer)_size_2), ((Integer)0));
+ int _size_1 = a.getSize();
+ boolean _operator_equals_1 = ObjectExtensions.operator_equals(((Integer)_size_1), ((Integer)0));
if (_operator_equals_1) {
_builder.append("copy.");
- String _name_4 = a.getName();
- _builder.append(_name_4, "");
- _builder.append(" = ");
String _name_5 = a.getName();
_builder.append(_name_5, "");
+ _builder.append(" = ");
+ String _name_6 = a.getName();
+ _builder.append(_name_6, "");
_builder.append(";");
_builder.newLineIfNotEmpty();
} else {
_builder.append("for (int i=0;i<");
- int _size_3 = a.getSize();
- _builder.append(_size_3, "");
- _builder.append(";i++){");
+ String _name_7 = a.getName();
+ _builder.append(_name_7, "");
+ _builder.append(".length;i++){");
_builder.newLineIfNotEmpty();
_builder.append("\t");
_builder.append("copy.");
- String _name_6 = a.getName();
- _builder.append(_name_6, " ");
+ String _name_8 = a.getName();
+ _builder.append(_name_8, " ");
_builder.append("[i] = ");
- String _name_7 = a.getName();
- _builder.append(_name_7, " ");
+ String _name_9 = a.getName();
+ _builder.append(_name_9, " ");
_builder.append("[i];");
_builder.newLineIfNotEmpty();
_builder.append("}");
diff --git a/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF
index 099b87907..a80ab73f6 100644
--- a/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.launch.c/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: eTrice C Generator Launcher
Bundle-SymbolicName: org.eclipse.etrice.generator.launch.c;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0.qualifier
Bundle-Activator: org.eclipse.etrice.generator.launch.c.Activator
Require-Bundle: org.eclipse.etrice.generator;bundle-version="0.1.0",
org.eclipse.etrice.generator.c;bundle-version="0.1.0",
diff --git a/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF
index 7527d815a..577054036 100644
--- a/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: eTrice Java Generator Launcher
Bundle-SymbolicName: org.eclipse.etrice.generator.launch.java;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0.qualifier
Bundle-Activator: org.eclipse.etrice.generator.launch.java.Activator
Require-Bundle: org.eclipse.etrice.generator;bundle-version="0.1.0",
org.eclipse.etrice.generator.java;bundle-version="0.1.0",
diff --git a/plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF
index da379f3cd..f3f6fecaf 100644
--- a/plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.launch/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: eTrice Generator Launch Base Classes
Bundle-SymbolicName: org.eclipse.etrice.generator.launch;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0.qualifier
Bundle-Activator: org.eclipse.etrice.generator.launch.Activator
Require-Bundle: org.eclipse.etrice.generator;bundle-version="0.1.0",
org.eclipse.core.runtime,
diff --git a/plugins/org.eclipse.etrice.generator.launch/src/org/eclipse/etrice/generator/launch/GeneratorLaunchConfigurationDelegate.java b/plugins/org.eclipse.etrice.generator.launch/src/org/eclipse/etrice/generator/launch/GeneratorLaunchConfigurationDelegate.java
index 45c7ecdf9..3f92814a1 100644
--- a/plugins/org.eclipse.etrice.generator.launch/src/org/eclipse/etrice/generator/launch/GeneratorLaunchConfigurationDelegate.java
+++ b/plugins/org.eclipse.etrice.generator.launch/src/org/eclipse/etrice/generator/launch/GeneratorLaunchConfigurationDelegate.java
@@ -85,7 +85,29 @@ public abstract class GeneratorLaunchConfigurationDelegate extends AbstractJavaL
pgmArgs = VariablesPlugin.getDefault().getStringVariableManager()
.performStringSubstitution(pgmArgs);
- String[] args = pgmArgs.split("[ \t]");
+ // split at single spaces but keep strings in double quotes as single argument
+ // (with double quotes removed)
+ ArrayList<String> res = new ArrayList<String>();
+ int begin = 0;
+ int end = pgmArgs.indexOf(' ');
+ boolean inQuotes = false;
+ while (end>0) {
+ if (pgmArgs.charAt(begin)=='\"')
+ inQuotes = true;
+ if ((inQuotes && pgmArgs.charAt(end-1)=='\"')) {
+ inQuotes = false;
+ }
+
+ if (!inQuotes) {
+ res.add(pgmArgs.substring(begin, end).replace("\"", ""));
+ begin = end+1;
+ }
+ end = pgmArgs.indexOf(' ', end+1);
+ }
+ res.add(pgmArgs.substring(begin).replace("\"", ""));
+
+ String[] args = new String[res.size()];
+ res.toArray(args);
final MessageConsole myConsole = findConsole(getConsoleName());
Display.getDefault().syncExec(new Runnable() {
@@ -152,7 +174,7 @@ public abstract class GeneratorLaunchConfigurationDelegate extends AbstractJavaL
@SuppressWarnings("unchecked")
ArrayList<String> models = (ArrayList<String>) configuration.getAttribute("ModelFiles", Collections.EMPTY_LIST);
for (String model : models){
- argString.append(" "+model);
+ argString.append(" \""+model+"\"");
}
}
diff --git a/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF
index 751a2e8d4..74c859134 100644
--- a/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: eTrice Generator Model
Bundle-SymbolicName: org.eclipse.etrice.generator;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: eTrice (Incubation)
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/ProcedureHelpers.xtend b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/ProcedureHelpers.xtend
index 27a98b881..c49eec95b 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/ProcedureHelpers.xtend
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/ProcedureHelpers.xtend
@@ -21,6 +21,7 @@ import org.eclipse.etrice.core.room.Attribute
import org.eclipse.etrice.core.room.DetailCode
import org.eclipse.etrice.core.room.Operation
import org.eclipse.etrice.core.room.VarDecl
+import org.eclipse.etrice.core.room.ComplexType
import org.eclipse.etrice.generator.base.DetailCodeTranslator
import org.eclipse.etrice.generator.base.ILogger
@@ -83,7 +84,7 @@ class ProcedureHelpers {
return result+"}"
}
- def attributeInitialization(List<Attribute> attribs) {
+ def attributeInitialization(List<Attribute> attribs, boolean useClassDefaultsOnly) {
'''
// initialize attributes
«FOR a : attribs»
@@ -98,14 +99,16 @@ class ProcedureHelpers {
«a.name»[i] = «a.defaultValueLiteral»;
}
«ENDIF»
- «ELSE»
+ «ELSEIF a.refType.type instanceof ComplexType || a.size>1 || !useClassDefaultsOnly»
«IF a.size==0»
«a.name» = «a.refType.type.defaultValue»;
«ELSE»
«a.name» = new «a.refType.type.typeName»[«a.size»];
- for (int i=0;i<«a.size»;i++){
- «a.name»[i] = «a.refType.type.defaultValue»;
- }
+ «IF !useClassDefaultsOnly»
+ for (int i=0;i<«a.size»;i++){
+ «a.name»[i] = «a.refType.type.defaultValue»;
+ }
+ «ENDIF»
«ENDIF»
«ENDIF»
«ENDFOR»
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java
index c7ab159f9..85ef55b13 100644
--- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java
+++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/ProcedureHelpers.java
@@ -6,6 +6,7 @@ import java.util.List;
import org.eclipse.emf.common.util.EList;
import org.eclipse.etrice.core.room.ActorClass;
import org.eclipse.etrice.core.room.Attribute;
+import org.eclipse.etrice.core.room.ComplexType;
import org.eclipse.etrice.core.room.DataType;
import org.eclipse.etrice.core.room.DetailCode;
import org.eclipse.etrice.core.room.Operation;
@@ -162,7 +163,7 @@ public class ProcedureHelpers {
return _operator_plus_9;
}
- public StringConcatenation attributeInitialization(final List<Attribute> attribs) {
+ public StringConcatenation attributeInitialization(final List<Attribute> attribs, final boolean useClassDefaultsOnly) {
StringConcatenation _builder = new StringConcatenation();
_builder.append("// initialize attributes");
_builder.newLine();
@@ -231,49 +232,73 @@ public class ProcedureHelpers {
}
}
} else {
- {
+ boolean _operator_or = false;
+ boolean _operator_or_1 = false;
+ RefableType _refType_2 = a.getRefType();
+ DataType _type_2 = _refType_2.getType();
+ if ((_type_2 instanceof ComplexType)) {
+ _operator_or_1 = true;
+ } else {
int _size_3 = a.getSize();
- boolean _operator_equals_1 = ObjectExtensions.operator_equals(((Integer)_size_3), ((Integer)0));
- if (_operator_equals_1) {
- String _name_4 = a.getName();
- _builder.append(_name_4, "");
- _builder.append(" = ");
- RefableType _refType_2 = a.getRefType();
- DataType _type_2 = _refType_2.getType();
- String _defaultValue = this._typeHelpers.defaultValue(_type_2);
- _builder.append(_defaultValue, "");
- _builder.append(";");
- _builder.newLineIfNotEmpty();
- } else {
- String _name_5 = a.getName();
- _builder.append(_name_5, "");
- _builder.append(" = new ");
- RefableType _refType_3 = a.getRefType();
- DataType _type_3 = _refType_3.getType();
- String _typeName_2 = this._typeHelpers.typeName(_type_3);
- _builder.append(_typeName_2, "");
- _builder.append("[");
+ boolean _operator_greaterThan = ComparableExtensions.<Integer>operator_greaterThan(((Integer)_size_3), ((Integer)1));
+ _operator_or_1 = BooleanExtensions.operator_or((_type_2 instanceof ComplexType), _operator_greaterThan);
+ }
+ if (_operator_or_1) {
+ _operator_or = true;
+ } else {
+ boolean _operator_not = BooleanExtensions.operator_not(useClassDefaultsOnly);
+ _operator_or = BooleanExtensions.operator_or(_operator_or_1, _operator_not);
+ }
+ if (_operator_or) {
+ {
int _size_4 = a.getSize();
- _builder.append(_size_4, "");
- _builder.append("];");
- _builder.newLineIfNotEmpty();
- _builder.append("for (int i=0;i<");
- int _size_5 = a.getSize();
- _builder.append(_size_5, "");
- _builder.append(";i++){");
- _builder.newLineIfNotEmpty();
- _builder.append("\t");
- String _name_6 = a.getName();
- _builder.append(_name_6, " ");
- _builder.append("[i] = ");
- RefableType _refType_4 = a.getRefType();
- DataType _type_4 = _refType_4.getType();
- String _defaultValue_1 = this._typeHelpers.defaultValue(_type_4);
- _builder.append(_defaultValue_1, " ");
- _builder.append(";");
- _builder.newLineIfNotEmpty();
- _builder.append("}");
- _builder.newLine();
+ boolean _operator_equals_1 = ObjectExtensions.operator_equals(((Integer)_size_4), ((Integer)0));
+ if (_operator_equals_1) {
+ String _name_4 = a.getName();
+ _builder.append(_name_4, "");
+ _builder.append(" = ");
+ RefableType _refType_3 = a.getRefType();
+ DataType _type_3 = _refType_3.getType();
+ String _defaultValue = this._typeHelpers.defaultValue(_type_3);
+ _builder.append(_defaultValue, "");
+ _builder.append(";");
+ _builder.newLineIfNotEmpty();
+ } else {
+ String _name_5 = a.getName();
+ _builder.append(_name_5, "");
+ _builder.append(" = new ");
+ RefableType _refType_4 = a.getRefType();
+ DataType _type_4 = _refType_4.getType();
+ String _typeName_2 = this._typeHelpers.typeName(_type_4);
+ _builder.append(_typeName_2, "");
+ _builder.append("[");
+ int _size_5 = a.getSize();
+ _builder.append(_size_5, "");
+ _builder.append("];");
+ _builder.newLineIfNotEmpty();
+ {
+ boolean _operator_not_1 = BooleanExtensions.operator_not(useClassDefaultsOnly);
+ if (_operator_not_1) {
+ _builder.append("for (int i=0;i<");
+ int _size_6 = a.getSize();
+ _builder.append(_size_6, "");
+ _builder.append(";i++){");
+ _builder.newLineIfNotEmpty();
+ _builder.append("\t");
+ String _name_6 = a.getName();
+ _builder.append(_name_6, " ");
+ _builder.append("[i] = ");
+ RefableType _refType_5 = a.getRefType();
+ DataType _type_5 = _refType_5.getType();
+ String _defaultValue_1 = this._typeHelpers.defaultValue(_type_5);
+ _builder.append(_defaultValue_1, " ");
+ _builder.append(";");
+ _builder.newLineIfNotEmpty();
+ _builder.append("}");
+ _builder.newLine();
+ }
+ }
+ }
}
}
}
diff --git a/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF
index 033ea19e4..72bca5203 100644
--- a/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.logging/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: eTrice Logging Fragment
Bundle-SymbolicName: org.eclipse.etrice.logging
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0.qualifier
Bundle-Vendor: eTrice (Incubation)
Fragment-Host: org.apache.log4j;bundle-version="1.2.15"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF
index 65c65629a..6449b10cb 100644
--- a/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Actor Behavior Diagram Editor
Bundle-SymbolicName: org.eclipse.etrice.ui.behavior;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0.qualifier
Bundle-Activator: org.eclipse.etrice.ui.behavior.Activator
Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="0.1.0",
org.eclipse.etrice.ui.common;bundle-version="0.1.0",
diff --git a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/dialogs/ChoicePointPropertyDialog.java b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/dialogs/ChoicePointPropertyDialog.java
new file mode 100644
index 000000000..d2678e816
--- /dev/null
+++ b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/dialogs/ChoicePointPropertyDialog.java
@@ -0,0 +1,63 @@
+package org.eclipse.etrice.ui.behavior.dialogs;
+
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.validation.IValidator;
+import org.eclipse.core.databinding.validation.ValidationStatus;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.etrice.core.room.ChoicePoint;
+import org.eclipse.etrice.core.room.RoomPackage;
+import org.eclipse.etrice.core.validation.ValidationUtil;
+import org.eclipse.etrice.core.validation.ValidationUtil.Result;
+import org.eclipse.etrice.ui.behavior.Activator;
+import org.eclipse.etrice.ui.common.dialogs.AbstractPropertyDialog;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.forms.IManagedForm;
+
+public class ChoicePointPropertyDialog extends AbstractPropertyDialog {
+
+ class NameValidator implements IValidator {
+
+ @Override
+ public IStatus validate(Object value) {
+ if (value instanceof String) {
+ String name = (String) value;
+
+ Result result = ValidationUtil.isUniqueName(cp, name);
+ if (!result.isOk())
+ return ValidationStatus.error(result.getMsg());
+ }
+ return Status.OK_STATUS;
+ }
+ }
+
+ private ChoicePoint cp;
+
+ public ChoicePointPropertyDialog(Shell shell, ChoicePoint cp) {
+ super(shell, "Edit Choice Point");
+ this.cp = cp;
+ }
+
+ @Override
+ protected Image getImage() {
+ return Activator.getImage("icons/Behavior.gif");
+ }
+
+ @Override
+ protected void createContent(IManagedForm mform, Composite body,
+ DataBindingContext bindingContext) {
+
+ NameValidator nv = new NameValidator();
+
+ Text name = createText(body, "&Name:", cp, RoomPackage.eINSTANCE.getTrPoint_Name(), nv);
+
+ createDecorator(name, "invalid name");
+
+ name.setFocus();
+ name.selectAll();
+ }
+
+}
diff --git a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/ChoicePointSupport.java b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/ChoicePointSupport.java
index db5caebd6..644cb5d0c 100644
--- a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/ChoicePointSupport.java
+++ b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/ChoicePointSupport.java
@@ -12,6 +12,7 @@
package org.eclipse.etrice.ui.behavior.support;
+import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.etrice.core.naming.RoomNameProvider;
@@ -20,6 +21,7 @@ import org.eclipse.etrice.core.room.ChoicePoint;
import org.eclipse.etrice.core.room.RoomFactory;
import org.eclipse.etrice.core.room.StateGraph;
import org.eclipse.etrice.ui.behavior.ImageProvider;
+import org.eclipse.etrice.ui.behavior.dialogs.ChoicePointPropertyDialog;
import org.eclipse.etrice.ui.common.support.CommonSupportUtil;
import org.eclipse.etrice.ui.common.support.DeleteWithoutConfirmFeature;
import org.eclipse.etrice.ui.common.support.NoResizeFeature;
@@ -36,7 +38,9 @@ import org.eclipse.graphiti.features.IResizeShapeFeature;
import org.eclipse.graphiti.features.IUpdateFeature;
import org.eclipse.graphiti.features.context.IAddContext;
import org.eclipse.graphiti.features.context.ICreateContext;
+import org.eclipse.graphiti.features.context.ICustomContext;
import org.eclipse.graphiti.features.context.IDeleteContext;
+import org.eclipse.graphiti.features.context.IDoubleClickContext;
import org.eclipse.graphiti.features.context.IMoveShapeContext;
import org.eclipse.graphiti.features.context.IPictogramElementContext;
import org.eclipse.graphiti.features.context.IRemoveContext;
@@ -44,6 +48,8 @@ import org.eclipse.graphiti.features.context.IResizeShapeContext;
import org.eclipse.graphiti.features.context.IUpdateContext;
import org.eclipse.graphiti.features.context.impl.CreateConnectionContext;
import org.eclipse.graphiti.features.context.impl.RemoveContext;
+import org.eclipse.graphiti.features.custom.AbstractCustomFeature;
+import org.eclipse.graphiti.features.custom.ICustomFeature;
import org.eclipse.graphiti.features.impl.AbstractAddFeature;
import org.eclipse.graphiti.features.impl.AbstractCreateFeature;
import org.eclipse.graphiti.features.impl.AbstractUpdateFeature;
@@ -72,10 +78,13 @@ import org.eclipse.graphiti.tb.IToolBehaviorProvider;
import org.eclipse.graphiti.ui.features.DefaultFeatureProvider;
import org.eclipse.graphiti.util.ColorConstant;
import org.eclipse.graphiti.util.IColorConstant;
+import org.eclipse.jface.window.Window;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.PlatformUI;
public class ChoicePointSupport {
- public static final int ITEM_SIZE = StateGraphSupport.MARGIN;
+ public static final int ITEM_SIZE = (int) (StateGraphSupport.MARGIN*0.625);
protected static final int LINE_WIDTH = 2;
protected static final IColorConstant DARK_COLOR = new ColorConstant(0, 0, 0);
@@ -87,6 +96,8 @@ public class ChoicePointSupport {
private static class CreateFeature extends AbstractCreateFeature {
+ private boolean doneChanges = false;
+
public CreateFeature(IFeatureProvider fp, String name, String description) {
super(fp, name, description);
}
@@ -98,23 +109,37 @@ public class ChoicePointSupport {
@Override
public Object[] create(ICreateContext context) {
+
ContainerShape targetContainer = context.getTargetContainer();
StateGraph sg = (StateGraph) targetContainer.getLink().getBusinessObjects().get(0);
+ ActorClass ac = SupportUtil.getActorClass(getDiagram());
boolean inherited = SupportUtil.isInherited(getDiagram(), sg);
if (inherited) {
- ActorClass ac = SupportUtil.getActorClass(getDiagram());
sg = SupportUtil.insertRefinedState(sg, ac, targetContainer, getFeatureProvider());
}
// create choice point and add it
ChoicePoint cp = RoomFactory.eINSTANCE.createChoicePoint();
- String name = RoomNameProvider.getUniqueChoicePointName(sg);
- cp.setName(name);
+ cp.setName(RoomNameProvider.getUniqueChoicePointName(sg));
sg.getChPoints().add(cp);
-
+
+ Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
+ ChoicePointPropertyDialog dlg = new ChoicePointPropertyDialog(shell, cp);
+ if (dlg.open()!=Window.OK) {
+ if (inherited) {
+ SupportUtil.undoInsertRefinedState(sg, ac, targetContainer, getFeatureProvider());
+ }
+ else {
+ sg.getChPoints().remove(cp);
+ }
+ doneChanges = false;
+ return EMPTY;
+ }
+
// do the add
addGraphicalRepresentation(context, cp);
+ doneChanges = true;
// return newly created business object(s)
return new Object[] { cp };
@@ -131,6 +156,11 @@ public class ChoicePointSupport {
}
return false;
}
+
+ @Override
+ public boolean hasDoneChanges() {
+ return doneChanges;
+ }
}
private class AddFeature extends AbstractAddFeature {
@@ -231,6 +261,60 @@ public class ChoicePointSupport {
}
}
+ private static class PropertyFeature extends AbstractCustomFeature {
+
+ private String name;
+ private String description;
+ private boolean doneChanges = false;
+
+ public PropertyFeature(IFeatureProvider fp) {
+ super(fp);
+ this.name = "Edit Choice Point";
+ this.description = "Edit Choice Point";
+ }
+
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public String getDescription() {
+ return description;
+ }
+
+ @Override
+ public boolean canExecute(ICustomContext context) {
+ PictogramElement[] pes = context.getPictogramElements();
+ if (pes != null && pes.length == 1 && pes[0] instanceof ContainerShape) {
+ Object bo = getBusinessObjectForPictogramElement(pes[0]);
+ if (bo instanceof ChoicePoint) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public void execute(ICustomContext context) {
+ PictogramElement pe = context.getPictogramElements()[0];
+ ChoicePoint cp = (ChoicePoint) getBusinessObjectForPictogramElement(pe);
+
+ Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
+ ChoicePointPropertyDialog dlg = new ChoicePointPropertyDialog(shell, cp);
+ if (dlg.open()!=Window.OK)
+ throw new OperationCanceledException();
+
+ doneChanges = true;
+ updateFigure(cp, pe, manageColor(DARK_COLOR), manageColor(BRIGHT_COLOR));
+ }
+
+ @Override
+ public boolean hasDoneChanges() {
+ return doneChanges;
+ }
+ }
+
private class UpdateFeature extends AbstractUpdateFeature {
public UpdateFeature(IFeatureProvider fp) {
@@ -367,6 +451,11 @@ public class ChoicePointSupport {
}
@Override
+ public ICustomFeature[] getCustomFeatures(ICustomContext context) {
+ return new ICustomFeature[] { new PropertyFeature(fp) };
+ }
+
+ @Override
public IUpdateFeature getUpdateFeature(IUpdateContext context) {
return new UpdateFeature(fp);
}
@@ -445,6 +534,22 @@ public class ChoicePointSupport {
}
@Override
+ public ICustomFeature getDoubleClickFeature(IDoubleClickContext context) {
+ return new FeatureProvider.PropertyFeature(getDiagramTypeProvider().getFeatureProvider());
+ }
+
+ @Override
+ public String getToolTip(GraphicsAlgorithm ga) {
+ PictogramElement pe = ga.getPictogramElement();
+ EObject bo = Graphiti.getLinkService().getBusinessObjectForLinkedPictogramElement(pe);
+ if (bo instanceof ChoicePoint) {
+ return ((ChoicePoint) bo).getName();
+ }
+
+ return super.getToolTip(ga);
+ }
+
+ @Override
public IContextButtonPadData getContextButtonPad(
IPictogramElementContext context) {
diff --git a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/StateSupport.java b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/StateSupport.java
index 26fdcf426..296fde40f 100644
--- a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/StateSupport.java
+++ b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/StateSupport.java
@@ -165,6 +165,7 @@ public class StateSupport {
else {
sg.getStates().remove(s);
}
+ doneChanges = false;
return EMPTY;
}
diff --git a/plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF
index a068a4ea3..3e79a470b 100644
--- a/plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.commands/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: eTrice Commands
Bundle-SymbolicName: org.eclipse.etrice.ui.commands; singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0.qualifier
Bundle-Activator: org.eclipse.etrice.ui.commands.Activator
Bundle-Vendor: eTrice (Incubation)
Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="0.1.0",
diff --git a/plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF
index a7b16603a..92d3c874c 100644
--- a/plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: UI Common
Bundle-SymbolicName: org.eclipse.etrice.ui.common;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0.qualifier
Bundle-Vendor: eTrice (Incubation)
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.eclipse.core.databinding;bundle-version="1.3.100",
diff --git a/plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF
index fe34baca1..7000cf4be 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.runtime/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: New Wizards for Runtime
Bundle-SymbolicName: org.eclipse.etrice.ui.runtime;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0.qualifier
Bundle-Vendor: eTrice (Incubation)
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
index 77fcd8eae..d935e2866 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF
index 4bd79a36b..95b9495cf 100644
--- a/plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.structure/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Actor Structure Diagram Editor
Bundle-SymbolicName: org.eclipse.etrice.ui.structure;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0.qualifier
Bundle-Activator: org.eclipse.etrice.ui.structure.Activator
Bundle-Vendor: eTrice (Incubation)
Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="0.1.0",
diff --git a/releng/org.eclipse.etrice.site/feature.xml b/releng/org.eclipse.etrice.site/feature.xml
index bc72a340f..a9d992601 100644
--- a/releng/org.eclipse.etrice.site/feature.xml
+++ b/releng/org.eclipse.etrice.site/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.etrice.site"
label="eTrice (Incubation) 0.1.0 Update Site"
- version="0.1.0.qualifier"
+ version="0.2.0.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg">
diff --git a/runtime/org.eclipse.etrice.modellib/doc-gen/room.basic.types.java.tex b/runtime/org.eclipse.etrice.modellib/doc-gen/room.basic.types.java.tex
index b660211d1..6be85698e 100644
--- a/runtime/org.eclipse.etrice.modellib/doc-gen/room.basic.types.java.tex
+++ b/runtime/org.eclipse.etrice.modellib/doc-gen/room.basic.types.java.tex
@@ -1,70 +1,70 @@
-\documentclass[titlepage]{article}
-\usepackage{graphicx}
-\makeatletter
-\newcommand\level[1]{%
- \ifcase#1\relax\expandafter\chapter\or
- \expandafter\section\or
- \expandafter\subsection\or
- \expandafter\subsubsection\else
- \def\next{\@level{#1}}\expandafter\next
- \fi}
-
-\newcommand{\@level}[1]{%
-\@startsection{level#1}
- {#1}
- {\z@}%
- {-3.25ex\@plus -1ex \@minus -.2ex}%
- {1.5ex \@plus .2ex}%
- {\normalfont\normalsize\bfseries}}
-
-\newdimen\@leveldim
- \newdimen\@dotsdim
- {\normalfont\normalsize
- \sbox\z@{0}\global\@leveldim=\wd\z@
- \sbox\z@{.}\global\@dotsdim=\wd\z@
- }
-\newcounter{level4}[subsubsection]
- \@namedef{thelevel4}{\thesubsubsection.\arabic{level4}}
- \@namedef{level4mark}#1{}
- \def\l@section{\@dottedtocline{1}{0pt}{\dimexpr\@leveldim*4+\@dotsdim*1+6pt\relax}}
- \def\l@subsection{\@dottedtocline{2}{0pt}{\dimexpr\@leveldim*5+\@dotsdim*2+6pt\relax}}
- \def\l@subsubsection{\@dottedtocline{3}{0pt}{\dimexpr\@leveldim*6+\@dotsdim*3+6pt\relax}}
- \@namedef{l@level4}{\@dottedtocline{4}{0pt}{\dimexpr\@leveldim*7+\@dotsdim*4+6pt\relax}}
-
-\count@=4
- \def\@ncp#1{\number\numexpr\count@+#1\relax}
- \loop\ifnum\count@<100
- \begingroup\edef\x{\endgroup
- \noexpand\newcounter{level\@ncp{1}}[level\number\count@]
- \noexpand\@namedef{thelevel\@ncp{1}}{%
- \noexpand\@nameuse{thelevel\@ncp{0}}.\noexpand\arabic{level\@ncp{0}}}
- \noexpand\@namedef{level\@ncp{1}mark}####1{}%
- \noexpand\@namedef{l@level\@ncp{1}}%
- {\noexpand\@dottedtocline{\@ncp{1}}{0pt}{\the\dimexpr\@leveldim*\@ncp{5}+\@dotsdim*\@ncp{0}\relax}}}%
- \x
- \advance\count@\@ne
- \repeat
- \makeatother
- \setcounter{secnumdepth}{100}
- \setcounter{tocdepth}{100}
-
-
-\title{room.basic.types.java Modeldocumentation}
-\date{\today}
-\author{generated by eTrice}
-
-\begin{document}
-\pagestyle{plain}
-\maketitle
-\tableofcontents
-
-\newpage
-\listoffigures
-\newpage
-\section{Modeldescription}
-
-\section{Protocol Class Description}
-\section{Data Class Description}
-\section{Actor Class Description}
-
-\end{document}
+\documentclass[titlepage]{article}
+\usepackage{graphicx}
+\makeatletter
+\newcommand\level[1]{%
+ \ifcase#1\relax\expandafter\chapter\or
+ \expandafter\section\or
+ \expandafter\subsection\or
+ \expandafter\subsubsection\else
+ \def\next{\@level{#1}}\expandafter\next
+ \fi}
+
+\newcommand{\@level}[1]{%
+\@startsection{level#1}
+ {#1}
+ {\z@}%
+ {-3.25ex\@plus -1ex \@minus -.2ex}%
+ {1.5ex \@plus .2ex}%
+ {\normalfont\normalsize\bfseries}}
+
+\newdimen\@leveldim
+ \newdimen\@dotsdim
+ {\normalfont\normalsize
+ \sbox\z@{0}\global\@leveldim=\wd\z@
+ \sbox\z@{.}\global\@dotsdim=\wd\z@
+ }
+\newcounter{level4}[subsubsection]
+ \@namedef{thelevel4}{\thesubsubsection.\arabic{level4}}
+ \@namedef{level4mark}#1{}
+ \def\l@section{\@dottedtocline{1}{0pt}{\dimexpr\@leveldim*4+\@dotsdim*1+6pt\relax}}
+ \def\l@subsection{\@dottedtocline{2}{0pt}{\dimexpr\@leveldim*5+\@dotsdim*2+6pt\relax}}
+ \def\l@subsubsection{\@dottedtocline{3}{0pt}{\dimexpr\@leveldim*6+\@dotsdim*3+6pt\relax}}
+ \@namedef{l@level4}{\@dottedtocline{4}{0pt}{\dimexpr\@leveldim*7+\@dotsdim*4+6pt\relax}}
+
+\count@=4
+ \def\@ncp#1{\number\numexpr\count@+#1\relax}
+ \loop\ifnum\count@<100
+ \begingroup\edef\x{\endgroup
+ \noexpand\newcounter{level\@ncp{1}}[level\number\count@]
+ \noexpand\@namedef{thelevel\@ncp{1}}{%
+ \noexpand\@nameuse{thelevel\@ncp{0}}.\noexpand\arabic{level\@ncp{0}}}
+ \noexpand\@namedef{level\@ncp{1}mark}####1{}%
+ \noexpand\@namedef{l@level\@ncp{1}}%
+ {\noexpand\@dottedtocline{\@ncp{1}}{0pt}{\the\dimexpr\@leveldim*\@ncp{5}+\@dotsdim*\@ncp{0}\relax}}}%
+ \x
+ \advance\count@\@ne
+ \repeat
+ \makeatother
+ \setcounter{secnumdepth}{100}
+ \setcounter{tocdepth}{100}
+
+
+\title{room.basic.types.java Modeldocumentation}
+\date{\today}
+\author{generated by eTrice}
+
+\begin{document}
+\pagestyle{plain}
+\maketitle
+\tableofcontents
+
+\newpage
+\listoffigures
+\newpage
+\section{Modeldescription}
+
+\section{Protocol Class Description}
+\section{Data Class Description}
+\section{Actor Class Description}
+
+\end{document}
diff --git a/runtime/org.eclipse.etrice.modellib/src-gen/org/eclipse/etrice/modellib/Socket/DSocketConfiguration.java b/runtime/org.eclipse.etrice.modellib/src-gen/org/eclipse/etrice/modellib/Socket/DSocketConfiguration.java
index 439376b85..cf5a0c40c 100644
--- a/runtime/org.eclipse.etrice.modellib/src-gen/org/eclipse/etrice/modellib/Socket/DSocketConfiguration.java
+++ b/runtime/org.eclipse.etrice.modellib/src-gen/org/eclipse/etrice/modellib/Socket/DSocketConfiguration.java
@@ -52,11 +52,6 @@ public class DSocketConfiguration {
super();
// initialize attributes
- serverName = "";
- portNumber = 0;
- protocol = 0;
- checkCookie = false;
- mode = 0;
}
// constructor using fields
diff --git a/runtime/org.eclipse.etrice.modellib/src-gen/org/eclipse/etrice/modellib/Socket/DSocketData.java b/runtime/org.eclipse.etrice.modellib/src-gen/org/eclipse/etrice/modellib/Socket/DSocketData.java
index e83f566b8..02aef15f0 100644
--- a/runtime/org.eclipse.etrice.modellib/src-gen/org/eclipse/etrice/modellib/Socket/DSocketData.java
+++ b/runtime/org.eclipse.etrice.modellib/src-gen/org/eclipse/etrice/modellib/Socket/DSocketData.java
@@ -31,8 +31,6 @@ public class DSocketData {
super();
// initialize attributes
- size = 0;
- data = "";
}
// constructor using fields
diff --git a/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/ALogService.java b/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/ALogService.java
index 9dc3b941b..9575ded18 100644
--- a/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/ALogService.java
+++ b/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/ALogService.java
@@ -106,9 +106,9 @@ public class ALogService extends ActorClassBase {
this.state = new_state;
}
- //*** Entry and Exit Codes
+ /* Entry and Exit Codes */
- //*** Action Codes
+ /* Action Codes */
protected void action_TRANS_closed_TO_opened_BY_openlog(InterfaceItemBase ifitem, String fileName) {
Date d=new Date(tStart);
try{
diff --git a/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/InternalLogData.java b/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/InternalLogData.java
index 50084924b..67f715a96 100644
--- a/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/InternalLogData.java
+++ b/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/InternalLogData.java
@@ -38,9 +38,6 @@ public class InternalLogData {
super();
// initialize attributes
- userString = "";
- sender = "";
- timeStamp = 0;
}
// constructor using fields
diff --git a/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/ATimingService.java b/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/ATimingService.java
index ad4195062..6aaf59624 100644
--- a/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/ATimingService.java
+++ b/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/ATimingService.java
@@ -104,12 +104,12 @@ public class ATimingService extends ActorClassBase {
this.state = new_state;
}
- //*** Entry and Exit Codes
+ /* Entry and Exit Codes */
protected void entry_Operational() {
// prepare
}
- //*** Action Codes
+ /* Action Codes */
protected void action_TRANS_INITIAL_TO__Operational() {
timerService = new Timer();
}
diff --git a/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF
index 3543fafdc..d4891d3c3 100644
--- a/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: eTrice Room Core Tests
Bundle-SymbolicName: org.eclipse.etrice.core.room.tests
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: eTrice (Incubation)
Require-Bundle: org.eclipse.etrice.core.room;bundle-version="0.1.0",
diff --git a/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF
index e3fdd1d9b..f50a5d85e 100644
--- a/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: eTrice Generator Model Tests
Bundle-SymbolicName: org.eclipse.etrice.generator.tests
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: eTrice (Incubation)
Require-Bundle: org.eclipse.etrice.core.room;bundle-version="0.1.0",
diff --git a/tests/org.eclipse.etrice.integration.tests/buckminster.cspec b/tests/org.eclipse.etrice.integration.tests/buckminster.cspec
index e4be950e1..045c79c6e 100644
--- a/tests/org.eclipse.etrice.integration.tests/buckminster.cspec
+++ b/tests/org.eclipse.etrice.integration.tests/buckminster.cspec
@@ -1,2 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.integration.tests" componentType="buckminster" version="1.0.0"/>
+<cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.integration.tests" componentType="buckminster" version="1.0.0">
+ <cs:actions>
+ <cs:public name="generate" actor="ant">
+ <cs:actorProperties>
+ <cs:property key="buildFile" value="generate.xml"/>
+ <cs:property key="targets" value="generate"/>
+ </cs:actorProperties>
+ </cs:public>
+ </cs:actions>
+</cs:cspec>
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTester.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTester.java
index 0f1da6f01..2b13c12f8 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTester.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTester.java
@@ -82,9 +82,9 @@ public class CPTester extends ActorClassBase {
this.state = new_state;
}
- //*** Entry and Exit Codes
+ /* Entry and Exit Codes */
- //*** Action Codes
+ /* Action Codes */
protected void action_TRANS_INITIAL_TO__state0() {
TestPort1.msg1();
System.out.println("msg1 sent ");
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPUser.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPUser.java
index 66e1f88b6..15b62eee1 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPUser.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPUser.java
@@ -105,7 +105,7 @@ public class CPUser extends ActorClassBase {
this.state = new_state;
}
- //*** Entry and Exit Codes
+ /* Entry and Exit Codes */
protected void entry_state0() {
System.out.println("state0: entry code");
crcGen.update(12);
@@ -132,7 +132,7 @@ public class CPUser extends ActorClassBase {
crcGen.update(23);
}
- //*** Action Codes
+ /* Action Codes */
protected void action_TRANS_INITIAL_TO__cp0() {
System.out.println("Top Level init transition");
crcGen.update(10);
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerUser.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerUser.java
index 5d8424300..2c4512456 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerUser.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerUser.java
@@ -126,7 +126,7 @@ public class HandlerUser extends ActorClassBase {
this.state = new_state;
}
- //*** Entry and Exit Codes
+ /* Entry and Exit Codes */
protected void entry_state0() {
System.out.println("state 0 entry action");
crcGen.update(13);
@@ -168,7 +168,7 @@ public class HandlerUser extends ActorClassBase {
crcGen.update(112);
}
- //*** Action Codes
+ /* Action Codes */
protected void action_TRANS_tp0_TO_tp0_BY_msg1TestPort1_tr0(InterfaceItemBase ifitem, int p1) {
System.out.println("top level handler action no guard ");
crcGen.update(11);
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/Tester.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/Tester.java
index 1364e1a2d..808c88c3e 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/Tester.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/Tester.java
@@ -87,9 +87,9 @@ public class Tester extends ActorClassBase {
this.state = new_state;
}
- //*** Entry and Exit Codes
+ /* Entry and Exit Codes */
- //*** Action Codes
+ /* Action Codes */
protected void action_TRANS_INITIAL_TO__state0() {
TestPort1.msg1(2);
System.out.println("msg1(2) sent ");
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPingActor.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPingActor.java
index c7e56440c..996ddad81 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPingActor.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPingActor.java
@@ -107,9 +107,9 @@ public class MrPingActor extends ActorClassBase {
this.state = new_state;
}
- //*** Entry and Exit Codes
+ /* Entry and Exit Codes */
- //*** Action Codes
+ /* Action Codes */
protected void action_TRANS_INITIAL_TO__waitForTimer() {
count = 0;
timer.Start(10);
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor1.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor1.java
index c438e1240..b8f859b02 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor1.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor1.java
@@ -84,9 +84,9 @@ public class MrPongActor1 extends ActorClassBase {
this.state = new_state;
}
- //*** Entry and Exit Codes
+ /* Entry and Exit Codes */
- //*** Action Codes
+ /* Action Codes */
protected void action_TRANS_waitForPing_TO_waitForPing_BY_pingPingPongPort_myTrigger(InterfaceItemBase ifitem) {
PingPongPort.pong();
}
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor2.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor2.java
index 2c5365077..c91a684e0 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor2.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor2.java
@@ -84,9 +84,9 @@ public class MrPongActor2 extends ActorClassBase {
this.state = new_state;
}
- //*** Entry and Exit Codes
+ /* Entry and Exit Codes */
- //*** Action Codes
+ /* Action Codes */
protected void action_TRANS_INITIAL_TO__waitForPing() {
// simulate blocking call e.g. Queue
try{
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPingActor.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPingActor.java
index 1d36c714a..cf8ca89dc 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPingActor.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPingActor.java
@@ -100,9 +100,9 @@ public class MrPingActor extends ActorClassBase {
this.state = new_state;
}
- //*** Entry and Exit Codes
+ /* Entry and Exit Codes */
- //*** Action Codes
+ /* Action Codes */
protected void action_TRANS_INITIAL_TO__waitForTimer() {
count = 0;
timer.Start(1000);
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPongActor1.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPongActor1.java
index e5e8e9aed..656905aa4 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPongActor1.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPongActor1.java
@@ -84,9 +84,9 @@ public class MrPongActor1 extends ActorClassBase {
this.state = new_state;
}
- //*** Entry and Exit Codes
+ /* Entry and Exit Codes */
- //*** Action Codes
+ /* Action Codes */
protected void action_TRANS_waitForPing_TO_waitForPing_BY_pingPingPongPort_myTrigger(InterfaceItemBase ifitem) {
PingPongPort.pong();
}
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPing.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPing.java
index dc3afc68c..00bf2740a 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPing.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPing.java
@@ -126,9 +126,9 @@ public class MrPing extends ActorClassBase {
this.state = new_state;
}
- //*** Entry and Exit Codes
+ /* Entry and Exit Codes */
- //*** Action Codes
+ /* Action Codes */
protected void action_TRANS_INITIAL_TO__waitForPong() {
int i;
int[] intArray;
@@ -215,9 +215,11 @@ public class MrPing extends ActorClassBase {
int[] intArray = data.getOwnType().getArrayFromInt32();
for (int i=0;i<intArray.length;i++) {intArray[i] = 10+i;}
data.getOwnType().setArrayFromInt32(intArray);
+ int[] intArrayShort=data.getArrayFromInt32();
+ for (int j=0;j<intArrayShort.length;j++) {intArray[j] = 10+j;}
// use convenient function
- PingPongPort.ping((byte)45,(short)34,80,'c',(float)3.14,7.12345,"Hase !",intArray,data.getOwnType());
+ PingPongPort.ping((byte)45,(short)34,80,'c',(float)3.14,7.12345,"Hase !",intArrayShort,data.getOwnType());
crcGen.update(13);
}
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPong.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPong.java
index c77b137ce..510919d98 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPong.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPong.java
@@ -98,9 +98,9 @@ public class MrPong extends ActorClassBase {
this.state = new_state;
}
- //*** Entry and Exit Codes
+ /* Entry and Exit Codes */
- //*** Action Codes
+ /* Action Codes */
protected void action_TRANS_reply_TO_reply_BY_pingPingPongPort_tr0(InterfaceItemBase ifitem, PingPongData p) {
p.setI8Val((byte)(p.getI8Val()+1));
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/PingPongData.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/PingPongData.java
index 97e4ea456..b3956d14b 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/PingPongData.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/PingPongData.java
@@ -116,10 +116,12 @@ public class PingPongData {
copy.f32Val = f32Val;
copy.f64Val = f64Val;
copy.stringVal = stringVal;
- for (int i=0;i<5;i++){
+ for (int i=0;i<arrayFromInt32.length;i++){
copy.arrayFromInt32[i] = arrayFromInt32[i];
}
- copy.ownType = ownType.deepCopy();
+ if (ownType!=null) {
+ copy.ownType = ownType.deepCopy();
+ }
return copy;
}
};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/PingPongDataDeep.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/PingPongDataDeep.java
index 06b104188..5936010e4 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/PingPongDataDeep.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/PingPongDataDeep.java
@@ -73,17 +73,7 @@ public class PingPongDataDeep {
super();
// initialize attributes
- i8Val = 0;
- i16Val = 0;
- i32Val = 0;
- charVal = 0;
- f32Val = 0;
- f64Val = 0;
- stringVal = "";
arrayFromInt32 = new int[10];
- for (int i=0;i<10;i++){
- arrayFromInt32[i] = 0;
- }
}
// constructor using fields
@@ -110,7 +100,7 @@ public class PingPongDataDeep {
copy.f32Val = f32Val;
copy.f64Val = f64Val;
copy.stringVal = stringVal;
- for (int i=0;i<10;i++){
+ for (int i=0;i<arrayFromInt32.length;i++){
copy.arrayFromInt32[i] = arrayFromInt32[i];
}
return copy;
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM.java
index 133f70e25..86c53d95c 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM.java
@@ -112,7 +112,7 @@ public class a_HFSM extends ActorClassBase {
this.state = new_state;
}
- //*** Entry and Exit Codes
+ /* Entry and Exit Codes */
protected void entry_State1() {
fct.s1_entry();
}
@@ -150,7 +150,7 @@ public class a_HFSM extends ActorClassBase {
fct.s4_exit();
}
- //*** Action Codes
+ /* Action Codes */
protected void action_TRANS_INITIAL_TO__State1() {
fct.init_action();
}
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM_Tester.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM_Tester.java
index d01ddf266..d8e69a429 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM_Tester.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM_Tester.java
@@ -113,12 +113,12 @@ public class a_HFSM_Tester extends ActorClassBase {
this.state = new_state;
}
- //*** Entry and Exit Codes
+ /* Entry and Exit Codes */
protected void entry_TestPass() {
RTServices.getInstance().getSubSystem().testFinished(0);
}
- //*** Action Codes
+ /* Action Codes */
protected void action_TRANS_State2_TO_State3_BY_s1_entrytestee(InterfaceItemBase ifitem) {
testee.m1();
}
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 c327f06dc..bdd169147 100644
--- a/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: eTrice Behavior Diagram Tests
Bundle-SymbolicName: org.eclipse.etrice.ui.behavior.tests
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0.qualifier
Bundle-Activator: org.eclipse.etrice.ui.behavior.BehaviorTestActivator
Bundle-Vendor: eTrice (Incubation)
Require-Bundle: org.eclipse.ui,
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 08f2c811d..988f89481 100644
--- a/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: eTrice Structure Diagram Tests
Bundle-SymbolicName: org.eclipse.etrice.ui.structure.tests
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0.qualifier
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.junit4;bundle-version="[4.8.1,4.9.0)",
diff --git a/tests/org.eclipse.etrice.ui.tests.base/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.tests.base/META-INF/MANIFEST.MF
index 984aa66c1..1f567254d 100644
--- a/tests/org.eclipse.etrice.ui.tests.base/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.ui.tests.base/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: eTrice Diagram Test Base Classes
Bundle-SymbolicName: org.eclipse.etrice.ui.tests.base
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0.qualifier
Require-Bundle: org.junit4;bundle-version="[4.8.1,4.9.0)",
org.eclipse.core.runtime,
org.eclipse.etrice.core.room;bundle-version="0.1.0",

Back to the top