diff options
author | Henrik Rentz-Reichert | 2012-02-02 10:09:22 +0000 |
---|---|---|
committer | Henrik Rentz-Reichert | 2012-02-02 10:09:22 +0000 |
commit | 0de5eb081f268c234947d86994102fa3a8ce864a (patch) | |
tree | 58bbb67c81c4d2d1c41909d92e6d1fc820f187a3 /examples/org.eclipse.etrice.tutorials/model/HelloWorld/diagrams/HelloWorld.System_HelloWorld.structure | |
parent | b55690aca6ad5d17e699e809af481d1ffd04191e (diff) | |
parent | cfe46b9799947e484ed42a2eefded0db55d43904 (diff) | |
download | org.eclipse.etrice-0de5eb081f268c234947d86994102fa3a8ce864a.tar.gz org.eclipse.etrice-0de5eb081f268c234947d86994102fa3a8ce864a.tar.xz org.eclipse.etrice-0de5eb081f268c234947d86994102fa3a8ce864a.zip |
Merge remote branch 'refs/remotes/origin/master'
Conflicts:
plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend
plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java
plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java
plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/StateMachineGen.java
plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/extensions/RoomExtensions.java
Diffstat (limited to 'examples/org.eclipse.etrice.tutorials/model/HelloWorld/diagrams/HelloWorld.System_HelloWorld.structure')
-rw-r--r-- | examples/org.eclipse.etrice.tutorials/model/HelloWorld/diagrams/HelloWorld.System_HelloWorld.structure | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/examples/org.eclipse.etrice.tutorials/model/HelloWorld/diagrams/HelloWorld.System_HelloWorld.structure b/examples/org.eclipse.etrice.tutorials/model/HelloWorld/diagrams/HelloWorld.System_HelloWorld.structure index b34959ea0..0ace07182 100644 --- a/examples/org.eclipse.etrice.tutorials/model/HelloWorld/diagrams/HelloWorld.System_HelloWorld.structure +++ b/examples/org.eclipse.etrice.tutorials/model/HelloWorld/diagrams/HelloWorld.System_HelloWorld.structure @@ -1,37 +1,37 @@ -<?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 System_HelloWorld" snapToGrid="true" showGuides="true" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link"> - <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/> - <link> - <businessObjects href="../HelloWorld.room#LogicalSystem:System_HelloWorld"/> - </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="461" height="301" x="90" y="20"> - <graphicsAlgorithmChildren xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.2" lineWidth="4" transparency="0.0" width="381" height="221" x="40" y="40"/> - </graphicsAlgorithm> - <link> - <businessObjects href="../HelloWorld.room#LogicalSystem:System_HelloWorld"/> - </link> - <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="220" height="120" x="120" y="80"> - <graphicsAlgorithmChildren xsi:type="al:Rectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="180" height="80" x="20" y="20"> - <graphicsAlgorithmChildren xsi:type="al:Rectangle" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="20" height="10" x="150" y="50"/> - <graphicsAlgorithmChildren xsi:type="al:Rectangle" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="20" height="10" x="145" y="65"/> - </graphicsAlgorithmChildren> - </graphicsAlgorithm> - <link> - <businessObjects href="../HelloWorld.room#SubSystemRef:System_HelloWorld$subsystem"/> - </link> - <anchors xsi:type="pi:ChopboxAnchor" referencedGraphicsAlgorithm="//@children.0/@children.0/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/> - <children visible="true"> - <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="180" height="80" x="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="subsystem
(SubSystem_HelloWorld)"/> - </children> - </children> - </children> - <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"/> -</pi:Diagram> +<?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 System_HelloWorld" snapToGrid="true" showGuides="true" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link">
+ <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
+ <link>
+ <businessObjects href="../HelloWorld.room#LogicalSystem:System_HelloWorld"/>
+ </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="461" height="301" x="90" y="20">
+ <graphicsAlgorithmChildren xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.2" lineWidth="4" transparency="0.0" width="381" height="221" x="40" y="40"/>
+ </graphicsAlgorithm>
+ <link>
+ <businessObjects href="../HelloWorld.room#LogicalSystem:System_HelloWorld"/>
+ </link>
+ <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="220" height="120" x="120" y="80">
+ <graphicsAlgorithmChildren xsi:type="al:Rectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="180" height="80" x="20" y="20">
+ <graphicsAlgorithmChildren xsi:type="al:Rectangle" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="20" height="10" x="150" y="50"/>
+ <graphicsAlgorithmChildren xsi:type="al:Rectangle" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="20" height="10" x="145" y="65"/>
+ </graphicsAlgorithmChildren>
+ </graphicsAlgorithm>
+ <link>
+ <businessObjects href="../HelloWorld.room#SubSystemRef:System_HelloWorld$subsystem"/>
+ </link>
+ <anchors xsi:type="pi:ChopboxAnchor" referencedGraphicsAlgorithm="//@children.0/@children.0/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
+ <children visible="true">
+ <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="180" height="80" x="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="subsystem
(SubSystem_HelloWorld)"/>
+ </children>
+ </children>
+ </children>
+ <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"/>
+</pi:Diagram>
|