You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gu...@apache.org on 2010/07/06 16:44:46 UTC
svn commit: r960905 [3/4] - in
/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling:
model/ src/org/apache/commons/scxml/modeling/
src/org/apache/commons/scxml/modeling/impl/
src/org/apache/commons/scxml/modeli...
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.gmfgraph
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.gmfgraph?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.gmfgraph (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.gmfgraph Tue Jul 6 14:44:45 2010
@@ -652,6 +652,13 @@
name="DonedataCompartment"
figure="DonedataFigure"
collapsible="true"/>
+ <compartments
+ name="RaiseCompartment"
+ figure="RaiseFigure"
+ collapsible="true"/>
+ <compartments
+ name="FinalizeCompartment"
+ figure="FinalizeFigure"/>
<labels
name="StateId"
figure="StateFigure"
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=960905&r1=960904&r2=960905&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 Tue Jul 6 14:44:45 2010
@@ -146,6 +146,23 @@
href="scxml.gmftool#//@palette/@tools.1/@tools.1"/>
<diagramNode
href="scxml.gmfgraph#Raise"/>
+ <children
+ compartment="//@nodes.0/@ownedChild/@children.0/@ownedChild/@children.2/@ownedChild/@compartments.0"
+ referencedChild="//@nodes.0/@ownedChild/@children.2/@ownedChild/@children.1/@ownedChild">
+ <containmentFeature
+ href="scxml.ecore#//Raise/param"/>
+ </children>
+ <children
+ compartment="//@nodes.0/@ownedChild/@children.0/@ownedChild/@children.2/@ownedChild/@compartments.0"
+ referencedChild="//@nodes.3/@ownedChild/@children.0/@ownedChild/@children.0/@ownedChild">
+ <containmentFeature
+ href="scxml.ecore#//Raise/content"/>
+ </children>
+ <compartments
+ children="//@nodes.0/@ownedChild/@children.0/@ownedChild/@children.2/@ownedChild/@children.0 //@nodes.0/@ownedChild/@children.0/@ownedChild/@children.2/@ownedChild/@children.1">
+ <compartment
+ href="scxml.gmfgraph#RaiseCompartment"/>
+ </compartments>
</ownedChild>
</children>
<children
@@ -406,6 +423,71 @@
href="scxml.gmftool#//@palette/@tools.0/@tools.12"/>
<diagramNode
href="scxml.gmfgraph#Finalize"/>
+ <children
+ compartment="//@nodes.0/@ownedChild/@children.2/@ownedChild/@children.0/@ownedChild/@compartments.0"
+ referencedChild="//@nodes.0/@ownedChild/@children.0/@ownedChild/@children.0/@ownedChild">
+ <containmentFeature
+ href="scxml.ecore#//Finalize/executableContent"/>
+ </children>
+ <children
+ compartment="//@nodes.0/@ownedChild/@children.2/@ownedChild/@children.0/@ownedChild/@compartments.0"
+ referencedChild="//@nodes.0/@ownedChild/@children.0/@ownedChild/@children.1/@ownedChild">
+ <containmentFeature
+ href="scxml.ecore#//Finalize/executableContent"/>
+ </children>
+ <children
+ compartment="//@nodes.0/@ownedChild/@children.2/@ownedChild/@children.0/@ownedChild/@compartments.0"
+ referencedChild="//@nodes.0/@ownedChild/@children.0/@ownedChild/@children.2/@ownedChild">
+ <containmentFeature
+ href="scxml.ecore#//Finalize/executableContent"/>
+ </children>
+ <children
+ compartment="//@nodes.0/@ownedChild/@children.2/@ownedChild/@children.0/@ownedChild/@compartments.0"
+ referencedChild="//@nodes.0/@ownedChild/@children.0/@ownedChild/@children.3/@ownedChild">
+ <containmentFeature
+ href="scxml.ecore#//Finalize/executableContent"/>
+ </children>
+ <children
+ compartment="//@nodes.0/@ownedChild/@children.2/@ownedChild/@children.0/@ownedChild/@compartments.0"
+ referencedChild="//@nodes.0/@ownedChild/@children.0/@ownedChild/@children.4/@ownedChild">
+ <containmentFeature
+ href="scxml.ecore#//Finalize/executableContent"/>
+ </children>
+ <children
+ compartment="//@nodes.0/@ownedChild/@children.2/@ownedChild/@children.0/@ownedChild/@compartments.0"
+ referencedChild="//@nodes.0/@ownedChild/@children.0/@ownedChild/@children.5/@ownedChild">
+ <containmentFeature
+ href="scxml.ecore#//Finalize/executableContent"/>
+ </children>
+ <children
+ compartment="//@nodes.0/@ownedChild/@children.2/@ownedChild/@children.0/@ownedChild/@compartments.0"
+ referencedChild="//@nodes.0/@ownedChild/@children.0/@ownedChild/@children.6/@ownedChild">
+ <containmentFeature
+ href="scxml.ecore#//Finalize/executableContent"/>
+ </children>
+ <children
+ compartment="//@nodes.0/@ownedChild/@children.2/@ownedChild/@children.0/@ownedChild/@compartments.0"
+ referencedChild="//@nodes.0/@ownedChild/@children.2/@ownedChild/@children.1/@ownedChild">
+ <containmentFeature
+ href="scxml.ecore#//Finalize/executableContent"/>
+ </children>
+ <children
+ compartment="//@nodes.0/@ownedChild/@children.2/@ownedChild/@children.0/@ownedChild/@compartments.0"
+ referencedChild="//@nodes.1/@ownedChild">
+ <containmentFeature
+ href="scxml.ecore#//Finalize/executableContent"/>
+ </children>
+ <children
+ compartment="//@nodes.0/@ownedChild/@children.2/@ownedChild/@children.0/@ownedChild/@compartments.0"
+ referencedChild="//@nodes.0/@ownedChild/@children.0/@ownedChild/@children.9/@ownedChild">
+ <containmentFeature
+ href="scxml.ecore#//Finalize/executableContent"/>
+ </children>
+ <compartments
+ children="//@nodes.0/@ownedChild/@children.2/@ownedChild/@children.0/@ownedChild/@children.0 //@nodes.0/@ownedChild/@children.2/@ownedChild/@children.0/@ownedChild/@children.1 //@nodes.0/@ownedChild/@children.2/@ownedChild/@children.0/@ownedChild/@children.2 //@nodes.0/@ownedChild/@children.2/@ownedChild/@children.0/@ownedChild/@children.3 //@nodes.0/@ownedChild/@children.2/@ownedChild/@children.0/@ownedChild/@children.4 //@nodes.0/@ownedChild/@children.2/@ownedChild/@children.0/@ownedChild/@children.5 //@nodes.0/@ownedChild/@children.2/@ownedChild/@children.0/@ownedChild/@children.6 //@nodes.0/@ownedChild/@children.2/@ownedChild/@children.0/@ownedChild/@children.7 //@nodes.0/@ownedChild/@children.2/@ownedChild/@children.0/@ownedChild/@children.8 //@nodes.0/@ownedChild/@children.2/@ownedChild/@children.0/@ownedChild/@children.9">
+ <compartment
+ href="scxml.gmfgraph#FinalizeCompartment"/>
+ </compartments>
</ownedChild>
</children>
<children
@@ -489,27 +571,6 @@
href="scxml.ecore#//State/subParallel"/>
</children>
<children
- compartment="//@nodes.0/@ownedChild/@compartments.0">
- <containmentFeature
- href="scxml.ecore#//State/anchor"/>
- <ownedChild>
- <domainMetaElement
- href="scxml.ecore#//Anchor"/>
- <labelMappings
- xsi:type="gmfmap:FeatureLabelMapping">
- <diagramLabel
- href="scxml.gmfgraph#AnchorType"/>
- <features
- href="scxml.ecore#//Anchor/type"/>
- </labelMappings>
- <tool
- xsi:type="gmftool:CreationTool"
- href="scxml.gmftool#//@palette/@tools.0/@tools.9"/>
- <diagramNode
- href="scxml.gmfgraph#Anchor"/>
- </ownedChild>
- </children>
- <children
compartment="//@nodes.0/@ownedChild/@compartments.0"
referencedChild="//@nodes.4/@ownedChild">
<containmentFeature
@@ -521,8 +582,20 @@
<containmentFeature
href="scxml.ecore#//State/subState"/>
</children>
+ <children
+ compartment="//@nodes.0/@ownedChild/@compartments.0"
+ referencedChild="//@nodes.3/@ownedChild">
+ <containmentFeature
+ href="scxml.ecore#//NamedElement/dataModel"/>
+ </children>
+ <children
+ compartment="//@nodes.0/@ownedChild/@compartments.0"
+ referencedChild="//@nodes.0/@ownedChild/@children.2/@ownedChild/@children.0/@ownedChild">
+ <containmentFeature
+ href="scxml.ecore#//State/finalize"/>
+ </children>
<compartments
- children="//@nodes.0/@ownedChild/@children.0 //@nodes.0/@ownedChild/@children.1 //@nodes.0/@ownedChild/@children.2 //@nodes.0/@ownedChild/@children.3 //@nodes.0/@ownedChild/@children.4 //@nodes.0/@ownedChild/@children.5 //@nodes.0/@ownedChild/@children.6 //@nodes.0/@ownedChild/@children.7 //@nodes.0/@ownedChild/@children.8">
+ children="//@nodes.0/@ownedChild/@children.0 //@nodes.0/@ownedChild/@children.1 //@nodes.0/@ownedChild/@children.2 //@nodes.0/@ownedChild/@children.3 //@nodes.0/@ownedChild/@children.4 //@nodes.0/@ownedChild/@children.5 //@nodes.0/@ownedChild/@children.6 //@nodes.0/@ownedChild/@children.7 //@nodes.0/@ownedChild/@children.8 //@nodes.0/@ownedChild/@children.9">
<compartment
href="scxml.gmfgraph#StateCompartment"/>
</compartments>
@@ -571,12 +644,6 @@
</children>
<children
compartment="//@nodes.2/@ownedChild/@compartments.0"
- referencedChild="//@nodes.0/@ownedChild/@children.6/@ownedChild">
- <containmentFeature
- href="scxml.ecore#//Parallel/anchor"/>
- </children>
- <children
- compartment="//@nodes.2/@ownedChild/@compartments.0"
referencedChild="//@nodes.2/@ownedChild">
<containmentFeature
href="scxml.ecore#//Parallel/parallel"/>
@@ -599,8 +666,26 @@
<containmentFeature
href="scxml.ecore#//Parallel/state"/>
</children>
+ <children
+ compartment="//@nodes.2/@ownedChild/@compartments.0"
+ referencedChild="//@nodes.3/@ownedChild">
+ <containmentFeature
+ href="scxml.ecore#//NamedElement/dataModel"/>
+ </children>
+ <children
+ compartment="//@nodes.2/@ownedChild/@compartments.0"
+ referencedChild="//@nodes.0/@ownedChild/@children.2/@ownedChild">
+ <containmentFeature
+ href="scxml.ecore#//Parallel/invoke"/>
+ </children>
+ <children
+ compartment="//@nodes.2/@ownedChild/@compartments.0"
+ referencedChild="//@nodes.0/@ownedChild/@children.2/@ownedChild/@children.0/@ownedChild">
+ <containmentFeature
+ href="scxml.ecore#//Parallel/finalize"/>
+ </children>
<compartments
- 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">
+ 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 //@nodes.2/@ownedChild/@children.6 //@nodes.2/@ownedChild/@children.7">
<compartment
href="scxml.gmfgraph#ParallelCompartment"/>
</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=960905&r1=960904&r2=960905&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 Tue Jul 6 14:44:45 2010
@@ -96,6 +96,9 @@
<nodeLabelTraces
visualID="5006"
queryText="true"/>
+ <compartmentTraces
+ visualID="7028"
+ queryText="true"/>
</childNodeTraces>
<childNodeTraces
visualID="3007"
@@ -196,6 +199,9 @@
<nodeLabelTraces
visualID="5018"
queryText="true"/>
+ <compartmentTraces
+ visualID="7030"
+ queryText="true"/>
</childNodeTraces>
<childNodeTraces
visualID="3020"
@@ -258,6 +264,9 @@
<nodeLabelTraces
visualID="5026"
queryText="true"/>
+ <compartmentTraces
+ visualID="7031"
+ queryText="true"/>
</childNodeTraces>
<childNodeTraces
visualID="3028"
@@ -305,13 +314,6 @@
queryText="true"/>
</childNodeTraces>
<childNodeTraces
- visualID="3034"
- queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'org.apache.commons.scxml' and _eClass_.name = 'Anchor') 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 = 'Parallel') and _containmentMF_.name = 'anchor')">
- <nodeLabelTraces
- visualID="5032"
- queryText="true"/>
- </childNodeTraces>
- <childNodeTraces
visualID="3035"
queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'org.apache.commons.scxml' and _eClass_.name = 'Parallel') 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 = 'Parallel') and _containmentMF_.name = 'parallel')">
<nodeLabelTraces
@@ -352,13 +354,6 @@
queryText="true"/>
</childNodeTraces>
<childNodeTraces
- visualID="3039"
- queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'org.apache.commons.scxml' and _eClass_.name = 'Anchor') 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 = 'State') and _containmentMF_.name = 'anchor')">
- <nodeLabelTraces
- visualID="5035"
- queryText="true"/>
- </childNodeTraces>
- <childNodeTraces
visualID="3040"
queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'org.apache.commons.scxml' and _eClass_.name = 'FinalState') 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 = 'State') and _containmentMF_.name = 'finalState')">
<nodeLabelTraces
@@ -453,6 +448,139 @@
visualID="5053"
queryText="true"/>
</childNodeTraces>
+ <childNodeTraces
+ visualID="3051"
+ queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'org.apache.commons.scxml' and _eClass_.name = 'Param') 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 = 'Raise') and _containmentMF_.name = 'param')">
+ <nodeLabelTraces
+ visualID="5054"
+ queryText="true"/>
+ </childNodeTraces>
+ <childNodeTraces
+ visualID="3052"
+ queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'org.apache.commons.scxml' and _eClass_.name = 'Content') 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 = 'Raise') and _containmentMF_.name = 'content')">
+ <compartmentTraces
+ visualID="7029"
+ queryText="true"/>
+ </childNodeTraces>
+ <childNodeTraces
+ visualID="3053"
+ queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'org.apache.commons.scxml' and _eClass_.name = 'If') 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 = 'Finalize') and _containmentMF_.name = 'executableContent')">
+ <nodeLabelTraces
+ visualID="5055"
+ queryText="true"/>
+ <compartmentTraces
+ visualID="7032"
+ queryText="true"/>
+ </childNodeTraces>
+ <childNodeTraces
+ visualID="3054"
+ queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'org.apache.commons.scxml' and _eClass_.name = 'Assign') 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 = 'Finalize') and _containmentMF_.name = 'executableContent')">
+ <nodeLabelTraces
+ visualID="5056"
+ queryText="true"/>
+ </childNodeTraces>
+ <childNodeTraces
+ visualID="3055"
+ queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'org.apache.commons.scxml' and _eClass_.name = 'Raise') 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 = 'Finalize') and _containmentMF_.name = 'executableContent')">
+ <nodeLabelTraces
+ visualID="5057"
+ queryText="true"/>
+ <compartmentTraces
+ visualID="7033"
+ queryText="true"/>
+ </childNodeTraces>
+ <childNodeTraces
+ visualID="3056"
+ queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'org.apache.commons.scxml' and _eClass_.name = 'Log') 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 = 'Finalize') and _containmentMF_.name = 'executableContent')">
+ <nodeLabelTraces
+ visualID="5058"
+ queryText="true"/>
+ </childNodeTraces>
+ <childNodeTraces
+ visualID="3057"
+ queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'org.apache.commons.scxml' and _eClass_.name = 'Validate') 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 = 'Finalize') and _containmentMF_.name = 'executableContent')">
+ <nodeLabelTraces
+ visualID="5059"
+ queryText="true"/>
+ </childNodeTraces>
+ <childNodeTraces
+ visualID="3058"
+ queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'org.apache.commons.scxml' and _eClass_.name = 'Cancel') 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 = 'Finalize') and _containmentMF_.name = 'executableContent')">
+ <nodeLabelTraces
+ visualID="5060"
+ queryText="true"/>
+ </childNodeTraces>
+ <childNodeTraces
+ visualID="3059"
+ queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'org.apache.commons.scxml' and _eClass_.name = 'Send') 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 = 'Finalize') and _containmentMF_.name = 'executableContent')">
+ <nodeLabelTraces
+ visualID="5061"
+ queryText="true"/>
+ <compartmentTraces
+ visualID="7034"
+ queryText="true"/>
+ </childNodeTraces>
+ <childNodeTraces
+ visualID="3060"
+ queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'org.apache.commons.scxml' and _eClass_.name = 'Param') 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 = 'Finalize') and _containmentMF_.name = 'executableContent')">
+ <nodeLabelTraces
+ visualID="5062"
+ queryText="true"/>
+ </childNodeTraces>
+ <childNodeTraces
+ visualID="3061"
+ 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 = 'Finalize') and _containmentMF_.name = 'executableContent')">
+ <nodeLabelTraces
+ visualID="5063"
+ queryText="true"/>
+ </childNodeTraces>
+ <childNodeTraces
+ visualID="3062"
+ queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'org.apache.commons.scxml' and _eClass_.name = 'ExtenExecContent') 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 = 'Finalize') and _containmentMF_.name = 'executableContent')">
+ <nodeLabelTraces
+ visualID="5064"
+ queryText="true"/>
+ </childNodeTraces>
+ <childNodeTraces
+ visualID="3063"
+ queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'org.apache.commons.scxml' and _eClass_.name = 'DataModel') 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 = 'NamedElement') and _containmentMF_.name = 'dataModel')">
+ <nodeLabelTraces
+ visualID="5065"
+ queryText="true"/>
+ <compartmentTraces
+ visualID="7035"
+ queryText="true"/>
+ </childNodeTraces>
+ <childNodeTraces
+ visualID="3064"
+ queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'org.apache.commons.scxml' and _eClass_.name = 'Finalize') 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 = 'State') and _containmentMF_.name = 'finalize')">
+ <nodeLabelTraces
+ visualID="5066"
+ queryText="true"/>
+ <compartmentTraces
+ visualID="7036"
+ queryText="true"/>
+ </childNodeTraces>
+ <childNodeTraces
+ visualID="3065"
+ queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'org.apache.commons.scxml' and _eClass_.name = 'Invoke') 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 = 'Parallel') and _containmentMF_.name = 'invoke')">
+ <nodeLabelTraces
+ visualID="5067"
+ queryText="true"/>
+ <compartmentTraces
+ visualID="7037"
+ queryText="true"/>
+ </childNodeTraces>
+ <childNodeTraces
+ visualID="3066"
+ queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'org.apache.commons.scxml' and _eClass_.name = 'Finalize') 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 = 'Parallel') and _containmentMF_.name = 'finalize')">
+ <nodeLabelTraces
+ visualID="5068"
+ queryText="true"/>
+ <compartmentTraces
+ visualID="7038"
+ queryText="true"/>
+ </childNodeTraces>
<linkTraces
visualID="4001"
queryText="modelFacet.oclIsKindOf(gmfgen::TypeLinkModelFacet) and (let _eClass_:ecore::EClass = modelFacet.oclAsType(gmfgen::TypeLinkModelFacet).metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'org.apache.commons.scxml' and _eClass_.name = 'Transition')">
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Content.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Content.java?rev=960905&r1=960904&r2=960905&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Content.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Content.java Tue Jul 6 14:44:45 2010
@@ -31,6 +31,7 @@ import org.eclipse.emf.ecore.EObject;
* The following features are supported:
* <ul>
* <li>{@link org.apache.commons.scxml.modeling.Content#getContent <em>Content</em>}</li>
+ * <li>{@link org.apache.commons.scxml.modeling.Content#getText_content <em>Text content</em>}</li>
* </ul>
* </p>
*
@@ -55,4 +56,30 @@ public interface Content extends EObject
*/
EList getContent();
+ /**
+ * Returns the value of the '<em><b>Text content</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Text content</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Text content</em>' attribute.
+ * @see #setText_content(String)
+ * @see org.apache.commons.scxml.modeling.ModelingPackage#getContent_Text_content()
+ * @model
+ * @generated
+ */
+ String getText_content();
+
+ /**
+ * Sets the value of the '{@link org.apache.commons.scxml.modeling.Content#getText_content <em>Text content</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Text content</em>' attribute.
+ * @see #getText_content()
+ * @generated
+ */
+ void setText_content(String value);
+
} // Content
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ModelingPackage.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ModelingPackage.java?rev=960905&r1=960904&r2=960905&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ModelingPackage.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ModelingPackage.java Tue Jul 6 14:44:45 2010
@@ -236,22 +236,22 @@ public interface ModelingPackage extends
int STATE__HISTORY_STATE = NAMED_ELEMENT_FEATURE_COUNT + 8;
/**
- * The feature id for the '<em><b>Anchor</b></em>' containment reference list.
+ * The feature id for the '<em><b>Invoke</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int STATE__ANCHOR = NAMED_ELEMENT_FEATURE_COUNT + 9;
+ int STATE__INVOKE = NAMED_ELEMENT_FEATURE_COUNT + 9;
/**
- * The feature id for the '<em><b>Invoke</b></em>' containment reference.
+ * The feature id for the '<em><b>Finalize</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int STATE__INVOKE = NAMED_ELEMENT_FEATURE_COUNT + 10;
+ int STATE__FINALIZE = NAMED_ELEMENT_FEATURE_COUNT + 10;
/**
* The number of structural features of the '<em>State</em>' class.
@@ -501,7 +501,7 @@ public interface ModelingPackage extends
int SERVICE_TEMPLATE__PARALLEL = 9;
/**
- * The feature id for the '<em><b>Data Model</b></em>' containment reference list.
+ * The feature id for the '<em><b>Data Model</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -821,13 +821,22 @@ public interface ModelingPackage extends
int PARALLEL__HISTORY_STATE = NAMED_ELEMENT_FEATURE_COUNT + 5;
/**
- * The feature id for the '<em><b>Anchor</b></em>' containment reference list.
+ * The feature id for the '<em><b>Invoke</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int PARALLEL__ANCHOR = NAMED_ELEMENT_FEATURE_COUNT + 6;
+ int PARALLEL__INVOKE = NAMED_ELEMENT_FEATURE_COUNT + 6;
+
+ /**
+ * The feature id for the '<em><b>Finalize</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int PARALLEL__FINALIZE = NAMED_ELEMENT_FEATURE_COUNT + 7;
/**
* The number of structural features of the '<em>Parallel</em>' class.
@@ -836,7 +845,7 @@ public interface ModelingPackage extends
* @generated
* @ordered
*/
- int PARALLEL_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 7;
+ int PARALLEL_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 8;
/**
* The meta object id for the '{@link org.apache.commons.scxml.modeling.impl.HistoryStateImpl <em>History State</em>}' class.
@@ -922,13 +931,31 @@ public interface ModelingPackage extends
int RAISE__EVENT = EXECUTABLE_CONTENT_FEATURE_COUNT + 0;
/**
+ * The feature id for the '<em><b>Param</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int RAISE__PARAM = EXECUTABLE_CONTENT_FEATURE_COUNT + 1;
+
+ /**
+ * The feature id for the '<em><b>Content</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int RAISE__CONTENT = EXECUTABLE_CONTENT_FEATURE_COUNT + 2;
+
+ /**
* The number of structural features of the '<em>Raise</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int RAISE_FEATURE_COUNT = EXECUTABLE_CONTENT_FEATURE_COUNT + 1;
+ int RAISE_FEATURE_COUNT = EXECUTABLE_CONTENT_FEATURE_COUNT + 3;
/**
* The meta object id for the '{@link org.apache.commons.scxml.modeling.impl.IfImpl <em>If</em>}' class.
@@ -1265,13 +1292,22 @@ public interface ModelingPackage extends
int SCRIPT = 22;
/**
+ * The feature id for the '<em><b>Script content</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int SCRIPT__SCRIPT_CONTENT = EXECUTABLE_CONTENT_FEATURE_COUNT + 0;
+
+ /**
* The number of structural features of the '<em>Script</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int SCRIPT_FEATURE_COUNT = 0;
+ int SCRIPT_FEATURE_COUNT = EXECUTABLE_CONTENT_FEATURE_COUNT + 1;
/**
* The meta object id for the '{@link org.apache.commons.scxml.modeling.impl.AnchorImpl <em>Anchor</em>}' class.
@@ -1521,13 +1557,22 @@ public interface ModelingPackage extends
int CONTENT__CONTENT = 0;
/**
+ * The feature id for the '<em><b>Text content</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int CONTENT__TEXT_CONTENT = 1;
+
+ /**
* The number of structural features of the '<em>Content</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int CONTENT_FEATURE_COUNT = 1;
+ int CONTENT_FEATURE_COUNT = 2;
/**
* The meta object id for the '{@link org.apache.commons.scxml.modeling.impl.DonedataImpl <em>Donedata</em>}' class.
@@ -1866,26 +1911,26 @@ public interface ModelingPackage extends
EReference getState_HistoryState();
/**
- * Returns the meta object for the containment reference list '{@link org.apache.commons.scxml.modeling.State#getAnchor <em>Anchor</em>}'.
+ * Returns the meta object for the containment reference '{@link org.apache.commons.scxml.modeling.State#getInvoke <em>Invoke</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Anchor</em>'.
- * @see org.apache.commons.scxml.modeling.State#getAnchor()
+ * @return the meta object for the containment reference '<em>Invoke</em>'.
+ * @see org.apache.commons.scxml.modeling.State#getInvoke()
* @see #getState()
* @generated
*/
- EReference getState_Anchor();
+ EReference getState_Invoke();
/**
- * Returns the meta object for the containment reference '{@link org.apache.commons.scxml.modeling.State#getInvoke <em>Invoke</em>}'.
+ * Returns the meta object for the containment reference '{@link org.apache.commons.scxml.modeling.State#getFinalize <em>Finalize</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Invoke</em>'.
- * @see org.apache.commons.scxml.modeling.State#getInvoke()
+ * @return the meta object for the containment reference '<em>Finalize</em>'.
+ * @see org.apache.commons.scxml.modeling.State#getFinalize()
* @see #getState()
* @generated
*/
- EReference getState_Invoke();
+ EReference getState_Finalize();
/**
* Returns the meta object for class '{@link org.apache.commons.scxml.modeling.Transition <em>Transition</em>}'.
@@ -2127,10 +2172,10 @@ public interface ModelingPackage extends
EReference getServiceTemplate_Parallel();
/**
- * Returns the meta object for the containment reference list '{@link org.apache.commons.scxml.modeling.ServiceTemplate#getDataModel <em>Data Model</em>}'.
+ * Returns the meta object for the containment reference '{@link org.apache.commons.scxml.modeling.ServiceTemplate#getDataModel <em>Data Model</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Data Model</em>'.
+ * @return the meta object for the containment reference '<em>Data Model</em>'.
* @see org.apache.commons.scxml.modeling.ServiceTemplate#getDataModel()
* @see #getServiceTemplate()
* @generated
@@ -2363,15 +2408,26 @@ public interface ModelingPackage extends
EReference getParallel_HistoryState();
/**
- * Returns the meta object for the containment reference list '{@link org.apache.commons.scxml.modeling.Parallel#getAnchor <em>Anchor</em>}'.
+ * Returns the meta object for the containment reference '{@link org.apache.commons.scxml.modeling.Parallel#getInvoke <em>Invoke</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the containment reference '<em>Invoke</em>'.
+ * @see org.apache.commons.scxml.modeling.Parallel#getInvoke()
+ * @see #getParallel()
+ * @generated
+ */
+ EReference getParallel_Invoke();
+
+ /**
+ * Returns the meta object for the containment reference '{@link org.apache.commons.scxml.modeling.Parallel#getFinalize <em>Finalize</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Anchor</em>'.
- * @see org.apache.commons.scxml.modeling.Parallel#getAnchor()
+ * @return the meta object for the containment reference '<em>Finalize</em>'.
+ * @see org.apache.commons.scxml.modeling.Parallel#getFinalize()
* @see #getParallel()
* @generated
*/
- EReference getParallel_Anchor();
+ EReference getParallel_Finalize();
/**
* Returns the meta object for class '{@link org.apache.commons.scxml.modeling.HistoryState <em>History State</em>}'.
@@ -2427,6 +2483,28 @@ public interface ModelingPackage extends
EAttribute getRaise_Event();
/**
+ * Returns the meta object for the containment reference list '{@link org.apache.commons.scxml.modeling.Raise#getParam <em>Param</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the containment reference list '<em>Param</em>'.
+ * @see org.apache.commons.scxml.modeling.Raise#getParam()
+ * @see #getRaise()
+ * @generated
+ */
+ EReference getRaise_Param();
+
+ /**
+ * Returns the meta object for the containment reference '{@link org.apache.commons.scxml.modeling.Raise#getContent <em>Content</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the containment reference '<em>Content</em>'.
+ * @see org.apache.commons.scxml.modeling.Raise#getContent()
+ * @see #getRaise()
+ * @generated
+ */
+ EReference getRaise_Content();
+
+ /**
* Returns the meta object for class '{@link org.apache.commons.scxml.modeling.If <em>If</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -2714,6 +2792,17 @@ public interface ModelingPackage extends
EClass getScript();
/**
+ * Returns the meta object for the attribute '{@link org.apache.commons.scxml.modeling.Script#getScript_content <em>Script content</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Script content</em>'.
+ * @see org.apache.commons.scxml.modeling.Script#getScript_content()
+ * @see #getScript()
+ * @generated
+ */
+ EAttribute getScript_Script_content();
+
+ /**
* Returns the meta object for class '{@link org.apache.commons.scxml.modeling.Anchor <em>Anchor</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -2974,6 +3063,17 @@ public interface ModelingPackage extends
EReference getContent_Content();
/**
+ * Returns the meta object for the attribute '{@link org.apache.commons.scxml.modeling.Content#getText_content <em>Text content</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Text content</em>'.
+ * @see org.apache.commons.scxml.modeling.Content#getText_content()
+ * @see #getContent()
+ * @generated
+ */
+ EAttribute getContent_Text_content();
+
+ /**
* Returns the meta object for class '{@link org.apache.commons.scxml.modeling.Donedata <em>Donedata</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -3296,20 +3396,20 @@ public interface ModelingPackage extends
EReference STATE__HISTORY_STATE = eINSTANCE.getState_HistoryState();
/**
- * The meta object literal for the '<em><b>Anchor</b></em>' containment reference list feature.
+ * The meta object literal for the '<em><b>Invoke</b></em>' containment reference feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- EReference STATE__ANCHOR = eINSTANCE.getState_Anchor();
+ EReference STATE__INVOKE = eINSTANCE.getState_Invoke();
/**
- * The meta object literal for the '<em><b>Invoke</b></em>' containment reference feature.
+ * The meta object literal for the '<em><b>Finalize</b></em>' containment reference feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- EReference STATE__INVOKE = eINSTANCE.getState_Invoke();
+ EReference STATE__FINALIZE = eINSTANCE.getState_Finalize();
/**
* The meta object literal for the '{@link org.apache.commons.scxml.modeling.impl.TransitionImpl <em>Transition</em>}' class.
@@ -3494,7 +3594,7 @@ public interface ModelingPackage extends
EReference SERVICE_TEMPLATE__PARALLEL = eINSTANCE.getServiceTemplate_Parallel();
/**
- * The meta object literal for the '<em><b>Data Model</b></em>' containment reference list feature.
+ * The meta object literal for the '<em><b>Data Model</b></em>' containment reference feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -3682,12 +3782,20 @@ public interface ModelingPackage extends
EReference PARALLEL__HISTORY_STATE = eINSTANCE.getParallel_HistoryState();
/**
- * The meta object literal for the '<em><b>Anchor</b></em>' containment reference list feature.
+ * The meta object literal for the '<em><b>Invoke</b></em>' containment reference feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- EReference PARALLEL__ANCHOR = eINSTANCE.getParallel_Anchor();
+ EReference PARALLEL__INVOKE = eINSTANCE.getParallel_Invoke();
+
+ /**
+ * The meta object literal for the '<em><b>Finalize</b></em>' containment reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference PARALLEL__FINALIZE = eINSTANCE.getParallel_Finalize();
/**
* The meta object literal for the '{@link org.apache.commons.scxml.modeling.impl.HistoryStateImpl <em>History State</em>}' class.
@@ -3734,6 +3842,22 @@ public interface ModelingPackage extends
EAttribute RAISE__EVENT = eINSTANCE.getRaise_Event();
/**
+ * The meta object literal for the '<em><b>Param</b></em>' containment reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference RAISE__PARAM = eINSTANCE.getRaise_Param();
+
+ /**
+ * The meta object literal for the '<em><b>Content</b></em>' containment reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference RAISE__CONTENT = eINSTANCE.getRaise_Content();
+
+ /**
* The meta object literal for the '{@link org.apache.commons.scxml.modeling.impl.IfImpl <em>If</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -3970,6 +4094,14 @@ public interface ModelingPackage extends
EClass SCRIPT = eINSTANCE.getScript();
/**
+ * The meta object literal for the '<em><b>Script content</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute SCRIPT__SCRIPT_CONTENT = eINSTANCE.getScript_Script_content();
+
+ /**
* The meta object literal for the '{@link org.apache.commons.scxml.modeling.impl.AnchorImpl <em>Anchor</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -4170,6 +4302,14 @@ public interface ModelingPackage extends
EReference CONTENT__CONTENT = eINSTANCE.getContent_Content();
/**
+ * The meta object literal for the '<em><b>Text content</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute CONTENT__TEXT_CONTENT = eINSTANCE.getContent_Text_content();
+
+ /**
* The meta object literal for the '{@link org.apache.commons.scxml.modeling.impl.DonedataImpl <em>Donedata</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Parallel.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Parallel.java?rev=960905&r1=960904&r2=960905&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Parallel.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Parallel.java Tue Jul 6 14:44:45 2010
@@ -34,7 +34,8 @@ import org.eclipse.emf.common.util.EList
* <li>{@link org.apache.commons.scxml.modeling.Parallel#getParallel <em>Parallel</em>}</li>
* <li>{@link org.apache.commons.scxml.modeling.Parallel#getState <em>State</em>}</li>
* <li>{@link org.apache.commons.scxml.modeling.Parallel#getHistoryState <em>History State</em>}</li>
- * <li>{@link org.apache.commons.scxml.modeling.Parallel#getAnchor <em>Anchor</em>}</li>
+ * <li>{@link org.apache.commons.scxml.modeling.Parallel#getInvoke <em>Invoke</em>}</li>
+ * <li>{@link org.apache.commons.scxml.modeling.Parallel#getFinalize <em>Finalize</em>}</li>
* </ul>
* </p>
*
@@ -170,19 +171,55 @@ public interface Parallel extends NamedE
EList getHistoryState();
/**
- * Returns the value of the '<em><b>Anchor</b></em>' containment reference list.
- * The list contents are of type {@link org.apache.commons.scxml.modeling.Anchor}.
+ * Returns the value of the '<em><b>Invoke</b></em>' containment reference.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Anchor</em>' containment reference list isn't clear,
+ * If the meaning of the '<em>Invoke</em>' containment reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Anchor</em>' containment reference list.
- * @see org.apache.commons.scxml.modeling.ModelingPackage#getParallel_Anchor()
- * @model type="org.apache.commons.scxml.modeling.Anchor" containment="true"
+ * @return the value of the '<em>Invoke</em>' containment reference.
+ * @see #setInvoke(Invoke)
+ * @see org.apache.commons.scxml.modeling.ModelingPackage#getParallel_Invoke()
+ * @model containment="true"
+ * @generated
+ */
+ Invoke getInvoke();
+
+ /**
+ * Sets the value of the '{@link org.apache.commons.scxml.modeling.Parallel#getInvoke <em>Invoke</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Invoke</em>' containment reference.
+ * @see #getInvoke()
+ * @generated
+ */
+ void setInvoke(Invoke value);
+
+ /**
+ * Returns the value of the '<em><b>Finalize</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Finalize</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Finalize</em>' containment reference.
+ * @see #setFinalize(Finalize)
+ * @see org.apache.commons.scxml.modeling.ModelingPackage#getParallel_Finalize()
+ * @model containment="true"
+ * @generated
+ */
+ Finalize getFinalize();
+
+ /**
+ * Sets the value of the '{@link org.apache.commons.scxml.modeling.Parallel#getFinalize <em>Finalize</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Finalize</em>' containment reference.
+ * @see #getFinalize()
* @generated
*/
- EList getAnchor();
+ void setFinalize(Finalize value);
} // Parallel
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Raise.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Raise.java?rev=960905&r1=960904&r2=960905&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Raise.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Raise.java Tue Jul 6 14:44:45 2010
@@ -18,6 +18,8 @@
*/
package org.apache.commons.scxml.modeling;
+import org.eclipse.emf.common.util.EList;
+
/**
* <!-- begin-user-doc -->
@@ -28,6 +30,8 @@ package org.apache.commons.scxml.modelin
* The following features are supported:
* <ul>
* <li>{@link org.apache.commons.scxml.modeling.Raise#getEvent <em>Event</em>}</li>
+ * <li>{@link org.apache.commons.scxml.modeling.Raise#getParam <em>Param</em>}</li>
+ * <li>{@link org.apache.commons.scxml.modeling.Raise#getContent <em>Content</em>}</li>
* </ul>
* </p>
*
@@ -62,4 +66,46 @@ public interface Raise extends Executabl
*/
void setEvent(String value);
+ /**
+ * Returns the value of the '<em><b>Param</b></em>' containment reference list.
+ * The list contents are of type {@link org.apache.commons.scxml.modeling.Param}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Param</em>' containment reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Param</em>' containment reference list.
+ * @see org.apache.commons.scxml.modeling.ModelingPackage#getRaise_Param()
+ * @model type="org.apache.commons.scxml.modeling.Param" containment="true"
+ * @generated
+ */
+ EList getParam();
+
+ /**
+ * Returns the value of the '<em><b>Content</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Content</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Content</em>' containment reference.
+ * @see #setContent(Content)
+ * @see org.apache.commons.scxml.modeling.ModelingPackage#getRaise_Content()
+ * @model containment="true"
+ * @generated
+ */
+ Content getContent();
+
+ /**
+ * Sets the value of the '{@link org.apache.commons.scxml.modeling.Raise#getContent <em>Content</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Content</em>' containment reference.
+ * @see #getContent()
+ * @generated
+ */
+ void setContent(Content value);
+
} // Raise
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Script.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Script.java?rev=960905&r1=960904&r2=960905&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Script.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Script.java Tue Jul 6 14:44:45 2010
@@ -25,10 +25,42 @@ import org.eclipse.emf.ecore.EObject;
* A representation of the model object '<em><b>Script</b></em>'.
* <!-- end-user-doc -->
*
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.apache.commons.scxml.modeling.Script#getScript_content <em>Script content</em>}</li>
+ * </ul>
+ * </p>
*
* @see org.apache.commons.scxml.modeling.ModelingPackage#getScript()
* @model
* @generated
*/
-public interface Script extends EObject {
+public interface Script extends ExecutableContent {
+
+ /**
+ * Returns the value of the '<em><b>Script content</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Script content</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Script content</em>' attribute.
+ * @see #setScript_content(String)
+ * @see org.apache.commons.scxml.modeling.ModelingPackage#getScript_Script_content()
+ * @model
+ * @generated
+ */
+ String getScript_content();
+
+ /**
+ * Sets the value of the '{@link org.apache.commons.scxml.modeling.Script#getScript_content <em>Script content</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Script content</em>' attribute.
+ * @see #getScript_content()
+ * @generated
+ */
+ void setScript_content(String value);
} // Script
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ServiceTemplate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ServiceTemplate.java?rev=960905&r1=960904&r2=960905&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ServiceTemplate.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ServiceTemplate.java Tue Jul 6 14:44:45 2010
@@ -271,20 +271,30 @@ public interface ServiceTemplate extends
EList getParallel();
/**
- * Returns the value of the '<em><b>Data Model</b></em>' containment reference list.
- * The list contents are of type {@link org.apache.commons.scxml.modeling.DataModel}.
+ * Returns the value of the '<em><b>Data Model</b></em>' containment reference.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Data Model</em>' containment reference list isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Data Model</em>' containment reference list.
+ * @return the value of the '<em>Data Model</em>' containment reference.
+ * @see #setDataModel(DataModel)
* @see org.apache.commons.scxml.modeling.ModelingPackage#getServiceTemplate_DataModel()
- * @model type="org.apache.commons.scxml.modeling.DataModel" containment="true"
+ * @model containment="true"
+ * @generated
+ */
+ DataModel getDataModel();
+
+ /**
+ * Sets the value of the '{@link org.apache.commons.scxml.modeling.ServiceTemplate#getDataModel <em>Data Model</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Data Model</em>' containment reference.
+ * @see #getDataModel()
* @generated
*/
- EList getDataModel();
+ void setDataModel(DataModel value);
/**
* Returns the value of the '<em><b>Script</b></em>' containment reference.
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/State.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/State.java?rev=960905&r1=960904&r2=960905&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/State.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/State.java Tue Jul 6 14:44:45 2010
@@ -37,8 +37,8 @@ import org.eclipse.emf.common.util.EList
* <li>{@link org.apache.commons.scxml.modeling.State#getFinalState <em>Final State</em>}</li>
* <li>{@link org.apache.commons.scxml.modeling.State#getSubParallel <em>Sub Parallel</em>}</li>
* <li>{@link org.apache.commons.scxml.modeling.State#getHistoryState <em>History State</em>}</li>
- * <li>{@link org.apache.commons.scxml.modeling.State#getAnchor <em>Anchor</em>}</li>
* <li>{@link org.apache.commons.scxml.modeling.State#getInvoke <em>Invoke</em>}</li>
+ * <li>{@link org.apache.commons.scxml.modeling.State#getFinalize <em>Finalize</em>}</li>
* </ul>
* </p>
*
@@ -242,22 +242,6 @@ public interface State extends NamedElem
EList getHistoryState();
/**
- * Returns the value of the '<em><b>Anchor</b></em>' containment reference list.
- * The list contents are of type {@link org.apache.commons.scxml.modeling.Anchor}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Anchor</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Anchor</em>' containment reference list.
- * @see org.apache.commons.scxml.modeling.ModelingPackage#getState_Anchor()
- * @model type="org.apache.commons.scxml.modeling.Anchor" containment="true"
- * @generated
- */
- EList getAnchor();
-
- /**
* Returns the value of the '<em><b>Invoke</b></em>' containment reference.
* <!-- begin-user-doc -->
* <p>
@@ -283,4 +267,30 @@ public interface State extends NamedElem
*/
void setInvoke(Invoke value);
+ /**
+ * Returns the value of the '<em><b>Finalize</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Finalize</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Finalize</em>' containment reference.
+ * @see #setFinalize(Finalize)
+ * @see org.apache.commons.scxml.modeling.ModelingPackage#getState_Finalize()
+ * @model containment="true"
+ * @generated
+ */
+ Finalize getFinalize();
+
+ /**
+ * Sets the value of the '{@link org.apache.commons.scxml.modeling.State#getFinalize <em>Finalize</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Finalize</em>' containment reference.
+ * @see #getFinalize()
+ * @generated
+ */
+ void setFinalize(Finalize value);
+
} // State
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ContentImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ContentImpl.java?rev=960905&r1=960904&r2=960905&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ContentImpl.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ContentImpl.java Tue Jul 6 14:44:45 2010
@@ -23,6 +23,7 @@ import java.util.Collection;
import org.apache.commons.scxml.modeling.Content;
import org.apache.commons.scxml.modeling.ModelingPackage;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
@@ -30,6 +31,7 @@ import org.eclipse.emf.common.util.EList
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
@@ -43,6 +45,7 @@ import org.eclipse.emf.ecore.util.Intern
* The following features are implemented:
* <ul>
* <li>{@link org.apache.commons.scxml.modeling.impl.ContentImpl#getContent <em>Content</em>}</li>
+ * <li>{@link org.apache.commons.scxml.modeling.impl.ContentImpl#getText_content <em>Text content</em>}</li>
* </ul>
* </p>
*
@@ -60,6 +63,25 @@ public class ContentImpl extends EObject
protected EList content;
/**
+ * The default value of the '{@link #getText_content() <em>Text content</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getText_content()
+ * @generated
+ * @ordered
+ */
+ protected static final String TEXT_CONTENT_EDEFAULT = null;
+ /**
+ * The cached value of the '{@link #getText_content() <em>Text content</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getText_content()
+ * @generated
+ * @ordered
+ */
+ protected String text_content = TEXT_CONTENT_EDEFAULT;
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -94,6 +116,27 @@ public class ContentImpl extends EObject
* <!-- end-user-doc -->
* @generated
*/
+ public String getText_content() {
+ return text_content;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setText_content(String newText_content) {
+ String oldText_content = text_content;
+ text_content = newText_content;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, ModelingPackage.CONTENT__TEXT_CONTENT, oldText_content, text_content));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
case ModelingPackage.CONTENT__CONTENT:
@@ -111,6 +154,8 @@ public class ContentImpl extends EObject
switch (featureID) {
case ModelingPackage.CONTENT__CONTENT:
return getContent();
+ case ModelingPackage.CONTENT__TEXT_CONTENT:
+ return getText_content();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -126,6 +171,9 @@ public class ContentImpl extends EObject
getContent().clear();
getContent().addAll((Collection)newValue);
return;
+ case ModelingPackage.CONTENT__TEXT_CONTENT:
+ setText_content((String)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -140,6 +188,9 @@ public class ContentImpl extends EObject
case ModelingPackage.CONTENT__CONTENT:
getContent().clear();
return;
+ case ModelingPackage.CONTENT__TEXT_CONTENT:
+ setText_content(TEXT_CONTENT_EDEFAULT);
+ return;
}
super.eUnset(featureID);
}
@@ -153,8 +204,25 @@ public class ContentImpl extends EObject
switch (featureID) {
case ModelingPackage.CONTENT__CONTENT:
return content != null && !content.isEmpty();
+ case ModelingPackage.CONTENT__TEXT_CONTENT:
+ return TEXT_CONTENT_EDEFAULT == null ? text_content != null : !TEXT_CONTENT_EDEFAULT.equals(text_content);
}
return super.eIsSet(featureID);
}
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String toString() {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (text_content: ");
+ result.append(text_content);
+ result.append(')');
+ return result.toString();
+ }
+
} //ContentImpl
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ModelingPackageImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ModelingPackageImpl.java?rev=960905&r1=960904&r2=960905&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ModelingPackageImpl.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ModelingPackageImpl.java Tue Jul 6 14:44:45 2010
@@ -474,7 +474,7 @@ public class ModelingPackageImpl extends
* <!-- end-user-doc -->
* @generated
*/
- public EReference getState_Anchor() {
+ public EReference getState_Invoke() {
return (EReference)stateEClass.getEStructuralFeatures().get(9);
}
@@ -483,7 +483,7 @@ public class ModelingPackageImpl extends
* <!-- end-user-doc -->
* @generated
*/
- public EReference getState_Invoke() {
+ public EReference getState_Finalize() {
return (EReference)stateEClass.getEStructuralFeatures().get(10);
}
@@ -888,7 +888,7 @@ public class ModelingPackageImpl extends
* <!-- end-user-doc -->
* @generated
*/
- public EReference getParallel_Anchor() {
+ public EReference getParallel_Invoke() {
return (EReference)parallelEClass.getEStructuralFeatures().get(6);
}
@@ -897,6 +897,15 @@ public class ModelingPackageImpl extends
* <!-- end-user-doc -->
* @generated
*/
+ public EReference getParallel_Finalize() {
+ return (EReference)parallelEClass.getEStructuralFeatures().get(7);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public EClass getHistoryState() {
return historyStateEClass;
}
@@ -942,6 +951,24 @@ public class ModelingPackageImpl extends
* <!-- end-user-doc -->
* @generated
*/
+ public EReference getRaise_Param() {
+ return (EReference)raiseEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getRaise_Content() {
+ return (EReference)raiseEClass.getEStructuralFeatures().get(2);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public EClass getIf() {
return ifEClass;
}
@@ -1185,6 +1212,15 @@ public class ModelingPackageImpl extends
* <!-- end-user-doc -->
* @generated
*/
+ public EAttribute getScript_Script_content() {
+ return (EAttribute)scriptEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public EClass getAnchor() {
return anchorEClass;
}
@@ -1401,6 +1437,15 @@ public class ModelingPackageImpl extends
* <!-- end-user-doc -->
* @generated
*/
+ public EAttribute getContent_Text_content() {
+ return (EAttribute)contentEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public EClass getDonedata() {
return donedataEClass;
}
@@ -1592,8 +1637,8 @@ public class ModelingPackageImpl extends
createEReference(stateEClass, STATE__FINAL_STATE);
createEReference(stateEClass, STATE__SUB_PARALLEL);
createEReference(stateEClass, STATE__HISTORY_STATE);
- createEReference(stateEClass, STATE__ANCHOR);
createEReference(stateEClass, STATE__INVOKE);
+ createEReference(stateEClass, STATE__FINALIZE);
transitionEClass = createEClass(TRANSITION);
createEReference(transitionEClass, TRANSITION__TARGET_STATUS);
@@ -1647,7 +1692,8 @@ public class ModelingPackageImpl extends
createEReference(parallelEClass, PARALLEL__PARALLEL);
createEReference(parallelEClass, PARALLEL__STATE);
createEReference(parallelEClass, PARALLEL__HISTORY_STATE);
- createEReference(parallelEClass, PARALLEL__ANCHOR);
+ createEReference(parallelEClass, PARALLEL__INVOKE);
+ createEReference(parallelEClass, PARALLEL__FINALIZE);
historyStateEClass = createEClass(HISTORY_STATE);
createEAttribute(historyStateEClass, HISTORY_STATE__ID);
@@ -1655,6 +1701,8 @@ public class ModelingPackageImpl extends
raiseEClass = createEClass(RAISE);
createEAttribute(raiseEClass, RAISE__EVENT);
+ createEReference(raiseEClass, RAISE__PARAM);
+ createEReference(raiseEClass, RAISE__CONTENT);
ifEClass = createEClass(IF);
createEAttribute(ifEClass, IF__COND);
@@ -1692,6 +1740,7 @@ public class ModelingPackageImpl extends
createEAttribute(paramEClass, PARAM__EXPR);
scriptEClass = createEClass(SCRIPT);
+ createEAttribute(scriptEClass, SCRIPT__SCRIPT_CONTENT);
anchorEClass = createEClass(ANCHOR);
createEAttribute(anchorEClass, ANCHOR__TYPE);
@@ -1720,6 +1769,7 @@ public class ModelingPackageImpl extends
contentEClass = createEClass(CONTENT);
createEReference(contentEClass, CONTENT__CONTENT);
+ createEAttribute(contentEClass, CONTENT__TEXT_CONTENT);
donedataEClass = createEClass(DONEDATA);
createEReference(donedataEClass, DONEDATA__CONTENT);
@@ -1780,6 +1830,7 @@ public class ModelingPackageImpl extends
extenExecContentEClass.getESuperTypes().add(this.getExecutableContent());
validateEClass.getESuperTypes().add(this.getExecutableContent());
paramEClass.getESuperTypes().add(this.getExecutableContent());
+ scriptEClass.getESuperTypes().add(this.getExecutableContent());
sendEClass.getESuperTypes().add(this.getExecutableContent());
cancelEClass.getESuperTypes().add(this.getExecutableContent());
@@ -1799,8 +1850,8 @@ public class ModelingPackageImpl extends
initEReference(getState_FinalState(), this.getFinalState(), null, "finalState", null, 0, -1, State.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getState_SubParallel(), this.getParallel(), null, "subParallel", null, 0, -1, State.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getState_HistoryState(), this.getHistoryState(), null, "historyState", null, 0, -1, State.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getState_Anchor(), this.getAnchor(), null, "anchor", null, 0, -1, State.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getState_Invoke(), this.getInvoke(), null, "invoke", null, 0, 1, State.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getState_Finalize(), this.getFinalize(), null, "finalize", null, 0, 1, State.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(transitionEClass, Transition.class, "Transition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getTransition_TargetStatus(), this.getNamedElement(), null, "targetStatus", null, 0, 1, Transition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1826,7 +1877,7 @@ public class ModelingPackageImpl extends
initEAttribute(getServiceTemplate_Exmode(), ecorePackage.getEString(), "exmode", null, 0, 1, ServiceTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getServiceTemplate_FinalState(), this.getFinalState(), null, "finalState", null, 0, -1, ServiceTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getServiceTemplate_Parallel(), this.getParallel(), null, "parallel", null, 0, -1, ServiceTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getServiceTemplate_DataModel(), this.getDataModel(), null, "dataModel", null, 0, -1, ServiceTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getServiceTemplate_DataModel(), this.getDataModel(), null, "dataModel", null, 0, 1, ServiceTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getServiceTemplate_Script(), this.getScript(), null, "script", null, 0, 1, ServiceTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(executableContentEClass, ExecutableContent.class, "ExecutableContent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -1854,7 +1905,8 @@ public class ModelingPackageImpl extends
initEReference(getParallel_Parallel(), this.getParallel(), null, "parallel", null, 0, -1, Parallel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getParallel_State(), this.getState(), null, "state", null, 0, -1, Parallel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getParallel_HistoryState(), this.getHistoryState(), null, "historyState", null, 0, -1, Parallel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getParallel_Anchor(), this.getAnchor(), null, "anchor", null, 0, -1, Parallel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getParallel_Invoke(), this.getInvoke(), null, "invoke", null, 0, 1, Parallel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getParallel_Finalize(), this.getFinalize(), null, "finalize", null, 0, 1, Parallel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(historyStateEClass, HistoryState.class, "HistoryState", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getHistoryState_Id(), ecorePackage.getEString(), "id", null, 0, 1, HistoryState.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1862,6 +1914,8 @@ public class ModelingPackageImpl extends
initEClass(raiseEClass, Raise.class, "Raise", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getRaise_Event(), ecorePackage.getEString(), "event", null, 0, 1, Raise.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getRaise_Param(), this.getParam(), null, "param", null, 0, -1, Raise.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getRaise_Content(), this.getContent(), null, "content", null, 0, 1, Raise.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(ifEClass, If.class, "If", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getIf_Cond(), ecorePackage.getEString(), "cond", null, 0, 1, If.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1899,6 +1953,7 @@ public class ModelingPackageImpl extends
initEAttribute(getParam_Expr(), ecorePackage.getEString(), "expr", null, 0, 1, Param.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(scriptEClass, Script.class, "Script", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getScript_Script_content(), ecorePackage.getEString(), "script_content", null, 0, 1, Script.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(anchorEClass, Anchor.class, "Anchor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getAnchor_Type(), ecorePackage.getEString(), "type", null, 0, 1, Anchor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1927,6 +1982,7 @@ public class ModelingPackageImpl extends
initEClass(contentEClass, Content.class, "Content", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getContent_Content(), this.getContent(), null, "content", null, 0, -1, Content.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getContent_Text_content(), ecorePackage.getEString(), "text_content", null, 0, 1, Content.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(donedataEClass, Donedata.class, "Donedata", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getDonedata_Content(), this.getContent(), null, "content", null, 0, 1, Donedata.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ParallelImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ParallelImpl.java?rev=960905&r1=960904&r2=960905&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ParallelImpl.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ParallelImpl.java Tue Jul 6 14:44:45 2010
@@ -20,8 +20,10 @@ package org.apache.commons.scxml.modelin
import java.util.Collection;
+import org.apache.commons.scxml.modeling.Finalize;
import org.apache.commons.scxml.modeling.Anchor;
import org.apache.commons.scxml.modeling.HistoryState;
+import org.apache.commons.scxml.modeling.Invoke;
import org.apache.commons.scxml.modeling.ModelingPackage;
import org.apache.commons.scxml.modeling.OnEntry;
import org.apache.commons.scxml.modeling.OnExit;
@@ -54,7 +56,8 @@ import org.eclipse.emf.ecore.util.Intern
* <li>{@link org.apache.commons.scxml.modeling.impl.ParallelImpl#getParallel <em>Parallel</em>}</li>
* <li>{@link org.apache.commons.scxml.modeling.impl.ParallelImpl#getState <em>State</em>}</li>
* <li>{@link org.apache.commons.scxml.modeling.impl.ParallelImpl#getHistoryState <em>History State</em>}</li>
- * <li>{@link org.apache.commons.scxml.modeling.impl.ParallelImpl#getAnchor <em>Anchor</em>}</li>
+ * <li>{@link org.apache.commons.scxml.modeling.impl.ParallelImpl#getInvoke <em>Invoke</em>}</li>
+ * <li>{@link org.apache.commons.scxml.modeling.impl.ParallelImpl#getFinalize <em>Finalize</em>}</li>
* </ul>
* </p>
*
@@ -132,14 +135,24 @@ public class ParallelImpl extends NamedE
protected EList historyState;
/**
- * The cached value of the '{@link #getAnchor() <em>Anchor</em>}' containment reference list.
+ * The cached value of the '{@link #getInvoke() <em>Invoke</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getAnchor()
+ * @see #getInvoke()
* @generated
* @ordered
*/
- protected EList anchor;
+ protected Invoke invoke;
+
+ /**
+ * The cached value of the '{@link #getFinalize() <em>Finalize</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getFinalize()
+ * @generated
+ * @ordered
+ */
+ protected Finalize finalize;
/**
* <!-- begin-user-doc -->
@@ -307,11 +320,85 @@ public class ParallelImpl extends NamedE
* <!-- end-user-doc -->
* @generated
*/
- public EList getAnchor() {
- if (anchor == null) {
- anchor = new EObjectContainmentEList(Anchor.class, this, ModelingPackage.PARALLEL__ANCHOR);
+ public Invoke getInvoke() {
+ return invoke;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetInvoke(Invoke newInvoke, NotificationChain msgs) {
+ Invoke oldInvoke = invoke;
+ invoke = newInvoke;
+ if (eNotificationRequired()) {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ModelingPackage.PARALLEL__INVOKE, oldInvoke, newInvoke);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setInvoke(Invoke newInvoke) {
+ if (newInvoke != invoke) {
+ NotificationChain msgs = null;
+ if (invoke != null)
+ msgs = ((InternalEObject)invoke).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ModelingPackage.PARALLEL__INVOKE, null, msgs);
+ if (newInvoke != null)
+ msgs = ((InternalEObject)newInvoke).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ModelingPackage.PARALLEL__INVOKE, null, msgs);
+ msgs = basicSetInvoke(newInvoke, msgs);
+ if (msgs != null) msgs.dispatch();
}
- return anchor;
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, ModelingPackage.PARALLEL__INVOKE, newInvoke, newInvoke));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public Finalize getFinalize() {
+ return finalize;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetFinalize(Finalize newFinalize, NotificationChain msgs) {
+ Finalize oldFinalize = finalize;
+ finalize = newFinalize;
+ if (eNotificationRequired()) {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ModelingPackage.PARALLEL__FINALIZE, oldFinalize, newFinalize);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setFinalize(Finalize newFinalize) {
+ if (newFinalize != finalize) {
+ NotificationChain msgs = null;
+ if (finalize != null)
+ msgs = ((InternalEObject)finalize).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ModelingPackage.PARALLEL__FINALIZE, null, msgs);
+ if (newFinalize != null)
+ msgs = ((InternalEObject)newFinalize).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ModelingPackage.PARALLEL__FINALIZE, null, msgs);
+ msgs = basicSetFinalize(newFinalize, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, ModelingPackage.PARALLEL__FINALIZE, newFinalize, newFinalize));
}
/**
@@ -331,8 +418,10 @@ public class ParallelImpl extends NamedE
return ((InternalEList)getState()).basicRemove(otherEnd, msgs);
case ModelingPackage.PARALLEL__HISTORY_STATE:
return ((InternalEList)getHistoryState()).basicRemove(otherEnd, msgs);
- case ModelingPackage.PARALLEL__ANCHOR:
- return ((InternalEList)getAnchor()).basicRemove(otherEnd, msgs);
+ case ModelingPackage.PARALLEL__INVOKE:
+ return basicSetInvoke(null, msgs);
+ case ModelingPackage.PARALLEL__FINALIZE:
+ return basicSetFinalize(null, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -356,8 +445,10 @@ public class ParallelImpl extends NamedE
return getState();
case ModelingPackage.PARALLEL__HISTORY_STATE:
return getHistoryState();
- case ModelingPackage.PARALLEL__ANCHOR:
- return getAnchor();
+ case ModelingPackage.PARALLEL__INVOKE:
+ return getInvoke();
+ case ModelingPackage.PARALLEL__FINALIZE:
+ return getFinalize();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -390,9 +481,11 @@ public class ParallelImpl extends NamedE
getHistoryState().clear();
getHistoryState().addAll((Collection)newValue);
return;
- case ModelingPackage.PARALLEL__ANCHOR:
- getAnchor().clear();
- getAnchor().addAll((Collection)newValue);
+ case ModelingPackage.PARALLEL__INVOKE:
+ setInvoke((Invoke)newValue);
+ return;
+ case ModelingPackage.PARALLEL__FINALIZE:
+ setFinalize((Finalize)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -423,8 +516,11 @@ public class ParallelImpl extends NamedE
case ModelingPackage.PARALLEL__HISTORY_STATE:
getHistoryState().clear();
return;
- case ModelingPackage.PARALLEL__ANCHOR:
- getAnchor().clear();
+ case ModelingPackage.PARALLEL__INVOKE:
+ setInvoke((Invoke)null);
+ return;
+ case ModelingPackage.PARALLEL__FINALIZE:
+ setFinalize((Finalize)null);
return;
}
super.eUnset(featureID);
@@ -449,8 +545,10 @@ public class ParallelImpl extends NamedE
return state != null && !state.isEmpty();
case ModelingPackage.PARALLEL__HISTORY_STATE:
return historyState != null && !historyState.isEmpty();
- case ModelingPackage.PARALLEL__ANCHOR:
- return anchor != null && !anchor.isEmpty();
+ case ModelingPackage.PARALLEL__INVOKE:
+ return invoke != null;
+ case ModelingPackage.PARALLEL__FINALIZE:
+ return finalize != null;
}
return super.eIsSet(featureID);
}