[*] bug 414560: [core.etphys][core.room] rename some attributes and references, use unordered groups

https://bugs.eclipse.org/bugs/show_bug.cgi?id=414560

6 files changed, 55 insertions, 18 deletions

diff --git a/runtime/org.eclipse.etrice.modellib.java/model/ALogService.room b/runtime/org.eclipse.etrice.modellib.java/model/ALogService.room
index ce26d64ef..51a868f60 100644
--- a/runtime/org.eclipse.etrice.modellib.java/model/ALogService.room
+++ b/runtime/org.eclipse.etrice.modellib.java/model/ALogService.room
@@ -15,7 +15,8 @@ RoomModel room.basic.service.logging {
 				"FileOutputStream file = null;"
 				"PrintStream p = null;"
 				"static long tStart = System.currentTimeMillis();"
-			} ServiceImplementation of log
+			}
+			ServiceImplementation of log
 		}
 		Behavior {
 			Operation destroyUser() {
@@ -77,14 +78,13 @@ RoomModel room.basic.service.logging {
 				"public static final int LOG_LEVEL_MEDIUM = 2;"
 				"public static final int LOG_LEVEL_HIGH = 3;"
 		}
-		
 		incoming {
 			Message open(fileName: string)
 			Message close()
 			private Message internalLog(data: InternalLogData)
 		}
 
-		conjugate PortClass {
+		conjugated PortClass {
 			usercode {
 				"static int logLevel=0;"
 				"InternalLogData d = new InternalLogData();"
diff --git a/runtime/org.eclipse.etrice.modellib.java/model/TimingService.room b/runtime/org.eclipse.etrice.modellib.java/model/TimingService.room
index 838be8e97..0260bdf93 100644
--- a/runtime/org.eclipse.etrice.modellib.java/model/TimingService.room
+++ b/runtime/org.eclipse.etrice.modellib.java/model/TimingService.room
@@ -150,7 +150,7 @@ RoomModel room.basic.service.timing {
 				}"
 			}
 		}
-		conjugate PortClass
+		conjugated PortClass
 		{
 			usercode {
 			"private int currentId = 0;
@@ -158,7 +158,7 @@ RoomModel room.basic.service.timing {
 			}
 			handle
 			outgoing internalTimer {
-			"//conjugate PortClass handle timer
+			"//conjugated PortClass handle timer
 				EventWithDataMessage dataMsg = (EventWithDataMessage) msg;
 				TimerData td = (TimerData) dataMsg.getData();
 				if (active && td.getId()==currentId) {
@@ -167,7 +167,7 @@ RoomModel room.basic.service.timing {
 			}
 			handle
 			outgoing internalTimeout {
-			"//conjugate PortClass handle timeout
+			"//conjugated PortClass handle timeout
 				EventWithDataMessage dataMsg = (EventWithDataMessage) msg;
 				TimerData td = (TimerData) dataMsg.getData();
 				if (active && td.getId()==currentId) {
@@ -177,7 +177,7 @@ RoomModel room.basic.service.timing {
 			}
 			handle
 			incoming kill {
-			"//conjugate PortClass kill
+			"//conjugated PortClass kill
 				if (active) {
 					active = false;
 					TimerData td = new TimerData();
diff --git a/runtime/org.eclipse.etrice.modellib.java/model/diagrams/room.basic.service.logging.ALogService.structure b/runtime/org.eclipse.etrice.modellib.java/model/diagrams/room.basic.service.logging.ALogService.structure
new file mode 100644
index 000000000..106589b88
--- /dev/null
+++ b/runtime/org.eclipse.etrice.modellib.java/model/diagrams/room.basic.service.logging.ALogService.structure
@@ -0,0 +1,35 @@
+<?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 ALogService" pictogramLinks="//@link //@children.0/@link //@children.0/@children.0/@link" verticalGridUnit="10" version="0.10.0">
+  <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
+  <link>
+    <businessObjects href="../ALogService.room#ActorClass:ALogService"/>
+  </link>
+  <children xsi:type="pi:ContainerShape" visible="true" active="true">
+    <properties key="obj-type" value="cls"/>
+    <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:Rectangle" background="//@colors.1" foreground="//@colors.2" lineWidth="4" transparency="0.5" width="800" height="500" x="40" y="40"/>
+      <graphicsAlgorithmChildren xsi:type="al:Rectangle" foreground="//@colors.2" lineWidth="4" filled="false" transparency="0.0" width="800" height="500" x="40" y="40"/>
+    </graphicsAlgorithm>
+    <link>
+      <businessObjects href="../ALogService.room#ActorClass:ALogService"/>
+    </link>
+    <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="80" height="80" x="400">
+        <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.2" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="40" height="40" x="20" y="20"/>
+      </graphicsAlgorithm>
+      <link>
+        <businessObjects href="../ALogService.room#SPP:ALogService$log"/>
+      </link>
+      <anchors xsi:type="pi:ChopboxAnchor"/>
+      <children visible="true">
+        <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="80" height="20" font="//@fonts.0" value="log"/>
+      </children>
+    </children>
+  </children>
+  <colors red="227" green="238" blue="249"/>
+  <colors red="255" green="255" blue="255"/>
+  <colors/>
+  <fonts name="Arial" size="8"/>
+</pi:Diagram>
diff --git a/runtime/org.eclipse.etrice.modellib.java/model/diagrams/room.basic.service.tcp.ATcpClient.structure b/runtime/org.eclipse.etrice.modellib.java/model/diagrams/room.basic.service.tcp.ATcpClient.structure
index 9495cd7df..ebb67ff22 100644
--- a/runtime/org.eclipse.etrice.modellib.java/model/diagrams/room.basic.service.tcp.ATcpClient.structure
+++ b/runtime/org.eclipse.etrice.modellib.java/model/diagrams/room.basic.service.tcp.ATcpClient.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 ATcpClient" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link //@children.0/@children.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 ATcpClient" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link //@children.0/@children.1/@link" verticalGridUnit="10" version="0.10.0">
   <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
   <link>
     <businessObjects href="../TcpService.room#ActorClass:ATcpClient"/>
diff --git a/runtime/org.eclipse.etrice.modellib.java/model/diagrams/room.basic.service.tcp.ATcpServer.structure b/runtime/org.eclipse.etrice.modellib.java/model/diagrams/room.basic.service.tcp.ATcpServer.structure
index dfe8167ab..c5ea429d3 100644
--- a/runtime/org.eclipse.etrice.modellib.java/model/diagrams/room.basic.service.tcp.ATcpServer.structure
+++ b/runtime/org.eclipse.etrice.modellib.java/model/diagrams/room.basic.service.tcp.ATcpServer.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 ATcpServer" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link //@children.0/@children.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 ATcpServer" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link //@children.0/@children.1/@link" verticalGridUnit="10" version="0.10.0">
   <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
   <link>
     <businessObjects href="../TcpService.room#ActorClass:ATcpServer"/>
diff --git a/runtime/org.eclipse.etrice.modellib.java/model/diagrams/room.basic.service.timing.ATimingService.structure b/runtime/org.eclipse.etrice.modellib.java/model/diagrams/room.basic.service.timing.ATimingService.structure
index b1f1ea630..a951de9b2 100644
--- a/runtime/org.eclipse.etrice.modellib.java/model/diagrams/room.basic.service.timing.ATimingService.structure
+++ b/runtime/org.eclipse.etrice.modellib.java/model/diagrams/room.basic.service.timing.ATimingService.structure
@@ -1,13 +1,14 @@
 <?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 ATimingService" snapToGrid="true" showGuides="true" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link" version="0.9.0">
-  <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" width="1000" height="1000"/>
+<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 ATimingService" pictogramLinks="//@link //@children.0/@link //@children.0/@children.0/@link" verticalGridUnit="10" version="0.10.0">
+  <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
   <link>
     <businessObjects href="../TimingService.room#ActorClass:ATimingService"/>
   </link>
   <children xsi:type="pi:ContainerShape" visible="true" active="true">
     <properties key="obj-type" value="cls"/>
-    <graphicsAlgorithm xsi:type="al:Rectangle" filled="false" lineVisible="false" width="880" height="580" x="40" y="40">
-      <graphicsAlgorithmChildren xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.2" lineWidth="4" width="800" height="500" x="40" y="40"/>
+    <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:Rectangle" background="//@colors.1" foreground="//@colors.2" lineWidth="4" transparency="0.5" width="800" height="500" x="40" y="40"/>
+      <graphicsAlgorithmChildren xsi:type="al:Rectangle" foreground="//@colors.2" lineWidth="4" filled="false" transparency="0.0" width="800" height="500" x="40" y="40"/>
     </graphicsAlgorithm>
     <link>
       <businessObjects href="../TimingService.room#ActorClass:ATimingService"/>
@@ -15,19 +16,20 @@
     <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" filled="false" lineVisible="false" width="80" height="80" x="240">
-        <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.2" foreground="//@colors.2" lineWidth="2" width="40" height="40" x="20" y="20"/>
+      <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="80" height="80" x="400">
+        <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.2" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="40" height="40" x="20" y="20"/>
       </graphicsAlgorithm>
       <link>
-        <businessObjects href="../TimingService.room#SPPRef:ATimingService$timer"/>
+        <businessObjects href="../TimingService.room#SPP:ATimingService$timer"/>
       </link>
-      <anchors xsi:type="pi:ChopboxAnchor" referencedGraphicsAlgorithm="//@children.0/@children.0/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
+      <anchors xsi:type="pi:ChopboxAnchor"/>
       <children visible="true">
-        <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" filled="false" width="80" height="20" horizontalAlignment="ALIGNMENT_CENTER" value="timer"/>
+        <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="80" height="20" font="//@fonts.0" value="timer"/>
       </children>
     </children>
   </children>
   <colors red="227" green="238" blue="249"/>
   <colors red="255" green="255" blue="255"/>
   <colors/>
+  <fonts name="Arial" size="8"/>
 </pi:Diagram>