Merge remote branch 'refs/remotes/origin/master'

Conflicts:
	plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java
	plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java
	plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericProtocolClassGenerator.java

1 files changed, 135 insertions, 0 deletions

diff --git a/examples/org.eclipse.etrice.generator.c.reference/model/diagrams/cGenRef.Receiver.behavior b/examples/org.eclipse.etrice.generator.c.reference/model/diagrams/cGenRef.Receiver.behavior
new file mode 100644
index 000000000..0d33249db
--- /dev/null
+++ b/examples/org.eclipse.etrice.generator.c.reference/model/diagrams/cGenRef.Receiver.behavior
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="ASCII"?>

+<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" diagramTypeId="room.behavior" name="Behavior of Receiver" showGuides="true" pictogramLinks="//@link //@children.0/@link //@children.0/@children.1/@link //@children.0/@children.2/@link //@children.0/@children.3/@link //@connections.0/@link //@connections.1/@link" verticalGridUnit="0">

+  <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>

+  <link>

+    <businessObjects href="../cGenRef.room#ActorClass:Receiver"/>

+  </link>

+  <children xsi:type="pi:ContainerShape" visible="true" active="true">

+    <properties key="obj-type" value="sg"/>

+    <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="880" height="580" x="40" y="40">

+      <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.1" foreground="//@colors.2" lineWidth="4" transparency="0.5" width="800" height="500" x="40" y="40" cornerHeight="20" cornerWidth="20"/>

+      <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="4" filled="false" transparency="0.0" width="800" height="500" x="40" y="40" cornerHeight="20" cornerWidth="20"/>

+    </graphicsAlgorithm>

+    <link>

+      <businessObjects href="../cGenRef.room#StateGraph:Receiver$sg"/>

+    </link>

+    <children visible="true">

+      <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="800" height="80" y="40" font="//@fonts.1" horizontalAlignment="ALIGNMENT_RIGHT" verticalAlignment="ALIGNMENT_TOP" value="/"/>

+    </children>

+    <children xsi:type="pi:ContainerShape" visible="true" active="true">

+      <properties key="obj-type" value="trp"/>

+      <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="40" height="40" x="100" y="100">

+        <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="20" height="20" x="10" y="10"/>

+      </graphicsAlgorithm>

+      <link>

+        <businessObjects href="../cGenRef.room#StateGraph:Receiver$sg"/>

+      </link>

+      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.0" referencedGraphicsAlgorithm="//@children.0/@children.1/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>

+      <children visible="true">

+        <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="40" height="20" y="10" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="I"/>

+      </children>

+    </children>

+    <children xsi:type="pi:ContainerShape" visible="true" active="true">

+      <properties key="obj-type" value="state"/>

+      <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="120" height="90" x="236" y="80">

+        <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="60" height="30" x="30" y="30" cornerHeight="20" cornerWidth="20">

+          <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="15" height="8" x="35" y="3" cornerHeight="5" cornerWidth="5"/>

+          <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">

+            <points x="-3" y="-3"/>

+            <points x="-3" y="3"/>

+            <points x="-11" y="3"/>

+          </graphicsAlgorithmChildren>

+          <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">

+            <points x="3" y="-3"/>

+            <points x="3" y="3"/>

+            <points x="11" y="3"/>

+          </graphicsAlgorithmChildren>

+          <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">

+            <points x="-2" y="-3"/>

+            <points x="-2" y="3"/>

+            <points x="2" y="3"/>

+            <points x="2" y="-3"/>

+          </graphicsAlgorithmChildren>

+        </graphicsAlgorithmChildren>

+      </graphicsAlgorithm>

+      <link>

+        <businessObjects href="../cGenRef.room#BaseState:Receiver$Idle"/>

+      </link>

+      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.1" incomingConnections="//@connections.0" referencedGraphicsAlgorithm="//@children.0/@children.2/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>

+      <children visible="true">

+        <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="60" height="30" x="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Idle"/>

+      </children>

+    </children>

+    <children xsi:type="pi:ContainerShape" visible="true" active="true">

+      <properties key="obj-type" value="state"/>

+      <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="149" height="90" x="488" y="80">

+        <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="89" height="30" x="30" y="30" cornerHeight="20" cornerWidth="20">

+          <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="15" height="8" x="64" y="3" cornerHeight="5" cornerWidth="5"/>

+          <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="44" y="24">

+            <points x="-3" y="-3"/>

+            <points x="-3" y="3"/>

+            <points x="-11" y="3"/>

+          </graphicsAlgorithmChildren>

+          <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="44" y="24">

+            <points x="3" y="-3"/>

+            <points x="3" y="3"/>

+            <points x="11" y="3"/>

+          </graphicsAlgorithmChildren>

+          <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="44" y="24">

+            <points x="-2" y="-3"/>

+            <points x="-2" y="3"/>

+            <points x="2" y="3"/>

+            <points x="2" y="-3"/>

+          </graphicsAlgorithmChildren>

+        </graphicsAlgorithmChildren>

+      </graphicsAlgorithm>

+      <link>

+        <businessObjects href="../cGenRef.room#BaseState:Receiver$DataReceived"/>

+      </link>

+      <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.1" referencedGraphicsAlgorithm="//@children.0/@children.3/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>

+      <children visible="true">

+        <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="89" height="30" x="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="DataReceived"/>

+      </children>

+    </children>

+  </children>

+  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.1/@anchors.0" end="//@children.0/@children.2/@anchors.0">

+    <properties key="obj-type" value="trans"/>

+    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>

+    <link>

+      <businessObjects href="../cGenRef.room#InitialTransition:Receiver$initial"/>

+    </link>

+    <connectionDecorators visible="true" locationRelative="true" location="1.0">

+      <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.1" foreground="//@colors.2" lineWidth="1" transparency="0.0">

+        <points x="-15" y="5"/>

+        <points/>

+        <points x="-15" y="-5"/>

+      </graphicsAlgorithm>

+    </connectionDecorators>

+    <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">

+      <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" transparency="0.0" x="10" font="//@fonts.0" value="init"/>

+    </connectionDecorators>

+  </connections>

+  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.2/@anchors.0" end="//@children.0/@children.3/@anchors.0">

+    <properties key="obj-type" value="trans"/>

+    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>

+    <link>

+      <businessObjects href="../cGenRef.room#TriggeredTransition:Receiver$tr0"/>

+    </link>

+    <connectionDecorators visible="true" locationRelative="true" location="1.0">

+      <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0">

+        <points x="-15" y="5"/>

+        <points/>

+        <points x="-15" y="-5"/>

+      </graphicsAlgorithm>

+    </connectionDecorators>

+    <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">

+      <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" transparency="0.0" x="10" font="//@fonts.0" value="tr0: &lt;inMessage1:dat..."/>

+    </connectionDecorators>

+  </connections>

+  <colors red="227" green="238" blue="249"/>

+  <colors red="255" green="255" blue="255"/>

+  <colors/>

+  <colors red="200" green="200" blue="200"/>

+  <fonts name="Arial" size="8"/>

+  <fonts name="Arial" size="9" bold="true"/>

+</pi:Diagram>