commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gu...@apache.org
Subject svn commit: r953053 - in /commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model: scxml.ecore scxml.ecore_diagram scxml.gmfgen scxml.gmfmap scxml.trace
Date Wed, 09 Jun 2010 15:58:29 GMT
Author: guixl
Date: Wed Jun  9 15:58:29 2010
New Revision: 953053

URL: http://svn.apache.org/viewvc?rev=953053&view=rev
Log:
change data model - remove initial state in service template, only state has initial state
node

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.gmfgen
    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

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=953053&r1=953052&r2=953053&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
Wed Jun  9 15:58:29 2010
@@ -57,8 +57,6 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" eType="ecore:EDataType
http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="profile" eType="ecore:EDataType
http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="exmode" eType="ecore:EDataType
http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="initialState" eType="#//InitialState"
-        containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="finalState" upperBound="-1"
         eType="#//FinalState" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="parallel" upperBound="-1"

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=953053&r1=953052&r2=953053&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
Wed Jun  9 15:58:29 2010
@@ -779,20 +779,6 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9bAysl17Ed-BqJBVG4-kXw"
id="(0.622807,0.0)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9bAys117Ed-BqJBVG4-kXw"
id="(0.4915254,1.0)"/>
   </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_9WsTQF17Ed-BqJBVG4-kXw" type="4003" source="_9KMvjV17Ed-BqJBVG4-kXw"
target="_9KWgbV17Ed-BqJBVG4-kXw">
-    <children xmi:type="notation:Node" xmi:id="_9WsTRF17Ed-BqJBVG4-kXw" type="6002">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_9WsTRV17Ed-BqJBVG4-kXw"
y="40"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_9WsTRl17Ed-BqJBVG4-kXw" type="6004">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_9WsTR117Ed-BqJBVG4-kXw"
y="60"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_9WsTQV17Ed-BqJBVG4-kXw"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_9WsTQl17Ed-BqJBVG4-kXw" fontName="微软雅黑"/>
-    <element xmi:type="ecore:EReference" href="scxml.ecore#//ServiceTemplate/initialState"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9WsTQ117Ed-BqJBVG4-kXw"
points="[1, 0, 423, 206]$[-422, -206, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9bJ8rl17Ed-BqJBVG4-kXw"
id="(0.36842105,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9bJ8r117Ed-BqJBVG4-kXw"
id="(0.32911393,1.0)"/>
-  </edges>
   <edges xmi:type="notation:Edge" xmi:id="_9WsTSF17Ed-BqJBVG4-kXw" type="4003" source="_9KMvjV17Ed-BqJBVG4-kXw"
target="_9KWgfV17Ed-BqJBVG4-kXw">
     <children xmi:type="notation:Node" xmi:id="_9WsTTF17Ed-BqJBVG4-kXw" type="6002">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_9WsTTV17Ed-BqJBVG4-kXw"
y="40"/>

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.gmfgen
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.gmfgen?rev=953053&r1=953052&r2=953053&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.gmfgen
(original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.gmfgen
Wed Jun  9 15:58:29 2010
@@ -2385,51 +2385,6 @@
       </labels>
     </topLevelNodes>
     <topLevelNodes
-        visualID="2002"
-        editPartClassName="InitialStateEditPart"
-        itemSemanticEditPolicyClassName="InitialStateItemSemanticEditPolicy"
-        notationViewFactoryClassName="InitialStateViewFactory"
-        canonicalEditPolicyClassName="InitialStateCanonicalEditPolicy"
-        graphicalNodeEditPolicyClassName="InitialStateGraphicalNodeEditPolicy"
-        createCommandClassName="InitialStateCreateCommand">
-      <diagramRunTimeClass
-          href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-      <elementType
-          xsi:type="gmfgen:SpecializationType"
-          metamodelType="//@diagram/@childNodes.31/@elementType"/>
-      <viewmap
-          xsi:type="gmfgen:InnerClassViewmap"
-          layoutType="FLOW_LAYOUT"
-          className="InitialStateFigure"
-          classBody="&#xA;/**&#xA; * @generated&#xA; */&#xA;public class
InitialStateFigure extends org.eclipse.draw2d.Ellipse {&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9;
* @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel
fFigureInitialStateTitle; &#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9;
*/&#xA;&#x9;public InitialStateFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;org.eclipse.draw2d.FlowLayout
layoutThis = new org.eclipse.draw2d.FlowLayout();&#xA;&#x9;layoutThis.setStretchMinorAxis(false);&#xA;&#x9;layoutThis.setMinorAlignment(org.eclipse.draw2d.FlowLayout.ALIGN_CENTER&#xA;);&#xA;&#xA;&#x9;layoutThis.setMajorAlignment(org.eclipse.draw2d.FlowLayout.ALIGN_CENTER&#xA;);&#xA;&#x9;layoutThis.setMajorSpacing(5);&#xA;&#x9;layoutThis.setMinorSpacing(5);&#xA;&#x9;layoutThis.setHorizontal(true);&#xA;&#xA;&#x9;this.setLayoutManager(layoutThis);&#xA;&#xA;&#x9;&#x9;&#x9;this.setBackgroundColor(THIS_BACK&#xA;);&#xA;&#x9;&#x9;createContents();&#xA
 ;&#x9;}&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private
void createContents(){&#xA;&#xA;&#xA;fFigureInitialStateTitle = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();&#xA;fFigureInitialStateTitle.setText(&quot;&quot;);&#xA;&#xA;this.add(fFigureInitialStateTitle);&#xA;&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9;
* @generated&#xA;&#x9; */&#xA;&#x9;private boolean myUseLocalCoordinates =
false;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected
boolean useLocalCoordinates() {&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9;
* @generated&#xA;&#x9; */&#xA;&#x9;protected void setUseLocalCoordinates(boolean
useLocalCoordinates) {&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9;
* @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel
getFigureInitialStateTitle() {&#xA;&#x9;&#x9;re
 turn fFigureInitialStateTitle;&#xA;&#x9;}&#xA;&#xA;&#xA;}&#xA;&#xA;/**&#xA;
* @generated&#xA; */&#xA;static final org.eclipse.swt.graphics.Color THIS_BACK = new
org.eclipse.swt.graphics.Color(null, 80, 80, 250);&#xA;&#xA;">
-        <attributes
-            xsi:type="gmfgen:StyleAttributes"
-            fixedBackground="true"/>
-        <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs>
-      </viewmap>
-      <modelFacet>
-        <metaClass
-            href="scxml.genmodel#//modeling/InitialState"/>
-        <containmentMetaFeature
-            href="scxml.genmodel#//modeling/ServiceTemplate/initialState"/>
-        <childMetaFeature
-            href="scxml.genmodel#//modeling/ServiceTemplate/initialState"/>
-      </modelFacet>
-      <labels
-          visualID="5046"
-          editPartClassName="WrappingLabelEditPart"
-          itemSemanticEditPolicyClassName="WrappingLabelItemSemanticEditPolicy"
-          notationViewFactoryClassName="WrappingLabelViewFactory"
-          readOnly="true">
-        <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
-        <viewmap
-            xsi:type="gmfgen:ParentAssignedViewmap"
-            getterName="getFigureInitialStateTitle"
-            figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-      </labels>
-    </topLevelNodes>
-    <topLevelNodes
         visualID="2003"
         editPartClassName="ScriptEditPart"
         itemSemanticEditPolicyClassName="ScriptItemSemanticEditPolicy"
@@ -3159,7 +3114,7 @@
         childNodes="//@diagram/@childNodes.34 //@diagram/@childNodes.35 //@diagram/@childNodes.36
//@diagram/@childNodes.37 //@diagram/@childNodes.38 //@diagram/@childNodes.39"
         title="ParallelCompartment"
         needsTitle="false"
-        node="//@diagram/@topLevelNodes.3"
+        node="//@diagram/@topLevelNodes.2"
         listLayout="false">
       <diagramRunTimeClass
           href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
@@ -3179,7 +3134,7 @@
         childNodes="//@diagram/@childNodes.48"
         title="DataModelCompartment"
         needsTitle="false"
-        node="//@diagram/@topLevelNodes.4"
+        node="//@diagram/@topLevelNodes.3"
         listLayout="false">
       <diagramRunTimeClass
           href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
@@ -3243,7 +3198,7 @@
         childNodes="//@diagram/@childNodes.42 //@diagram/@childNodes.45 //@diagram/@childNodes.46"
         title="FinalStateCompartment"
         needsTitle="false"
-        node="//@diagram/@topLevelNodes.5"
+        node="//@diagram/@topLevelNodes.4"
         listLayout="false">
       <diagramRunTimeClass
           href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
@@ -3282,17 +3237,17 @@
             xsi:type="gmfgen:ToolEntry"
             title="InitialState"
             description="Create new InitialState"
-            genNodes="//@diagram/@childNodes.31 //@diagram/@topLevelNodes.1"/>
+            genNodes="//@diagram/@childNodes.31"/>
         <entries
             xsi:type="gmfgen:ToolEntry"
             title="FinalState"
             description="Create new FinalState"
-            genNodes="//@diagram/@childNodes.41 //@diagram/@topLevelNodes.5"/>
+            genNodes="//@diagram/@childNodes.41 //@diagram/@topLevelNodes.4"/>
         <entries
             xsi:type="gmfgen:ToolEntry"
             title="Parallel"
             description="Create new Parallel"
-            genNodes="//@diagram/@childNodes.33 //@diagram/@childNodes.36 //@diagram/@topLevelNodes.3"/>
+            genNodes="//@diagram/@childNodes.33 //@diagram/@childNodes.36 //@diagram/@topLevelNodes.2"/>
         <entries
             xsi:type="gmfgen:ToolEntry"
             title="HistoryState"
@@ -3385,7 +3340,7 @@
             xsi:type="gmfgen:ToolEntry"
             title="DataModel"
             description="Create new DataModel"
-            genNodes="//@diagram/@topLevelNodes.4"/>
+            genNodes="//@diagram/@topLevelNodes.3"/>
         <entries
             xsi:type="gmfgen:ToolEntry"
             title="Data"
@@ -3395,7 +3350,7 @@
             xsi:type="gmfgen:ToolEntry"
             title="Script"
             description="Create new Script"
-            genNodes="//@diagram/@childNodes.14 //@diagram/@childNodes.25 //@diagram/@topLevelNodes.2"/>
+            genNodes="//@diagram/@childNodes.14 //@diagram/@childNodes.25 //@diagram/@topLevelNodes.1"/>
         <entries
             xsi:type="gmfgen:ToolEntry"
             title="Content"
@@ -3803,29 +3758,26 @@
         parent="//@diagram"
         child="//@diagram/@topLevelNodes.1"/>
     <childReferences
-        parent="//@diagram"
-        child="//@diagram/@topLevelNodes.2"/>
-    <childReferences
-        parent="//@diagram/@topLevelNodes.3"
+        parent="//@diagram/@topLevelNodes.2"
         child="//@diagram/@childNodes.34"/>
     <childReferences
-        parent="//@diagram/@topLevelNodes.3"
+        parent="//@diagram/@topLevelNodes.2"
         child="//@diagram/@childNodes.35"/>
     <childReferences
-        parent="//@diagram/@topLevelNodes.3"
+        parent="//@diagram/@topLevelNodes.2"
         child="//@diagram/@childNodes.36"/>
     <childReferences
-        parent="//@diagram/@topLevelNodes.3"
+        parent="//@diagram/@topLevelNodes.2"
         child="//@diagram/@childNodes.37"/>
     <childReferences
-        parent="//@diagram/@topLevelNodes.3"
+        parent="//@diagram/@topLevelNodes.2"
         child="//@diagram/@childNodes.38"/>
     <childReferences
-        parent="//@diagram/@topLevelNodes.3"
+        parent="//@diagram/@topLevelNodes.2"
         child="//@diagram/@childNodes.39"/>
     <childReferences
         parent="//@diagram"
-        child="//@diagram/@topLevelNodes.3"/>
+        child="//@diagram/@topLevelNodes.2"/>
     <childReferences
         parent="//@diagram/@childNodes.49"
         child="//@diagram/@childNodes.12"/>
@@ -3833,23 +3785,23 @@
         parent="//@diagram/@childNodes.48"
         child="//@diagram/@childNodes.49"/>
     <childReferences
-        parent="//@diagram/@topLevelNodes.4"
+        parent="//@diagram/@topLevelNodes.3"
         child="//@diagram/@childNodes.48"/>
     <childReferences
         parent="//@diagram"
-        child="//@diagram/@topLevelNodes.4"/>
+        child="//@diagram/@topLevelNodes.3"/>
     <childReferences
-        parent="//@diagram/@topLevelNodes.5"
+        parent="//@diagram/@topLevelNodes.4"
         child="//@diagram/@childNodes.42"/>
     <childReferences
-        parent="//@diagram/@topLevelNodes.5"
+        parent="//@diagram/@topLevelNodes.4"
         child="//@diagram/@childNodes.45"/>
     <childReferences
-        parent="//@diagram/@topLevelNodes.5"
+        parent="//@diagram/@topLevelNodes.4"
         child="//@diagram/@childNodes.46"/>
     <childReferences
         parent="//@diagram"
-        child="//@diagram/@topLevelNodes.5"/>
+        child="//@diagram/@topLevelNodes.4"/>
     <childReferences
         parent="//@diagram"
         child="//@diagram/@links.0"
@@ -3869,36 +3821,24 @@
         groupIcon="icons/incomingLinksNavigatorGroup.gif"/>
     <childReferences
         parent="//@diagram/@links.0"
-        child="//@diagram/@topLevelNodes.1"
-        referenceType="out_target"
-        groupName="target"
-        groupIcon="icons/linkTargetNavigatorGroup.gif"/>
-    <childReferences
-        parent="//@diagram/@topLevelNodes.1"
-        child="//@diagram/@links.0"
-        referenceType="in_source"
-        groupName="incoming links"
-        groupIcon="icons/incomingLinksNavigatorGroup.gif"/>
-    <childReferences
-        parent="//@diagram/@links.0"
-        child="//@diagram/@topLevelNodes.3"
+        child="//@diagram/@topLevelNodes.2"
         referenceType="out_target"
         groupName="target"
         groupIcon="icons/linkTargetNavigatorGroup.gif"/>
     <childReferences
-        parent="//@diagram/@topLevelNodes.3"
+        parent="//@diagram/@topLevelNodes.2"
         child="//@diagram/@links.0"
         referenceType="in_source"
         groupName="incoming links"
         groupIcon="icons/incomingLinksNavigatorGroup.gif"/>
     <childReferences
         parent="//@diagram/@links.0"
-        child="//@diagram/@topLevelNodes.5"
+        child="//@diagram/@topLevelNodes.4"
         referenceType="out_target"
         groupName="target"
         groupIcon="icons/linkTargetNavigatorGroup.gif"/>
     <childReferences
-        parent="//@diagram/@topLevelNodes.5"
+        parent="//@diagram/@topLevelNodes.4"
         child="//@diagram/@links.0"
         referenceType="in_source"
         groupName="incoming links"
@@ -4013,36 +3953,24 @@
         groupIcon="icons/outgoingLinksNavigatorGroup.gif"/>
     <childReferences
         parent="//@diagram/@links.0"
-        child="//@diagram/@topLevelNodes.1"
-        referenceType="in_source"
-        groupName="source"
-        groupIcon="icons/linkSourceNavigatorGroup.gif"/>
-    <childReferences
-        parent="//@diagram/@topLevelNodes.1"
-        child="//@diagram/@links.0"
-        referenceType="out_target"
-        groupName="outgoing links"
-        groupIcon="icons/outgoingLinksNavigatorGroup.gif"/>
-    <childReferences
-        parent="//@diagram/@links.0"
-        child="//@diagram/@topLevelNodes.3"
+        child="//@diagram/@topLevelNodes.2"
         referenceType="in_source"
         groupName="source"
         groupIcon="icons/linkSourceNavigatorGroup.gif"/>
     <childReferences
-        parent="//@diagram/@topLevelNodes.3"
+        parent="//@diagram/@topLevelNodes.2"
         child="//@diagram/@links.0"
         referenceType="out_target"
         groupName="outgoing links"
         groupIcon="icons/outgoingLinksNavigatorGroup.gif"/>
     <childReferences
         parent="//@diagram/@links.0"
-        child="//@diagram/@topLevelNodes.5"
+        child="//@diagram/@topLevelNodes.4"
         referenceType="in_source"
         groupName="source"
         groupIcon="icons/linkSourceNavigatorGroup.gif"/>
     <childReferences
-        parent="//@diagram/@topLevelNodes.5"
+        parent="//@diagram/@topLevelNodes.4"
         child="//@diagram/@links.0"
         referenceType="out_target"
         groupName="outgoing links"

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.gmfmap
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.gmfmap?rev=953053&r1=953052&r2=953053&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.gmfmap
(original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.gmfmap
Wed Jun  9 15:58:29 2010
@@ -238,7 +238,7 @@
               </children>
               <children
                   compartment="//@nodes.0/@ownedChild/@children.0/@ownedChild/@children.6/@ownedChild/@compartments.0"
-                  referencedChild="//@nodes.4/@ownedChild/@children.0/@ownedChild/@children.0/@ownedChild">
+                  referencedChild="//@nodes.3/@ownedChild/@children.0/@ownedChild/@children.0/@ownedChild">
                 <containmentFeature
                     href="scxml.ecore#//Send/content"/>
               </children>
@@ -257,7 +257,7 @@
           </children>
           <children
               compartment="//@nodes.0/@ownedChild/@children.0/@ownedChild/@compartments.0"
-              referencedChild="//@nodes.2/@ownedChild">
+              referencedChild="//@nodes.1/@ownedChild">
             <containmentFeature
                 href="scxml.ecore#//OnEntry/script"/>
           </children>
@@ -353,7 +353,7 @@
           </children>
           <children
               compartment="//@nodes.0/@ownedChild/@children.1/@ownedChild/@compartments.0"
-              referencedChild="//@nodes.2/@ownedChild">
+              referencedChild="//@nodes.1/@ownedChild">
             <containmentFeature
                 href="scxml.ecore#//OnExit/script"/>
           </children>
@@ -431,7 +431,7 @@
           </children>
           <children
               compartment="//@nodes.0/@ownedChild/@children.2/@ownedChild/@compartments.0"
-              referencedChild="//@nodes.4/@ownedChild/@children.0/@ownedChild/@children.0/@ownedChild">
+              referencedChild="//@nodes.3/@ownedChild/@children.0/@ownedChild/@children.0/@ownedChild">
             <containmentFeature
                 href="scxml.ecore#//Invoke/content"/>
           </children>
@@ -443,10 +443,23 @@
         </ownedChild>
       </children>
       <children
-          compartment="//@nodes.0/@ownedChild/@compartments.0"
-          referencedChild="//@nodes.1/@ownedChild">
+          compartment="//@nodes.0/@ownedChild/@compartments.0">
         <containmentFeature
             href="scxml.ecore#//State/initState"/>
+        <ownedChild>
+          <domainMetaElement
+              href="scxml.ecore#//InitialState"/>
+          <labelMappings
+              readOnly="true">
+            <diagramLabel
+                href="scxml.gmfgraph#InitialStateTitle"/>
+          </labelMappings>
+          <tool
+              xsi:type="gmftool:CreationTool"
+              href="scxml.gmftool#//@palette/@tools.0/@tools.4"/>
+          <diagramNode
+              href="scxml.gmfgraph#InitialState"/>
+        </ownedChild>
       </children>
       <children
           compartment="//@nodes.0/@ownedChild/@compartments.0">
@@ -471,7 +484,7 @@
       </children>
       <children
           compartment="//@nodes.0/@ownedChild/@compartments.0"
-          referencedChild="//@nodes.3/@ownedChild">
+          referencedChild="//@nodes.2/@ownedChild">
         <containmentFeature
             href="scxml.ecore#//State/subParallel"/>
       </children>
@@ -498,7 +511,7 @@
       </children>
       <children
           compartment="//@nodes.0/@ownedChild/@compartments.0"
-          referencedChild="//@nodes.5/@ownedChild">
+          referencedChild="//@nodes.4/@ownedChild">
         <containmentFeature
             href="scxml.ecore#//State/finalState"/>
       </children>
@@ -517,24 +530,6 @@
   </nodes>
   <nodes>
     <containmentFeature
-        href="scxml.ecore#//ServiceTemplate/initialState"/>
-    <ownedChild>
-      <domainMetaElement
-          href="scxml.ecore#//InitialState"/>
-      <labelMappings
-          readOnly="true">
-        <diagramLabel
-            href="scxml.gmfgraph#InitialStateTitle"/>
-      </labelMappings>
-      <tool
-          xsi:type="gmftool:CreationTool"
-          href="scxml.gmftool#//@palette/@tools.0/@tools.4"/>
-      <diagramNode
-          href="scxml.gmfgraph#InitialState"/>
-    </ownedChild>
-  </nodes>
-  <nodes>
-    <containmentFeature
         href="scxml.ecore#//ServiceTemplate/script"/>
     <ownedChild>
       <domainMetaElement
@@ -569,43 +564,43 @@
       <diagramNode
           href="scxml.gmfgraph#Parallel"/>
       <children
-          compartment="//@nodes.3/@ownedChild/@compartments.0"
+          compartment="//@nodes.2/@ownedChild/@compartments.0"
           referencedChild="//@nodes.0/@ownedChild/@children.4/@ownedChild">
         <containmentFeature
             href="scxml.ecore#//Parallel/historyState"/>
       </children>
       <children
-          compartment="//@nodes.3/@ownedChild/@compartments.0"
+          compartment="//@nodes.2/@ownedChild/@compartments.0"
           referencedChild="//@nodes.0/@ownedChild/@children.6/@ownedChild">
         <containmentFeature
             href="scxml.ecore#//Parallel/anchor"/>
       </children>
       <children
-          compartment="//@nodes.3/@ownedChild/@compartments.0"
-          referencedChild="//@nodes.3/@ownedChild">
+          compartment="//@nodes.2/@ownedChild/@compartments.0"
+          referencedChild="//@nodes.2/@ownedChild">
         <containmentFeature
             href="scxml.ecore#//Parallel/parallel"/>
       </children>
       <children
-          compartment="//@nodes.3/@ownedChild/@compartments.0"
+          compartment="//@nodes.2/@ownedChild/@compartments.0"
           referencedChild="//@nodes.0/@ownedChild/@children.0/@ownedChild">
         <containmentFeature
             href="scxml.ecore#//Parallel/onEntry"/>
       </children>
       <children
-          compartment="//@nodes.3/@ownedChild/@compartments.0"
+          compartment="//@nodes.2/@ownedChild/@compartments.0"
           referencedChild="//@nodes.0/@ownedChild/@children.1/@ownedChild">
         <containmentFeature
             href="scxml.ecore#//Parallel/onExit"/>
       </children>
       <children
-          compartment="//@nodes.3/@ownedChild/@compartments.0"
+          compartment="//@nodes.2/@ownedChild/@compartments.0"
           referencedChild="//@nodes.0/@ownedChild">
         <containmentFeature
             href="scxml.ecore#//Parallel/state"/>
       </children>
       <compartments
-          children="//@nodes.3/@ownedChild/@children.0 //@nodes.3/@ownedChild/@children.1
//@nodes.3/@ownedChild/@children.2 //@nodes.3/@ownedChild/@children.3 //@nodes.3/@ownedChild/@children.4
//@nodes.3/@ownedChild/@children.5">
+          children="//@nodes.2/@ownedChild/@children.0 //@nodes.2/@ownedChild/@children.1
//@nodes.2/@ownedChild/@children.2 //@nodes.2/@ownedChild/@children.3 //@nodes.2/@ownedChild/@children.4
//@nodes.2/@ownedChild/@children.5">
         <compartment
             href="scxml.gmfgraph#ParallelCompartment"/>
       </compartments>
@@ -630,7 +625,7 @@
       <diagramNode
           href="scxml.gmfgraph#DataModel"/>
       <children
-          compartment="//@nodes.4/@ownedChild/@compartments.0">
+          compartment="//@nodes.3/@ownedChild/@compartments.0">
         <containmentFeature
             href="scxml.ecore#//DataModel/data"/>
         <ownedChild>
@@ -649,7 +644,7 @@
           <diagramNode
               href="scxml.gmfgraph#Data"/>
           <children
-              compartment="//@nodes.4/@ownedChild/@children.0/@ownedChild/@compartments.0">
+              compartment="//@nodes.3/@ownedChild/@children.0/@ownedChild/@compartments.0">
             <containmentFeature
                 href="scxml.ecore#//Data/content"/>
             <ownedChild>
@@ -661,27 +656,27 @@
               <diagramNode
                   href="scxml.gmfgraph#Content"/>
               <children
-                  compartment="//@nodes.4/@ownedChild/@children.0/@ownedChild/@children.0/@ownedChild/@compartments.0"
-                  referencedChild="//@nodes.4/@ownedChild/@children.0/@ownedChild/@children.0/@ownedChild">
+                  compartment="//@nodes.3/@ownedChild/@children.0/@ownedChild/@children.0/@ownedChild/@compartments.0"
+                  referencedChild="//@nodes.3/@ownedChild/@children.0/@ownedChild/@children.0/@ownedChild">
                 <containmentFeature
                     href="scxml.ecore#//Content/content"/>
               </children>
               <compartments
-                  children="//@nodes.4/@ownedChild/@children.0/@ownedChild/@children.0/@ownedChild/@children.0">
+                  children="//@nodes.3/@ownedChild/@children.0/@ownedChild/@children.0/@ownedChild/@children.0">
                 <compartment
                     href="scxml.gmfgraph#ContentCompartment"/>
               </compartments>
             </ownedChild>
           </children>
           <compartments
-              children="//@nodes.4/@ownedChild/@children.0/@ownedChild/@children.0">
+              children="//@nodes.3/@ownedChild/@children.0/@ownedChild/@children.0">
             <compartment
                 href="scxml.gmfgraph#DataCompartment"/>
           </compartments>
         </ownedChild>
       </children>
       <compartments
-          children="//@nodes.4/@ownedChild/@children.0">
+          children="//@nodes.3/@ownedChild/@children.0">
         <compartment
             href="scxml.gmfgraph#DataModelCompartment"/>
       </compartments>
@@ -706,7 +701,7 @@
       <diagramNode
           href="scxml.gmfgraph#FinalState"/>
       <children
-          compartment="//@nodes.5/@ownedChild/@compartments.0">
+          compartment="//@nodes.4/@ownedChild/@compartments.0">
         <containmentFeature
             href="scxml.ecore#//FinalState/donedata"/>
         <ownedChild>
@@ -723,38 +718,38 @@
           <diagramNode
               href="scxml.gmfgraph#Donedata"/>
           <children
-              compartment="//@nodes.5/@ownedChild/@children.0/@ownedChild/@compartments.0"
+              compartment="//@nodes.4/@ownedChild/@children.0/@ownedChild/@compartments.0"
               referencedChild="//@nodes.0/@ownedChild/@children.2/@ownedChild/@children.1/@ownedChild">
             <containmentFeature
                 href="scxml.ecore#//Donedata/param"/>
           </children>
           <children
-              compartment="//@nodes.5/@ownedChild/@children.0/@ownedChild/@compartments.0"
-              referencedChild="//@nodes.4/@ownedChild/@children.0/@ownedChild/@children.0/@ownedChild">
+              compartment="//@nodes.4/@ownedChild/@children.0/@ownedChild/@compartments.0"
+              referencedChild="//@nodes.3/@ownedChild/@children.0/@ownedChild/@children.0/@ownedChild">
             <containmentFeature
                 href="scxml.ecore#//Donedata/content"/>
           </children>
           <compartments
-              children="//@nodes.5/@ownedChild/@children.0/@ownedChild/@children.0 //@nodes.5/@ownedChild/@children.0/@ownedChild/@children.1">
+              children="//@nodes.4/@ownedChild/@children.0/@ownedChild/@children.0 //@nodes.4/@ownedChild/@children.0/@ownedChild/@children.1">
             <compartment
                 href="scxml.gmfgraph#DonedataCompartment"/>
           </compartments>
         </ownedChild>
       </children>
       <children
-          compartment="//@nodes.5/@ownedChild/@compartments.0"
+          compartment="//@nodes.4/@ownedChild/@compartments.0"
           referencedChild="//@nodes.0/@ownedChild/@children.0/@ownedChild">
         <containmentFeature
             href="scxml.ecore#//FinalState/onEntry"/>
       </children>
       <children
-          compartment="//@nodes.5/@ownedChild/@compartments.0"
+          compartment="//@nodes.4/@ownedChild/@compartments.0"
           referencedChild="//@nodes.0/@ownedChild/@children.1/@ownedChild">
         <containmentFeature
             href="scxml.ecore#//FinalState/onExit"/>
       </children>
       <compartments
-          children="//@nodes.5/@ownedChild/@children.0 //@nodes.5/@ownedChild/@children.1
//@nodes.5/@ownedChild/@children.2">
+          children="//@nodes.4/@ownedChild/@children.0 //@nodes.4/@ownedChild/@children.1
//@nodes.4/@ownedChild/@children.2">
         <compartment
             href="scxml.gmfgraph#FinalStateCompartment"/>
       </compartments>

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.trace
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.trace?rev=953053&r1=953052&r2=953053&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.trace
(original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.trace
Wed Jun  9 15:58:29 2010
@@ -13,13 +13,6 @@
         queryText="true"/>
   </nodeTraces>
   <nodeTraces
-      visualID="2002"
-      queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI
= 'org.apache.commons.scxml' and _eClass_.name = 'InitialState') and (let _containmentMF_:ecore::EStructuralFeature
= modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass
in _eClass_.ePackage.nsURI = 'org.apache.commons.scxml' and _eClass_.name = 'ServiceTemplate')
and _containmentMF_.name = 'initialState')">
-    <nodeLabelTraces
-        visualID="5046"
-        queryText="true"/>
-  </nodeTraces>
-  <nodeTraces
       visualID="2003"
       queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI
= 'org.apache.commons.scxml' and _eClass_.name = 'Script') and (let _containmentMF_:ecore::EStructuralFeature
= modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass = _containmentMF_.eContainingClass
in _eClass_.ePackage.nsURI = 'org.apache.commons.scxml' and _eClass_.name = 'ServiceTemplate')
and _containmentMF_.name = 'script')">
     <nodeLabelTraces



Mime
View raw message