[tutorials.simulators.trafficlight.example] completed working example with two coordinated traffic lights, fixed several diagrams, added script for flatten project structure

2 files changed, 9 insertions, 65 deletions

diff --git a/examples/org.eclipse.etrice.tutorials.java/model/Blinky/diagrams/Blinky.SubSystem_Blinky.structure b/examples/org.eclipse.etrice.tutorials.java/model/Blinky/diagrams/Blinky.SubSystem_Blinky.structure
index 63956f25e..045db94e9 100644
--- a/examples/org.eclipse.etrice.tutorials.java/model/Blinky/diagrams/Blinky.SubSystem_Blinky.structure
+++ b/examples/org.eclipse.etrice.tutorials.java/model/Blinky/diagrams/Blinky.SubSystem_Blinky.structure
@@ -1,5 +1,5 @@
 <?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" gridUnit="10" diagramTypeId="room.structure" name="Structure of SubSystem_Blinky" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link //@children.0/@children.1/@link //@children.0/@children.1/@children.1/@link //@children.0/@children.1/@children.2/@link //@connections.0/@link //@connections.1/@link" verticalGridUnit="10" version="0.9.0">

+<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" gridUnit="10" diagramTypeId="room.structure" name="Structure of SubSystem_Blinky" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link //@children.0/@children.1/@link //@children.0/@children.1/@children.1/@link //@connections.0/@link" verticalGridUnit="10" version="0.9.0">

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

   <link>

     <businessObjects href="../Blinky.room#SubSystemClass:SubSystem_Blinky"/>

@@ -24,7 +24,7 @@
       <link>

         <businessObjects href="../Blinky.room#ActorRef:SubSystem_Blinky$application"/>

       </link>

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

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

       <children visible="true">

         <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="180" height="80" x="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="application&#xA;(BlinkyTop)"/>

       </children>

@@ -47,31 +47,17 @@
       <children xsi:type="pi:ContainerShape" visible="true" active="true">

         <properties key="obj-type" value="port"/>

         <properties key="item-kind" value=""/>

-        <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="60" height="60" x="59">

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

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

         </graphicsAlgorithm>

         <link>

-          <businessObjects href="file:/C:/eTriceJuno/eTrice-rt/org.eclipse.etrice.modellib.java/models/TimingService.room#SPPRef:ATimingService$timer"/>

+          <businessObjects href="file:/C:/entw/projekte/eTrice/eTriceDevelopment/repositories/eTriceGIT/FlatWorld/org.eclipse.etrice.modellib.java/models/TimingService.room#SPPRef:ATimingService$timer"/>

         </link>

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

         <children visible="true">

           <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="60" height="15" y="6" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="timer"/>

         </children>

       </children>

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

-        <properties key="obj-type" value="port"/>

-        <properties key="item-kind" value=""/>

-        <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="60" height="60" x="119">

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

-        </graphicsAlgorithm>

-        <link>

-          <businessObjects href="file:/C:/eTriceJuno/eTrice-rt/org.eclipse.etrice.modellib.java/models/TimingService.room#SPPRef:ATimingService$timeout"/>

-        </link>

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

-        <children visible="true">

-          <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="60" height="15" y="6" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="timeout"/>

-        </children>

-      </children>

     </children>

   </children>

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

@@ -88,20 +74,6 @@
       </graphicsAlgorithm>

     </connectionDecorators>

   </connections>

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

-    <properties key="obj-type" value="conn"/>

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

-    <link>

-      <businessObjects href="../Blinky.room#LayerConnection:SubSystem_Blinky$application-timingService!timeout"/>

-    </link>

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

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

-        <points x="-15" y="10"/>

-        <points/>

-        <points x="-15" y="-10"/>

-      </graphicsAlgorithm>

-    </connectionDecorators>

-  </connections>

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

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

   <colors/>

diff --git a/examples/org.eclipse.etrice.tutorials.java/model/PedLightsController/diagrams/PedLightsController.SubSys_PedLights.structure b/examples/org.eclipse.etrice.tutorials.java/model/PedLightsController/diagrams/PedLightsController.SubSys_PedLights.structure
index e9e5b8572..2f64483e7 100644
--- a/examples/org.eclipse.etrice.tutorials.java/model/PedLightsController/diagrams/PedLightsController.SubSys_PedLights.structure
+++ b/examples/org.eclipse.etrice.tutorials.java/model/PedLightsController/diagrams/PedLightsController.SubSys_PedLights.structure
@@ -1,5 +1,5 @@
 <?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" gridUnit="10" diagramTypeId="room.structure" name="Structure of SubSys_PedLights" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link //@children.0/@children.1/@link //@children.0/@children.1/@children.1/@link //@children.0/@children.1/@children.2/@link //@connections.0/@link //@connections.1/@link" verticalGridUnit="10" version="0.9.0">

+<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" gridUnit="10" diagramTypeId="room.structure" name="Structure of SubSys_PedLights" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link //@children.0/@children.1/@link //@children.0/@children.1/@children.1/@link //@connections.0/@link" verticalGridUnit="10" version="0.9.0">

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

   <link>

     <businessObjects href="../PedLightsController.room#SubSystemClass:SubSys_PedLights"/>

@@ -24,14 +24,14 @@
       <link>

         <businessObjects href="../PedLightsController.room#ActorRef:SubSys_PedLights$PedLightsTopRef"/>

       </link>

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

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

       <children visible="true">

         <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="180" height="80" x="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="PedLightsTopRef&#xA;(PedLightsTop)"/>

       </children>

     </children>

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

       <properties key="obj-type" value="ref"/>

-      <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="240" height="140" x="128" y="257">

+      <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="240" height="140" x="128" y="264">

         <graphicsAlgorithmChildren xsi:type="al:Rectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="180" height="80" x="30" y="30">

           <graphicsAlgorithmChildren xsi:type="al:Rectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="20" height="10" x="150" y="50"/>

           <graphicsAlgorithmChildren xsi:type="al:Rectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="20" height="10" x="145" y="65"/>

@@ -47,31 +47,17 @@
       <children xsi:type="pi:ContainerShape" visible="true" active="true">

         <properties key="obj-type" value="port"/>

         <properties key="item-kind" value=""/>

-        <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="60" height="60" x="59">

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

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

         </graphicsAlgorithm>

         <link>

-          <businessObjects href="file:/C:/eTriceJuno/eTrice-rt/org.eclipse.etrice.modellib.java/models/TimingService.room#SPPRef:ATimingService$timer"/>

+          <businessObjects href="file:/C:/entw/projekte/eTrice/eTriceDevelopment/repositories/eTriceGIT/FlatWorld/org.eclipse.etrice.modellib.java/models/TimingService.room#SPPRef:ATimingService$timer"/>

         </link>

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

         <children visible="true">

           <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="60" height="15" y="6" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="timer"/>

         </children>

       </children>

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

-        <properties key="obj-type" value="port"/>

-        <properties key="item-kind" value=""/>

-        <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="60" height="60" x="119">

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

-        </graphicsAlgorithm>

-        <link>

-          <businessObjects href="file:/C:/eTriceJuno/eTrice-rt/org.eclipse.etrice.modellib.java/models/TimingService.room#SPPRef:ATimingService$timeout"/>

-        </link>

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

-        <children visible="true">

-          <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="60" height="15" y="6" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="timeout"/>

-        </children>

-      </children>

     </children>

   </children>

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

@@ -88,20 +74,6 @@
       </graphicsAlgorithm>

     </connectionDecorators>

   </connections>

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

-    <properties key="obj-type" value="conn"/>

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

-    <link>

-      <businessObjects href="../PedLightsController.room#LayerConnection:SubSys_PedLights$PedLightsTopRef-timingService!timeout"/>

-    </link>

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

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

-        <points x="-15" y="10"/>

-        <points/>

-        <points x="-15" y="-10"/>

-      </graphicsAlgorithm>

-    </connectionDecorators>

-  </connections>

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

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

   <colors/>