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/05/21 07:43:12 UTC
svn commit: r946880 [1/3] - 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...
Author: guixl
Date: Fri May 21 05:43:10 2010
New Revision: 946880
URL: http://svn.apache.org/viewvc?rev=946880&view=rev
Log:
change typo translation to transition in ecore model and codes
Added:
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Transition.java (with props)
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/TransitionImpl.java (with props)
Removed:
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ScxmlFactory.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ScxmlPackage.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Translation.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ScxmlFactoryImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ScxmlPackageImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/TranslationImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/util/ScxmlAdapterFactory.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/util/ScxmlSwitch.java
Modified:
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.ecore
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.ecore_diagram
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.genmodel
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.gmfgen
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.gmfgraph
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.gmfmap
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.gmftool
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Anchor.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Assign.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Cancel.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Content.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Data.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/DataModel.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Donedata.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Else.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ElseIf.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ExecutableContent.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ExtenExecContent.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/FinalState.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Finalize.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/HistoryState.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/If.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/InitialState.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Invoke.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Log.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ModelingFactory.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ModelingPackage.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/NamedElement.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/OnEntry.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/OnExit.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Parallel.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Param.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Raise.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Script.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Send.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ServiceTemplate.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/State.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Validate.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/AnchorImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/AssignImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/CancelImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ContentImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/DataImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/DataModelImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/DonedataImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ElseIfImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ElseImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ExecutableContentImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ExtenExecContentImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/FinalStateImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/FinalizeImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/HistoryStateImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/IfImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/InitialStateImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/InvokeImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/LogImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ModelingFactoryImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ModelingPackageImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/NamedElementImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/OnEntryImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/OnExitImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ParallelImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ParamImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/RaiseImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ScriptImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/SendImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ServiceTemplateImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/StateImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ValidateImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/util/ModelingAdapterFactory.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/util/ModelingSwitch.java
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.ecore
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.ecore?rev=946880&r1=946879&r2=946880&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 Fri May 21 05:43:10 2010
@@ -5,9 +5,9 @@
nsURI="org.apache.commons.scxml" nsPrefix="org.apache.commons.scxml">
<eClassifiers xsi:type="ecore:EClass" name="NamedElement">
<eStructuralFeatures xsi:type="ecore:EReference" name="sourceConnection" upperBound="-1"
- eType="#//Translation" containment="true"/>
+ eType="#//Transition" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="targetConnection" upperBound="-1"
- eType="#//Translation" containment="true"/>
+ eType="#//Transition" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="dataModel" upperBound="-1"
eType="#//DataModel" containment="true"/>
</eClassifiers>
@@ -33,7 +33,7 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="invoke" eType="#//Invoke"
containment="true"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Translation">
+ <eClassifiers xsi:type="ecore:EClass" name="Transition">
<eStructuralFeatures xsi:type="ecore:EReference" name="targetStatus" eType="#//NamedElement"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="sourceStatus" eType="#//NamedElement"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="event" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -48,7 +48,7 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ServiceTemplate">
<eStructuralFeatures xsi:type="ecore:EReference" name="transList" upperBound="-1"
- eType="#//Translation" containment="true"/>
+ eType="#//Transition" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="stateList" upperBound="-1"
eType="#//State" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="initial" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -205,6 +205,6 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Finalize">
<eStructuralFeatures xsi:type="ecore:EReference" name="executableContent" upperBound="-1"
- eType="#//ExecutableContent" containment="true" />
+ eType="#//ExecutableContent" containment="true"/>
</eClassifiers>
</ecore:EPackage>
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=946880&r1=946879&r2=946880&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 Fri May 21 05:43:10 2010
@@ -42,27 +42,6 @@
<element xmi:type="ecore:EClass" href="scxml.ecore#//State"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_9KC-bl17Ed-BqJBVG4-kXw" x="975" y="1230" width="286" height="186"/>
</children>
- <children xmi:type="notation:Node" xmi:id="_9KMvbV17Ed-BqJBVG4-kXw" type="2001">
- <children xmi:type="notation:Node" xmi:id="_9KMvcF17Ed-BqJBVG4-kXw" type="5001"/>
- <children xmi:type="notation:Node" xmi:id="_9KMvcV17Ed-BqJBVG4-kXw" type="7001">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_9KMvcl17Ed-BqJBVG4-kXw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_9KMvc117Ed-BqJBVG4-kXw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_9KMvdF17Ed-BqJBVG4-kXw"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_9KMvdV17Ed-BqJBVG4-kXw" type="7002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_9KMvdl17Ed-BqJBVG4-kXw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_9KMvd117Ed-BqJBVG4-kXw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_9KMveF17Ed-BqJBVG4-kXw"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_9KMveV17Ed-BqJBVG4-kXw" type="7003">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_9KMvel17Ed-BqJBVG4-kXw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_9KMve117Ed-BqJBVG4-kXw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_9KMvfF17Ed-BqJBVG4-kXw"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_9KMvbl17Ed-BqJBVG4-kXw" fontName="微软é
é»"/>
- <element xmi:type="ecore:EClass" href="scxml.ecore#//Translation"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9KMvb117Ed-BqJBVG4-kXw" x="-25" y="575"/>
- </children>
<children xmi:type="notation:Node" xmi:id="_9KMvfV17Ed-BqJBVG4-kXw" type="2001">
<children xmi:type="notation:Node" xmi:id="_9KMvgF17Ed-BqJBVG4-kXw" type="5001"/>
<children xmi:type="notation:Node" xmi:id="_9KMvgV17Ed-BqJBVG4-kXw" type="7001">
@@ -632,34 +611,6 @@
</children>
<styles xmi:type="notation:DiagramStyle" xmi:id="_N8TzcVxEEd-J9vls9vCPuA"/>
<element xmi:type="ecore:EPackage" href="scxml.ecore#/"/>
- <edges xmi:type="notation:Edge" xmi:id="_9U6KkF17Ed-BqJBVG4-kXw" type="4003" source="_9J50cF17Ed-BqJBVG4-kXw" target="_9KMvbV17Ed-BqJBVG4-kXw">
- <children xmi:type="notation:Node" xmi:id="_9U6KlF17Ed-BqJBVG4-kXw" type="6002">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_9U6KlV17Ed-BqJBVG4-kXw" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_9U6Kll17Ed-BqJBVG4-kXw" type="6004">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_9U6Kl117Ed-BqJBVG4-kXw" y="60"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_9U6KkV17Ed-BqJBVG4-kXw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_9U6Kkl17Ed-BqJBVG4-kXw" fontName="微软é
é»"/>
- <element xmi:type="ecore:EReference" href="scxml.ecore#//NamedElement/sourceConnection"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9U6Kk117Ed-BqJBVG4-kXw" points="[0, 0, 0, -102]$[0, 102, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9bAykl17Ed-BqJBVG4-kXw" id="(0.5,1.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9bAyk117Ed-BqJBVG4-kXw" id="(0.4939759,0.0)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_9VzicF17Ed-BqJBVG4-kXw" type="4003" source="_9J50cF17Ed-BqJBVG4-kXw" target="_9KMvbV17Ed-BqJBVG4-kXw">
- <children xmi:type="notation:Node" xmi:id="_9VzidF17Ed-BqJBVG4-kXw" type="6002">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_9VzidV17Ed-BqJBVG4-kXw" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_9Vzidl17Ed-BqJBVG4-kXw" type="6004">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_9Vzid117Ed-BqJBVG4-kXw" y="60"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_9VzicV17Ed-BqJBVG4-kXw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_9Vzicl17Ed-BqJBVG4-kXw" fontName="微软é
é»"/>
- <element xmi:type="ecore:EReference" href="scxml.ecore#//NamedElement/targetConnection"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9Vzic117Ed-BqJBVG4-kXw" points="[0, 0, 0, -102]$[0, 102, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9bAylF17Ed-BqJBVG4-kXw" id="(0.5,1.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9bAylV17Ed-BqJBVG4-kXw" id="(0.4939759,0.0)"/>
- </edges>
<edges xmi:type="notation:Edge" xmi:id="_9VzieF17Ed-BqJBVG4-kXw" type="4003" source="_9J50cF17Ed-BqJBVG4-kXw" target="_9KfqXV17Ed-BqJBVG4-kXw">
<children xmi:type="notation:Node" xmi:id="_9VzifF17Ed-BqJBVG4-kXw" type="6002">
<layoutConstraint xmi:type="notation:Location" xmi:id="_9VzifV17Ed-BqJBVG4-kXw" y="40"/>
@@ -806,34 +757,6 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9bJ8ml17Ed-BqJBVG4-kXw" id="(0.16949153,0.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9bJ8m117Ed-BqJBVG4-kXw" id="(0.6666667,1.0)"/>
</edges>
- <edges xmi:type="notation:Edge" xmi:id="_9WQObF17Ed-BqJBVG4-kXw" type="4002" source="_9KMvbV17Ed-BqJBVG4-kXw" target="_9J50cF17Ed-BqJBVG4-kXw">
- <children xmi:type="notation:Node" xmi:id="_9WQOcF17Ed-BqJBVG4-kXw" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_9WQOcV17Ed-BqJBVG4-kXw" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_9WQOcl17Ed-BqJBVG4-kXw" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_9WQOc117Ed-BqJBVG4-kXw" y="60"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_9WQObV17Ed-BqJBVG4-kXw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_9WQObl17Ed-BqJBVG4-kXw" fontName="微软é
é»"/>
- <element xmi:type="ecore:EReference" href="scxml.ecore#//Translation/targetStatus"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9WQOb117Ed-BqJBVG4-kXw" points="[0, 0, 0, 102]$[0, -102, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9bAynl17Ed-BqJBVG4-kXw" id="(0.4939759,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9bAyn117Ed-BqJBVG4-kXw" id="(0.5,1.0)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_9WZYUF17Ed-BqJBVG4-kXw" type="4002" source="_9KMvbV17Ed-BqJBVG4-kXw" target="_9J50cF17Ed-BqJBVG4-kXw">
- <children xmi:type="notation:Node" xmi:id="_9WZYVF17Ed-BqJBVG4-kXw" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_9WZYVV17Ed-BqJBVG4-kXw" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_9WZYVl17Ed-BqJBVG4-kXw" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_9WZYV117Ed-BqJBVG4-kXw" y="60"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_9WZYUV17Ed-BqJBVG4-kXw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_9WZYUl17Ed-BqJBVG4-kXw" fontName="微软é
é»"/>
- <element xmi:type="ecore:EReference" href="scxml.ecore#//Translation/sourceStatus"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9WZYU117Ed-BqJBVG4-kXw" points="[0, 0, 0, 102]$[0, -102, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9bAynF17Ed-BqJBVG4-kXw" id="(0.4939759,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9bAynV17Ed-BqJBVG4-kXw" id="(0.5,1.0)"/>
- </edges>
<edges xmi:type="notation:Edge" xmi:id="_9WZYWF17Ed-BqJBVG4-kXw" type="4004" source="_9KMvfV17Ed-BqJBVG4-kXw" target="_9KMvnV17Ed-BqJBVG4-kXw">
<styles xmi:type="notation:ConnectorStyle" xmi:id="_9WZYWV17Ed-BqJBVG4-kXw"/>
<styles xmi:type="notation:FontStyle" xmi:id="_9WZYWl17Ed-BqJBVG4-kXw" fontName="微软é
é»"/>
@@ -842,20 +765,6 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9bAysF17Ed-BqJBVG4-kXw" id="(0.49333334,0.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9bAysV17Ed-BqJBVG4-kXw" id="(0.04761905,1.0)"/>
</edges>
- <edges xmi:type="notation:Edge" xmi:id="_9WjJUF17Ed-BqJBVG4-kXw" type="4003" source="_9KMvjV17Ed-BqJBVG4-kXw" target="_9KMvbV17Ed-BqJBVG4-kXw">
- <children xmi:type="notation:Node" xmi:id="_9WjJVF17Ed-BqJBVG4-kXw" type="6002">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_9WjJVV17Ed-BqJBVG4-kXw" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_9WjJVl17Ed-BqJBVG4-kXw" type="6004">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_9WjJV117Ed-BqJBVG4-kXw" y="60"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_9WjJUV17Ed-BqJBVG4-kXw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_9WjJUl17Ed-BqJBVG4-kXw" fontName="微软é
é»"/>
- <element xmi:type="ecore:EReference" href="scxml.ecore#//ServiceTemplate/transList"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9WjJU117Ed-BqJBVG4-kXw" points="[0, 0, 842, 472]$[-214, -61, 628, 411]$[-480, -199, 362, 273]$[-649, -320, 193, 152]$[-842, -472, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9bJ8oF17Ed-BqJBVG4-kXw" id="(0.24561404,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9bJ8oV17Ed-BqJBVG4-kXw" id="(0.4939759,1.0)"/>
- </edges>
<edges xmi:type="notation:Edge" xmi:id="_9WjJWF17Ed-BqJBVG4-kXw" type="4003" source="_9KMvjV17Ed-BqJBVG4-kXw" target="_9KC-bF17Ed-BqJBVG4-kXw">
<children xmi:type="notation:Node" xmi:id="_9WjJXF17Ed-BqJBVG4-kXw" type="6002">
<layoutConstraint xmi:type="notation:Location" xmi:id="_9WjJXV17Ed-BqJBVG4-kXw" y="40"/>
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.genmodel
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.genmodel?rev=946880&r1=946879&r2=946880&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.genmodel (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.genmodel Fri May 21 05:43:10 2010
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<genmodel:GenModel xmi:version="2.0"
xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
 (the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at

 http://www.apache.org/licenses/LICENSE-2.0

 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License."
- modelDirectory="/org.apache.commons.scxml.modeling/src/" modelPluginID="org.apache.commons.scxml.modeling"
- modelName="Modeling" copyrightFields="false">
+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.apache.commons.scxml.modeling/src/"
+ modelPluginID="org.apache.commons.scxml.modeling" modelName="Modeling" copyrightFields="false">
<genPackages prefix="Modeling" basePackage="org.apache.commons.scxml" disposableProviderFactory="true"
ecorePackage="scxml.ecore#/">
<genClasses ecoreClass="scxml.ecore#//NamedElement">
@@ -24,13 +23,13 @@
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference scxml.ecore#//State/anchor"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference scxml.ecore#//State/invoke"/>
</genClasses>
- <genClasses ecoreClass="scxml.ecore#//Translation">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference scxml.ecore#//Translation/targetStatus"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference scxml.ecore#//Translation/sourceStatus"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute scxml.ecore#//Translation/event"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute scxml.ecore#//Translation/cond"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute scxml.ecore#//Translation/target"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute scxml.ecore#//Translation/anchor"/>
+ <genClasses ecoreClass="scxml.ecore#//Transition">
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference scxml.ecore#//Transition/targetStatus"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference scxml.ecore#//Transition/sourceStatus"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute scxml.ecore#//Transition/event"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute scxml.ecore#//Transition/cond"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute scxml.ecore#//Transition/target"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute scxml.ecore#//Transition/anchor"/>
</genClasses>
<genClasses ecoreClass="scxml.ecore#//Assign">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute scxml.ecore#//Assign/location"/>
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=946880&r1=946879&r2=946880&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 Fri May 21 05:43:10 2010
@@ -2,7 +2,7 @@
<gmfgen:GenEditorGenerator xmi:version="2.0"
xmlns:xmi="http://www.omg.org/XMI"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:gmfgen="http://www.eclipse.org/gmf/2008/GenModel" copyrightText="Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
 (the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at

 http://www.apache.org/licenses/LICENSE-2.0

 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.">
+ xmlns:gmfgen="http://www.eclipse.org/gmf/2008/GenModel" copyrightText="Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at

 http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.">
<diagram
visualID="1000"
editPartClassName="ServiceTemplateEditPart"
@@ -1412,7 +1412,7 @@
xsi:type="gmfgen:InnerClassViewmap"
layoutType="FLOW_LAYOUT"
className="InitialStateFigure"
- classBody="
/**
 * @generated
 */
public class InitialStateFigure extends org.eclipse.draw2d.Ellipse {


	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fFigureInitialStateTitle; 


	/**
	 * @generated
	 */
	public InitialStateFigure() {
		
	org.eclipse.draw2d.FlowLayout layoutThis = new org.eclipse.draw2d.FlowLayout();
	layoutThis.setStretchMinorAxis(false);
	layoutThis.setMinorAlignment(org.eclipse.draw2d.FlowLayout.ALIGN_CENTER
);

	layoutThis.setMajorAlignment(org.eclipse.draw2d.FlowLayout.ALIGN_CENTER
);
	layoutThis.setMajorSpacing(5);
	layoutThis.setMinorSpacing(5);
	layoutThis.setHorizontal(true);

	this.setLayoutManager(layoutThis);

			this.setBackgroundColor(THIS_BACK
);
		createContents();

;	}
	/**
	 * @generated
	 */
	private void createContents(){


fFigureInitialStateTitle = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();
fFigureInitialStateTitle.setText("S");

this.add(fFigureInitialStateTitle);


	}




	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}



	/**
	 * @generated
	 */
	public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getFigureInitialStateTitle() {
		r
eturn fFigureInitialStateTitle;
	}


}

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Color THIS_BACK = new org.eclipse.swt.graphics.Color(null, 80, 80, 250);

">
+ classBody="
/**
 * @generated
 */
public class InitialStateFigure extends org.eclipse.draw2d.Ellipse {


	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fFigureInitialStateTitle; 


	/**
	 * @generated
	 */
	public InitialStateFigure() {
		
	org.eclipse.draw2d.FlowLayout layoutThis = new org.eclipse.draw2d.FlowLayout();
	layoutThis.setStretchMinorAxis(false);
	layoutThis.setMinorAlignment(org.eclipse.draw2d.FlowLayout.ALIGN_CENTER
);

	layoutThis.setMajorAlignment(org.eclipse.draw2d.FlowLayout.ALIGN_CENTER
);
	layoutThis.setMajorSpacing(5);
	layoutThis.setMinorSpacing(5);
	layoutThis.setHorizontal(true);

	this.setLayoutManager(layoutThis);

			this.setBackgroundColor(THIS_BACK
);
		createContents();

;	}
	/**
	 * @generated
	 */
	private void createContents(){


fFigureInitialStateTitle = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();
fFigureInitialStateTitle.setText("");

this.add(fFigureInitialStateTitle);


	}




	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}



	/**
	 * @generated
	 */
	public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getFigureInitialStateTitle() {
		re
turn fFigureInitialStateTitle;
	}


}

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Color THIS_BACK = new org.eclipse.swt.graphics.Color(null, 80, 80, 250);

">
<attributes
xsi:type="gmfgen:StyleAttributes"
fixedBackground="true"/>
@@ -2353,7 +2353,7 @@
xsi:type="gmfgen:InnerClassViewmap"
layoutType="FLOW_LAYOUT"
className="InitialStateFigure"
- classBody="
/**
 * @generated
 */
public class InitialStateFigure extends org.eclipse.draw2d.Ellipse {


	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fFigureInitialStateTitle; 


	/**
	 * @generated
	 */
	public InitialStateFigure() {
		
	org.eclipse.draw2d.FlowLayout layoutThis = new org.eclipse.draw2d.FlowLayout();
	layoutThis.setStretchMinorAxis(false);
	layoutThis.setMinorAlignment(org.eclipse.draw2d.FlowLayout.ALIGN_CENTER
);

	layoutThis.setMajorAlignment(org.eclipse.draw2d.FlowLayout.ALIGN_CENTER
);
	layoutThis.setMajorSpacing(5);
	layoutThis.setMinorSpacing(5);
	layoutThis.setHorizontal(true);

	this.setLayoutManager(layoutThis);

			this.setBackgroundColor(THIS_BACK
);
		createContents();

;	}
	/**
	 * @generated
	 */
	private void createContents(){


fFigureInitialStateTitle = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();
fFigureInitialStateTitle.setText("S");

this.add(fFigureInitialStateTitle);


	}




	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}



	/**
	 * @generated
	 */
	public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getFigureInitialStateTitle() {
		r
eturn fFigureInitialStateTitle;
	}


}

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Color THIS_BACK = new org.eclipse.swt.graphics.Color(null, 80, 80, 250);

">
+ classBody="
/**
 * @generated
 */
public class InitialStateFigure extends org.eclipse.draw2d.Ellipse {


	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fFigureInitialStateTitle; 


	/**
	 * @generated
	 */
	public InitialStateFigure() {
		
	org.eclipse.draw2d.FlowLayout layoutThis = new org.eclipse.draw2d.FlowLayout();
	layoutThis.setStretchMinorAxis(false);
	layoutThis.setMinorAlignment(org.eclipse.draw2d.FlowLayout.ALIGN_CENTER
);

	layoutThis.setMajorAlignment(org.eclipse.draw2d.FlowLayout.ALIGN_CENTER
);
	layoutThis.setMajorSpacing(5);
	layoutThis.setMinorSpacing(5);
	layoutThis.setHorizontal(true);

	this.setLayoutManager(layoutThis);

			this.setBackgroundColor(THIS_BACK
);
		createContents();

;	}
	/**
	 * @generated
	 */
	private void createContents(){


fFigureInitialStateTitle = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();
fFigureInitialStateTitle.setText("");

this.add(fFigureInitialStateTitle);


	}




	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}



	/**
	 * @generated
	 */
	public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getFigureInitialStateTitle() {
		re
turn fFigureInitialStateTitle;
	}


}

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Color THIS_BACK = new org.eclipse.swt.graphics.Color(null, 80, 80, 250);

">
<attributes
xsi:type="gmfgen:StyleAttributes"
fixedBackground="true"/>
@@ -2569,16 +2569,16 @@
</topLevelNodes>
<links
visualID="4001"
- editPartClassName="TranslationEditPart"
- itemSemanticEditPolicyClassName="TranslationItemSemanticEditPolicy"
- notationViewFactoryClassName="TranslationViewFactory"
- createCommandClassName="TranslationCreateCommand"
- reorientCommandClassName="TranslationReorientCommand">
+ editPartClassName="TransitionEditPart"
+ itemSemanticEditPolicyClassName="TransitionItemSemanticEditPolicy"
+ notationViewFactoryClassName="TransitionViewFactory"
+ createCommandClassName="TransitionCreateCommand"
+ reorientCommandClassName="TransitionReorientCommand">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
<elementType
xsi:type="gmfgen:MetamodelType"
- editHelperClassName="TranslationEditHelper"/>
+ editHelperClassName="TransitionEditHelper"/>
<viewmap
xsi:type="gmfgen:InnerClassViewmap"
className="TranslationFigure"
@@ -2588,19 +2588,19 @@
<modelFacet
xsi:type="gmfgen:TypeLinkModelFacet">
<metaClass
- href="scxml.genmodel#//modeling/Translation"/>
+ href="scxml.genmodel#//modeling/Transition"/>
<containmentMetaFeature
href="scxml.genmodel#//modeling/NamedElement/targetConnection"/>
<childMetaFeature
href="scxml.genmodel#//modeling/NamedElement/targetConnection"/>
<targetMetaFeature
- href="scxml.genmodel#//modeling/Translation/targetStatus"/>
+ href="scxml.genmodel#//modeling/Transition/targetStatus"/>
</modelFacet>
<labels
visualID="6001"
- editPartClassName="TranslationEventEditPart"
- itemSemanticEditPolicyClassName="TranslationEventItemSemanticEditPolicy"
- notationViewFactoryClassName="TranslationEventViewFactory"
+ editPartClassName="TransitionCondEditPart"
+ itemSemanticEditPolicyClassName="TransitionCondItemSemanticEditPolicy"
+ notationViewFactoryClassName="TransitionCondViewFactory"
elementIcon="true">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
@@ -2613,9 +2613,12 @@
y="40"/>
</viewmap>
<modelFacet
- xsi:type="gmfgen:FeatureLabelModelFacet">
+ xsi:type="gmfgen:FeatureLabelModelFacet"
+ viewPattern=""
+ editorPattern=""
+ editPattern="">
<metaFeatures
- href="scxml.genmodel#//modeling/Translation/event"/>
+ href="scxml.genmodel#//modeling/Transition/cond"/>
</modelFacet>
</labels>
</links>
@@ -3206,7 +3209,8 @@
</compartments>
<palette>
<groups
- title="scxml">
+ title="Scxml State Element"
+ collapse="true">
<entries
xsi:type="gmfgen:ToolEntry"
title="State"
@@ -3214,16 +3218,11 @@
genNodes="//@diagram/@topLevelNodes.0 //@diagram/@childNodes.37 //@diagram/@childNodes.45"/>
<entries
xsi:type="gmfgen:ToolEntry"
- title="Translation"
- description="Create new Translation"
+ title="Transition"
+ description="Create new Transition"
genLinks="//@diagram/@links.0"/>
<entries
xsi:type="gmfgen:ToolEntry"
- title="Assign"
- description="Create new Assign"
- genNodes="//@diagram/@childNodes.4 //@diagram/@childNodes.17"/>
- <entries
- xsi:type="gmfgen:ToolEntry"
title="OnEntry"
description="Create new OnEntry"
genNodes="//@diagram/@childNodes.0 //@diagram/@childNodes.35 //@diagram/@childNodes.43"/>
@@ -3254,6 +3253,39 @@
genNodes="//@diagram/@childNodes.30 //@diagram/@childNodes.32"/>
<entries
xsi:type="gmfgen:ToolEntry"
+ title="ExtenExecContent"
+ description="Create new ExtenExecContent"/>
+ <entries
+ xsi:type="gmfgen:ToolEntry"
+ title="Anchor"
+ description="Create new Anchor"
+ genNodes="//@diagram/@childNodes.33 //@diagram/@childNodes.38"/>
+ <entries
+ xsi:type="gmfgen:ToolEntry"
+ title="Donedata"
+ description="Create new Donedata"
+ genNodes="//@diagram/@childNodes.40"/>
+ <entries
+ xsi:type="gmfgen:ToolEntry"
+ title="Invoke"
+ description="Create new Invoke"
+ genNodes="//@diagram/@childNodes.25"/>
+ <entries
+ xsi:type="gmfgen:ToolEntry"
+ title="Finalize"
+ description="Create new Finalize"
+ genNodes="//@diagram/@childNodes.26"/>
+ </groups>
+ <groups
+ title="Execute Content"
+ collapse="true">
+ <entries
+ xsi:type="gmfgen:ToolEntry"
+ title="Assign"
+ description="Create new Assign"
+ genNodes="//@diagram/@childNodes.4 //@diagram/@childNodes.17"/>
+ <entries
+ xsi:type="gmfgen:ToolEntry"
title="Raise"
description="Create new Raise"
genNodes="//@diagram/@childNodes.5 //@diagram/@childNodes.18"/>
@@ -3279,20 +3311,6 @@
genNodes="//@diagram/@childNodes.6 //@diagram/@childNodes.19"/>
<entries
xsi:type="gmfgen:ToolEntry"
- title="ExtenExecContent"
- description="Create new ExtenExecContent"/>
- <entries
- xsi:type="gmfgen:ToolEntry"
- title="DataModel"
- description="Create new DataModel"
- genNodes="//@diagram/@topLevelNodes.4"/>
- <entries
- xsi:type="gmfgen:ToolEntry"
- title="Data"
- description="Create new Data"
- genNodes="//@diagram/@childNodes.46"/>
- <entries
- xsi:type="gmfgen:ToolEntry"
title="Validate"
description="Create new Validate"
genNodes="//@diagram/@childNodes.7 //@diagram/@childNodes.20"/>
@@ -3303,16 +3321,6 @@
genNodes="//@diagram/@childNodes.10 //@diagram/@childNodes.13 //@diagram/@childNodes.22 //@diagram/@childNodes.27 //@diagram/@childNodes.41"/>
<entries
xsi:type="gmfgen:ToolEntry"
- title="Script"
- description="Create new Script"
- genNodes="//@diagram/@childNodes.14 //@diagram/@childNodes.24 //@diagram/@topLevelNodes.2"/>
- <entries
- xsi:type="gmfgen:ToolEntry"
- title="Anchor"
- description="Create new Anchor"
- genNodes="//@diagram/@childNodes.33 //@diagram/@childNodes.38"/>
- <entries
- xsi:type="gmfgen:ToolEntry"
title="Send"
description="Create new Send"
genNodes="//@diagram/@childNodes.9 //@diagram/@childNodes.23"/>
@@ -3321,26 +3329,30 @@
title="Cancel"
description="Create new Cancel"
genNodes="//@diagram/@childNodes.8 //@diagram/@childNodes.21"/>
+ </groups>
+ <groups
+ title="Data Model Element"
+ collapse="true">
<entries
xsi:type="gmfgen:ToolEntry"
- title="Content"
- description="Create new Content"
- genNodes="//@diagram/@childNodes.11 //@diagram/@childNodes.12 //@diagram/@childNodes.28 //@diagram/@childNodes.42 //@diagram/@childNodes.47"/>
+ title="DataModel"
+ description="Create new DataModel"
+ genNodes="//@diagram/@topLevelNodes.4"/>
<entries
xsi:type="gmfgen:ToolEntry"
- title="Donedata"
- description="Create new Donedata"
- genNodes="//@diagram/@childNodes.40"/>
+ title="Data"
+ description="Create new Data"
+ genNodes="//@diagram/@childNodes.46"/>
<entries
xsi:type="gmfgen:ToolEntry"
- title="Invoke"
- description="Create new Invoke"
- genNodes="//@diagram/@childNodes.25"/>
+ title="Script"
+ description="Create new Script"
+ genNodes="//@diagram/@childNodes.14 //@diagram/@childNodes.24 //@diagram/@topLevelNodes.2"/>
<entries
xsi:type="gmfgen:ToolEntry"
- title="Finalize"
- description="Create new Finalize"
- genNodes="//@diagram/@childNodes.26"/>
+ title="Content"
+ description="Create new Content"
+ genNodes="//@diagram/@childNodes.11 //@diagram/@childNodes.12 //@diagram/@childNodes.28 //@diagram/@childNodes.42 //@diagram/@childNodes.47"/>
</groups>
</palette>
<preferencePages
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=946880&r1=946879&r2=946880&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 Fri May 21 05:43:10 2010
@@ -159,7 +159,7 @@
<children
xsi:type="gmfgraph:Label"
name="InitialStateTitle"
- text="S"/>
+ text=""/>
</actualFigure>
<accessors
figure="//@figures.0/@descriptors.6/@actualFigure/@children.0"/>
@@ -937,5 +937,5 @@
<labels
name="ScriptLabel"
figure="ScriptFigure"
- accessor="//@figures.0/@descriptors.20/@accessors.0" />
+ accessor="//@figures.0/@descriptors.20/@accessors.0"/>
</gmfgraph:Canvas>
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=946880&r1=946879&r2=946880&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 Fri May 21 05:43:10 2010
@@ -37,7 +37,7 @@
</labelMappings>
<tool
xsi:type="gmftool:CreationTool"
- href="scxml.gmftool#//@palette/@tools.0/@tools.3"/>
+ href="scxml.gmftool#//@palette/@tools.0/@tools.2"/>
<diagramNode
href="scxml.gmfgraph#OnEntry"/>
<children
@@ -56,7 +56,7 @@
</labelMappings>
<tool
xsi:type="gmftool:CreationTool"
- href="scxml.gmftool#//@palette/@tools.0/@tools.10"/>
+ href="scxml.gmftool#//@palette/@tools.1/@tools.2"/>
<diagramNode
href="scxml.gmfgraph#If"/>
<children
@@ -75,7 +75,7 @@
</labelMappings>
<tool
xsi:type="gmftool:CreationTool"
- href="scxml.gmftool#//@palette/@tools.0/@tools.11"/>
+ href="scxml.gmftool#//@palette/@tools.1/@tools.3"/>
<diagramNode
href="scxml.gmfgraph#ElseIf"/>
</ownedChild>
@@ -94,7 +94,7 @@
</labelMappings>
<tool
xsi:type="gmftool:CreationTool"
- href="scxml.gmftool#//@palette/@tools.0/@tools.12"/>
+ href="scxml.gmftool#//@palette/@tools.1/@tools.4"/>
<diagramNode
href="scxml.gmfgraph#Else"/>
</ownedChild>
@@ -129,7 +129,7 @@
</labelMappings>
<tool
xsi:type="gmftool:CreationTool"
- href="scxml.gmftool#//@palette/@tools.0/@tools.2"/>
+ href="scxml.gmftool#//@palette/@tools.1/@tools.0"/>
<diagramNode
href="scxml.gmfgraph#Assign"/>
</ownedChild>
@@ -150,7 +150,7 @@
</labelMappings>
<tool
xsi:type="gmftool:CreationTool"
- href="scxml.gmftool#//@palette/@tools.0/@tools.9"/>
+ href="scxml.gmftool#//@palette/@tools.1/@tools.1"/>
<diagramNode
href="scxml.gmfgraph#Raise"/>
</ownedChild>
@@ -171,7 +171,7 @@
</labelMappings>
<tool
xsi:type="gmftool:CreationTool"
- href="scxml.gmftool#//@palette/@tools.0/@tools.13"/>
+ href="scxml.gmftool#//@palette/@tools.1/@tools.5"/>
<diagramNode
href="scxml.gmfgraph#Log"/>
</ownedChild>
@@ -192,7 +192,7 @@
</labelMappings>
<tool
xsi:type="gmftool:CreationTool"
- href="scxml.gmftool#//@palette/@tools.0/@tools.17"/>
+ href="scxml.gmftool#//@palette/@tools.1/@tools.6"/>
<diagramNode
href="scxml.gmfgraph#Validate"/>
</ownedChild>
@@ -213,7 +213,7 @@
</labelMappings>
<tool
xsi:type="gmftool:CreationTool"
- href="scxml.gmftool#//@palette/@tools.0/@tools.22"/>
+ href="scxml.gmftool#//@palette/@tools.1/@tools.9"/>
<diagramNode
href="scxml.gmfgraph#Cancel"/>
</ownedChild>
@@ -234,7 +234,7 @@
</labelMappings>
<tool
xsi:type="gmftool:CreationTool"
- href="scxml.gmftool#//@palette/@tools.0/@tools.21"/>
+ href="scxml.gmftool#//@palette/@tools.1/@tools.8"/>
<diagramNode
href="scxml.gmfgraph#Send"/>
<children
@@ -289,7 +289,7 @@
</labelMappings>
<tool
xsi:type="gmftool:CreationTool"
- href="scxml.gmftool#//@palette/@tools.0/@tools.4"/>
+ href="scxml.gmftool#//@palette/@tools.0/@tools.3"/>
<diagramNode
href="scxml.gmfgraph#OnExit"/>
<children
@@ -369,7 +369,7 @@
</labelMappings>
<tool
xsi:type="gmftool:CreationTool"
- href="scxml.gmftool#//@palette/@tools.0/@tools.25"/>
+ href="scxml.gmftool#//@palette/@tools.0/@tools.11"/>
<diagramNode
href="scxml.gmfgraph#Invoke"/>
<children
@@ -386,7 +386,7 @@
</labelMappings>
<tool
xsi:type="gmftool:CreationTool"
- href="scxml.gmftool#//@palette/@tools.0/@tools.26"/>
+ href="scxml.gmftool#//@palette/@tools.0/@tools.12"/>
<diagramNode
href="scxml.gmfgraph#Finalize"/>
</ownedChild>
@@ -407,7 +407,7 @@
</labelMappings>
<tool
xsi:type="gmftool:CreationTool"
- href="scxml.gmftool#//@palette/@tools.0/@tools.18"/>
+ href="scxml.gmftool#//@palette/@tools.1/@tools.7"/>
<diagramNode
href="scxml.gmfgraph#Param"/>
</ownedChild>
@@ -447,7 +447,7 @@
</labelMappings>
<tool
xsi:type="gmftool:CreationTool"
- href="scxml.gmftool#//@palette/@tools.0/@tools.8"/>
+ href="scxml.gmftool#//@palette/@tools.0/@tools.7"/>
<diagramNode
href="scxml.gmfgraph#HistoryState"/>
</ownedChild>
@@ -474,7 +474,7 @@
</labelMappings>
<tool
xsi:type="gmftool:CreationTool"
- href="scxml.gmftool#//@palette/@tools.0/@tools.20"/>
+ href="scxml.gmftool#//@palette/@tools.0/@tools.9"/>
<diagramNode
href="scxml.gmfgraph#Anchor"/>
</ownedChild>
@@ -511,7 +511,7 @@
</labelMappings>
<tool
xsi:type="gmftool:CreationTool"
- href="scxml.gmftool#//@palette/@tools.0/@tools.5"/>
+ href="scxml.gmftool#//@palette/@tools.0/@tools.4"/>
<diagramNode
href="scxml.gmfgraph#InitialState"/>
</ownedChild>
@@ -528,7 +528,7 @@
</labelMappings>
<tool
xsi:type="gmftool:CreationTool"
- href="scxml.gmftool#//@palette/@tools.0/@tools.19"/>
+ href="scxml.gmftool#//@palette/@tools.2/@tools.2"/>
<diagramNode
href="scxml.gmfgraph#Script"/>
</ownedChild>
@@ -548,7 +548,7 @@
</labelMappings>
<tool
xsi:type="gmftool:CreationTool"
- href="scxml.gmftool#//@palette/@tools.0/@tools.7"/>
+ href="scxml.gmftool#//@palette/@tools.0/@tools.6"/>
<diagramNode
href="scxml.gmfgraph#Parallel"/>
<children
@@ -609,7 +609,7 @@
</labelMappings>
<tool
xsi:type="gmftool:CreationTool"
- href="scxml.gmftool#//@palette/@tools.0/@tools.15"/>
+ href="scxml.gmftool#//@palette/@tools.2/@tools.0"/>
<diagramNode
href="scxml.gmfgraph#DataModel"/>
<children
@@ -628,7 +628,7 @@
</labelMappings>
<tool
xsi:type="gmftool:CreationTool"
- href="scxml.gmftool#//@palette/@tools.0/@tools.16"/>
+ href="scxml.gmftool#//@palette/@tools.2/@tools.1"/>
<diagramNode
href="scxml.gmfgraph#Data"/>
<children
@@ -640,7 +640,7 @@
href="scxml.ecore#//Content"/>
<tool
xsi:type="gmftool:CreationTool"
- href="scxml.gmftool#//@palette/@tools.0/@tools.23"/>
+ href="scxml.gmftool#//@palette/@tools.2/@tools.3"/>
<diagramNode
href="scxml.gmfgraph#Content"/>
<children
@@ -685,7 +685,7 @@
</labelMappings>
<tool
xsi:type="gmftool:CreationTool"
- href="scxml.gmftool#//@palette/@tools.0/@tools.6"/>
+ href="scxml.gmftool#//@palette/@tools.0/@tools.5"/>
<diagramNode
href="scxml.gmfgraph#FinalState"/>
<children
@@ -702,7 +702,7 @@
</labelMappings>
<tool
xsi:type="gmftool:CreationTool"
- href="scxml.gmftool#//@palette/@tools.0/@tools.24"/>
+ href="scxml.gmftool#//@palette/@tools.0/@tools.10"/>
<diagramNode
href="scxml.gmfgraph#Donedata"/>
<children
@@ -745,13 +745,16 @@
</nodes>
<links>
<domainMetaElement
- href="scxml.ecore#//Translation"/>
+ href="scxml.ecore#//Transition"/>
<labelMappings
- xsi:type="gmfmap:FeatureLabelMapping">
+ xsi:type="gmfmap:FeatureLabelMapping"
+ viewPattern=""
+ editorPattern=""
+ editPattern="">
<diagramLabel
href="scxml.gmfgraph#TranslationCond"/>
<features
- href="scxml.ecore#//Translation/event"/>
+ href="scxml.ecore#//Transition/cond"/>
</labelMappings>
<containmentFeature
href="scxml.ecore#//NamedElement/targetConnection"/>
@@ -762,11 +765,11 @@
href="scxml.gmfgraph#Translation"/>
<linkMetaFeature
xsi:type="ecore:EReference"
- href="scxml.ecore#//Translation/targetStatus"/>
+ href="scxml.ecore#//Transition/targetStatus"/>
</links>
<diagram>
<diagramCanvas
- href="scxml.gmfgraph#scxml" />
+ href="scxml.gmfgraph#scxml"/>
<domainModel
href="scxml.ecore#/"/>
<domainMetaElement
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.gmftool
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.gmftool?rev=946880&r1=946879&r2=946880&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.gmftool (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/model/scxml.gmftool Fri May 21 05:43:10 2010
@@ -8,7 +8,8 @@
description="Scxml Palette">
<tools
xsi:type="gmftool:ToolGroup"
- title="scxml">
+ title="Scxml State Element"
+ collapsible="true">
<tools
xsi:type="gmftool:CreationTool"
title="State"
@@ -20,17 +21,8 @@
</tools>
<tools
xsi:type="gmftool:CreationTool"
- title="Translation"
- description="Create new Translation">
- <smallIcon
- xsi:type="gmftool:DefaultImage"/>
- <largeIcon
- xsi:type="gmftool:DefaultImage"/>
- </tools>
- <tools
- xsi:type="gmftool:CreationTool"
- title="Assign"
- description="Create new Assign">
+ title="Transition"
+ description="Create new Transition">
<smallIcon
xsi:type="gmftool:DefaultImage"/>
<largeIcon
@@ -92,8 +84,8 @@
</tools>
<tools
xsi:type="gmftool:CreationTool"
- title="Raise"
- description="Create new Raise">
+ title="ExtenExecContent"
+ description="Create new ExtenExecContent">
<smallIcon
xsi:type="gmftool:DefaultImage"/>
<largeIcon
@@ -101,8 +93,8 @@
</tools>
<tools
xsi:type="gmftool:CreationTool"
- title="If"
- description="Create new If">
+ title="Anchor"
+ description="Create new Anchor">
<smallIcon
xsi:type="gmftool:DefaultImage"/>
<largeIcon
@@ -110,8 +102,8 @@
</tools>
<tools
xsi:type="gmftool:CreationTool"
- title="ElseIf"
- description="Create new ElseIf">
+ title="Donedata"
+ description="Create new Donedata">
<smallIcon
xsi:type="gmftool:DefaultImage"/>
<largeIcon
@@ -119,8 +111,8 @@
</tools>
<tools
xsi:type="gmftool:CreationTool"
- title="Else"
- description="Create new Else">
+ title="Invoke"
+ description="Create new Invoke">
<smallIcon
xsi:type="gmftool:DefaultImage"/>
<largeIcon
@@ -128,17 +120,22 @@
</tools>
<tools
xsi:type="gmftool:CreationTool"
- title="Log"
- description="Create new Log">
+ title="Finalize"
+ description="Create new Finalize">
<smallIcon
xsi:type="gmftool:DefaultImage"/>
<largeIcon
xsi:type="gmftool:DefaultImage"/>
</tools>
+ </tools>
+ <tools
+ xsi:type="gmftool:ToolGroup"
+ title="Execute Content"
+ collapsible="true">
<tools
xsi:type="gmftool:CreationTool"
- title="ExtenExecContent"
- description="Create new ExtenExecContent">
+ title="Assign"
+ description="Create new Assign">
<smallIcon
xsi:type="gmftool:DefaultImage"/>
<largeIcon
@@ -146,8 +143,8 @@
</tools>
<tools
xsi:type="gmftool:CreationTool"
- title="DataModel"
- description="Create new DataModel">
+ title="Raise"
+ description="Create new Raise">
<smallIcon
xsi:type="gmftool:DefaultImage"/>
<largeIcon
@@ -155,8 +152,8 @@
</tools>
<tools
xsi:type="gmftool:CreationTool"
- title="Data"
- description="Create new Data">
+ title="If"
+ description="Create new If">
<smallIcon
xsi:type="gmftool:DefaultImage"/>
<largeIcon
@@ -164,8 +161,8 @@
</tools>
<tools
xsi:type="gmftool:CreationTool"
- title="Validate"
- description="Create new Validate">
+ title="ElseIf"
+ description="Create new ElseIf">
<smallIcon
xsi:type="gmftool:DefaultImage"/>
<largeIcon
@@ -173,8 +170,8 @@
</tools>
<tools
xsi:type="gmftool:CreationTool"
- title="Param"
- description="Create new Param">
+ title="Else"
+ description="Create new Else">
<smallIcon
xsi:type="gmftool:DefaultImage"/>
<largeIcon
@@ -182,8 +179,8 @@
</tools>
<tools
xsi:type="gmftool:CreationTool"
- title="Script"
- description="Create new Script">
+ title="Log"
+ description="Create new Log">
<smallIcon
xsi:type="gmftool:DefaultImage"/>
<largeIcon
@@ -191,8 +188,17 @@
</tools>
<tools
xsi:type="gmftool:CreationTool"
- title="Anchor"
- description="Create new Anchor">
+ title="Validate"
+ description="Create new Validate">
+ <smallIcon
+ xsi:type="gmftool:DefaultImage"/>
+ <largeIcon
+ xsi:type="gmftool:DefaultImage"/>
+ </tools>
+ <tools
+ xsi:type="gmftool:CreationTool"
+ title="Param"
+ description="Create new Param">
<smallIcon
xsi:type="gmftool:DefaultImage"/>
<largeIcon
@@ -216,10 +222,15 @@
<largeIcon
xsi:type="gmftool:DefaultImage"/>
</tools>
+ </tools>
+ <tools
+ xsi:type="gmftool:ToolGroup"
+ title="Data Model Element"
+ collapsible="true">
<tools
xsi:type="gmftool:CreationTool"
- title="Content"
- description="Create new Content">
+ title="DataModel"
+ description="Create new DataModel">
<smallIcon
xsi:type="gmftool:DefaultImage"/>
<largeIcon
@@ -227,8 +238,8 @@
</tools>
<tools
xsi:type="gmftool:CreationTool"
- title="Donedata"
- description="Create new Donedata">
+ title="Data"
+ description="Create new Data">
<smallIcon
xsi:type="gmftool:DefaultImage"/>
<largeIcon
@@ -236,8 +247,8 @@
</tools>
<tools
xsi:type="gmftool:CreationTool"
- title="Invoke"
- description="Create new Invoke">
+ title="Script"
+ description="Create new Script">
<smallIcon
xsi:type="gmftool:DefaultImage"/>
<largeIcon
@@ -245,8 +256,8 @@
</tools>
<tools
xsi:type="gmftool:CreationTool"
- title="Finalize"
- description="Create new Finalize">
+ title="Content"
+ description="Create new Content">
<smallIcon
xsi:type="gmftool:DefaultImage"/>
<largeIcon
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Anchor.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/Anchor.java?rev=946880&r1=946879&r2=946880&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Anchor.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Anchor.java Fri May 21 05:43:10 2010
@@ -1,6 +1,18 @@
/**
- * <copyright>
- * </copyright>
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
* $Id$
*/
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Assign.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/Assign.java?rev=946880&r1=946879&r2=946880&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Assign.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Assign.java Fri May 21 05:43:10 2010
@@ -1,6 +1,18 @@
/**
- * <copyright>
- * </copyright>
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
* $Id$
*/
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Cancel.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/Cancel.java?rev=946880&r1=946879&r2=946880&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Cancel.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Cancel.java Fri May 21 05:43:10 2010
@@ -1,6 +1,18 @@
/**
- * <copyright>
- * </copyright>
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
* $Id$
*/
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=946880&r1=946879&r2=946880&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 Fri May 21 05:43:10 2010
@@ -1,6 +1,18 @@
/**
- * <copyright>
- * </copyright>
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
* $Id$
*/
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Data.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/Data.java?rev=946880&r1=946879&r2=946880&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Data.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Data.java Fri May 21 05:43:10 2010
@@ -1,6 +1,18 @@
/**
- * <copyright>
- * </copyright>
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
* $Id$
*/
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/DataModel.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/DataModel.java?rev=946880&r1=946879&r2=946880&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/DataModel.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/DataModel.java Fri May 21 05:43:10 2010
@@ -1,6 +1,18 @@
/**
- * <copyright>
- * </copyright>
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
* $Id$
*/
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Donedata.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/Donedata.java?rev=946880&r1=946879&r2=946880&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Donedata.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Donedata.java Fri May 21 05:43:10 2010
@@ -1,6 +1,18 @@
/**
- * <copyright>
- * </copyright>
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
* $Id$
*/
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Else.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/Else.java?rev=946880&r1=946879&r2=946880&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Else.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/Else.java Fri May 21 05:43:10 2010
@@ -1,6 +1,18 @@
/**
- * <copyright>
- * </copyright>
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
* $Id$
*/
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ElseIf.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/ElseIf.java?rev=946880&r1=946879&r2=946880&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ElseIf.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ElseIf.java Fri May 21 05:43:10 2010
@@ -1,6 +1,18 @@
/**
- * <copyright>
- * </copyright>
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
* $Id$
*/
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ExecutableContent.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/ExecutableContent.java?rev=946880&r1=946879&r2=946880&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ExecutableContent.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ExecutableContent.java Fri May 21 05:43:10 2010
@@ -1,6 +1,18 @@
/**
- * <copyright>
- * </copyright>
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
* $Id$
*/
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ExtenExecContent.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/ExtenExecContent.java?rev=946880&r1=946879&r2=946880&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ExtenExecContent.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ExtenExecContent.java Fri May 21 05:43:10 2010
@@ -1,6 +1,18 @@
/**
- * <copyright>
- * </copyright>
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
* $Id$
*/