Author: guixl
Date: Tue Jul 6 14:44:45 2010
New Revision: 960905
URL: http://svn.apache.org/viewvc?rev=960905&view=rev
Log:
fix data model problems, remove anchor element
Modified:
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.ecore
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.ecore_diagram
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.genmodel
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.gmfgen
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.gmfgraph
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.gmfmap
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.trace
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Content.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ModelingPackage.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Parallel.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Raise.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Script.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ServiceTemplate.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/State.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ContentImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ModelingPackageImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ParallelImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/RaiseImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ScriptImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ServiceTemplateImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/StateImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/util/ModelingSwitch.java
Modified:
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.ecore
URL:
http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.ecore?rev=960905&r1=960904&r2=960905&view=diff
==============================================================================
---
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.ecore
(original)
+++
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.ecore
Tue Jul 6 14:44:45 2010
@@ -28,10 +28,10 @@
eType="#//Parallel" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="historyState"
upperBound="-1"
eType="#//HistoryState" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="anchor"
upperBound="-1"
- eType="#//Anchor" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="invoke"
eType="#//Invoke"
containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="finalize"
eType="#//Finalize"
+ containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Transition">
<eStructuralFeatures xsi:type="ecore:EReference" name="targetStatus"
eType="#//NamedElement"/>
@@ -61,8 +61,8 @@
eType="#//FinalState" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="parallel"
upperBound="-1"
eType="#//Parallel" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="dataModel"
upperBound="-1"
- eType="#//DataModel" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="dataModel"
eType="#//DataModel"
+ containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="script"
eType="#//Script"
containment="true"/>
</eClassifiers>
@@ -101,8 +101,10 @@
eType="#//State" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="historyState"
upperBound="-1"
eType="#//HistoryState" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="anchor"
upperBound="-1"
- eType="#//Anchor" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="invoke"
eType="#//Invoke"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="finalize"
eType="#//Finalize"
+ containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="HistoryState"
eSuperTypes="#//NamedElement">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="id"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -110,6 +112,10 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Raise"
eSuperTypes="#//ExecutableContent">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="event"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="param"
upperBound="-1"
+ eType="#//Param" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="content"
eType="#//Content"
+ containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="If"
eSuperTypes="#//ExecutableContent">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="cond"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -147,7 +153,9 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="expr"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Script"/>
+ <eClassifiers xsi:type="ecore:EClass" name="Script"
eSuperTypes="#//ExecutableContent">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="script_content"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Anchor">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="type"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="snapshot"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -178,6 +186,7 @@
<eClassifiers xsi:type="ecore:EClass" name="Content">
<eStructuralFeatures xsi:type="ecore:EReference" name="content"
upperBound="-1"
eType="#//Content" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="text_content"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Donedata">
<eStructuralFeatures xsi:type="ecore:EReference" name="content"
eType="#//Content"
Modified:
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.ecore_diagram
URL:
http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.ecore_diagram?rev=960905&r1=960904&r2=960905&view=diff
==============================================================================
---
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.ecore_diagram
(original)
+++
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.ecore_diagram
Tue Jul 6 14:44:45 2010
@@ -82,7 +82,7 @@
</children>
<styles xmi:type="notation:ShapeStyle" xmi:id="_9KMvjl17Ed-BqJBVG4-kXw"
fontName="微软é
é»"/>
<element xmi:type="ecore:EClass" href="scxml.ecore#//ServiceTemplate"/>
- <layoutConstraint xmi:type="notation:Bounds"
xmi:id="_9KMvj117Ed-BqJBVG4-kXw" x="540" y="1215"/>
+ <layoutConstraint xmi:type="notation:Bounds"
xmi:id="_9KMvj117Ed-BqJBVG4-kXw" x="275" y="1225"/>
</children>
<children xmi:type="notation:Node" xmi:id="_9KMvnV17Ed-BqJBVG4-kXw"
type="2001">
<children xmi:type="notation:Node" xmi:id="_9KMvoF17Ed-BqJBVG4-kXw"
type="5001"/>
@@ -376,7 +376,7 @@
</children>
<styles xmi:type="notation:ShapeStyle" xmi:id="_9KfqXl17Ed-BqJBVG4-kXw"
fontName="微软é
é»"/>
<element xmi:type="ecore:EClass" href="scxml.ecore#//DataModel"/>
- <layoutConstraint xmi:type="notation:Bounds"
xmi:id="_9KfqX117Ed-BqJBVG4-kXw" x="12" y="268"/>
+ <layoutConstraint xmi:type="notation:Bounds"
xmi:id="_9KfqX117Ed-BqJBVG4-kXw" x="45" y="620"/>
</children>
<children xmi:type="notation:Node" xmi:id="_9KfqbV17Ed-BqJBVG4-kXw"
type="2001">
<children xmi:type="notation:Node" xmi:id="_9KfqcF17Ed-BqJBVG4-kXw"
type="5001"/>
@@ -397,7 +397,7 @@
</children>
<styles xmi:type="notation:ShapeStyle" xmi:id="_9Kfqbl17Ed-BqJBVG4-kXw"
fontName="微软é
é»"/>
<element xmi:type="ecore:EClass" href="scxml.ecore#//Data"/>
- <layoutConstraint xmi:type="notation:Bounds"
xmi:id="_9Kfqb117Ed-BqJBVG4-kXw" x="775" y="113"/>
+ <layoutConstraint xmi:type="notation:Bounds"
xmi:id="_9Kfqb117Ed-BqJBVG4-kXw" x="570" y="145"/>
</children>
<children xmi:type="notation:Node" xmi:id="_9KfqfV17Ed-BqJBVG4-kXw"
type="2001">
<children xmi:type="notation:Node" xmi:id="_9KfqgF17Ed-BqJBVG4-kXw"
type="5001"/>
@@ -460,7 +460,7 @@
</children>
<styles xmi:type="notation:ShapeStyle" xmi:id="_9Kfqnl17Ed-BqJBVG4-kXw"
fontName="微软é
é»"/>
<element xmi:type="ecore:EClass" href="scxml.ecore#//Script"/>
- <layoutConstraint xmi:type="notation:Bounds"
xmi:id="_9Kfqn117Ed-BqJBVG4-kXw" x="1689" y="389"/>
+ <layoutConstraint xmi:type="notation:Bounds"
xmi:id="_9Kfqn117Ed-BqJBVG4-kXw" x="1670" y="185"/>
</children>
<children xmi:type="notation:Node" xmi:id="_9KfqrV17Ed-BqJBVG4-kXw"
type="2001">
<children xmi:type="notation:Node" xmi:id="_9KfqsF17Ed-BqJBVG4-kXw"
type="5001"/>
@@ -544,7 +544,7 @@
</children>
<styles xmi:type="notation:ShapeStyle" xmi:id="_9Kfq3l17Ed-BqJBVG4-kXw"
fontName="微软é
é»"/>
<element xmi:type="ecore:EClass" href="scxml.ecore#//Content"/>
- <layoutConstraint xmi:type="notation:Bounds"
xmi:id="_9Kfq3117Ed-BqJBVG4-kXw" x="1518"/>
+ <layoutConstraint xmi:type="notation:Bounds"
xmi:id="_9Kfq3117Ed-BqJBVG4-kXw" x="805" y="50"/>
</children>
<children xmi:type="notation:Node" xmi:id="_9Kfq7V17Ed-BqJBVG4-kXw"
type="2001">
<children xmi:type="notation:Node" xmi:id="_9Kfq8F17Ed-BqJBVG4-kXw"
type="5001"/>
@@ -609,6 +609,27 @@
<element xmi:type="ecore:EClass" href="scxml.ecore#//Finalize"/>
<layoutConstraint xmi:type="notation:Bounds"
xmi:id="_9KfrD117Ed-BqJBVG4-kXw" x="1261" y="389"/>
</children>
+ <children xmi:type="notation:Node" xmi:id="_qfcfBIhFEd-lXOreoMfyhw"
type="2001">
+ <children xmi:type="notation:Node" xmi:id="_qfcfB4hFEd-lXOreoMfyhw"
type="5001"/>
+ <children xmi:type="notation:Node" xmi:id="_qfcfCIhFEd-lXOreoMfyhw"
type="7001">
+ <styles xmi:type="notation:DrawerStyle"
xmi:id="_qfcfCYhFEd-lXOreoMfyhw"/>
+ <styles xmi:type="notation:SortingStyle"
xmi:id="_qfcfCohFEd-lXOreoMfyhw"/>
+ <styles xmi:type="notation:FilteringStyle"
xmi:id="_qfcfC4hFEd-lXOreoMfyhw"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_qfcfDIhFEd-lXOreoMfyhw"
type="7002">
+ <styles xmi:type="notation:DrawerStyle"
xmi:id="_qfcfDYhFEd-lXOreoMfyhw"/>
+ <styles xmi:type="notation:SortingStyle"
xmi:id="_qfcfDohFEd-lXOreoMfyhw"/>
+ <styles xmi:type="notation:FilteringStyle"
xmi:id="_qfcfD4hFEd-lXOreoMfyhw"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_qfcfEIhFEd-lXOreoMfyhw"
type="7003">
+ <styles xmi:type="notation:DrawerStyle"
xmi:id="_qfcfEYhFEd-lXOreoMfyhw"/>
+ <styles xmi:type="notation:SortingStyle"
xmi:id="_qfcfEohFEd-lXOreoMfyhw"/>
+ <styles xmi:type="notation:FilteringStyle"
xmi:id="_qfcfE4hFEd-lXOreoMfyhw"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_qfcfBYhFEd-lXOreoMfyhw"
fontName="微软é
é»"/>
+ <element xmi:type="ecore:EClass" href="scxml.ecore#//Transition"/>
+ <layoutConstraint xmi:type="notation:Bounds"
xmi:id="_qfcfBohFEd-lXOreoMfyhw"/>
+ </children>
<styles xmi:type="notation:DiagramStyle" xmi:id="_N8TzcVxEEd-J9vls9vCPuA"/>
<element xmi:type="ecore:EPackage" href="scxml.ecore#/"/>
<edges xmi:type="notation:Edge" xmi:id="_9VzieF17Ed-BqJBVG4-kXw" type="4003"
source="_9J50cF17Ed-BqJBVG4-kXw" target="_9KfqXV17Ed-BqJBVG4-kXw">
@@ -721,20 +742,6 @@
<sourceAnchor xmi:type="notation:IdentityAnchor"
xmi:id="_9bJ8tF17Ed-BqJBVG4-kXw" id="(0.27118644,0.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor"
xmi:id="_9bJ8tV17Ed-BqJBVG4-kXw" id="(0.3258427,1.0)"/>
</edges>
- <edges xmi:type="notation:Edge" xmi:id="_9WGdeF17Ed-BqJBVG4-kXw" type="4003"
source="_9KC-bF17Ed-BqJBVG4-kXw" target="_9KfqrV17Ed-BqJBVG4-kXw">
- <children xmi:type="notation:Node" xmi:id="_9WGdfF17Ed-BqJBVG4-kXw"
type="6002">
- <layoutConstraint xmi:type="notation:Location"
xmi:id="_9WGdfV17Ed-BqJBVG4-kXw" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_9WGdfl17Ed-BqJBVG4-kXw"
type="6004">
- <layoutConstraint xmi:type="notation:Location"
xmi:id="_9WGdf117Ed-BqJBVG4-kXw" y="60"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle"
xmi:id="_9WGdeV17Ed-BqJBVG4-kXw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_9WGdel17Ed-BqJBVG4-kXw"
fontName="微软é
é»"/>
- <element xmi:type="ecore:EReference" href="scxml.ecore#//State/anchor"/>
- <bendpoints xmi:type="notation:RelativeBendpoints"
xmi:id="_9WGde117Ed-BqJBVG4-kXw" points="[1, 0, 1, 368]$[1, -368, 1, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor"
xmi:id="_9bJ8ul17Ed-BqJBVG4-kXw" id="(0.5254237,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor"
xmi:id="_9bJ8u117Ed-BqJBVG4-kXw" id="(0.5243902,1.0)"/>
- </edges>
<edges xmi:type="notation:Edge" xmi:id="_9WQOYF17Ed-BqJBVG4-kXw" type="4003"
source="_9KC-bF17Ed-BqJBVG4-kXw" target="_9Kfq_V17Ed-BqJBVG4-kXw">
<children xmi:type="notation:Node" xmi:id="_9WQOZF17Ed-BqJBVG4-kXw"
type="6002">
<layoutConstraint xmi:type="notation:Location"
xmi:id="_9WQOZV17Ed-BqJBVG4-kXw" y="40"/>
@@ -817,7 +824,7 @@
<styles xmi:type="notation:ConnectorStyle"
xmi:id="_9W2ESV17Ed-BqJBVG4-kXw"/>
<styles xmi:type="notation:FontStyle" xmi:id="_9W2ESl17Ed-BqJBVG4-kXw"
fontName="微软é
é»"/>
<element xmi:type="ecore:EReference"
href="scxml.ecore#//ServiceTemplate/dataModel"/>
- <bendpoints xmi:type="notation:RelativeBendpoints"
xmi:id="_9W2ES117Ed-BqJBVG4-kXw" points="[0, 0, 849, 799]$[-497, -61, 352,
738]$[-914, -320, -65, 479]$[-927, -645, -78, 154]$[-927, -739, -78, 60]$[-849,
-799, 0, 0]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints"
xmi:id="_9W2ES117Ed-BqJBVG4-kXw" points="[0, 0, 488, 534]$[-488, -534, 0, 0]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor"
xmi:id="_9bJ8tl17Ed-BqJBVG4-kXw" id="(0.12280702,0.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor"
xmi:id="_9bJ8t117Ed-BqJBVG4-kXw" id="(0.25,1.0)"/>
</edges>
@@ -1017,20 +1024,6 @@
<sourceAnchor xmi:type="notation:IdentityAnchor"
xmi:id="_9bJ8kF17Ed-BqJBVG4-kXw" id="(0.16393442,0.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor"
xmi:id="_9bJ8kV17Ed-BqJBVG4-kXw" id="(0.66292137,1.0)"/>
</edges>
- <edges xmi:type="notation:Edge" xmi:id="_9Xb6IF17Ed-BqJBVG4-kXw" type="4003"
source="_9KWgjV17Ed-BqJBVG4-kXw" target="_9KfqrV17Ed-BqJBVG4-kXw">
- <children xmi:type="notation:Node" xmi:id="_9Xb6JF17Ed-BqJBVG4-kXw"
type="6002">
- <layoutConstraint xmi:type="notation:Location"
xmi:id="_9Xb6JV17Ed-BqJBVG4-kXw" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_9Xb6Jl17Ed-BqJBVG4-kXw"
type="6004">
- <layoutConstraint xmi:type="notation:Location"
xmi:id="_9Xb6J117Ed-BqJBVG4-kXw" y="60"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle"
xmi:id="_9Xb6IV17Ed-BqJBVG4-kXw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_9Xb6Il17Ed-BqJBVG4-kXw"
fontName="微软é
é»"/>
- <element xmi:type="ecore:EReference" href="scxml.ecore#//Parallel/anchor"/>
- <bendpoints xmi:type="notation:RelativeBendpoints"
xmi:id="_9Xb6I117Ed-BqJBVG4-kXw" points="[0, 0, -55, 247]$[19, -61, -36,
186]$[56, -247, 1, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor"
xmi:id="_9bJ8ll17Ed-BqJBVG4-kXw" id="(0.4918033,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor"
xmi:id="_9bJ8l117Ed-BqJBVG4-kXw" id="(0.25609756,1.0)"/>
- </edges>
<edges xmi:type="notation:Edge" xmi:id="_9Xb6KF17Ed-BqJBVG4-kXw" type="4004"
source="_9KWgjV17Ed-BqJBVG4-kXw" target="_9J50cF17Ed-BqJBVG4-kXw">
<styles xmi:type="notation:ConnectorStyle"
xmi:id="_9Xb6KV17Ed-BqJBVG4-kXw"/>
<styles xmi:type="notation:FontStyle" xmi:id="_9Xb6Kl17Ed-BqJBVG4-kXw"
fontName="微软é
é»"/>
@@ -1307,4 +1300,138 @@
<sourceAnchor xmi:type="notation:IdentityAnchor"
xmi:id="_9bAyql17Ed-BqJBVG4-kXw" id="(0.4918033,0.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor"
xmi:id="_9bAyq117Ed-BqJBVG4-kXw" id="(0.5714286,1.0)"/>
</edges>
+ <edges xmi:type="notation:Edge" xmi:id="_qfmP8IhFEd-lXOreoMfyhw" type="4003"
source="_9J50cF17Ed-BqJBVG4-kXw" target="_qfcfBIhFEd-lXOreoMfyhw">
+ <children xmi:type="notation:Node" xmi:id="_qfmP9IhFEd-lXOreoMfyhw"
type="6002">
+ <layoutConstraint xmi:type="notation:Location"
xmi:id="_qfmP9YhFEd-lXOreoMfyhw" y="40"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_qfmP9ohFEd-lXOreoMfyhw"
type="6004">
+ <layoutConstraint xmi:type="notation:Location"
xmi:id="_qfmP94hFEd-lXOreoMfyhw" y="60"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle"
xmi:id="_qfmP8YhFEd-lXOreoMfyhw"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_qfmP8ohFEd-lXOreoMfyhw"
fontName="微软é
é»"/>
+ <element xmi:type="ecore:EReference"
href="scxml.ecore#//NamedElement/sourceConnection"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints"
xmi:id="_qfmP84hFEd-lXOreoMfyhw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_qfmP-IhFEd-lXOreoMfyhw" type="4003"
source="_9J50cF17Ed-BqJBVG4-kXw" target="_qfcfBIhFEd-lXOreoMfyhw">
+ <children xmi:type="notation:Node" xmi:id="_qfmP_IhFEd-lXOreoMfyhw"
type="6002">
+ <layoutConstraint xmi:type="notation:Location"
xmi:id="_qfmP_YhFEd-lXOreoMfyhw" y="40"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_qfmP_ohFEd-lXOreoMfyhw"
type="6004">
+ <layoutConstraint xmi:type="notation:Location"
xmi:id="_qfmP_4hFEd-lXOreoMfyhw" y="60"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle"
xmi:id="_qfmP-YhFEd-lXOreoMfyhw"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_qfmP-ohFEd-lXOreoMfyhw"
fontName="微软é
é»"/>
+ <element xmi:type="ecore:EReference"
href="scxml.ecore#//NamedElement/targetConnection"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints"
xmi:id="_qfmP-4hFEd-lXOreoMfyhw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_qfvZ4IhFEd-lXOreoMfyhw" type="4003"
source="_9KC-bF17Ed-BqJBVG4-kXw" target="_9KfrDV17Ed-BqJBVG4-kXw">
+ <children xmi:type="notation:Node" xmi:id="_qfvZ5IhFEd-lXOreoMfyhw"
type="6002">
+ <layoutConstraint xmi:type="notation:Location"
xmi:id="_qfvZ5YhFEd-lXOreoMfyhw" y="40"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_qfvZ5ohFEd-lXOreoMfyhw"
type="6004">
+ <layoutConstraint xmi:type="notation:Location"
xmi:id="_qfvZ54hFEd-lXOreoMfyhw" y="60"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle"
xmi:id="_qfvZ4YhFEd-lXOreoMfyhw"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_qfvZ4ohFEd-lXOreoMfyhw"
fontName="微软é
é»"/>
+ <element xmi:type="ecore:EReference" href="scxml.ecore#//State/finalize"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints"
xmi:id="_qfvZ44hFEd-lXOreoMfyhw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_qfvZ6IhFEd-lXOreoMfyhw" type="4003"
source="_9KMvjV17Ed-BqJBVG4-kXw" target="_qfcfBIhFEd-lXOreoMfyhw">
+ <children xmi:type="notation:Node" xmi:id="_qfvZ7IhFEd-lXOreoMfyhw"
type="6002">
+ <layoutConstraint xmi:type="notation:Location"
xmi:id="_qfvZ7YhFEd-lXOreoMfyhw" y="40"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_qfvZ7ohFEd-lXOreoMfyhw"
type="6004">
+ <layoutConstraint xmi:type="notation:Location"
xmi:id="_qfvZ74hFEd-lXOreoMfyhw" y="60"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle"
xmi:id="_qfvZ6YhFEd-lXOreoMfyhw"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_qfvZ6ohFEd-lXOreoMfyhw"
fontName="微软é
é»"/>
+ <element xmi:type="ecore:EReference"
href="scxml.ecore#//ServiceTemplate/transList"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints"
xmi:id="_qfvZ64hFEd-lXOreoMfyhw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_qfvZ8IhFEd-lXOreoMfyhw" type="4002"
source="_qfcfBIhFEd-lXOreoMfyhw" target="_9J50cF17Ed-BqJBVG4-kXw">
+ <children xmi:type="notation:Node" xmi:id="_qfvZ9IhFEd-lXOreoMfyhw"
type="6001">
+ <layoutConstraint xmi:type="notation:Location"
xmi:id="_qfvZ9YhFEd-lXOreoMfyhw" y="40"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_qfvZ9ohFEd-lXOreoMfyhw"
type="6003">
+ <layoutConstraint xmi:type="notation:Location"
xmi:id="_qfvZ94hFEd-lXOreoMfyhw" y="60"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle"
xmi:id="_qfvZ8YhFEd-lXOreoMfyhw"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_qfvZ8ohFEd-lXOreoMfyhw"
fontName="微软é
é»"/>
+ <element xmi:type="ecore:EReference"
href="scxml.ecore#//Transition/targetStatus"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints"
xmi:id="_qfvZ84hFEd-lXOreoMfyhw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_qfvZ-IhFEd-lXOreoMfyhw" type="4002"
source="_qfcfBIhFEd-lXOreoMfyhw" target="_9J50cF17Ed-BqJBVG4-kXw">
+ <children xmi:type="notation:Node" xmi:id="_qfvZ_IhFEd-lXOreoMfyhw"
type="6001">
+ <layoutConstraint xmi:type="notation:Location"
xmi:id="_qfvZ_YhFEd-lXOreoMfyhw" y="40"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_qfvZ_ohFEd-lXOreoMfyhw"
type="6003">
+ <layoutConstraint xmi:type="notation:Location"
xmi:id="_qfvZ_4hFEd-lXOreoMfyhw" y="60"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle"
xmi:id="_qfvZ-YhFEd-lXOreoMfyhw"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_qfvZ-ohFEd-lXOreoMfyhw"
fontName="微软é
é»"/>
+ <element xmi:type="ecore:EReference"
href="scxml.ecore#//Transition/sourceStatus"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints"
xmi:id="_qfvZ-4hFEd-lXOreoMfyhw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_0H9RUIhFEd-lXOreoMfyhw" type="4003"
source="_9KWgjV17Ed-BqJBVG4-kXw" target="_9Kfq_V17Ed-BqJBVG4-kXw">
+ <children xmi:type="notation:Node" xmi:id="_0H9RVIhFEd-lXOreoMfyhw"
type="6002">
+ <layoutConstraint xmi:type="notation:Location"
xmi:id="_0H9RVYhFEd-lXOreoMfyhw" y="40"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_0H9RVohFEd-lXOreoMfyhw"
type="6004">
+ <layoutConstraint xmi:type="notation:Location"
xmi:id="_0H9RV4hFEd-lXOreoMfyhw" y="60"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle"
xmi:id="_0H9RUYhFEd-lXOreoMfyhw"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_0H9RUohFEd-lXOreoMfyhw"
fontName="微软é
é»"/>
+ <element xmi:type="ecore:EReference" href="scxml.ecore#//Parallel/invoke"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints"
xmi:id="_0H9RU4hFEd-lXOreoMfyhw" points="[6, -4, -189, 166]$[183, -149, -12,
21]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor"
xmi:id="_0H9RWIhFEd-lXOreoMfyhw" id="(0.40983605,0.08196721)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor"
xmi:id="_0H9RWYhFEd-lXOreoMfyhw" id="(0.11881188,0.8833333)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_4J75AIhFEd-lXOreoMfyhw" type="4003"
source="_9KWgjV17Ed-BqJBVG4-kXw" target="_9KfrDV17Ed-BqJBVG4-kXw">
+ <children xmi:type="notation:Node" xmi:id="_4J75BIhFEd-lXOreoMfyhw"
type="6002">
+ <layoutConstraint xmi:type="notation:Location"
xmi:id="_4J75BYhFEd-lXOreoMfyhw" y="40"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_4J75BohFEd-lXOreoMfyhw"
type="6004">
+ <layoutConstraint xmi:type="notation:Location"
xmi:id="_4J75B4hFEd-lXOreoMfyhw" y="60"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle"
xmi:id="_4J75AYhFEd-lXOreoMfyhw"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_4J75AohFEd-lXOreoMfyhw"
fontName="微软é
é»"/>
+ <element xmi:type="ecore:EReference"
href="scxml.ecore#//Parallel/finalize"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints"
xmi:id="_4J75A4hFEd-lXOreoMfyhw" points="[8, -10, -343, 455]$[345, -466, -6,
-1]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor"
xmi:id="_4J75CIhFEd-lXOreoMfyhw" id="(0.3442623,0.18032786)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor"
xmi:id="_4J75CYhFEd-lXOreoMfyhw" id="(0.09836066,0.4716981)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_YkfzgIjNEd-qxcGAoqOhWA" type="4003"
source="_9KWgrV17Ed-BqJBVG4-kXw" target="_9Kfq3V17Ed-BqJBVG4-kXw">
+ <children xmi:type="notation:Node" xmi:id="_YkfzhIjNEd-qxcGAoqOhWA"
type="6002">
+ <layoutConstraint xmi:type="notation:Location"
xmi:id="_YkfzhYjNEd-qxcGAoqOhWA" y="40"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_YkfzhojNEd-qxcGAoqOhWA"
type="6004">
+ <layoutConstraint xmi:type="notation:Location"
xmi:id="_Ykfzh4jNEd-qxcGAoqOhWA" y="60"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle"
xmi:id="_YkfzgYjNEd-qxcGAoqOhWA"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_YkfzgojNEd-qxcGAoqOhWA"
fontName="å®ä½"/>
+ <element xmi:type="ecore:EReference" href="scxml.ecore#//Raise/content"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints"
xmi:id="_Ykfzg4jNEd-qxcGAoqOhWA" points="[7, -5, -479, 310]$[482, -315, -4,
0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor"
xmi:id="_YkpkgIjNEd-qxcGAoqOhWA" id="(0.33898306,0.084745765)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor"
xmi:id="_YkpkgYjNEd-qxcGAoqOhWA" id="(0.06557377,0.5576923)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_pqhjgIjREd-qxcGAoqOhWA" type="4003"
source="_9KWgrV17Ed-BqJBVG4-kXw" target="_9KfqjV17Ed-BqJBVG4-kXw">
+ <children xmi:type="notation:Node" xmi:id="_pqhjhIjREd-qxcGAoqOhWA"
type="6002">
+ <layoutConstraint xmi:type="notation:Location"
xmi:id="_pqhjhYjREd-qxcGAoqOhWA" y="40"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_pqhjhojREd-qxcGAoqOhWA"
type="6004">
+ <layoutConstraint xmi:type="notation:Location"
xmi:id="_pqhjh4jREd-qxcGAoqOhWA" y="60"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle"
xmi:id="_pqhjgYjREd-qxcGAoqOhWA"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_pqhjgojREd-qxcGAoqOhWA"
fontName="å®ä½"/>
+ <element xmi:type="ecore:EReference" href="scxml.ecore#//Raise/param"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints"
xmi:id="_pqhjg4jREd-qxcGAoqOhWA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_s29qUIjREd-qxcGAoqOhWA" type="4004"
source="_9KfqnV17Ed-BqJBVG4-kXw" target="_9KMvnV17Ed-BqJBVG4-kXw">
+ <styles xmi:type="notation:ConnectorStyle"
xmi:id="_s29qUYjREd-qxcGAoqOhWA"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_s29qUojREd-qxcGAoqOhWA"
fontName="å®ä½"/>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints"
xmi:id="_s29qU4jREd-qxcGAoqOhWA" points="[-7, 2, 267, -98]$[-246, 99, 28, -1]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor"
xmi:id="_s29qVIjREd-qxcGAoqOhWA" id="(0.14545454,0.15384616)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor"
xmi:id="_s29qVYjREd-qxcGAoqOhWA" id="(0.95947903,0.48076922)"/>
+ </edges>
</notation:Diagram>
Modified:
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.genmodel
URL:
http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.genmodel?rev=960905&r1=960904&r2=960905&view=diff
==============================================================================
---
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.genmodel
(original)
+++
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.genmodel
Tue Jul 6 14:44:45 2010
@@ -21,8 +21,8 @@
<genFeatures property="None" children="true" createChild="true"
ecoreFeature="ecore:EReference scxml.ecore#//State/finalState"/>
<genFeatures property="None" children="true" createChild="true"
ecoreFeature="ecore:EReference scxml.ecore#//State/subParallel"/>
<genFeatures property="None" children="true" createChild="true"
ecoreFeature="ecore:EReference scxml.ecore#//State/historyState"/>
- <genFeatures property="None" children="true" createChild="true"
ecoreFeature="ecore:EReference scxml.ecore#//State/anchor"/>
<genFeatures property="None" children="true" createChild="true"
ecoreFeature="ecore:EReference scxml.ecore#//State/invoke"/>
+ <genFeatures property="None" children="true" createChild="true"
ecoreFeature="ecore:EReference scxml.ecore#//State/finalize"/>
</genClasses>
<genClasses ecoreClass="scxml.ecore#//Transition">
<genFeatures notify="false" createChild="false"
propertySortChoices="true" ecoreFeature="ecore:EReference
scxml.ecore#//Transition/targetStatus"/>
@@ -46,7 +46,6 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute
scxml.ecore#//ServiceTemplate/version"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute
scxml.ecore#//ServiceTemplate/profile"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute
scxml.ecore#//ServiceTemplate/exmode"/>
- <genFeatures property="None" children="true" createChild="true"
ecoreFeature="ecore:EReference scxml.ecore#//ServiceTemplate/initialState"/>
<genFeatures property="None" children="true" createChild="true"
ecoreFeature="ecore:EReference scxml.ecore#//ServiceTemplate/finalState"/>
<genFeatures property="None" children="true" createChild="true"
ecoreFeature="ecore:EReference scxml.ecore#//ServiceTemplate/parallel"/>
<genFeatures property="None" children="true" createChild="true"
ecoreFeature="ecore:EReference scxml.ecore#//ServiceTemplate/dataModel"/>
@@ -75,7 +74,8 @@
<genFeatures property="None" children="true" createChild="true"
ecoreFeature="ecore:EReference scxml.ecore#//Parallel/parallel"/>
<genFeatures property="None" children="true" createChild="true"
ecoreFeature="ecore:EReference scxml.ecore#//Parallel/state"/>
<genFeatures property="None" children="true" createChild="true"
ecoreFeature="ecore:EReference scxml.ecore#//Parallel/historyState"/>
- <genFeatures property="None" children="true" createChild="true"
ecoreFeature="ecore:EReference scxml.ecore#//Parallel/anchor"/>
+ <genFeatures property="None" children="true" createChild="true"
ecoreFeature="ecore:EReference scxml.ecore#//Parallel/invoke"/>
+ <genFeatures property="None" children="true" createChild="true"
ecoreFeature="ecore:EReference scxml.ecore#//Parallel/finalize"/>
</genClasses>
<genClasses ecoreClass="scxml.ecore#//HistoryState">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute
scxml.ecore#//HistoryState/id"/>
@@ -83,6 +83,8 @@
</genClasses>
<genClasses ecoreClass="scxml.ecore#//Raise">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute
scxml.ecore#//Raise/event"/>
+ <genFeatures property="None" children="true" createChild="true"
ecoreFeature="ecore:EReference scxml.ecore#//Raise/param"/>
+ <genFeatures property="None" children="true" createChild="true"
ecoreFeature="ecore:EReference scxml.ecore#//Raise/content"/>
</genClasses>
<genClasses ecoreClass="scxml.ecore#//If">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute
scxml.ecore#//If/cond"/>
@@ -117,7 +119,9 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute
scxml.ecore#//Param/name"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute
scxml.ecore#//Param/expr"/>
</genClasses>
- <genClasses ecoreClass="scxml.ecore#//Script"/>
+ <genClasses ecoreClass="scxml.ecore#//Script">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute
scxml.ecore#//Script/script_content"/>
+ </genClasses>
<genClasses ecoreClass="scxml.ecore#//Anchor">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute
scxml.ecore#//Anchor/type"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute
scxml.ecore#//Anchor/snapshot"/>
@@ -145,6 +149,7 @@
</genClasses>
<genClasses ecoreClass="scxml.ecore#//Content">
<genFeatures property="None" children="true" createChild="true"
ecoreFeature="ecore:EReference scxml.ecore#//Content/content"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute
scxml.ecore#//Content/text_content"/>
</genClasses>
<genClasses ecoreClass="scxml.ecore#//Donedata">
<genFeatures property="None" children="true" createChild="true"
ecoreFeature="ecore:EReference scxml.ecore#//Donedata/content"/>
