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/PedLightsController/diagrams/PedLightsController.PedLightsTop.behavior | |
| 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/PedLightsController/diagrams/PedLightsController.PedLightsTop.behavior')
| -rw-r--r-- | examples/org.eclipse.etrice.tutorials/model/PedLightsController/diagrams/PedLightsController.PedLightsTop.behavior | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/examples/org.eclipse.etrice.tutorials/model/PedLightsController/diagrams/PedLightsController.PedLightsTop.behavior b/examples/org.eclipse.etrice.tutorials/model/PedLightsController/diagrams/PedLightsController.PedLightsTop.behavior index 2a7d49266..949cbccd1 100644 --- a/examples/org.eclipse.etrice.tutorials/model/PedLightsController/diagrams/PedLightsController.PedLightsTop.behavior +++ b/examples/org.eclipse.etrice.tutorials/model/PedLightsController/diagrams/PedLightsController.PedLightsTop.behavior @@ -1,24 +1,24 @@ -<?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.behavior" name="Behavior of PedLightsTop" snapToGrid="true" showGuides="true" pictogramLinks="//@link //@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="../PedLightsController.room#ActorClass:PedLightsTop"/> - </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="691" height="421" x="20" y="20"> - <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.1" foreground="//@colors.2" lineWidth="4" transparency="0.0" width="651" height="381" x="20" y="20" cornerHeight="20" cornerWidth="20"/> - </graphicsAlgorithm> - <link> - <businessObjects href="../PedLightsController.room#StateMachine:PedLightsTop$sg"/> - </link> - <children visible="true"> - <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="651" height="40" y="20" font="//@fonts.1" horizontalAlignment="ALIGNMENT_RIGHT" verticalAlignment="ALIGNMENT_TOP" value="/"/> - </children> - </children> - <colors red="227" green="238" blue="249"/> - <colors red="255" green="255" blue="255"/> - <colors/> - <fonts name="Arial" size="8"/> - <fonts name="Arial" size="9" bold="true"/> -</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.behavior" name="Behavior of PedLightsTop" snapToGrid="true" showGuides="true" pictogramLinks="//@link //@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="../PedLightsController.room#ActorClass:PedLightsTop"/>
+ </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="691" height="421" x="20" y="20">
+ <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.1" foreground="//@colors.2" lineWidth="4" transparency="0.0" width="651" height="381" x="20" y="20" cornerHeight="20" cornerWidth="20"/>
+ </graphicsAlgorithm>
+ <link>
+ <businessObjects href="../PedLightsController.room#StateMachine:PedLightsTop$sg"/>
+ </link>
+ <children visible="true">
+ <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="651" height="40" y="20" font="//@fonts.1" horizontalAlignment="ALIGNMENT_RIGHT" verticalAlignment="ALIGNMENT_TOP" value="/"/>
+ </children>
+ </children>
+ <colors red="227" green="238" blue="249"/>
+ <colors red="255" green="255" blue="255"/>
+ <colors/>
+ <fonts name="Arial" size="8"/>
+ <fonts name="Arial" size="9" bold="true"/>
+</pi:Diagram>
|