diff options
| author | Henrik Rentz-Reichert | 2011-12-06 15:57:59 +0000 |
|---|---|---|
| committer | Henrik Rentz-Reichert | 2011-12-06 15:57:59 +0000 |
| commit | 193c8774c7a16619bba772e2dc35c4ba88e4375d (patch) | |
| tree | 04ca6ebded314fe8e5f13ace687490e155082e91 | |
| parent | a801412531f0f605afe33acc09082693b406408c (diff) | |
| download | org.eclipse.etrice-193c8774c7a16619bba772e2dc35c4ba88e4375d.tar.gz org.eclipse.etrice-193c8774c7a16619bba772e2dc35c4ba88e4375d.tar.xz org.eclipse.etrice-193c8774c7a16619bba772e2dc35c4ba88e4375d.zip | |
[doc] minor changes and most graphics of 040 scaled 80%
86 files changed, 768 insertions, 759 deletions
diff --git a/plugins/org.eclipse.etrice.doc/build/etrice.textile b/plugins/org.eclipse.etrice.doc/build/etrice.textile index 1a53749a3..221f84e19 100644 --- a/plugins/org.eclipse.etrice.doc/build/etrice.textile +++ b/plugins/org.eclipse.etrice.doc/build/etrice.textile @@ -941,7 +941,7 @@ This method is synchronized. That means, regardless who sends the message, the q h1. ROOM Concepts
This chapter gives an overview over the ROOM language elements and their textual and graphical notation.
-The formal ROOM grammar based on XText (EBNF) you can find here: "ROOM Grammar":http://git.eclipse.org/c/etrice/org.eclipse.etrice.git/tree/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/Room.xtext
+The formal ROOM grammar based on Xtext (EBNF) you can find here: "ROOM Grammar":http://git.eclipse.org/c/etrice/org.eclipse.etrice.git/tree/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/Room.xtext
h2. Actors
@@ -951,14 +951,14 @@ The actor is the basic structural building block for building systems with ROOM. h3. Motivation
-* Actors enable the construction of hierarchical structures with composition and layering
+* Actors enable the construction of hierarchical structures by composition and layering
* Actors have their own logical thread of execution
* Actors can be freely deployed
* Actors define potentially reusable blocks
h3. Notation
-<table title="Actor Class Notation" frame="box" border="1">
+<table title="Actor Class Notation" frame="box" border="2" cellpadding="3" cellspacing="0" >
<tr>
<td align="center">*Element*</td>
<td align="center">*Graphical Notation*</td>
@@ -990,7 +990,7 @@ An *ActorClass* defines the type (or blueprint) of an actor. Hierarchies are bui Example:
-<table title="Actor Class Example" frame="box" border="1">
+<table title="Actor Class Example" frame="box" border="2" cellpadding="3" cellspacing="0" >
<tr>
<td align="center">*Graphical Notation*</td>
<td align="center">*Textual Notation*</td>
@@ -1061,14 +1061,14 @@ h4. Class Ports These symbols can only appear on the border of an actor class symbol.
-Ports that define an external interface of the ActorClass, are defined in the Interface. Ports that define an internal interface are defined in the Structure (e.g. internal ports).
+Ports that define an external interface of the ActorClass, are defined in the _Interface_. Ports that define an internal interface are defined in the _Structure_ (e.g. internal ports).
* *External End Ports* are defined in the Interface and the Structure
* *Internal End Ports* are only defined in the Structure
* *Relay Ports* are only defined in the Interface
* *End Ports* are always connected to the internal behavior of the ActorClass
* *Replicated Ports* can be defined with a fixed replication factor ( e.g. _Port port18 [ 5 ]: ProtocolClass1_ ) or a variable replication factor (e.g. _Port port18[ * ]: ProtocolClass1_ )
-<table title="Class Port Notation" frame="box" border="1">
+<table title="Class Port Notation" frame="box" border="2" cellpadding="3" cellspacing="0">
<tr>
<td align="center">*Element*</td>
<td align="center">*Graphical Notation*</td>
@@ -1148,7 +1148,7 @@ h4. Reference Ports 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.
-<table title="Title" frame="box" border="1">
+<table title="Title" frame="box" border="2" cellpadding="3" cellspacing="0">
<tr>
<td align="center">*Element*</td>
<td align="center">*Graphical Notation*</td>
@@ -1203,7 +1203,7 @@ In addition to the Actor containment hierarchies, Layering provides another meth h3. Notation
-<table title="Title" frame="box" border="1">
+<table title="Title" frame="box" border="2" cellpadding="3" cellspacing="0">
<tr>
<td align="center">*Description*</td>
<td align="center">*Graphical Notation*</td>
diff --git a/plugins/org.eclipse.etrice.doc/build/etrice.xml b/plugins/org.eclipse.etrice.doc/build/etrice.xml index 5c2fa4758..29a5a9718 100644 --- a/plugins/org.eclipse.etrice.doc/build/etrice.xml +++ b/plugins/org.eclipse.etrice.doc/build/etrice.xml @@ -1641,7 +1641,7 @@ carLights.setState(TrafficLight3.OFF); <chapter id="ROOMConcepts"> <title>ROOM Concepts</title> <para>This chapter gives an overview over the ROOM language elements and their textual and graphical notation. - The formal ROOM grammar based on XText (EBNF) you can find here: + The formal ROOM grammar based on Xtext (EBNF) you can find here: <ulink url="http://git.eclipse.org/c/etrice/org.eclipse.etrice.git/tree/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/Room.xtext">ROOM Grammar</ulink> </para> <section id="Actors"> @@ -1654,7 +1654,7 @@ carLights.setState(TrafficLight3.OFF); <title>Motivation</title> <itemizedlist> <listitem> - <para>Actors enable the construction of hierarchical structures with composition and layering</para> + <para>Actors enable the construction of hierarchical structures by composition and layering</para> </listitem> <listitem> <para>Actors have their own logical thread of execution</para> @@ -1669,7 +1669,7 @@ carLights.setState(TrafficLight3.OFF); </section> <section id="Notation"> <title>Notation</title> - <para><table title="Actor Class Notation" frame="box" border="1"> + <para><table title="Actor Class Notation" frame="box" border="2" cellpadding="3" cellspacing="0" > <tr> <td align="center"> <emphasis role="bold">Element</emphasis></td> @@ -1731,7 +1731,7 @@ carLights.setState(TrafficLight3.OFF); <emphasis role="bold">Bindings</emphasis> connect Ports inside an ActorClass. </para> <para>Example:</para> - <para><table title="Actor Class Example" frame="box" border="1"> + <para><table title="Actor Class Example" frame="box" border="2" cellpadding="3" cellspacing="0" > <tr> <td align="center"> <emphasis role="bold">Graphical Notation</emphasis></td> @@ -1877,7 +1877,10 @@ carLights.setState(TrafficLight3.OFF); <section id="ClassPorts"> <title>Class Ports</title> <para>These symbols can only appear on the border of an actor class symbol. </para> - <para>Ports that define an external interface of the ActorClass, are defined in the Interface. Ports that define an internal interface are defined in the Structure (e.g. internal ports).</para> + <para>Ports that define an external interface of the ActorClass, are defined in the + <emphasis>Interface</emphasis>. Ports that define an internal interface are defined in the + <emphasis>Structure</emphasis> (e.g. internal ports). + </para> <itemizedlist> <listitem> <para> @@ -1907,7 +1910,7 @@ carLights.setState(TrafficLight3.OFF); </para> </listitem> </itemizedlist> - <para><table title="Class Port Notation" frame="box" border="1"> + <para><table title="Class Port Notation" frame="box" border="2" cellpadding="3" cellspacing="0"> <tr> <td align="center"> <emphasis role="bold">Element</emphasis></td> @@ -2098,7 +2101,7 @@ carLights.setState(TrafficLight3.OFF); <section id="ReferencePorts"> <title>Reference Ports</title> <para>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.</para> - <para><table title="Title" frame="box" border="1"> + <para><table title="Title" frame="box" border="2" cellpadding="3" cellspacing="0"> <tr> <td align="center"> <emphasis role="bold">Element</emphasis></td> @@ -2201,7 +2204,7 @@ carLights.setState(TrafficLight3.OFF); </section> <section id="Notation5"> <title>Notation</title> - <para><table title="Title" frame="box" border="1"> + <para><table title="Title" frame="box" border="2" cellpadding="3" cellspacing="0"> <tr> <td align="center"> <emphasis role="bold">Description</emphasis></td> diff --git a/plugins/org.eclipse.etrice.doc/doc/040-room-concepts.textile b/plugins/org.eclipse.etrice.doc/doc/040-room-concepts.textile index 965c6cbea..47bf6b0ae 100644 --- a/plugins/org.eclipse.etrice.doc/doc/040-room-concepts.textile +++ b/plugins/org.eclipse.etrice.doc/doc/040-room-concepts.textile @@ -1,7 +1,7 @@ h1. ROOM Concepts
This chapter gives an overview over the ROOM language elements and their textual and graphical notation.
-The formal ROOM grammar based on XText (EBNF) you can find here: "ROOM Grammar":http://git.eclipse.org/c/etrice/org.eclipse.etrice.git/tree/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/Room.xtext
+The formal ROOM grammar based on Xtext (EBNF) you can find here: "ROOM Grammar":http://git.eclipse.org/c/etrice/org.eclipse.etrice.git/tree/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/Room.xtext
h2. Actors
@@ -11,14 +11,14 @@ The actor is the basic structural building block for building systems with ROOM. h3. Motivation
-* Actors enable the construction of hierarchical structures with composition and layering
+* Actors enable the construction of hierarchical structures by composition and layering
* Actors have their own logical thread of execution
* Actors can be freely deployed
* Actors define potentially reusable blocks
h3. Notation
-<table title="Actor Class Notation" frame="box" border="1">
+<table title="Actor Class Notation" frame="box" border="2" cellpadding="3" cellspacing="0" >
<tr>
<td align="center">*Element*</td>
<td align="center">*Graphical Notation*</td>
@@ -50,7 +50,7 @@ An *ActorClass* defines the type (or blueprint) of an actor. Hierarchies are bui Example:
-<table title="Actor Class Example" frame="box" border="1">
+<table title="Actor Class Example" frame="box" border="2" cellpadding="3" cellspacing="0" >
<tr>
<td align="center">*Graphical Notation*</td>
<td align="center">*Textual Notation*</td>
@@ -121,14 +121,14 @@ h4. Class Ports These symbols can only appear on the border of an actor class symbol.
-Ports that define an external interface of the ActorClass, are defined in the Interface. Ports that define an internal interface are defined in the Structure (e.g. internal ports).
+Ports that define an external interface of the ActorClass, are defined in the _Interface_. Ports that define an internal interface are defined in the _Structure_ (e.g. internal ports).
* *External End Ports* are defined in the Interface and the Structure
* *Internal End Ports* are only defined in the Structure
* *Relay Ports* are only defined in the Interface
* *End Ports* are always connected to the internal behavior of the ActorClass
* *Replicated Ports* can be defined with a fixed replication factor ( e.g. _Port port18 [ 5 ]: ProtocolClass1_ ) or a variable replication factor (e.g. _Port port18[ * ]: ProtocolClass1_ )
-<table title="Class Port Notation" frame="box" border="1">
+<table title="Class Port Notation" frame="box" border="2" cellpadding="3" cellspacing="0">
<tr>
<td align="center">*Element*</td>
<td align="center">*Graphical Notation*</td>
@@ -208,7 +208,7 @@ h4. Reference Ports 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.
-<table title="Title" frame="box" border="1">
+<table title="Title" frame="box" border="2" cellpadding="3" cellspacing="0">
<tr>
<td align="center">*Element*</td>
<td align="center">*Graphical Notation*</td>
@@ -263,7 +263,7 @@ In addition to the Actor containment hierarchies, Layering provides another meth h3. Notation
-<table title="Title" frame="box" border="1">
+<table title="Title" frame="box" border="2" cellpadding="3" cellspacing="0">
<tr>
<td align="center">*Description*</td>
<td align="center">*Graphical Notation*</td>
diff --git a/plugins/org.eclipse.etrice.doc/doc/images/040-ActorClass.png b/plugins/org.eclipse.etrice.doc/doc/images/040-ActorClass.png Binary files differindex 8f8acc10d..a082127df 100644 --- a/plugins/org.eclipse.etrice.doc/doc/images/040-ActorClass.png +++ b/plugins/org.eclipse.etrice.doc/doc/images/040-ActorClass.png diff --git a/plugins/org.eclipse.etrice.doc/doc/images/040-ActorClassAttributes.png b/plugins/org.eclipse.etrice.doc/doc/images/040-ActorClassAttributes.png Binary files differindex b572a6aa6..8345f3402 100644 --- a/plugins/org.eclipse.etrice.doc/doc/images/040-ActorClassAttributes.png +++ b/plugins/org.eclipse.etrice.doc/doc/images/040-ActorClassAttributes.png diff --git a/plugins/org.eclipse.etrice.doc/doc/images/040-ActorClassExampleTextualNotation.png b/plugins/org.eclipse.etrice.doc/doc/images/040-ActorClassExampleTextualNotation.png Binary files differindex a99cb9cc1..7f5bbd01a 100644 --- a/plugins/org.eclipse.etrice.doc/doc/images/040-ActorClassExampleTextualNotation.png +++ b/plugins/org.eclipse.etrice.doc/doc/images/040-ActorClassExampleTextualNotation.png diff --git a/plugins/org.eclipse.etrice.doc/doc/images/040-ActorClassOperations.png b/plugins/org.eclipse.etrice.doc/doc/images/040-ActorClassOperations.png Binary files differindex 9bee28d1c..0dd88a04c 100644 --- a/plugins/org.eclipse.etrice.doc/doc/images/040-ActorClassOperations.png +++ b/plugins/org.eclipse.etrice.doc/doc/images/040-ActorClassOperations.png diff --git a/plugins/org.eclipse.etrice.doc/doc/images/040-ActorClassTextualNotation.png b/plugins/org.eclipse.etrice.doc/doc/images/040-ActorClassTextualNotation.png Binary files differindex e42c4666e..de047f109 100644 --- a/plugins/org.eclipse.etrice.doc/doc/images/040-ActorClassTextualNotation.png +++ b/plugins/org.eclipse.etrice.doc/doc/images/040-ActorClassTextualNotation.png diff --git a/plugins/org.eclipse.etrice.doc/doc/images/040-ActorReferenceTextualNotation.png b/plugins/org.eclipse.etrice.doc/doc/images/040-ActorReferenceTextualNotation.png Binary files differindex 350edaa9e..dd84691e4 100644 --- a/plugins/org.eclipse.etrice.doc/doc/images/040-ActorReferenceTextualNotation.png +++ b/plugins/org.eclipse.etrice.doc/doc/images/040-ActorReferenceTextualNotation.png diff --git a/plugins/org.eclipse.etrice.doc/doc/images/040-ClassEndPortInternalTextual.png b/plugins/org.eclipse.etrice.doc/doc/images/040-ClassEndPortInternalTextual.png Binary files differindex 3897974bd..a21e55483 100644 --- a/plugins/org.eclipse.etrice.doc/doc/images/040-ClassEndPortInternalTextual.png +++ b/plugins/org.eclipse.etrice.doc/doc/images/040-ClassEndPortInternalTextual.png diff --git a/plugins/org.eclipse.etrice.doc/doc/images/040-ClassEndPortTextual.png b/plugins/org.eclipse.etrice.doc/doc/images/040-ClassEndPortTextual.png Binary files differindex ce2eec8ba..d21f47d00 100644 --- a/plugins/org.eclipse.etrice.doc/doc/images/040-ClassEndPortTextual.png +++ b/plugins/org.eclipse.etrice.doc/doc/images/040-ClassEndPortTextual.png diff --git a/plugins/org.eclipse.etrice.doc/doc/images/040-ClassRelayPortTextual.png b/plugins/org.eclipse.etrice.doc/doc/images/040-ClassRelayPortTextual.png Binary files differindex c02a157f1..9452c0937 100644 --- a/plugins/org.eclipse.etrice.doc/doc/images/040-ClassRelayPortTextual.png +++ b/plugins/org.eclipse.etrice.doc/doc/images/040-ClassRelayPortTextual.png diff --git a/plugins/org.eclipse.etrice.doc/doc/images/040-ConjugatedClassEndPortInternalTextual.png b/plugins/org.eclipse.etrice.doc/doc/images/040-ConjugatedClassEndPortInternalTextual.png Binary files differindex febb20be4..6a423dac5 100644 --- a/plugins/org.eclipse.etrice.doc/doc/images/040-ConjugatedClassEndPortInternalTextual.png +++ b/plugins/org.eclipse.etrice.doc/doc/images/040-ConjugatedClassEndPortInternalTextual.png diff --git a/plugins/org.eclipse.etrice.doc/doc/images/040-ConjugatedClassEndPortTextual.png b/plugins/org.eclipse.etrice.doc/doc/images/040-ConjugatedClassEndPortTextual.png Binary files differindex f7373518d..da40a11e8 100644 --- a/plugins/org.eclipse.etrice.doc/doc/images/040-ConjugatedClassEndPortTextual.png +++ b/plugins/org.eclipse.etrice.doc/doc/images/040-ConjugatedClassEndPortTextual.png diff --git a/plugins/org.eclipse.etrice.doc/doc/images/040-ConjugatedClassRelayPortTextual.png b/plugins/org.eclipse.etrice.doc/doc/images/040-ConjugatedClassRelayPortTextual.png Binary files differindex f3ffb311d..79c5f5aee 100644 --- a/plugins/org.eclipse.etrice.doc/doc/images/040-ConjugatedClassRelayPortTextual.png +++ b/plugins/org.eclipse.etrice.doc/doc/images/040-ConjugatedClassRelayPortTextual.png diff --git a/plugins/org.eclipse.etrice.doc/doc/images/040-ConjugatedReplicatedClassEndPortInternalTextual.png b/plugins/org.eclipse.etrice.doc/doc/images/040-ConjugatedReplicatedClassEndPortInternalTextual.png Binary files differindex d7ffa9aa2..582bf70ea 100644 --- a/plugins/org.eclipse.etrice.doc/doc/images/040-ConjugatedReplicatedClassEndPortInternalTextual.png +++ b/plugins/org.eclipse.etrice.doc/doc/images/040-ConjugatedReplicatedClassEndPortInternalTextual.png diff --git a/plugins/org.eclipse.etrice.doc/doc/images/040-ConjugatedReplicatedClassEndPortTextual.png b/plugins/org.eclipse.etrice.doc/doc/images/040-ConjugatedReplicatedClassEndPortTextual.png Binary files differindex 23090e30d..650191dcc 100644 --- a/plugins/org.eclipse.etrice.doc/doc/images/040-ConjugatedReplicatedClassEndPortTextual.png +++ b/plugins/org.eclipse.etrice.doc/doc/images/040-ConjugatedReplicatedClassEndPortTextual.png diff --git a/plugins/org.eclipse.etrice.doc/doc/images/040-ConjugatedReplicatedClassRelayPortTextual.png b/plugins/org.eclipse.etrice.doc/doc/images/040-ConjugatedReplicatedClassRelayPortTextual.png Binary files differindex e1d396780..4f4482217 100644 --- a/plugins/org.eclipse.etrice.doc/doc/images/040-ConjugatedReplicatedClassRelayPortTextual.png +++ b/plugins/org.eclipse.etrice.doc/doc/images/040-ConjugatedReplicatedClassRelayPortTextual.png diff --git a/plugins/org.eclipse.etrice.doc/doc/images/040-DataClass1.png b/plugins/org.eclipse.etrice.doc/doc/images/040-DataClass1.png Binary files differindex f2ae2030c..7e743a833 100644 --- a/plugins/org.eclipse.etrice.doc/doc/images/040-DataClass1.png +++ b/plugins/org.eclipse.etrice.doc/doc/images/040-DataClass1.png diff --git a/plugins/org.eclipse.etrice.doc/doc/images/040-DataClass2.png b/plugins/org.eclipse.etrice.doc/doc/images/040-DataClass2.png Binary files differindex 4098abbcb..c9f8e2fca 100644 --- a/plugins/org.eclipse.etrice.doc/doc/images/040-DataClass2.png +++ b/plugins/org.eclipse.etrice.doc/doc/images/040-DataClass2.png diff --git a/plugins/org.eclipse.etrice.doc/doc/images/040-LayeringActorWithSAP.png b/plugins/org.eclipse.etrice.doc/doc/images/040-LayeringActorWithSAP.png Binary files differindex f6303b727..cd830dadf 100644 --- a/plugins/org.eclipse.etrice.doc/doc/images/040-LayeringActorWithSAP.png +++ b/plugins/org.eclipse.etrice.doc/doc/images/040-LayeringActorWithSAP.png diff --git a/plugins/org.eclipse.etrice.doc/doc/images/040-LayeringApplicationLayerTextual.png b/plugins/org.eclipse.etrice.doc/doc/images/040-LayeringApplicationLayerTextual.png Binary files differindex 2a46c5fc6..7dcda26e1 100644 --- a/plugins/org.eclipse.etrice.doc/doc/images/040-LayeringApplicationLayerTextual.png +++ b/plugins/org.eclipse.etrice.doc/doc/images/040-LayeringApplicationLayerTextual.png diff --git a/plugins/org.eclipse.etrice.doc/doc/images/040-LayeringModelTextual.png b/plugins/org.eclipse.etrice.doc/doc/images/040-LayeringModelTextual.png Binary files differindex 091689ac6..bea098ecd 100644 --- a/plugins/org.eclipse.etrice.doc/doc/images/040-LayeringModelTextual.png +++ b/plugins/org.eclipse.etrice.doc/doc/images/040-LayeringModelTextual.png diff --git a/plugins/org.eclipse.etrice.doc/doc/images/040-LayeringServiceLayerTextual.png b/plugins/org.eclipse.etrice.doc/doc/images/040-LayeringServiceLayerTextual.png Binary files differindex 1bdc72abb..a993740e2 100644 --- a/plugins/org.eclipse.etrice.doc/doc/images/040-LayeringServiceLayerTextual.png +++ b/plugins/org.eclipse.etrice.doc/doc/images/040-LayeringServiceLayerTextual.png diff --git a/plugins/org.eclipse.etrice.doc/doc/images/040-ProtocolClassTextualNotation.png b/plugins/org.eclipse.etrice.doc/doc/images/040-ProtocolClassTextualNotation.png Binary files differindex 098a726da..603e7c84c 100644 --- a/plugins/org.eclipse.etrice.doc/doc/images/040-ProtocolClassTextualNotation.png +++ b/plugins/org.eclipse.etrice.doc/doc/images/040-ProtocolClassTextualNotation.png diff --git a/plugins/org.eclipse.etrice.doc/doc/images/040-ReplicatedClassEndPortInternalTextual.png b/plugins/org.eclipse.etrice.doc/doc/images/040-ReplicatedClassEndPortInternalTextual.png Binary files differindex 873dfdf39..4d5a94f1f 100644 --- a/plugins/org.eclipse.etrice.doc/doc/images/040-ReplicatedClassEndPortInternalTextual.png +++ b/plugins/org.eclipse.etrice.doc/doc/images/040-ReplicatedClassEndPortInternalTextual.png diff --git a/plugins/org.eclipse.etrice.doc/doc/images/040-ReplicatedClassEndPortTextual.png b/plugins/org.eclipse.etrice.doc/doc/images/040-ReplicatedClassEndPortTextual.png Binary files differindex 3e1a96179..fad42abc4 100644 --- a/plugins/org.eclipse.etrice.doc/doc/images/040-ReplicatedClassEndPortTextual.png +++ b/plugins/org.eclipse.etrice.doc/doc/images/040-ReplicatedClassEndPortTextual.png diff --git a/plugins/org.eclipse.etrice.doc/doc/images/040-ReplicatedClassRelayPortTextual.png b/plugins/org.eclipse.etrice.doc/doc/images/040-ReplicatedClassRelayPortTextual.png Binary files differindex cafe61904..f6486cbcf 100644 --- a/plugins/org.eclipse.etrice.doc/doc/images/040-ReplicatedClassRelayPortTextual.png +++ b/plugins/org.eclipse.etrice.doc/doc/images/040-ReplicatedClassRelayPortTextual.png diff --git a/plugins/org.eclipse.etrice.doc/help/DataClass.html b/plugins/org.eclipse.etrice.doc/help/DataClass.html index 53e415183..07e19f60d 100644 --- a/plugins/org.eclipse.etrice.doc/help/DataClass.html +++ b/plugins/org.eclipse.etrice.doc/help/DataClass.html @@ -1,64 +1,64 @@ -<html> -<head> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<title>DataClass</title> -<link href="book.css" rel="stylesheet" type="text/css"> -<meta content="DocBook XSL Stylesheets V1.75.1" name="generator"> -<link rel="home" href="index.html" title="eTrice User Guide"> -<link rel="up" href="ROOMConcepts.html" title="ROOM Concepts"> -<link rel="prev" href="Ports.html" title="Ports"> -<link rel="next" href="Layering2.html" title="Layering"> -</head> -<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> -<h1 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">DataClass</h1> -<div class="section" title="DataClass"> -<div class="titlepage"> -<div> -<div> -<h2 class="title" style="clear: both"> -<a name="DataClass"></a>DataClass</h2> -</div> -</div> -</div> -<div class="section" title="Description"> -<div class="titlepage"> -<div> -<div> -<h3 class="title"> -<a name="Description4"></a>Description</h3> -</div> -</div> -</div> -<p>The DataClass enables the modeling of hierarchical complex datatypes and operations on them. The DataClass is the equivalent to a Class in languages like Java or C++, but has less features. The content of a DataClass can always be sent via message between actors (defined as message data in ProtocolClass).</p> -</div> -<div class="section" title="Notation"> -<div class="titlepage"> -<div> -<div> -<h3 class="title"> -<a name="Notation4"></a>Notation</h3> -</div> -</div> -</div> -<p>Example: DataClass using PrimitiveTypes</p> -<p> - -</p> -<div class="mediaobject"> -<img src="images\040-DataClass1.png"></div> -<p> - -</p> -<p>Example: DataClass using other DataClasses:</p> -<p> - -</p> -<div class="mediaobject"> -<img src="images\040-DataClass2.png"></div> -<p> - -</p> -</div> -</div> -</body> -</html> +<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>DataClass</title>
+<link href="book.css" rel="stylesheet" type="text/css">
+<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
+<link rel="home" href="index.html" title="eTrice User Guide">
+<link rel="up" href="ROOMConcepts.html" title="ROOM Concepts">
+<link rel="prev" href="Ports.html" title="Ports">
+<link rel="next" href="Layering2.html" title="Layering">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<h1 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">DataClass</h1>
+<div class="section" title="DataClass">
+<div class="titlepage">
+<div>
+<div>
+<h2 class="title" style="clear: both">
+<a name="DataClass"></a>DataClass</h2>
+</div>
+</div>
+</div>
+<div class="section" title="Description">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Description4"></a>Description</h3>
+</div>
+</div>
+</div>
+<p>The DataClass enables the modeling of hierarchical complex datatypes and operations on them. The DataClass is the equivalent to a Class in languages like Java or C++, but has less features. The content of a DataClass can always be sent via message between actors (defined as message data in ProtocolClass).</p>
+</div>
+<div class="section" title="Notation">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Notation4"></a>Notation</h3>
+</div>
+</div>
+</div>
+<p>Example: DataClass using PrimitiveTypes</p>
+<p>
+
+</p>
+<div class="mediaobject">
+<img src="images\040-DataClass1.png"></div>
+<p>
+
+</p>
+<p>Example: DataClass using other DataClasses:</p>
+<p>
+
+</p>
+<div class="mediaobject">
+<img src="images\040-DataClass2.png"></div>
+<p>
+
+</p>
+</div>
+</div>
+</body>
+</html>
diff --git a/plugins/org.eclipse.etrice.doc/help/FiniteStateMachine.html b/plugins/org.eclipse.etrice.doc/help/FiniteStateMachine.html index 89256a291..b074ffa86 100644 --- a/plugins/org.eclipse.etrice.doc/help/FiniteStateMachine.html +++ b/plugins/org.eclipse.etrice.doc/help/FiniteStateMachine.html @@ -1,74 +1,74 @@ -<html> -<head> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<title>Finite State Machine</title> -<link href="book.css" rel="stylesheet" type="text/css"> -<meta content="DocBook XSL Stylesheets V1.75.1" name="generator"> -<link rel="home" href="index.html" title="eTrice User Guide"> -<link rel="up" href="ROOMConcepts.html" title="ROOM Concepts"> -<link rel="prev" href="Layering2.html" title="Layering"> -</head> -<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> -<h1 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">Finite State Machine</h1> -<div class="section" title="Finite State Machine"> -<div class="titlepage"> -<div> -<div> -<h2 class="title" style="clear: both"> -<a name="FiniteStateMachine"></a>Finite State Machine</h2> -</div> -</div> -</div> -<div class="section" title="Description"> -<div class="titlepage"> -<div> -<div> -<h3 class="title"> -<a name="Description6"></a>Description</h3> -</div> -</div> -</div> -</div> -<div class="section" title="Motivation"> -<div class="titlepage"> -<div> -<div> -<h3 class="title"> -<a name="Motivation4"></a>Motivation</h3> -</div> -</div> -</div> -</div> -<div class="section" title="Notation"> -<div class="titlepage"> -<div> -<div> -<h3 class="title"> -<a name="Notation6"></a>Notation</h3> -</div> -</div> -</div> -</div> -<div class="section" title="Examples"> -<div class="titlepage"> -<div> -<div> -<h3 class="title"> -<a name="Examples"></a>Examples</h3> -</div> -</div> -</div> -</div> -<div class="section" title="Details"> -<div class="titlepage"> -<div> -<div> -<h3 class="title"> -<a name="Details2"></a>Details</h3> -</div> -</div> -</div> -</div> -</div> -</body> -</html> +<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Finite State Machine</title>
+<link href="book.css" rel="stylesheet" type="text/css">
+<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
+<link rel="home" href="index.html" title="eTrice User Guide">
+<link rel="up" href="ROOMConcepts.html" title="ROOM Concepts">
+<link rel="prev" href="Layering2.html" title="Layering">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<h1 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">Finite State Machine</h1>
+<div class="section" title="Finite State Machine">
+<div class="titlepage">
+<div>
+<div>
+<h2 class="title" style="clear: both">
+<a name="FiniteStateMachine"></a>Finite State Machine</h2>
+</div>
+</div>
+</div>
+<div class="section" title="Description">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Description6"></a>Description</h3>
+</div>
+</div>
+</div>
+</div>
+<div class="section" title="Motivation">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Motivation4"></a>Motivation</h3>
+</div>
+</div>
+</div>
+</div>
+<div class="section" title="Notation">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Notation6"></a>Notation</h3>
+</div>
+</div>
+</div>
+</div>
+<div class="section" title="Examples">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Examples"></a>Examples</h3>
+</div>
+</div>
+</div>
+</div>
+<div class="section" title="Details">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Details2"></a>Details</h3>
+</div>
+</div>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/plugins/org.eclipse.etrice.doc/help/Layering2.html b/plugins/org.eclipse.etrice.doc/help/Layering2.html index 4f73a8d56..dbf4d6fe9 100644 --- a/plugins/org.eclipse.etrice.doc/help/Layering2.html +++ b/plugins/org.eclipse.etrice.doc/help/Layering2.html @@ -1,128 +1,128 @@ -<html> -<head> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<title>Layering</title> -<link href="book.css" rel="stylesheet" type="text/css"> -<meta content="DocBook XSL Stylesheets V1.75.1" name="generator"> -<link rel="home" href="index.html" title="eTrice User Guide"> -<link rel="up" href="ROOMConcepts.html" title="ROOM Concepts"> -<link rel="prev" href="DataClass.html" title="DataClass"> -<link rel="next" href="FiniteStateMachine.html" title="Finite State Machine"> -</head> -<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> -<h1 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">Layering</h1> -<div class="section" title="Layering"> -<div class="titlepage"> -<div> -<div> -<h2 class="title" style="clear: both"> -<a name="Layering2"></a>Layering</h2> -</div> -</div> -</div> -<div class="section" title="Description"> -<div class="titlepage"> -<div> -<div> -<h3 class="title"> -<a name="Description5"></a>Description</h3> -</div> -</div> -</div> -<p>In addition to the Actor containment hierarchies, Layering provides another method to hierarchically structure a software system. Layering and actor hierarchies with port to port connections can be mixed on every level of granularity.</p> -<div class="orderedlist"> -<ol class="orderedlist" type="1"> -<li class="listitem"> -<p>an ActorClass can define a Service Provision Point (SPP) to publish a specific service, defined by a ProtocolClass</p> -</li> -<li class="listitem"> -<p>an ActorClass can define a Service Access Point (SAP) if it needs a service, defined by a ProtocolClass</p> -</li> -<li class="listitem"> -<p>for a given Actor hierarchy, a LayerConnection defines which SAP will be satisfied by (connected to) which SPP</p> -</li> -</ol> -</div> -</div> -<div class="section" title="Notation"> -<div class="titlepage"> -<div> -<div> -<h3 class="title"> -<a name="Notation5"></a>Notation</h3> -</div> -</div> -</div> -<table title="Title" frame="box" border="1" id="N10BFF"> -<tr> - -<td align="center"> - <span class="bold"><strong>Description</strong></span></td> - <td align="center"> - <span class="bold"><strong>Graphical Notation</strong></span></td> - <td align="center"> - <span class="bold"><strong>Textual Notation</strong></span></td> - -</tr> -<tr> - -<td>The Layer Connections in this model define which services are provided by the - <span class="emphasis"><em>ServiceLayer</em></span> ( - <span class="emphasis"><em>digitalIO</em></span> and - <span class="emphasis"><em>timer</em></span>)</td> - <td> - -<div class="mediaobject"> -<img src="images\040-LayeringModel.png"></div> -</td> - <td> - -<div class="mediaobject"> -<img src="images\040-LayeringModelTextual.png"></div> -</td> - -</tr> -<tr> - -<td>The implementation of the services (SPPs) can be delegated to sub actors. In this case the actor - <span class="emphasis"><em>ServiceLayer</em></span> relays (delegates) the implementation services - <span class="emphasis"><em>digitalIO</em></span> and - <span class="emphasis"><em>timer</em></span> to sub actors</td> - <td> - -<div class="mediaobject"> -<img src="images\040-LayeringServiceLayer.png"></div> -</td> - <td> - -<div class="mediaobject"> -<img src="images\040-LayeringServiceLayerTextual.png"></div> -</td> - -</tr> -<tr> - -<td>Every Actor inside the - <span class="emphasis"><em>ApplicationLayer</em></span> that contains an SAP with the same Protocol as - <span class="emphasis"><em>timer</em></span> or - <span class="emphasis"><em>digitalIO</em></span> will be connected to the specified SPP</td> - <td> - -<div class="mediaobject"> -<img src="images\040-LayeringApplicationLayer.png"></div> -</td> - <td> - -<div class="mediaobject"> -<img src="images\040-LayeringApplicationLayerTextual.png"></div> -</td> - -</tr> -</table> -<p> - -</p> -</div> -</div> -</body> -</html> +<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Layering</title>
+<link href="book.css" rel="stylesheet" type="text/css">
+<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
+<link rel="home" href="index.html" title="eTrice User Guide">
+<link rel="up" href="ROOMConcepts.html" title="ROOM Concepts">
+<link rel="prev" href="DataClass.html" title="DataClass">
+<link rel="next" href="FiniteStateMachine.html" title="Finite State Machine">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<h1 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">Layering</h1>
+<div class="section" title="Layering">
+<div class="titlepage">
+<div>
+<div>
+<h2 class="title" style="clear: both">
+<a name="Layering2"></a>Layering</h2>
+</div>
+</div>
+</div>
+<div class="section" title="Description">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Description5"></a>Description</h3>
+</div>
+</div>
+</div>
+<p>In addition to the Actor containment hierarchies, Layering provides another method to hierarchically structure a software system. Layering and actor hierarchies with port to port connections can be mixed on every level of granularity.</p>
+<div class="orderedlist">
+<ol class="orderedlist" type="1">
+<li class="listitem">
+<p>an ActorClass can define a Service Provision Point (SPP) to publish a specific service, defined by a ProtocolClass</p>
+</li>
+<li class="listitem">
+<p>an ActorClass can define a Service Access Point (SAP) if it needs a service, defined by a ProtocolClass</p>
+</li>
+<li class="listitem">
+<p>for a given Actor hierarchy, a LayerConnection defines which SAP will be satisfied by (connected to) which SPP</p>
+</li>
+</ol>
+</div>
+</div>
+<div class="section" title="Notation">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Notation5"></a>Notation</h3>
+</div>
+</div>
+</div>
+<table title="Title" frame="box" border="2" cellpadding="3" cellspacing="0" id="N10C0D">
+<tr>
+
+<td align="center">
+ <span class="bold"><strong>Description</strong></span></td>
+ <td align="center">
+ <span class="bold"><strong>Graphical Notation</strong></span></td>
+ <td align="center">
+ <span class="bold"><strong>Textual Notation</strong></span></td>
+
+</tr>
+<tr>
+
+<td>The Layer Connections in this model define which services are provided by the
+ <span class="emphasis"><em>ServiceLayer</em></span> (
+ <span class="emphasis"><em>digitalIO</em></span> and
+ <span class="emphasis"><em>timer</em></span>)</td>
+ <td>
+
+<div class="mediaobject">
+<img src="images\040-LayeringModel.png"></div>
+</td>
+ <td>
+
+<div class="mediaobject">
+<img src="images\040-LayeringModelTextual.png"></div>
+</td>
+
+</tr>
+<tr>
+
+<td>The implementation of the services (SPPs) can be delegated to sub actors. In this case the actor
+ <span class="emphasis"><em>ServiceLayer</em></span> relays (delegates) the implementation services
+ <span class="emphasis"><em>digitalIO</em></span> and
+ <span class="emphasis"><em>timer</em></span> to sub actors</td>
+ <td>
+
+<div class="mediaobject">
+<img src="images\040-LayeringServiceLayer.png"></div>
+</td>
+ <td>
+
+<div class="mediaobject">
+<img src="images\040-LayeringServiceLayerTextual.png"></div>
+</td>
+
+</tr>
+<tr>
+
+<td>Every Actor inside the
+ <span class="emphasis"><em>ApplicationLayer</em></span> that contains an SAP with the same Protocol as
+ <span class="emphasis"><em>timer</em></span> or
+ <span class="emphasis"><em>digitalIO</em></span> will be connected to the specified SPP</td>
+ <td>
+
+<div class="mediaobject">
+<img src="images\040-LayeringApplicationLayer.png"></div>
+</td>
+ <td>
+
+<div class="mediaobject">
+<img src="images\040-LayeringApplicationLayerTextual.png"></div>
+</td>
+
+</tr>
+</table>
+<p>
+
+</p>
+</div>
+</div>
+</body>
+</html>
diff --git a/plugins/org.eclipse.etrice.doc/help/Ports.html b/plugins/org.eclipse.etrice.doc/help/Ports.html index 9e713ae7a..9c7d22d3f 100644 --- a/plugins/org.eclipse.etrice.doc/help/Ports.html +++ b/plugins/org.eclipse.etrice.doc/help/Ports.html @@ -1,376 +1,379 @@ -<html> -<head> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<title>Ports</title> -<link href="book.css" rel="stylesheet" type="text/css"> -<meta content="DocBook XSL Stylesheets V1.75.1" name="generator"> -<link rel="home" href="index.html" title="eTrice User Guide"> -<link rel="up" href="ROOMConcepts.html" title="ROOM Concepts"> -<link rel="prev" href="Protocols.html" title="Protocols"> -<link rel="next" href="DataClass.html" title="DataClass"> -</head> -<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> -<h1 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">Ports</h1> -<div class="section" title="Ports"> -<div class="titlepage"> -<div> -<div> -<h2 class="title" style="clear: both"> -<a name="Ports"></a>Ports</h2> -</div> -</div> -</div> -<div class="section" title="Description"> -<div class="titlepage"> -<div> -<div> -<h3 class="title"> -<a name="Description3"></a>Description</h3> -</div> -</div> -</div> -<p>Ports are the only interfaces of actors. A port has always a protocol assigned. - Service Access Points (SAP) and Service Provision Points (SPP) are specialized ports that are used to define layering.</p> -</div> -<div class="section" title="Motivation"> -<div class="titlepage"> -<div> -<div> -<h3 class="title"> -<a name="Motivation3"></a>Motivation</h3> -</div> -</div> -</div> -<div class="itemizedlist"> -<ul class="itemizedlist" type="disc"> -<li class="listitem"> -<p>Ports decouple interface definition (Protocols) from interface usage</p> -</li> -<li class="listitem"> -<p>Ports decouple the logical interface from the transport </p> -</li> -</ul> -</div> -</div> -<div class="section" title="Notation"> -<div class="titlepage"> -<div> -<div> -<h3 class="title"> -<a name="Notation3"></a>Notation</h3> -</div> -</div> -</div> -<div class="section" title="Class Ports"> -<div class="titlepage"> -<div> -<div> -<h4 class="title"> -<a name="ClassPorts"></a>Class Ports</h4> -</div> -</div> -</div> -<p>These symbols can only appear on the border of an actor class symbol. </p> -<p>Ports that define an external interface of the ActorClass, are defined in the Interface. Ports that define an internal interface are defined in the Structure (e.g. internal ports).</p> -<div class="itemizedlist"> -<ul class="itemizedlist" type="disc"> -<li class="listitem"> -<p> - -<span class="bold"><strong>External End Ports</strong></span> are defined in the Interface and the Structure - </p> -</li> -<li class="listitem"> -<p> - -<span class="bold"><strong>Internal End Ports</strong></span> are only defined in the Structure - </p> -</li> -<li class="listitem"> -<p> - -<span class="bold"><strong>Relay Ports</strong></span> are only defined in the Interface - </p> -</li> -<li class="listitem"> -<p> - -<span class="bold"><strong>End Ports</strong></span> are always connected to the internal behavior of the ActorClass - </p> -</li> -<li class="listitem"> -<p> - -<span class="bold"><strong>Replicated Ports</strong></span> can be defined with a fixed replication factor ( e.g. - <span class="emphasis"><em>Port port18 [ 5 ]: ProtocolClass1</em></span> ) or a variable replication factor (e.g. - <span class="emphasis"><em>Port port18[ * ]: ProtocolClass1</em></span> ) - </p> -</li> -</ul> -</div> -<table title="Class Port Notation" frame="box" border="1" id="N10A09"> -<tr> - -<td align="center"> - <span class="bold"><strong>Element</strong></span></td> - <td align="center"> - <span class="bold"><strong>Graphical Notation</strong></span></td> - <td align="center"> - <span class="bold"><strong>Textual Notation</strong></span></td> - -</tr> -<tr> - -<td>Class End Port</td> - <td align="center"> - -<div class="mediaobject"> -<img src="images\040-ClassEndPort.png"></div> -</td> - <td> - - <span class="bold"><strong>External Class End Port:</strong></span> - - -<div class="mediaobject"> -<img src="images\040-ClassEndPortTextual.png"></div> - - -<span class="bold"><strong>Internal Class End Port:</strong></span> - - -<div class="mediaobject"> -<img src="images\040-ClassEndPortInternalTextual.png"></div> - -</td> - -</tr> -<tr> - -<td>Conjugated Class End Port</td> - <td align="center"> - -<div class="mediaobject"> -<img src="images\040-ConjugatedClassEndPort.png"></div> -</td> - <td> - - <span class="bold"><strong>External Conjugated Class End Port:</strong></span> - - -<div class="mediaobject"> -<img src="images\040-ConjugatedClassEndPortTextual.png"></div> - - -<span class="bold"><strong>Internal Conjugated Class End Port:</strong></span> - - -<div class="mediaobject"> -<img src="images\040-ConjugatedClassEndPortInternalTextual.png"></div> - -</td> - -</tr> -<tr> - -<td>Class Relay Port</td> - <td align="center"> - -<div class="mediaobject"> -<img src="images\040-ClassRelayPort.png"></div> -</td> - <td> - - -<div class="mediaobject"> -<img src="images\040-ClassRelayPortTextual.png"></div> - -</td> - -</tr> -<tr> - -<td>Conjugated Class Relay Port</td> - <td align="center"> - -<div class="mediaobject"> -<img src="images\040-ConjugatedClassRelayPort.png"></div> -</td> - <td> - - -<div class="mediaobject"> -<img src="images\040-ConjugatedClassRelayPortTextual.png"></div> - -</td> - -</tr> -<tr> - -<td>Replicated Class End Port</td> - <td align="center"> - -<div class="mediaobject"> -<img src="images\040-ReplicatedClassEndPort.png"></div> -</td> - <td> - - <span class="bold"><strong>External Replicated Class End Port:</strong></span> - - -<div class="mediaobject"> -<img src="images\040-ReplicatedClassEndPortTextual.png"></div> - - -<span class="bold"><strong>Internal Replicated Class End Port:</strong></span> - - -<div class="mediaobject"> -<img src="images\040-ReplicatedClassEndPortInternalTextual.png"></div> - -</td> - -</tr> -<tr> - -<td>Conjugated Replicated Class End Port</td> - <td align="center"> - -<div class="mediaobject"> -<img src="images\040-ConjugatedReplicatedClassEndPort.png"></div> -</td> - <td> - - <span class="bold"><strong>External Conjugated Replicated Class End Port:</strong></span> - - -<div class="mediaobject"> -<img src="images\040-ConjugatedReplicatedClassEndPortTextual.png"></div> - - -<span class="bold"><strong>Internal Conjugated Replicated Class End Port:</strong></span> - - -<div class="mediaobject"> -<img src="images\040-ConjugatedReplicatedClassEndPortInternalTextual.png"></div> - -</td> - -</tr> -<tr> - -<td>Replicated Class Relay Port</td> - <td align="center"> - -<div class="mediaobject"> -<img src="images\040-ReplicatedClassRelayPort.png"></div> -</td> - <td> - - -<div class="mediaobject"> -<img src="images\040-ReplicatedClassRelayPortTextual.png"></div> - -</td> - -</tr> -<tr> - -<td>Conjugated Replicated Class Relay Port</td> - <td align="center"> - -<div class="mediaobject"> -<img src="images\040-ConjugatedReplicatedClassRelayPort.png"></div> -</td> - <td> - - -<div class="mediaobject"> -<img src="images\040-ConjugatedReplicatedClassRelayPortTextual.png"></div> - -</td> - -</tr> -</table> -<p> - -</p> -</div> -<div class="section" title="Reference Ports"> -<div class="titlepage"> -<div> -<div> -<h4 class="title"> -<a name="ReferencePorts"></a>Reference Ports</h4> -</div> -</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="1" id="N10B3E"> -<tr> - -<td align="center"> - <span class="bold"><strong>Element</strong></span></td> - <td align="center"> - <span class="bold"><strong>Graphical Notation</strong></span></td> - <td align="center"> - <span class="bold"><strong>Textual Notation</strong></span></td> - -</tr> -<tr> - -<td>Reference Port</td> - <td align="center"> - -<div class="mediaobject"> -<img src="images\040-ReferencePort.png"></div> -</td> - <td align="center"> - <span class="emphasis"><em>implicit</em></span></td> - -</tr> -<tr> - -<td>Conjugated Reference Port</td> - <td align="center"> - -<div class="mediaobject"> -<img src="images\040-ConjugatedReferencePort.png"></div> -</td> - <td align="center"> - <span class="emphasis"><em>implicit</em></span></td> - -</tr> -<tr> - -<td>Replicated Reference Port</td> - <td align="center"> - -<div class="mediaobject"> -<img src="images\040-ReplicatedReferencePort.png"></div> -</td> - <td align="center"> - <span class="emphasis"><em>implicit</em></span></td> - -</tr> -<tr> - -<td>Conjugated Replicated Reference Port</td> - <td align="center"> - -<div class="mediaobject"> -<img src="images\040-ConjugatedReplicatedReferencePort.png"></div> -</td> - <td align="center"> - <span class="emphasis"><em>implicit</em></span></td> - -</tr> -</table> -<p> - -</p> -</div> -</div> -</div> -</body> -</html> +<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Ports</title>
+<link href="book.css" rel="stylesheet" type="text/css">
+<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
+<link rel="home" href="index.html" title="eTrice User Guide">
+<link rel="up" href="ROOMConcepts.html" title="ROOM Concepts">
+<link rel="prev" href="Protocols.html" title="Protocols">
+<link rel="next" href="DataClass.html" title="DataClass">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<h1 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">Ports</h1>
+<div class="section" title="Ports">
+<div class="titlepage">
+<div>
+<div>
+<h2 class="title" style="clear: both">
+<a name="Ports"></a>Ports</h2>
+</div>
+</div>
+</div>
+<div class="section" title="Description">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Description3"></a>Description</h3>
+</div>
+</div>
+</div>
+<p>Ports are the only interfaces of actors. A port has always a protocol assigned.
+ Service Access Points (SAP) and Service Provision Points (SPP) are specialized ports that are used to define layering.</p>
+</div>
+<div class="section" title="Motivation">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Motivation3"></a>Motivation</h3>
+</div>
+</div>
+</div>
+<div class="itemizedlist">
+<ul class="itemizedlist" type="disc">
+<li class="listitem">
+<p>Ports decouple interface definition (Protocols) from interface usage</p>
+</li>
+<li class="listitem">
+<p>Ports decouple the logical interface from the transport </p>
+</li>
+</ul>
+</div>
+</div>
+<div class="section" title="Notation">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Notation3"></a>Notation</h3>
+</div>
+</div>
+</div>
+<div class="section" title="Class Ports">
+<div class="titlepage">
+<div>
+<div>
+<h4 class="title">
+<a name="ClassPorts"></a>Class Ports</h4>
+</div>
+</div>
+</div>
+<p>These symbols can only appear on the border of an actor class symbol. </p>
+<p>Ports that define an external interface of the ActorClass, are defined in the
+ <span class="emphasis"><em>Interface</em></span>. Ports that define an internal interface are defined in the
+ <span class="emphasis"><em>Structure</em></span> (e.g. internal ports).
+ </p>
+<div class="itemizedlist">
+<ul class="itemizedlist" type="disc">
+<li class="listitem">
+<p>
+
+<span class="bold"><strong>External End Ports</strong></span> are defined in the Interface and the Structure
+ </p>
+</li>
+<li class="listitem">
+<p>
+
+<span class="bold"><strong>Internal End Ports</strong></span> are only defined in the Structure
+ </p>
+</li>
+<li class="listitem">
+<p>
+
+<span class="bold"><strong>Relay Ports</strong></span> are only defined in the Interface
+ </p>
+</li>
+<li class="listitem">
+<p>
+
+<span class="bold"><strong>End Ports</strong></span> are always connected to the internal behavior of the ActorClass
+ </p>
+</li>
+<li class="listitem">
+<p>
+
+<span class="bold"><strong>Replicated Ports</strong></span> can be defined with a fixed replication factor ( e.g.
+ <span class="emphasis"><em>Port port18 [ 5 ]: ProtocolClass1</em></span> ) or a variable replication factor (e.g.
+ <span class="emphasis"><em>Port port18[ * ]: ProtocolClass1</em></span> )
+ </p>
+</li>
+</ul>
+</div>
+<table title="Class Port Notation" frame="box" border="2" cellpadding="3" cellspacing="0" id="N10A13">
+<tr>
+
+<td align="center">
+ <span class="bold"><strong>Element</strong></span></td>
+ <td align="center">
+ <span class="bold"><strong>Graphical Notation</strong></span></td>
+ <td align="center">
+ <span class="bold"><strong>Textual Notation</strong></span></td>
+
+</tr>
+<tr>
+
+<td>Class End Port</td>
+ <td align="center">
+
+<div class="mediaobject">
+<img src="images\040-ClassEndPort.png"></div>
+</td>
+ <td>
+
+ <span class="bold"><strong>External Class End Port:</strong></span>
+
+
+<div class="mediaobject">
+<img src="images\040-ClassEndPortTextual.png"></div>
+
+
+<span class="bold"><strong>Internal Class End Port:</strong></span>
+
+
+<div class="mediaobject">
+<img src="images\040-ClassEndPortInternalTextual.png"></div>
+
+</td>
+
+</tr>
+<tr>
+
+<td>Conjugated Class End Port</td>
+ <td align="center">
+
+<div class="mediaobject">
+<img src="images\040-ConjugatedClassEndPort.png"></div>
+</td>
+ <td>
+
+ <span class="bold"><strong>External Conjugated Class End Port:</strong></span>
+
+
+<div class="mediaobject">
+<img src="images\040-ConjugatedClassEndPortTextual.png"></div>
+
+
+<span class="bold"><strong>Internal Conjugated Class End Port:</strong></span>
+
+
+<div class="mediaobject">
+<img src="images\040-ConjugatedClassEndPortInternalTextual.png"></div>
+
+</td>
+
+</tr>
+<tr>
+
+<td>Class Relay Port</td>
+ <td align="center">
+
+<div class="mediaobject">
+<img src="images\040-ClassRelayPort.png"></div>
+</td>
+ <td>
+
+
+<div class="mediaobject">
+<img src="images\040-ClassRelayPortTextual.png"></div>
+
+</td>
+
+</tr>
+<tr>
+
+<td>Conjugated Class Relay Port</td>
+ <td align="center">
+
+<div class="mediaobject">
+<img src="images\040-ConjugatedClassRelayPort.png"></div>
+</td>
+ <td>
+
+
+<div class="mediaobject">
+<img src="images\040-ConjugatedClassRelayPortTextual.png"></div>
+
+</td>
+
+</tr>
+<tr>
+
+<td>Replicated Class End Port</td>
+ <td align="center">
+
+<div class="mediaobject">
+<img src="images\040-ReplicatedClassEndPort.png"></div>
+</td>
+ <td>
+
+ <span class="bold"><strong>External Replicated Class End Port:</strong></span>
+
+
+<div class="mediaobject">
+<img src="images\040-ReplicatedClassEndPortTextual.png"></div>
+
+
+<span class="bold"><strong>Internal Replicated Class End Port:</strong></span>
+
+
+<div class="mediaobject">
+<img src="images\040-ReplicatedClassEndPortInternalTextual.png"></div>
+
+</td>
+
+</tr>
+<tr>
+
+<td>Conjugated Replicated Class End Port</td>
+ <td align="center">
+
+<div class="mediaobject">
+<img src="images\040-ConjugatedReplicatedClassEndPort.png"></div>
+</td>
+ <td>
+
+ <span class="bold"><strong>External Conjugated Replicated Class End Port:</strong></span>
+
+
+<div class="mediaobject">
+<img src="images\040-ConjugatedReplicatedClassEndPortTextual.png"></div>
+
+
+<span class="bold"><strong>Internal Conjugated Replicated Class End Port:</strong></span>
+
+
+<div class="mediaobject">
+<img src="images\040-ConjugatedReplicatedClassEndPortInternalTextual.png"></div>
+
+</td>
+
+</tr>
+<tr>
+
+<td>Replicated Class Relay Port</td>
+ <td align="center">
+
+<div class="mediaobject">
+<img src="images\040-ReplicatedClassRelayPort.png"></div>
+</td>
+ <td>
+
+
+<div class="mediaobject">
+<img src="images\040-ReplicatedClassRelayPortTextual.png"></div>
+
+</td>
+
+</tr>
+<tr>
+
+<td>Conjugated Replicated Class Relay Port</td>
+ <td align="center">
+
+<div class="mediaobject">
+<img src="images\040-ConjugatedReplicatedClassRelayPort.png"></div>
+</td>
+ <td>
+
+
+<div class="mediaobject">
+<img src="images\040-ConjugatedReplicatedClassRelayPortTextual.png"></div>
+
+</td>
+
+</tr>
+</table>
+<p>
+
+</p>
+</div>
+<div class="section" title="Reference Ports">
+<div class="titlepage">
+<div>
+<div>
+<h4 class="title">
+<a name="ReferencePorts"></a>Reference Ports</h4>
+</div>
+</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="N10B4A">
+<tr>
+
+<td align="center">
+ <span class="bold"><strong>Element</strong></span></td>
+ <td align="center">
+ <span class="bold"><strong>Graphical Notation</strong></span></td>
+ <td align="center">
+ <span class="bold"><strong>Textual Notation</strong></span></td>
+
+</tr>
+<tr>
+
+<td>Reference Port</td>
+ <td align="center">
+
+<div class="mediaobject">
+<img src="images\040-ReferencePort.png"></div>
+</td>
+ <td align="center">
+ <span class="emphasis"><em>implicit</em></span></td>
+
+</tr>
+<tr>
+
+<td>Conjugated Reference Port</td>
+ <td align="center">
+
+<div class="mediaobject">
+<img src="images\040-ConjugatedReferencePort.png"></div>
+</td>
+ <td align="center">
+ <span class="emphasis"><em>implicit</em></span></td>
+
+</tr>
+<tr>
+
+<td>Replicated Reference Port</td>
+ <td align="center">
+
+<div class="mediaobject">
+<img src="images\040-ReplicatedReferencePort.png"></div>
+</td>
+ <td align="center">
+ <span class="emphasis"><em>implicit</em></span></td>
+
+</tr>
+<tr>
+
+<td>Conjugated Replicated Reference Port</td>
+ <td align="center">
+
+<div class="mediaobject">
+<img src="images\040-ConjugatedReplicatedReferencePort.png"></div>
+</td>
+ <td align="center">
+ <span class="emphasis"><em>implicit</em></span></td>
+
+</tr>
+</table>
+<p>
+
+</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/plugins/org.eclipse.etrice.doc/help/Protocols.html b/plugins/org.eclipse.etrice.doc/help/Protocols.html index e7e92132f..6b18b2ae1 100644 --- a/plugins/org.eclipse.etrice.doc/help/Protocols.html +++ b/plugins/org.eclipse.etrice.doc/help/Protocols.html @@ -1,77 +1,77 @@ -<html> -<head> -<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<title>Protocols</title> -<link href="book.css" rel="stylesheet" type="text/css"> -<meta content="DocBook XSL Stylesheets V1.75.1" name="generator"> -<link rel="home" href="index.html" title="eTrice User Guide"> -<link rel="up" href="ROOMConcepts.html" title="ROOM Concepts"> -<link rel="prev" href="ROOMConcepts.html" title="ROOM Concepts"> -<link rel="next" href="Ports.html" title="Ports"> -</head> -<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> -<h1 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">Protocols</h1> -<div class="section" title="Protocols"> -<div class="titlepage"> -<div> -<div> -<h2 class="title" style="clear: both"> -<a name="Protocols"></a>Protocols</h2> -</div> -</div> -</div> -<div class="section" title="Description"> -<div class="titlepage"> -<div> -<div> -<h3 class="title"> -<a name="Description2"></a>Description</h3> -</div> -</div> -</div> -<p>A ProtocolClass defines a set of incoming and outgoing messages that can be exchanged between two ports. - The exact semantics of a message is defined by the execution model.</p> -</div> -<div class="section" title="Motivation"> -<div class="titlepage"> -<div> -<div> -<h3 class="title"> -<a name="Motivation2"></a>Motivation</h3> -</div> -</div> -</div> -<div class="itemizedlist"> -<ul class="itemizedlist" type="disc"> -<li class="listitem"> -<p>ProtocolClasses provide a reusable interface specification for ports</p> -</li> -<li class="listitem"> -<p>ProtocolClasses can optionally specify valid message exchange sequences</p> -</li> -</ul> -</div> -</div> -<div class="section" title="Notation"> -<div class="titlepage"> -<div> -<div> -<h3 class="title"> -<a name="Notation2"></a>Notation</h3> -</div> -</div> -</div> -<p>ProtocolClasses have only textual notation. - The example defines a ProtocolClass with 2 incoming and two outgoing messages. Messages can have data attached. The data can be of a primitive type (e.g. int32, float64, ...) or a DataClass.</p> -<p> - -</p> -<div class="mediaobject"> -<img src="images\040-ProtocolClassTextualNotation.png"></div> -<p> - -</p> -</div> -</div> -</body> -</html> +<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Protocols</title>
+<link href="book.css" rel="stylesheet" type="text/css">
+<meta content="DocBook XSL Stylesheets V1.75.1" name="generator">
+<link rel="home" href="index.html" title="eTrice User Guide">
+<link rel="up" href="ROOMConcepts.html" title="ROOM Concepts">
+<link rel="prev" href="ROOMConcepts.html" title="ROOM Concepts">
+<link rel="next" href="Ports.html" title="Ports">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<h1 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">Protocols</h1>
+<div class="section" title="Protocols">
+<div class="titlepage">
+<div>
+<div>
+<h2 class="title" style="clear: both">
+<a name="Protocols"></a>Protocols</h2>
+</div>
+</div>
+</div>
+<div class="section" title="Description">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Description2"></a>Description</h3>
+</div>
+</div>
+</div>
+<p>A ProtocolClass defines a set of incoming and outgoing messages that can be exchanged between two ports.
+ The exact semantics of a message is defined by the execution model.</p>
+</div>
+<div class="section" title="Motivation">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Motivation2"></a>Motivation</h3>
+</div>
+</div>
+</div>
+<div class="itemizedlist">
+<ul class="itemizedlist" type="disc">
+<li class="listitem">
+<p>ProtocolClasses provide a reusable interface specification for ports</p>
+</li>
+<li class="listitem">
+<p>ProtocolClasses can optionally specify valid message exchange sequences</p>
+</li>
+</ul>
+</div>
+</div>
+<div class="section" title="Notation">
+<div class="titlepage">
+<div>
+<div>
+<h3 class="title">
+<a name="Notation2"></a>Notation</h3>
+</div>
+</div>
+</div>
+<p>ProtocolClasses have only textual notation.
+ The example defines a ProtocolClass with 2 incoming and two outgoing messages. Messages can have data attached. The data can be of a primitive type (e.g. int32, float64, ...) or a DataClass.</p>
+<p>
+
+</p>
+<div class="mediaobject">
+<img src="images\040-ProtocolClassTextualNotation.png"></div>
+<p>
+
+</p>
+</div>
+</div>
+</body>
+</html>
diff --git a/plugins/org.eclipse.etrice.doc/help/ROOMConcepts.html b/plugins/org.eclipse.etrice.doc/help/ROOMConcepts.html index ce0ea780b..aa838517c 100644 --- a/plugins/org.eclipse.etrice.doc/help/ROOMConcepts.html +++ b/plugins/org.eclipse.etrice.doc/help/ROOMConcepts.html @@ -43,7 +43,7 @@ </dl>
</div>
<p>This chapter gives an overview over the ROOM language elements and their textual and graphical notation.
- The formal ROOM grammar based on XText (EBNF) you can find here:
+ The formal ROOM grammar based on Xtext (EBNF) you can find here:
<a class="ulink" href="http://git.eclipse.org/c/etrice/org.eclipse.etrice.git/tree/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/Room.xtext" target="_new">ROOM Grammar</a>
</p>
@@ -79,7 +79,7 @@ <div class="itemizedlist">
<ul class="itemizedlist" type="disc">
<li class="listitem">
-<p>Actors enable the construction of hierarchical structures with composition and layering</p>
+<p>Actors enable the construction of hierarchical structures by composition and layering</p>
</li>
<li class="listitem">
<p>Actors have their own logical thread of execution</p>
@@ -102,7 +102,7 @@ </div>
</div>
</div>
-<table title="Actor Class Notation" frame="box" border="1" id="N10887">
+<table title="Actor Class Notation" frame="box" border="2" cellpadding="3" cellspacing="0" id="N10887">
<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="1" id="N1090A">
+<table title="Actor Class Example" frame="box" border="2" cellpadding="3" cellspacing="0" id="N1090C">
<tr>
<td align="center">
diff --git a/plugins/org.eclipse.etrice.doc/help/images/040-ActorClass.png b/plugins/org.eclipse.etrice.doc/help/images/040-ActorClass.png Binary files differindex 8f8acc10d..a082127df 100644 --- a/plugins/org.eclipse.etrice.doc/help/images/040-ActorClass.png +++ b/plugins/org.eclipse.etrice.doc/help/images/040-ActorClass.png diff --git a/plugins/org.eclipse.etrice.doc/help/images/040-ActorClassAttributes.png b/plugins/org.eclipse.etrice.doc/help/images/040-ActorClassAttributes.png Binary files differindex b572a6aa6..8345f3402 100644 --- a/plugins/org.eclipse.etrice.doc/help/images/040-ActorClassAttributes.png +++ b/plugins/org.eclipse.etrice.doc/help/images/040-ActorClassAttributes.png diff --git a/plugins/org.eclipse.etrice.doc/help/images/040-ActorClassExampleTextualNotation.png b/plugins/org.eclipse.etrice.doc/help/images/040-ActorClassExampleTextualNotation.png Binary files differindex a99cb9cc1..7f5bbd01a 100644 --- a/plugins/org.eclipse.etrice.doc/help/images/040-ActorClassExampleTextualNotation.png +++ b/plugins/org.eclipse.etrice.doc/help/images/040-ActorClassExampleTextualNotation.png diff --git a/plugins/org.eclipse.etrice.doc/help/images/040-ActorClassOperations.png b/plugins/org.eclipse.etrice.doc/help/images/040-ActorClassOperations.png Binary files differindex 9bee28d1c..0dd88a04c 100644 --- a/plugins/org.eclipse.etrice.doc/help/images/040-ActorClassOperations.png +++ b/plugins/org.eclipse.etrice.doc/help/images/040-ActorClassOperations.png diff --git a/plugins/org.eclipse.etrice.doc/help/images/040-ActorClassTextualNotation.png b/plugins/org.eclipse.etrice.doc/help/images/040-ActorClassTextualNotation.png Binary files differindex e42c4666e..de047f109 100644 --- a/plugins/org.eclipse.etrice.doc/help/images/040-ActorClassTextualNotation.png +++ b/plugins/org.eclipse.etrice.doc/help/images/040-ActorClassTextualNotation.png diff --git a/plugins/org.eclipse.etrice.doc/help/images/040-ActorReferenceTextualNotation.png b/plugins/org.eclipse.etrice.doc/help/images/040-ActorReferenceTextualNotation.png Binary files differindex 350edaa9e..dd84691e4 100644 --- a/plugins/org.eclipse.etrice.doc/help/images/040-ActorReferenceTextualNotation.png +++ b/plugins/org.eclipse.etrice.doc/help/images/040-ActorReferenceTextualNotation.png diff --git a/plugins/org.eclipse.etrice.doc/help/images/040-ClassEndPortInternalTextual.png b/plugins/org.eclipse.etrice.doc/help/images/040-ClassEndPortInternalTextual.png Binary files differindex 3897974bd..a21e55483 100644 --- a/plugins/org.eclipse.etrice.doc/help/images/040-ClassEndPortInternalTextual.png +++ b/plugins/org.eclipse.etrice.doc/help/images/040-ClassEndPortInternalTextual.png diff --git a/plugins/org.eclipse.etrice.doc/help/images/040-ClassEndPortTextual.png b/plugins/org.eclipse.etrice.doc/help/images/040-ClassEndPortTextual.png Binary files differindex ce2eec8ba..d21f47d00 100644 --- a/plugins/org.eclipse.etrice.doc/help/images/040-ClassEndPortTextual.png +++ b/plugins/org.eclipse.etrice.doc/help/images/040-ClassEndPortTextual.png diff --git a/plugins/org.eclipse.etrice.doc/help/images/040-ClassRelayPortTextual.png b/plugins/org.eclipse.etrice.doc/help/images/040-ClassRelayPortTextual.png Binary files differindex c02a157f1..9452c0937 100644 --- a/plugins/org.eclipse.etrice.doc/help/images/040-ClassRelayPortTextual.png +++ b/plugins/org.eclipse.etrice.doc/help/images/040-ClassRelayPortTextual.png diff --git a/plugins/org.eclipse.etrice.doc/help/images/040-ConjugatedClassEndPortInternalTextual.png b/plugins/org.eclipse.etrice.doc/help/images/040-ConjugatedClassEndPortInternalTextual.png Binary files differindex febb20be4..6a423dac5 100644 --- a/plugins/org.eclipse.etrice.doc/help/images/040-ConjugatedClassEndPortInternalTextual.png +++ b/plugins/org.eclipse.etrice.doc/help/images/040-ConjugatedClassEndPortInternalTextual.png diff --git a/plugins/org.eclipse.etrice.doc/help/images/040-ConjugatedClassEndPortTextual.png b/plugins/org.eclipse.etrice.doc/help/images/040-ConjugatedClassEndPortTextual.png Binary files differindex f7373518d..da40a11e8 100644 --- a/plugins/org.eclipse.etrice.doc/help/images/040-ConjugatedClassEndPortTextual.png +++ b/plugins/org.eclipse.etrice.doc/help/images/040-ConjugatedClassEndPortTextual.png diff --git a/plugins/org.eclipse.etrice.doc/help/images/040-ConjugatedClassRelayPortTextual.png b/plugins/org.eclipse.etrice.doc/help/images/040-ConjugatedClassRelayPortTextual.png Binary files differindex f3ffb311d..79c5f5aee 100644 --- a/plugins/org.eclipse.etrice.doc/help/images/040-ConjugatedClassRelayPortTextual.png +++ b/plugins/org.eclipse.etrice.doc/help/images/040-ConjugatedClassRelayPortTextual.png diff --git a/plugins/org.eclipse.etrice.doc/help/images/040-ConjugatedReplicatedClassEndPortInternalTextual.png b/plugins/org.eclipse.etrice.doc/help/images/040-ConjugatedReplicatedClassEndPortInternalTextual.png Binary files differindex d7ffa9aa2..582bf70ea 100644 --- a/plugins/org.eclipse.etrice.doc/help/images/040-ConjugatedReplicatedClassEndPortInternalTextual.png +++ b/plugins/org.eclipse.etrice.doc/help/images/040-ConjugatedReplicatedClassEndPortInternalTextual.png diff --git a/plugins/org.eclipse.etrice.doc/help/images/040-ConjugatedReplicatedClassEndPortTextual.png b/plugins/org.eclipse.etrice.doc/help/images/040-ConjugatedReplicatedClassEndPortTextual.png Binary files differindex 23090e30d..650191dcc 100644 --- a/plugins/org.eclipse.etrice.doc/help/images/040-ConjugatedReplicatedClassEndPortTextual.png +++ b/plugins/org.eclipse.etrice.doc/help/images/040-ConjugatedReplicatedClassEndPortTextual.png diff --git a/plugins/org.eclipse.etrice.doc/help/images/040-ConjugatedReplicatedClassRelayPortTextual.png b/plugins/org.eclipse.etrice.doc/help/images/040-ConjugatedReplicatedClassRelayPortTextual.png Binary files differindex e1d396780..4f4482217 100644 --- a/plugins/org.eclipse.etrice.doc/help/images/040-ConjugatedReplicatedClassRelayPortTextual.png +++ b/plugins/org.eclipse.etrice.doc/help/images/040-ConjugatedReplicatedClassRelayPortTextual.png diff --git a/plugins/org.eclipse.etrice.doc/help/images/040-DataClass1.png b/plugins/org.eclipse.etrice.doc/help/images/040-DataClass1.png Binary files differindex f2ae2030c..7e743a833 100644 --- a/plugins/org.eclipse.etrice.doc/help/images/040-DataClass1.png +++ b/plugins/org.eclipse.etrice.doc/help/images/040-DataClass1.png diff --git a/plugins/org.eclipse.etrice.doc/help/images/040-DataClass2.png b/plugins/org.eclipse.etrice.doc/help/images/040-DataClass2.png Binary files differindex 4098abbcb..c9f8e2fca 100644 --- a/plugins/org.eclipse.etrice.doc/help/images/040-DataClass2.png +++ b/plugins/org.eclipse.etrice.doc/help/images/040-DataClass2.png diff --git a/plugins/org.eclipse.etrice.doc/help/images/040-LayeringActorWithSAP.png b/plugins/org.eclipse.etrice.doc/help/images/040-LayeringActorWithSAP.png Binary files differindex f6303b727..cd830dadf 100644 --- a/plugins/org.eclipse.etrice.doc/help/images/040-LayeringActorWithSAP.png +++ b/plugins/org.eclipse.etrice.doc/help/images/040-LayeringActorWithSAP.png diff --git a/plugins/org.eclipse.etrice.doc/help/images/040-LayeringApplicationLayerTextual.png b/plugins/org.eclipse.etrice.doc/help/images/040-LayeringApplicationLayerTextual.png Binary files differindex 2a46c5fc6..7dcda26e1 100644 --- a/plugins/org.eclipse.etrice.doc/help/images/040-LayeringApplicationLayerTextual.png +++ b/plugins/org.eclipse.etrice.doc/help/images/040-LayeringApplicationLayerTextual.png diff --git a/plugins/org.eclipse.etrice.doc/help/images/040-LayeringModelTextual.png b/plugins/org.eclipse.etrice.doc/help/images/040-LayeringModelTextual.png Binary files differindex 091689ac6..bea098ecd 100644 --- a/plugins/org.eclipse.etrice.doc/help/images/040-LayeringModelTextual.png +++ b/plugins/org.eclipse.etrice.doc/help/images/040-LayeringModelTextual.png diff --git a/plugins/org.eclipse.etrice.doc/help/images/040-LayeringServiceLayerTextual.png b/plugins/org.eclipse.etrice.doc/help/images/040-LayeringServiceLayerTextual.png Binary files differindex 1bdc72abb..a993740e2 100644 --- a/plugins/org.eclipse.etrice.doc/help/images/040-LayeringServiceLayerTextual.png +++ b/plugins/org.eclipse.etrice.doc/help/images/040-LayeringServiceLayerTextual.png diff --git a/plugins/org.eclipse.etrice.doc/help/images/040-ProtocolClassTextualNotation.png b/plugins/org.eclipse.etrice.doc/help/images/040-ProtocolClassTextualNotation.png Binary files differindex 098a726da..603e7c84c 100644 --- a/plugins/org.eclipse.etrice.doc/help/images/040-ProtocolClassTextualNotation.png +++ b/plugins/org.eclipse.etrice.doc/help/images/040-ProtocolClassTextualNotation.png diff --git a/plugins/org.eclipse.etrice.doc/help/images/040-ReplicatedClassEndPortInternalTextual.png b/plugins/org.eclipse.etrice.doc/help/images/040-ReplicatedClassEndPortInternalTextual.png Binary files differindex 873dfdf39..4d5a94f1f 100644 --- a/plugins/org.eclipse.etrice.doc/help/images/040-ReplicatedClassEndPortInternalTextual.png +++ b/plugins/org.eclipse.etrice.doc/help/images/040-ReplicatedClassEndPortInternalTextual.png diff --git a/plugins/org.eclipse.etrice.doc/help/images/040-ReplicatedClassEndPortTextual.png b/plugins/org.eclipse.etrice.doc/help/images/040-ReplicatedClassEndPortTextual.png Binary files differindex 3e1a96179..fad42abc4 100644 --- a/plugins/org.eclipse.etrice.doc/help/images/040-ReplicatedClassEndPortTextual.png +++ b/plugins/org.eclipse.etrice.doc/help/images/040-ReplicatedClassEndPortTextual.png diff --git a/plugins/org.eclipse.etrice.doc/help/images/040-ReplicatedClassRelayPortTextual.png b/plugins/org.eclipse.etrice.doc/help/images/040-ReplicatedClassRelayPortTextual.png Binary files differindex cafe61904..f6486cbcf 100644 --- a/plugins/org.eclipse.etrice.doc/help/images/040-ReplicatedClassRelayPortTextual.png +++ b/plugins/org.eclipse.etrice.doc/help/images/040-ReplicatedClassRelayPortTextual.png diff --git a/plugins/org.eclipse.etrice.doc/html/etrice.html b/plugins/org.eclipse.etrice.doc/html/etrice.html index 217b91683..b680b3b71 100644 --- a/plugins/org.eclipse.etrice.doc/html/etrice.html +++ b/plugins/org.eclipse.etrice.doc/html/etrice.html @@ -201,13 +201,13 @@ </dt>
<dt>8.1. <a href="#N10887"></a>
</dt>
-<dt>8.2. <a href="#N1090A"></a>
+<dt>8.2. <a href="#N1090C"></a>
</dt>
-<dt>8.3. <a href="#N10A09"></a>
+<dt>8.3. <a href="#N10A13"></a>
</dt>
-<dt>8.4. <a href="#N10B3E"></a>
+<dt>8.4. <a href="#N10B4A"></a>
</dt>
-<dt>8.5. <a href="#N10BFF"></a>
+<dt>8.5. <a href="#N10C0D"></a>
</dt>
</dl>
</div>
@@ -2505,7 +2505,7 @@ carLights.setState(TrafficLight3.OFF); <br> </div>
</div>
<p>This chapter gives an overview over the ROOM language elements and their textual and graphical notation.
- The formal ROOM grammar based on XText (EBNF) you can find here:
+ The formal ROOM grammar based on Xtext (EBNF) you can find here:
<a class="ulink" href="http://git.eclipse.org/c/etrice/org.eclipse.etrice.git/tree/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/Room.xtext" target="_new">ROOM Grammar</a>
</p>
@@ -2541,7 +2541,7 @@ carLights.setState(TrafficLight3.OFF); <br> <div class="itemizedlist">
<ul class="itemizedlist" type="disc">
<li class="listitem">
-<p>Actors enable the construction of hierarchical structures with composition and layering</p>
+<p>Actors enable the construction of hierarchical structures by composition and layering</p>
</li>
<li class="listitem">
<p>Actors have their own logical thread of execution</p>
@@ -2564,7 +2564,7 @@ carLights.setState(TrafficLight3.OFF); <br> </div>
</div>
</div>
-<table title="Actor Class Notation" frame="box" border="1" id="N10887">
+<table title="Actor Class Notation" frame="box" border="2" cellpadding="3" cellspacing="0" id="N10887">
<tr>
<td align="center">
@@ -2647,7 +2647,7 @@ carLights.setState(TrafficLight3.OFF); <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="1" id="N1090A">
+<table title="Actor Class Example" frame="box" border="2" cellpadding="3" cellspacing="0" id="N1090C">
<tr>
<td align="center">
@@ -2889,7 +2889,10 @@ carLights.setState(TrafficLight3.OFF); <br> </div>
</div>
<p>These symbols can only appear on the border of an actor class symbol. </p>
-<p>Ports that define an external interface of the ActorClass, are defined in the Interface. Ports that define an internal interface are defined in the Structure (e.g. internal ports).</p>
+<p>Ports that define an external interface of the ActorClass, are defined in the
+ <span class="emphasis"><em>Interface</em></span>. Ports that define an internal interface are defined in the
+ <span class="emphasis"><em>Structure</em></span> (e.g. internal ports).
+ </p>
<div class="itemizedlist">
<ul class="itemizedlist" type="disc">
<li class="listitem">
@@ -2926,7 +2929,7 @@ carLights.setState(TrafficLight3.OFF); <br> </li>
</ul>
</div>
-<table title="Class Port Notation" frame="box" border="1" id="N10A09">
+<table title="Class Port Notation" frame="box" border="2" cellpadding="3" cellspacing="0" id="N10A13">
<tr>
<td align="center">
@@ -3124,7 +3127,7 @@ carLights.setState(TrafficLight3.OFF); <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="1" id="N10B3E">
+<table title="Title" frame="box" border="2" cellpadding="3" cellspacing="0" id="N10B4A">
<tr>
<td align="center">
@@ -3281,7 +3284,7 @@ carLights.setState(TrafficLight3.OFF); <br> </div>
</div>
</div>
-<table title="Title" frame="box" border="1" id="N10BFF">
+<table title="Title" frame="box" border="2" cellpadding="3" cellspacing="0" id="N10C0D">
<tr>
<td align="center">
diff --git a/plugins/org.eclipse.etrice.doc/html/images/040-ActorClass.png b/plugins/org.eclipse.etrice.doc/html/images/040-ActorClass.png Binary files differindex 8f8acc10d..a082127df 100644 --- a/plugins/org.eclipse.etrice.doc/html/images/040-ActorClass.png +++ b/plugins/org.eclipse.etrice.doc/html/images/040-ActorClass.png diff --git a/plugins/org.eclipse.etrice.doc/html/images/040-ActorClassAttributes.png b/plugins/org.eclipse.etrice.doc/html/images/040-ActorClassAttributes.png Binary files differindex b572a6aa6..8345f3402 100644 --- a/plugins/org.eclipse.etrice.doc/html/images/040-ActorClassAttributes.png +++ b/plugins/org.eclipse.etrice.doc/html/images/040-ActorClassAttributes.png diff --git a/plugins/org.eclipse.etrice.doc/html/images/040-ActorClassExampleTextualNotation.png b/plugins/org.eclipse.etrice.doc/html/images/040-ActorClassExampleTextualNotation.png Binary files differindex a99cb9cc1..7f5bbd01a 100644 --- a/plugins/org.eclipse.etrice.doc/html/images/040-ActorClassExampleTextualNotation.png +++ b/plugins/org.eclipse.etrice.doc/html/images/040-ActorClassExampleTextualNotation.png diff --git a/plugins/org.eclipse.etrice.doc/html/images/040-ActorClassOperations.png b/plugins/org.eclipse.etrice.doc/html/images/040-ActorClassOperations.png Binary files differindex 9bee28d1c..0dd88a04c 100644 --- a/plugins/org.eclipse.etrice.doc/html/images/040-ActorClassOperations.png +++ b/plugins/org.eclipse.etrice.doc/html/images/040-ActorClassOperations.png diff --git a/plugins/org.eclipse.etrice.doc/html/images/040-ActorClassTextualNotation.png b/plugins/org.eclipse.etrice.doc/html/images/040-ActorClassTextualNotation.png Binary files differindex e42c4666e..de047f109 100644 --- a/plugins/org.eclipse.etrice.doc/html/images/040-ActorClassTextualNotation.png +++ b/plugins/org.eclipse.etrice.doc/html/images/040-ActorClassTextualNotation.png diff --git a/plugins/org.eclipse.etrice.doc/html/images/040-ActorReferenceTextualNotation.png b/plugins/org.eclipse.etrice.doc/html/images/040-ActorReferenceTextualNotation.png Binary files differindex 350edaa9e..dd84691e4 100644 --- a/plugins/org.eclipse.etrice.doc/html/images/040-ActorReferenceTextualNotation.png +++ b/plugins/org.eclipse.etrice.doc/html/images/040-ActorReferenceTextualNotation.png diff --git a/plugins/org.eclipse.etrice.doc/html/images/040-ClassEndPortInternalTextual.png b/plugins/org.eclipse.etrice.doc/html/images/040-ClassEndPortInternalTextual.png Binary files differindex 3897974bd..a21e55483 100644 --- a/plugins/org.eclipse.etrice.doc/html/images/040-ClassEndPortInternalTextual.png +++ b/plugins/org.eclipse.etrice.doc/html/images/040-ClassEndPortInternalTextual.png diff --git a/plugins/org.eclipse.etrice.doc/html/images/040-ClassEndPortTextual.png b/plugins/org.eclipse.etrice.doc/html/images/040-ClassEndPortTextual.png Binary files differindex ce2eec8ba..d21f47d00 100644 --- a/plugins/org.eclipse.etrice.doc/html/images/040-ClassEndPortTextual.png +++ b/plugins/org.eclipse.etrice.doc/html/images/040-ClassEndPortTextual.png diff --git a/plugins/org.eclipse.etrice.doc/html/images/040-ClassRelayPortTextual.png b/plugins/org.eclipse.etrice.doc/html/images/040-ClassRelayPortTextual.png Binary files differindex c02a157f1..9452c0937 100644 --- a/plugins/org.eclipse.etrice.doc/html/images/040-ClassRelayPortTextual.png +++ b/plugins/org.eclipse.etrice.doc/html/images/040-ClassRelayPortTextual.png diff --git a/plugins/org.eclipse.etrice.doc/html/images/040-ConjugatedClassEndPortInternalTextual.png b/plugins/org.eclipse.etrice.doc/html/images/040-ConjugatedClassEndPortInternalTextual.png Binary files differindex febb20be4..6a423dac5 100644 --- a/plugins/org.eclipse.etrice.doc/html/images/040-ConjugatedClassEndPortInternalTextual.png +++ b/plugins/org.eclipse.etrice.doc/html/images/040-ConjugatedClassEndPortInternalTextual.png diff --git a/plugins/org.eclipse.etrice.doc/html/images/040-ConjugatedClassEndPortTextual.png b/plugins/org.eclipse.etrice.doc/html/images/040-ConjugatedClassEndPortTextual.png Binary files differindex f7373518d..da40a11e8 100644 --- a/plugins/org.eclipse.etrice.doc/html/images/040-ConjugatedClassEndPortTextual.png +++ b/plugins/org.eclipse.etrice.doc/html/images/040-ConjugatedClassEndPortTextual.png diff --git a/plugins/org.eclipse.etrice.doc/html/images/040-ConjugatedClassRelayPortTextual.png b/plugins/org.eclipse.etrice.doc/html/images/040-ConjugatedClassRelayPortTextual.png Binary files differindex f3ffb311d..79c5f5aee 100644 --- a/plugins/org.eclipse.etrice.doc/html/images/040-ConjugatedClassRelayPortTextual.png +++ b/plugins/org.eclipse.etrice.doc/html/images/040-ConjugatedClassRelayPortTextual.png diff --git a/plugins/org.eclipse.etrice.doc/html/images/040-ConjugatedReplicatedClassEndPortInternalTextual.png b/plugins/org.eclipse.etrice.doc/html/images/040-ConjugatedReplicatedClassEndPortInternalTextual.png Binary files differindex d7ffa9aa2..582bf70ea 100644 --- a/plugins/org.eclipse.etrice.doc/html/images/040-ConjugatedReplicatedClassEndPortInternalTextual.png +++ b/plugins/org.eclipse.etrice.doc/html/images/040-ConjugatedReplicatedClassEndPortInternalTextual.png diff --git a/plugins/org.eclipse.etrice.doc/html/images/040-ConjugatedReplicatedClassEndPortTextual.png b/plugins/org.eclipse.etrice.doc/html/images/040-ConjugatedReplicatedClassEndPortTextual.png Binary files differindex 23090e30d..650191dcc 100644 --- a/plugins/org.eclipse.etrice.doc/html/images/040-ConjugatedReplicatedClassEndPortTextual.png +++ b/plugins/org.eclipse.etrice.doc/html/images/040-ConjugatedReplicatedClassEndPortTextual.png diff --git a/plugins/org.eclipse.etrice.doc/html/images/040-ConjugatedReplicatedClassRelayPortTextual.png b/plugins/org.eclipse.etrice.doc/html/images/040-ConjugatedReplicatedClassRelayPortTextual.png Binary files differindex e1d396780..4f4482217 100644 --- a/plugins/org.eclipse.etrice.doc/html/images/040-ConjugatedReplicatedClassRelayPortTextual.png +++ b/plugins/org.eclipse.etrice.doc/html/images/040-ConjugatedReplicatedClassRelayPortTextual.png diff --git a/plugins/org.eclipse.etrice.doc/html/images/040-DataClass1.png b/plugins/org.eclipse.etrice.doc/html/images/040-DataClass1.png Binary files differindex f2ae2030c..7e743a833 100644 --- a/plugins/org.eclipse.etrice.doc/html/images/040-DataClass1.png +++ b/plugins/org.eclipse.etrice.doc/html/images/040-DataClass1.png diff --git a/plugins/org.eclipse.etrice.doc/html/images/040-DataClass2.png b/plugins/org.eclipse.etrice.doc/html/images/040-DataClass2.png Binary files differindex 4098abbcb..c9f8e2fca 100644 --- a/plugins/org.eclipse.etrice.doc/html/images/040-DataClass2.png +++ b/plugins/org.eclipse.etrice.doc/html/images/040-DataClass2.png diff --git a/plugins/org.eclipse.etrice.doc/html/images/040-LayeringActorWithSAP.png b/plugins/org.eclipse.etrice.doc/html/images/040-LayeringActorWithSAP.png Binary files differindex f6303b727..cd830dadf 100644 --- a/plugins/org.eclipse.etrice.doc/html/images/040-LayeringActorWithSAP.png +++ b/plugins/org.eclipse.etrice.doc/html/images/040-LayeringActorWithSAP.png diff --git a/plugins/org.eclipse.etrice.doc/html/images/040-LayeringApplicationLayerTextual.png b/plugins/org.eclipse.etrice.doc/html/images/040-LayeringApplicationLayerTextual.png Binary files differindex 2a46c5fc6..7dcda26e1 100644 --- a/plugins/org.eclipse.etrice.doc/html/images/040-LayeringApplicationLayerTextual.png +++ b/plugins/org.eclipse.etrice.doc/html/images/040-LayeringApplicationLayerTextual.png diff --git a/plugins/org.eclipse.etrice.doc/html/images/040-LayeringModelTextual.png b/plugins/org.eclipse.etrice.doc/html/images/040-LayeringModelTextual.png Binary files differindex 091689ac6..bea098ecd 100644 --- a/plugins/org.eclipse.etrice.doc/html/images/040-LayeringModelTextual.png +++ b/plugins/org.eclipse.etrice.doc/html/images/040-LayeringModelTextual.png diff --git a/plugins/org.eclipse.etrice.doc/html/images/040-LayeringServiceLayerTextual.png b/plugins/org.eclipse.etrice.doc/html/images/040-LayeringServiceLayerTextual.png Binary files differindex 1bdc72abb..a993740e2 100644 --- a/plugins/org.eclipse.etrice.doc/html/images/040-LayeringServiceLayerTextual.png +++ b/plugins/org.eclipse.etrice.doc/html/images/040-LayeringServiceLayerTextual.png diff --git a/plugins/org.eclipse.etrice.doc/html/images/040-ProtocolClassTextualNotation.png b/plugins/org.eclipse.etrice.doc/html/images/040-ProtocolClassTextualNotation.png Binary files differindex 098a726da..603e7c84c 100644 --- a/plugins/org.eclipse.etrice.doc/html/images/040-ProtocolClassTextualNotation.png +++ b/plugins/org.eclipse.etrice.doc/html/images/040-ProtocolClassTextualNotation.png diff --git a/plugins/org.eclipse.etrice.doc/html/images/040-ReplicatedClassEndPortInternalTextual.png b/plugins/org.eclipse.etrice.doc/html/images/040-ReplicatedClassEndPortInternalTextual.png Binary files differindex 873dfdf39..4d5a94f1f 100644 --- a/plugins/org.eclipse.etrice.doc/html/images/040-ReplicatedClassEndPortInternalTextual.png +++ b/plugins/org.eclipse.etrice.doc/html/images/040-ReplicatedClassEndPortInternalTextual.png diff --git a/plugins/org.eclipse.etrice.doc/html/images/040-ReplicatedClassEndPortTextual.png b/plugins/org.eclipse.etrice.doc/html/images/040-ReplicatedClassEndPortTextual.png Binary files differindex 3e1a96179..fad42abc4 100644 --- a/plugins/org.eclipse.etrice.doc/html/images/040-ReplicatedClassEndPortTextual.png +++ b/plugins/org.eclipse.etrice.doc/html/images/040-ReplicatedClassEndPortTextual.png diff --git a/plugins/org.eclipse.etrice.doc/html/images/040-ReplicatedClassRelayPortTextual.png b/plugins/org.eclipse.etrice.doc/html/images/040-ReplicatedClassRelayPortTextual.png Binary files differindex cafe61904..f6486cbcf 100644 --- a/plugins/org.eclipse.etrice.doc/html/images/040-ReplicatedClassRelayPortTextual.png +++ b/plugins/org.eclipse.etrice.doc/html/images/040-ReplicatedClassRelayPortTextual.png diff --git a/plugins/org.eclipse.etrice.doc/manual/etrice.pdf b/plugins/org.eclipse.etrice.doc/manual/etrice.pdf Binary files differindex 5e7d21ebc..7d9e5c244 100644 --- a/plugins/org.eclipse.etrice.doc/manual/etrice.pdf +++ b/plugins/org.eclipse.etrice.doc/manual/etrice.pdf |
