Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2018-03-16 09:03:28 -0400
committerHenrik Rentz-Reichert2018-03-16 09:03:28 -0400
commit870ba7446b8b188226787c6869b126be2c97a2db (patch)
treeade0d26ef520617ccaa8399b222b740df292debd
parentd2a982a5bc1ed42b4328e0c53941b2f6dc2fd752 (diff)
downloadorg.eclipse.etrice-870ba7446b8b188226787c6869b126be2c97a2db.tar.gz
org.eclipse.etrice-870ba7446b8b188226787c6869b126be2c97a2db.tar.xz
org.eclipse.etrice-870ba7446b8b188226787c6869b126be2c97a2db.zip
Bug 532533 - update images for (online) documentation
Did necessary adjustments in the documentation and re-generated. Change-Id: Id98a4e3e2ebeba24f2757117d99766770542b297
-rw-r--r--plugins/org.eclipse.etrice.doc/featuremodel/etrice.roomlanguage.featurizer22
-rw-r--r--plugins/org.eclipse.etrice.doc/online-doc/content/feature-reference.md12
-rw-r--r--plugins/org.eclipse.etrice.doc/targets/contextHelp.xml78
-rw-r--r--plugins/org.eclipse.etrice.doc/targets/keyword-hover/Binding.html2
4 files changed, 57 insertions, 57 deletions
diff --git a/plugins/org.eclipse.etrice.doc/featuremodel/etrice.roomlanguage.featurizer b/plugins/org.eclipse.etrice.doc/featuremodel/etrice.roomlanguage.featurizer
index 40f574e03..38606a7f2 100644
--- a/plugins/org.eclipse.etrice.doc/featuremodel/etrice.roomlanguage.featurizer
+++ b/plugins/org.eclipse.etrice.doc/featuremodel/etrice.roomlanguage.featurizer
@@ -663,7 +663,7 @@ Feature CommunicationType
// explicit: eventdriven ProtocolClass EventdrivenProtocolClass {
incoming {
Message msg1() ["message without data"]
- Message msg2(data: int32) ["message with data"]
+ Message msg2(int32) ["message with data"]
}
outgoing {
Message msg4() ["eventdriven ProtocolClass can have message into two directions"]
@@ -672,7 +672,7 @@ Feature CommunicationType
datadriven ProtocolClass DatadrivenProtocolClass {
incoming {
- Message signal1 (data: int32) ["a datadriven message needs data"]
+ Message signal1 (int32) ["a datadriven message needs data"]
}
// datadriven ProtocolClass can only have incoming messages (signals)
}
@@ -697,11 +697,11 @@ Feature ProtocolClass
```room
ProtocolClass SimpleProtocolClass {
incoming {
- Message msg1(data: int32}
+ Message msg1(int32}
Message msg2()
}
outgoing {
- Message msg3(data: DataClass1}
+ Message msg3(DataClass1}
Message msg4()
}
}
@@ -717,13 +717,13 @@ Feature ProtocolClass
incoming {
// incoming means incoming for a regular port and outgoing for a conjugated port
Message message1() // message without data
- Message message2(data: int32) // message with simple data
- Message message3(data: DMessageData) // message with complex data (DataClass)
+ Message message2(int32) // message with simple data
+ Message message3(DMessageData) // message with complex data (DataClass)
}
outgoing {
// outgoing means outgoing for a regular port and incoming for a conjugated port
- Message message1(data: int32) // incoming and outgoing Messages can have the same name to enable symmetric protocols
+ Message message1(int32) // incoming and outgoing Messages can have the same name to enable symmetric protocols
}
}
@@ -737,9 +737,9 @@ Feature ProtocolClass
datadriven ProtocolClass ProtocolClassData {
incoming {
// incoming means incoming for a regular port and outgoing for a conjugated port
- Message value1(value: int32) // a datadriven message (signal) always needs data
- Message value2(value: int16) // datadriven message with simple data
- Message value3(value: DMessageData) // datadriven message with complex data (DataClass)
+ Message value1(int32) // a datadriven message (signal) always needs data
+ Message value2(int16) // datadriven message with simple data
+ Message value3(DMessageData) // datadriven message with complex data (DataClass)
}
// no outgoing messages for datadriven ports allowed
@@ -755,7 +755,7 @@ Feature ProtocolClass
usercode3 ''' '''
incoming {
Message messageName()
- Message messageName(data: int32)
+ Message messageName(int32)
}
outgoing {
Message ...
diff --git a/plugins/org.eclipse.etrice.doc/online-doc/content/feature-reference.md b/plugins/org.eclipse.etrice.doc/online-doc/content/feature-reference.md
index ba6f16582..00b915403 100644
--- a/plugins/org.eclipse.etrice.doc/online-doc/content/feature-reference.md
+++ b/plugins/org.eclipse.etrice.doc/online-doc/content/feature-reference.md
@@ -3117,6 +3117,12 @@ The MSCLogging is activated by default, but can be set manually in the [Generati
+[CCodeGenerator]: #ccodegenerator
+[JavaCodeGenerator]: #javacodegenerator
+[CPPCodeGenerator]: #cppcodegenerator
+[GenerationOptions]: #generationoptions
+[MSCLogging]: #msclogging
+[DataLogging]: #datalogging
[TextualROOMEditor]: #textualroomeditor
[OutlineView]: #outlineview
[GraphicalBehaviorEditor]: #graphicalbehavioreditor
@@ -3158,9 +3164,3 @@ The MSCLogging is activated by default, but can be set manually in the [Generati
[SAP]: #sap
[ServiceImplementation]: #serviceimplementation
[SPP]: #spp
-[CCodeGenerator]: #ccodegenerator
-[JavaCodeGenerator]: #javacodegenerator
-[CPPCodeGenerator]: #cppcodegenerator
-[GenerationOptions]: #generationoptions
-[MSCLogging]: #msclogging
-[DataLogging]: #datalogging
diff --git a/plugins/org.eclipse.etrice.doc/targets/contextHelp.xml b/plugins/org.eclipse.etrice.doc/targets/contextHelp.xml
index ad2eb274b..841081ad3 100644
--- a/plugins/org.eclipse.etrice.doc/targets/contextHelp.xml
+++ b/plugins/org.eclipse.etrice.doc/targets/contextHelp.xml
@@ -1,6 +1,44 @@
<!-- generated by featurizer -->
<contexts>
+<context id="featureContextHelp_CCodeGenerator" title="CCodeGenerator">
+<description></description>
+<topic href="targets/eclipse-help/feature-reference.html#ccodegenerator" label="CCodeGenerator"/>
+</context>
+
+<context id="featureContextHelp_JavaCodeGenerator" title="JavaCodeGenerator">
+<description></description>
+<topic href="targets/eclipse-help/feature-reference.html#javacodegenerator" label="JavaCodeGenerator"/>
+</context>
+
+<context id="featureContextHelp_CPPCodeGenerator" title="CPPCodeGenerator">
+<description></description>
+<topic href="targets/eclipse-help/feature-reference.html#cppcodegenerator" label="CPPCodeGenerator"/>
+</context>
+
+<context id="featureContextHelp_GenerationOptions" title="GenerationOptions">
+<description>Mechanism to adjust the generation.</description>
+<topic href="targets/eclipse-help/feature-reference.html#generationoptions" label="GenerationOptions"/>
+<topic href="targets/eclipse-help/feature-reference.html#generationoptions" label="CCodeGenerator"/>
+<topic href="targets/eclipse-help/feature-reference.html#generationoptions" label="JavaCodeGenerator"/>
+<topic href="targets/eclipse-help/feature-reference.html#generationoptions" label="MSCLogging"/>
+</context>
+
+<context id="featureContextHelp_MSCLogging" title="MSCLogging">
+<description>Runtime logger for event-driven Messages, represented as a Message Sequence Chart.</description>
+<topic href="targets/eclipse-help/feature-reference.html#msclogging" label="MSCLogging"/>
+<topic href="targets/eclipse-help/feature-reference.html#msclogging" label="GenerationOptions"/>
+<topic href="targets/eclipse-help/feature-reference.html#msclogging" label="CCodeGenerator"/>
+<topic href="targets/eclipse-help/feature-reference.html#msclogging" label="JavaCodeGenerator"/>
+</context>
+
+<context id="featureContextHelp_DataLogging" title="DataLogging">
+<description>Runtime logger for data-driven Messages with primitive data.</description>
+<topic href="targets/eclipse-help/feature-reference.html#datalogging" label="DataLogging"/>
+<topic href="targets/eclipse-help/feature-reference.html#datalogging" label="Annotation"/>
+<topic href="targets/eclipse-help/feature-reference.html#datalogging" label="CCodeGenerator"/>
+</context>
+
<context id="featureContextHelp_TextualROOMEditor" title="TextualROOMEditor">
<description>Textual model editor</description>
<topic href="targets/eclipse-help/feature-reference.html#textualroomeditor" label="TextualROOMEditor"/>
@@ -68,12 +106,12 @@
<description>An Annotation can be attached to a ROOM classes to apply the properties of its AnnotationType</description>
<topic href="targets/eclipse-help/feature-reference.html#annotation" label="Annotation"/>
<topic href="targets/eclipse-help/feature-reference.html#annotation" label="AnnotationType"/>
+<topic href="targets/eclipse-help/feature-reference.html#annotation" label="DataLogging"/>
<topic href="targets/eclipse-help/feature-reference.html#annotation" label="LogicalSystem"/>
<topic href="targets/eclipse-help/feature-reference.html#annotation" label="ActorClass"/>
<topic href="targets/eclipse-help/feature-reference.html#annotation" label="SubSystemClass"/>
<topic href="targets/eclipse-help/feature-reference.html#annotation" label="ProtocolClass"/>
<topic href="targets/eclipse-help/feature-reference.html#annotation" label="DataClass"/>
-<topic href="targets/eclipse-help/feature-reference.html#annotation" label="DataLogging"/>
</context>
<context id="featureContextHelp_Inheritance" title="Inheritance">
@@ -325,42 +363,4 @@
<topic href="targets/eclipse-help/feature-reference.html#spp" label="LayerConnection"/>
<topic href="targets/eclipse-help/feature-reference.html#spp" label="ServiceImplementation"/>
</context>
-
-<context id="featureContextHelp_CCodeGenerator" title="CCodeGenerator">
-<description></description>
-<topic href="targets/eclipse-help/feature-reference.html#ccodegenerator" label="CCodeGenerator"/>
-</context>
-
-<context id="featureContextHelp_JavaCodeGenerator" title="JavaCodeGenerator">
-<description></description>
-<topic href="targets/eclipse-help/feature-reference.html#javacodegenerator" label="JavaCodeGenerator"/>
-</context>
-
-<context id="featureContextHelp_CPPCodeGenerator" title="CPPCodeGenerator">
-<description></description>
-<topic href="targets/eclipse-help/feature-reference.html#cppcodegenerator" label="CPPCodeGenerator"/>
-</context>
-
-<context id="featureContextHelp_GenerationOptions" title="GenerationOptions">
-<description>Mechanism to adjust the generation.</description>
-<topic href="targets/eclipse-help/feature-reference.html#generationoptions" label="GenerationOptions"/>
-<topic href="targets/eclipse-help/feature-reference.html#generationoptions" label="CCodeGenerator"/>
-<topic href="targets/eclipse-help/feature-reference.html#generationoptions" label="JavaCodeGenerator"/>
-<topic href="targets/eclipse-help/feature-reference.html#generationoptions" label="MSCLogging"/>
-</context>
-
-<context id="featureContextHelp_MSCLogging" title="MSCLogging">
-<description>Runtime logger for event-driven Messages, represented as a Message Sequence Chart.</description>
-<topic href="targets/eclipse-help/feature-reference.html#msclogging" label="MSCLogging"/>
-<topic href="targets/eclipse-help/feature-reference.html#msclogging" label="GenerationOptions"/>
-<topic href="targets/eclipse-help/feature-reference.html#msclogging" label="CCodeGenerator"/>
-<topic href="targets/eclipse-help/feature-reference.html#msclogging" label="JavaCodeGenerator"/>
-</context>
-
-<context id="featureContextHelp_DataLogging" title="DataLogging">
-<description>Runtime logger for data-driven Messages with primitive data.</description>
-<topic href="targets/eclipse-help/feature-reference.html#datalogging" label="DataLogging"/>
-<topic href="targets/eclipse-help/feature-reference.html#datalogging" label="Annotation"/>
-<topic href="targets/eclipse-help/feature-reference.html#datalogging" label="CCodeGenerator"/>
-</context>
</contexts>
diff --git a/plugins/org.eclipse.etrice.doc/targets/keyword-hover/Binding.html b/plugins/org.eclipse.etrice.doc/targets/keyword-hover/Binding.html
index 33b926897..24ebfcdef 100644
--- a/plugins/org.eclipse.etrice.doc/targets/keyword-hover/Binding.html
+++ b/plugins/org.eclipse.etrice.doc/targets/keyword-hover/Binding.html
@@ -1,5 +1,5 @@
<!-- generated by featurizer -->
<p>A Binding connects two Ports with each other</p>
-<pre><code class=room customHighlighted><span class=keyword>Binding</span> port1 <span class=keyword>and</span> <span class=keyword>actorRef</span>.port2
+<pre><code class=room customHighlighted><span class=keyword>Binding</span> port1 <span class=keyword>and</span> actorRef.port2
<span class=keyword>Binding</span> actorRef1.port1 <span class=keyword>and</span> actorRef2.port2
</code></pre> \ No newline at end of file

Back to the top