summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortjung2012-10-02 15:33:00 (EDT)
committertjung2012-10-02 15:33:00 (EDT)
commit353984bdf92ba0b398a56ae24ac0d031940cf3a0 (patch)
treee85e76030f5a37c07cb17185aab331db284051ed
parentd3e33a45e3639efd6d60353b1398ccd53775d3b9 (diff)
downloadorg.eclipse.etrice-353984bdf92ba0b398a56ae24ac0d031940cf3a0.zip
org.eclipse.etrice-353984bdf92ba0b398a56ae24ac0d031940cf3a0.tar.gz
org.eclipse.etrice-353984bdf92ba0b398a56ae24ac0d031940cf3a0.tar.bz2
[tutorials.c] Types.room removed from Tutorials.
-rw-r--r--examples/org.eclipse.etrice.tutorials.c/Debug/org.eclipse.etrice.tutorials.c.exebin250505 -> 250505 bytes
-rw-r--r--examples/org.eclipse.etrice.tutorials.c/model/RemoveComment/RemoveComment.room5
-rw-r--r--examples/org.eclipse.etrice.tutorials.c/model/RemoveComment/Types.room22
-rw-r--r--plugins/org.eclipse.etrice.doc/build/etrice.textile14
-rw-r--r--plugins/org.eclipse.etrice.doc/build/etrice.xml26
-rw-r--r--plugins/org.eclipse.etrice.doc/doc/036-tutorial-remove-comment_C.textile14
-rw-r--r--plugins/org.eclipse.etrice.doc/doc/images/036-RemoveCommentC07.pngbin9964 -> 9425 bytes
-rw-r--r--plugins/org.eclipse.etrice.doc/help/Createyourowndatatype.html28
-rw-r--r--plugins/org.eclipse.etrice.doc/help/FiniteStateMachines.html4
-rw-r--r--plugins/org.eclipse.etrice.doc/help/Layering2.html2
-rw-r--r--plugins/org.eclipse.etrice.doc/help/Ports.html4
-rw-r--r--plugins/org.eclipse.etrice.doc/help/ROOMConcepts.html4
-rw-r--r--plugins/org.eclipse.etrice.doc/help/images/036-RemoveCommentC07.pngbin9964 -> 9425 bytes
-rw-r--r--plugins/org.eclipse.etrice.doc/html/etrice.html42
-rw-r--r--plugins/org.eclipse.etrice.doc/html/images/036-RemoveCommentC07.pngbin9964 -> 9425 bytes
-rw-r--r--plugins/org.eclipse.etrice.doc/manual/etrice.pdfbin6992978 -> 6979593 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zipbin15418 -> 14616 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zipbin19598 -> 19600 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zipbin128890 -> 127696 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zipbin37338 -> 37338 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zipbin100280 -> 100139 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zipbin100449 -> 100453 bytes
22 files changed, 66 insertions, 99 deletions
diff --git a/examples/org.eclipse.etrice.tutorials.c/Debug/org.eclipse.etrice.tutorials.c.exe b/examples/org.eclipse.etrice.tutorials.c/Debug/org.eclipse.etrice.tutorials.c.exe
index 3f7b439..97cfc0d 100644
--- a/examples/org.eclipse.etrice.tutorials.c/Debug/org.eclipse.etrice.tutorials.c.exe
+++ b/examples/org.eclipse.etrice.tutorials.c/Debug/org.eclipse.etrice.tutorials.c.exe
Binary files differ
diff --git a/examples/org.eclipse.etrice.tutorials.c/model/RemoveComment/RemoveComment.room b/examples/org.eclipse.etrice.tutorials.c/model/RemoveComment/RemoveComment.room
index 6b36094..f9e6b45 100644
--- a/examples/org.eclipse.etrice.tutorials.c/model/RemoveComment/RemoveComment.room
+++ b/examples/org.eclipse.etrice.tutorials.c/model/RemoveComment/RemoveComment.room
@@ -1,5 +1,8 @@
RoomModel RemoveComment {
- import room.basic.types.* from "Types.room"
+ import room.basic.types.* from "../../../org.eclipse.etrice.modellib.c/model/Types.room"
+
+ PrimitiveType file:ptInteger -> FILE default "0"
+
SubSystemClass RemoveCommentSubSys {
ActorRef Topref:ATop
}
diff --git a/examples/org.eclipse.etrice.tutorials.c/model/RemoveComment/Types.room b/examples/org.eclipse.etrice.tutorials.c/model/RemoveComment/Types.room
deleted file mode 100644
index a9ccbf3..0000000
--- a/examples/org.eclipse.etrice.tutorials.c/model/RemoveComment/Types.room
+++ /dev/null
@@ -1,22 +0,0 @@
-RoomModel room.basic.types {
-
- PrimitiveType boolean: ptBoolean -> boolean default "FALSE"
- PrimitiveType char: ptCharacter -> char default "0"
- PrimitiveType int8: ptInteger -> int8 default "0"
- PrimitiveType int16: ptInteger -> int16 default "0"
- PrimitiveType int32: ptInteger -> int32 default "0"
- PrimitiveType int64: ptInteger -> int64 default "0"
-
- PrimitiveType uint8: ptInteger -> uint8 default "0"
- PrimitiveType uint16: ptInteger -> uint16 default "0"
- PrimitiveType uint32: ptInteger -> uint32 default "0"
- PrimitiveType uint64: ptInteger -> uint64 default "0"
-
- PrimitiveType float32:ptReal -> float32 default "0"
- PrimitiveType float64:ptReal -> float64 default "0"
-
- // TODO: define strings for C
- PrimitiveType charPtr:ptCharacter -> charPtr default "0"
- PrimitiveType string:ptCharacter -> charPtr default "0"
- PrimitiveType file:ptInteger -> FILE default "0"
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.doc/build/etrice.textile b/plugins/org.eclipse.etrice.doc/build/etrice.textile
index fdd593b..8af234d 100644
--- a/plugins/org.eclipse.etrice.doc/build/etrice.textile
+++ b/plugins/org.eclipse.etrice.doc/build/etrice.textile
@@ -1222,20 +1222,22 @@ Now the model is created and all settings for the code generator, compiler and l
h2. Create your own data type
-The planed application should read a C source file and remove the comments. Therefore we need a file descriptor which is not part of the basic C types. The type for the file descriptor for MinGW is _FILE_. To make this type available on the model level, you have to declare the type in Types.room. To not interfere with other models, make a copy of _Types.room_ from _org.eclipse.modellib.c_ to your model folder.
+The planed application should read a C source file and remove the comments. Therefore we need a file descriptor which is not part of the basic C types. The type for the file descriptor for MinGW is _FILE_. To make this type available on the model level, you have to declare the type.
-!images/036-RemoveCommentC03.png!
-
-Open _Types.room_ and take a look at the declaration of _string_ (last line) which is not a basic C type.
+Open the file _Types.room_ from _org.eclipse.modellib.c_ and take a look at the declaration of _string_ (last line) which is not a basic C type.
_PrimitiveType string:ptCharacter -> charPtr default "0"_
With this declaration, you make the _string_ keyword available on model level as a primitive type. This type will be translated to _charPtr_ in your C sources. _charPtr_ is defined in _etDatatypes.h_. This header file is platform specific (_generic_). With this mechanism you can define your own type system on model level and map the model types to specific target/platform types.
-Add the following line in _Types.room_:
+To not interfere with other models, we will declare the type direct in the model.
+Add the following line to your model:
bc..
-PrimitiveType file:ptInteger -> FILE default "0"
+RoomModel RemoveComment {
+ import room.basic.types.* from "../../../org.eclipse.etrice.modellib.c/model/Types.room"
+
+ PrimitiveType file:ptInteger -> FILE default "0"
bq.
_FILE_ is the native type for MinGW. Therefore you donīt need a mapping within _etDatatypes.h_. If your model should be portable across different platforms you should not take this shortcut.
diff --git a/plugins/org.eclipse.etrice.doc/build/etrice.xml b/plugins/org.eclipse.etrice.doc/build/etrice.xml
index 33b6ae0..f0e5d7d 100644
--- a/plugins/org.eclipse.etrice.doc/build/etrice.xml
+++ b/plugins/org.eclipse.etrice.doc/build/etrice.xml
@@ -2189,19 +2189,11 @@ carLights.setState(TrafficLight3.OFF);
<section id="Createyourowndatatype">
<title>Create your own data type</title>
<para>The planed application should read a C source file and remove the comments. Therefore we need a file descriptor which is not part of the basic C types. The type for the file descriptor for MinGW is
- <emphasis>FILE</emphasis>. To make this type available on the model level, you have to declare the type in Types.room. To not interfere with other models, make a copy of
- <emphasis>Types.room</emphasis> from
- <emphasis>org.eclipse.modellib.c</emphasis> to your model folder.
+ <emphasis>FILE</emphasis>. To make this type available on the model level, you have to declare the type.
</para>
- <para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/036-RemoveCommentC03.png"/>
- </imageobject>
- </mediaobject>
- </para>
- <para>Open
- <emphasis>Types.room</emphasis> and take a look at the declaration of
+ <para>Open the file
+ <emphasis>Types.room</emphasis> from
+ <emphasis>org.eclipse.modellib.c</emphasis> and take a look at the declaration of
<emphasis>string</emphasis> (last line) which is not a basic C type.
</para>
<para>
@@ -2214,10 +2206,12 @@ carLights.setState(TrafficLight3.OFF);
<emphasis>etDatatypes.h</emphasis>. This header file is platform specific (
<emphasis>generic</emphasis>). With this mechanism you can define your own type system on model level and map the model types to specific target/platform types.
</para>
- <para>Add the following line in
- <emphasis>Types.room</emphasis>:
- </para>
- <literallayout><code>PrimitiveType file:ptInteger -&gt; FILE default "0"
+ <para>To not interfere with other models, we will declare the type direct in the model.
+ Add the following line to your model:</para>
+ <literallayout><code>RoomModel RemoveComment {
+ import room.basic.types.* from "../../../org.eclipse.etrice.modellib.c/model/Types.room"
+
+ PrimitiveType file:ptInteger -&gt; FILE default "0"
</code></literallayout>
<blockquote>
<para></para>
diff --git a/plugins/org.eclipse.etrice.doc/doc/036-tutorial-remove-comment_C.textile b/plugins/org.eclipse.etrice.doc/doc/036-tutorial-remove-comment_C.textile
index 95ae5d2..92e6587 100644
--- a/plugins/org.eclipse.etrice.doc/doc/036-tutorial-remove-comment_C.textile
+++ b/plugins/org.eclipse.etrice.doc/doc/036-tutorial-remove-comment_C.textile
@@ -41,20 +41,22 @@ Now the model is created and all settings for the code generator, compiler and l
h2. Create your own data type
-The planed application should read a C source file and remove the comments. Therefore we need a file descriptor which is not part of the basic C types. The type for the file descriptor for MinGW is _FILE_. To make this type available on the model level, you have to declare the type in Types.room. To not interfere with other models, make a copy of _Types.room_ from _org.eclipse.modellib.c_ to your model folder.
+The planed application should read a C source file and remove the comments. Therefore we need a file descriptor which is not part of the basic C types. The type for the file descriptor for MinGW is _FILE_. To make this type available on the model level, you have to declare the type.
-!images/036-RemoveCommentC03.png!
-
-Open _Types.room_ and take a look at the declaration of _string_ (last line) which is not a basic C type.
+Open the file _Types.room_ from _org.eclipse.modellib.c_ and take a look at the declaration of _string_ (last line) which is not a basic C type.
_PrimitiveType string:ptCharacter -> charPtr default "0"_
With this declaration, you make the _string_ keyword available on model level as a primitive type. This type will be translated to _charPtr_ in your C sources. _charPtr_ is defined in _etDatatypes.h_. This header file is platform specific (_generic_). With this mechanism you can define your own type system on model level and map the model types to specific target/platform types.
-Add the following line in _Types.room_:
+To not interfere with other models, we will declare the type direct in the model.
+Add the following line to your model:
bc..
-PrimitiveType file:ptInteger -> FILE default "0"
+RoomModel RemoveComment {
+ import room.basic.types.* from "../../../org.eclipse.etrice.modellib.c/model/Types.room"
+
+ PrimitiveType file:ptInteger -> FILE default "0"
bq.
_FILE_ is the native type for MinGW. Therefore you donīt need a mapping within _etDatatypes.h_. If your model should be portable across different platforms you should not take this shortcut.
diff --git a/plugins/org.eclipse.etrice.doc/doc/images/036-RemoveCommentC07.png b/plugins/org.eclipse.etrice.doc/doc/images/036-RemoveCommentC07.png
index 050ea63..70e3d14 100644
--- a/plugins/org.eclipse.etrice.doc/doc/images/036-RemoveCommentC07.png
+++ b/plugins/org.eclipse.etrice.doc/doc/images/036-RemoveCommentC07.png
Binary files differ
diff --git a/plugins/org.eclipse.etrice.doc/help/Createyourowndatatype.html b/plugins/org.eclipse.etrice.doc/help/Createyourowndatatype.html
index dc2218c..ed9949b 100644
--- a/plugins/org.eclipse.etrice.doc/help/Createyourowndatatype.html
+++ b/plugins/org.eclipse.etrice.doc/help/Createyourowndatatype.html
@@ -21,20 +21,11 @@
</div>
</div>
<p>The planed application should read a C source file and remove the comments. Therefore we need a file descriptor which is not part of the basic C types. The type for the file descriptor for MinGW is
- <span class="emphasis"><em>FILE</em></span>. To make this type available on the model level, you have to declare the type in Types.room. To not interfere with other models, make a copy of
- <span class="emphasis"><em>Types.room</em></span> from
- <span class="emphasis"><em>org.eclipse.modellib.c</em></span> to your model folder.
+ <span class="emphasis"><em>FILE</em></span>. To make this type available on the model level, you have to declare the type.
</p>
-<p>
-
-</p>
-<div class="mediaobject">
-<img src="images/036-RemoveCommentC03.png"></div>
-<p>
-
-</p>
-<p>Open
- <span class="emphasis"><em>Types.room</em></span> and take a look at the declaration of
+<p>Open the file
+ <span class="emphasis"><em>Types.room</em></span> from
+ <span class="emphasis"><em>org.eclipse.modellib.c</em></span> and take a look at the declaration of
<span class="emphasis"><em>string</em></span> (last line) which is not a basic C type.
</p>
<p>
@@ -49,12 +40,15 @@
<span class="emphasis"><em>etDatatypes.h</em></span>. This header file is platform specific (
<span class="emphasis"><em>generic</em></span>). With this mechanism you can define your own type system on model level and map the model types to specific target/platform types.
</p>
-<p>Add the following line in
- <span class="emphasis"><em>Types.room</em></span>:
- </p>
+<p>To not interfere with other models, we will declare the type direct in the model.
+ Add the following line to your model:</p>
<div class="literallayout">
<p>
-<code class="code">PrimitiveType&nbsp;file:ptInteger&nbsp;-&gt;&nbsp;FILE&nbsp;default&nbsp;"0"<br>
+<code class="code">RoomModel&nbsp;RemoveComment&nbsp;{<br>
+ import&nbsp;room.basic.types.*&nbsp;from&nbsp;"../../../org.eclipse.etrice.modellib.c/model/Types.room"<br>
+
+<br>
+ PrimitiveType&nbsp;file:ptInteger&nbsp;-&gt;&nbsp;FILE&nbsp;default&nbsp;"0"<br>
</code>
</p>
diff --git a/plugins/org.eclipse.etrice.doc/help/FiniteStateMachines.html b/plugins/org.eclipse.etrice.doc/help/FiniteStateMachines.html
index fb27a2d..8ac1d4a 100644
--- a/plugins/org.eclipse.etrice.doc/help/FiniteStateMachines.html
+++ b/plugins/org.eclipse.etrice.doc/help/FiniteStateMachines.html
@@ -70,7 +70,7 @@
</div>
</div>
<p>The simpler flat finite state machines are composed of the following elements:</p>
-<table title="Title" frame="box" border="2" cellpadding="3" cellspacing="0" id="N11015">
+<table title="Title" frame="box" border="2" cellpadding="3" cellspacing="0" id="N11008">
<tr>
<td align="center">
@@ -184,7 +184,7 @@
</div>
<p>The hierarchical finite state machine adds the notion of a sub state machine nested in a state.
A few modeling elements are added to the set listed above:</p>
-<table title="Title" frame="box" border="2" cellpadding="3" cellspacing="0" id="N110D4">
+<table title="Title" frame="box" border="2" cellpadding="3" cellspacing="0" id="N110C7">
<tr>
<td align="center">
diff --git a/plugins/org.eclipse.etrice.doc/help/Layering2.html b/plugins/org.eclipse.etrice.doc/help/Layering2.html
index 59b5adf..cd25f77 100644
--- a/plugins/org.eclipse.etrice.doc/help/Layering2.html
+++ b/plugins/org.eclipse.etrice.doc/help/Layering2.html
@@ -53,7 +53,7 @@
</div>
</div>
</div>
-<table title="Title" frame="box" border="2" cellpadding="3" cellspacing="0" id="N10F65">
+<table title="Title" frame="box" border="2" cellpadding="3" cellspacing="0" id="N10F58">
<tr>
<td align="center">
diff --git a/plugins/org.eclipse.etrice.doc/help/Ports.html b/plugins/org.eclipse.etrice.doc/help/Ports.html
index 039ac1b..ac9b85a 100644
--- a/plugins/org.eclipse.etrice.doc/help/Ports.html
+++ b/plugins/org.eclipse.etrice.doc/help/Ports.html
@@ -111,7 +111,7 @@
</li>
</ul>
</div>
-<table title="Class Port Notation" frame="box" border="2" cellpadding="3" cellspacing="0" id="N10D6A">
+<table title="Class Port Notation" frame="box" border="2" cellpadding="3" cellspacing="0" id="N10D5D">
<tr>
<td align="center">
@@ -309,7 +309,7 @@
</div>
</div>
<p>These symbols can only appear on the border of an ActorReference symbol. Since the type of port is defined in the ActorClass, no textual notation for the Reference Ports exists.</p>
-<table title="Title" frame="box" border="2" cellpadding="3" cellspacing="0" id="N10EA2">
+<table title="Title" frame="box" border="2" cellpadding="3" cellspacing="0" id="N10E95">
<tr>
<td align="center">
diff --git a/plugins/org.eclipse.etrice.doc/help/ROOMConcepts.html b/plugins/org.eclipse.etrice.doc/help/ROOMConcepts.html
index 2faab34..7cc9592 100644
--- a/plugins/org.eclipse.etrice.doc/help/ROOMConcepts.html
+++ b/plugins/org.eclipse.etrice.doc/help/ROOMConcepts.html
@@ -102,7 +102,7 @@
</div>
</div>
</div>
-<table title="Actor Class Notation" frame="box" border="2" cellpadding="3" cellspacing="0" id="N10BDE">
+<table title="Actor Class Notation" frame="box" border="2" cellpadding="3" cellspacing="0" id="N10BD1">
<tr>
<td align="center">
@@ -185,7 +185,7 @@
<span class="bold"><strong>Bindings</strong></span> connect Ports inside an ActorClass.
</p>
<p>Example:</p>
-<table title="Actor Class Example" frame="box" border="2" cellpadding="3" cellspacing="0" id="N10C63">
+<table title="Actor Class Example" frame="box" border="2" cellpadding="3" cellspacing="0" id="N10C56">
<tr>
<td align="center">
diff --git a/plugins/org.eclipse.etrice.doc/help/images/036-RemoveCommentC07.png b/plugins/org.eclipse.etrice.doc/help/images/036-RemoveCommentC07.png
index 050ea63..70e3d14 100644
--- a/plugins/org.eclipse.etrice.doc/help/images/036-RemoveCommentC07.png
+++ b/plugins/org.eclipse.etrice.doc/help/images/036-RemoveCommentC07.png
Binary files differ
diff --git a/plugins/org.eclipse.etrice.doc/html/etrice.html b/plugins/org.eclipse.etrice.doc/html/etrice.html
index f75baee..d445a7e 100644
--- a/plugins/org.eclipse.etrice.doc/html/etrice.html
+++ b/plugins/org.eclipse.etrice.doc/html/etrice.html
@@ -3255,20 +3255,11 @@ carLights.setState(TrafficLight3.OFF);&nbsp;<br>
</div>
</div>
<p>The planed application should read a C source file and remove the comments. Therefore we need a file descriptor which is not part of the basic C types. The type for the file descriptor for MinGW is
- <span class="emphasis"><em>FILE</em></span>. To make this type available on the model level, you have to declare the type in Types.room. To not interfere with other models, make a copy of
- <span class="emphasis"><em>Types.room</em></span> from
- <span class="emphasis"><em>org.eclipse.modellib.c</em></span> to your model folder.
+ <span class="emphasis"><em>FILE</em></span>. To make this type available on the model level, you have to declare the type.
</p>
-<p>
-
-</p>
-<div class="mediaobject">
-<img src="images/036-RemoveCommentC03.png"></div>
-<p>
-
-</p>
-<p>Open
- <span class="emphasis"><em>Types.room</em></span> and take a look at the declaration of
+<p>Open the file
+ <span class="emphasis"><em>Types.room</em></span> from
+ <span class="emphasis"><em>org.eclipse.modellib.c</em></span> and take a look at the declaration of
<span class="emphasis"><em>string</em></span> (last line) which is not a basic C type.
</p>
<p>
@@ -3283,12 +3274,15 @@ carLights.setState(TrafficLight3.OFF);&nbsp;<br>
<span class="emphasis"><em>etDatatypes.h</em></span>. This header file is platform specific (
<span class="emphasis"><em>generic</em></span>). With this mechanism you can define your own type system on model level and map the model types to specific target/platform types.
</p>
-<p>Add the following line in
- <span class="emphasis"><em>Types.room</em></span>:
- </p>
+<p>To not interfere with other models, we will declare the type direct in the model.
+ Add the following line to your model:</p>
<div class="literallayout">
<p>
-<code class="code">PrimitiveType&nbsp;file:ptInteger&nbsp;-&gt;&nbsp;FILE&nbsp;default&nbsp;"0"<br>
+<code class="code">RoomModel&nbsp;RemoveComment&nbsp;{<br>
+ import&nbsp;room.basic.types.*&nbsp;from&nbsp;"../../../org.eclipse.etrice.modellib.c/model/Types.room"<br>
+
+<br>
+ PrimitiveType&nbsp;file:ptInteger&nbsp;-&gt;&nbsp;FILE&nbsp;default&nbsp;"0"<br>
</code>
</p>
@@ -3488,7 +3482,7 @@ carLights.setState(TrafficLight3.OFF);&nbsp;<br>
</div>
</div>
</div>
-<table title="Actor Class Notation" frame="box" border="2" cellpadding="3" cellspacing="0" id="N10BDE">
+<table title="Actor Class Notation" frame="box" border="2" cellpadding="3" cellspacing="0" id="N10BD1">
<tr>
<td align="center">
@@ -3571,7 +3565,7 @@ carLights.setState(TrafficLight3.OFF);&nbsp;<br>
<span class="bold"><strong>Bindings</strong></span> connect Ports inside an ActorClass.
</p>
<p>Example:</p>
-<table title="Actor Class Example" frame="box" border="2" cellpadding="3" cellspacing="0" id="N10C63">
+<table title="Actor Class Example" frame="box" border="2" cellpadding="3" cellspacing="0" id="N10C56">
<tr>
<td align="center">
@@ -3853,7 +3847,7 @@ carLights.setState(TrafficLight3.OFF);&nbsp;<br>
</li>
</ul>
</div>
-<table title="Class Port Notation" frame="box" border="2" cellpadding="3" cellspacing="0" id="N10D6A">
+<table title="Class Port Notation" frame="box" border="2" cellpadding="3" cellspacing="0" id="N10D5D">
<tr>
<td align="center">
@@ -4051,7 +4045,7 @@ carLights.setState(TrafficLight3.OFF);&nbsp;<br>
</div>
</div>
<p>These symbols can only appear on the border of an ActorReference symbol. Since the type of port is defined in the ActorClass, no textual notation for the Reference Ports exists.</p>
-<table title="Title" frame="box" border="2" cellpadding="3" cellspacing="0" id="N10EA2">
+<table title="Title" frame="box" border="2" cellpadding="3" cellspacing="0" id="N10E95">
<tr>
<td align="center">
@@ -4208,7 +4202,7 @@ carLights.setState(TrafficLight3.OFF);&nbsp;<br>
</div>
</div>
</div>
-<table title="Title" frame="box" border="2" cellpadding="3" cellspacing="0" id="N10F65">
+<table title="Title" frame="box" border="2" cellpadding="3" cellspacing="0" id="N10F58">
<tr>
<td align="center">
@@ -4339,7 +4333,7 @@ carLights.setState(TrafficLight3.OFF);&nbsp;<br>
</div>
</div>
<p>The simpler flat finite state machines are composed of the following elements:</p>
-<table title="Title" frame="box" border="2" cellpadding="3" cellspacing="0" id="N11015">
+<table title="Title" frame="box" border="2" cellpadding="3" cellspacing="0" id="N11008">
<tr>
<td align="center">
@@ -4453,7 +4447,7 @@ carLights.setState(TrafficLight3.OFF);&nbsp;<br>
</div>
<p>The hierarchical finite state machine adds the notion of a sub state machine nested in a state.
A few modeling elements are added to the set listed above:</p>
-<table title="Title" frame="box" border="2" cellpadding="3" cellspacing="0" id="N110D4">
+<table title="Title" frame="box" border="2" cellpadding="3" cellspacing="0" id="N110C7">
<tr>
<td align="center">
diff --git a/plugins/org.eclipse.etrice.doc/html/images/036-RemoveCommentC07.png b/plugins/org.eclipse.etrice.doc/html/images/036-RemoveCommentC07.png
index 050ea63..70e3d14 100644
--- a/plugins/org.eclipse.etrice.doc/html/images/036-RemoveCommentC07.png
+++ b/plugins/org.eclipse.etrice.doc/html/images/036-RemoveCommentC07.png
Binary files differ
diff --git a/plugins/org.eclipse.etrice.doc/manual/etrice.pdf b/plugins/org.eclipse.etrice.doc/manual/etrice.pdf
index be9f8f1..32707cf 100644
--- a/plugins/org.eclipse.etrice.doc/manual/etrice.pdf
+++ b/plugins/org.eclipse.etrice.doc/manual/etrice.pdf
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip
index 72550ee..d018f42 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip
index 6a41b39..3ef5e78 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip
Binary files differ
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 e6dd6f5..262367e 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.runtime/contents/org.eclipse.etrice.runtime.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip
index ebbe319..2508ce9 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip
index 8963d52..3644e23 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip
index a69d335..d757bf9 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip
Binary files differ