Author: guixl Date: Tue Jul 6 15:11:16 2010 New Revision: 960912 URL: http://svn.apache.org/viewvc?rev=960912&view=rev Log: fix data model problems, remove anchor element
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/META-INF/MANIFEST.MF commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/messages.properties commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/plugin.properties commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/plugin.xml Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/META-INF/MANIFEST.MF?rev=960912&r1=960911&r2=960912&view=diff ============================================================================== --- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/META-INF/MANIFEST.MF (original) +++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/META-INF/MANIFEST.MF Tue Jul 6 15:11:16 2010 @@ -3,9 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.apache.commons.scxml.modeling.diagram; singleton:=true Bundle-Version: 1.0.0.qualifier -Bundle-ClassPath: ., - lib/xalan.jar, - lib/serializer.jar +Bundle-ClassPath: .,lib/xalan.jar,lib/serializer.jar Bundle-Activator: org.apache.commons.scxml.modeling.diagram.part.ModelingDiagramEditorPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/messages.properties URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/messages.properties?rev=960912&r1=960911&r2=960912&view=diff ============================================================================== --- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/messages.properties (original) +++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/messages.properties Tue Jul 6 15:11:16 2010 @@ -264,3 +264,14 @@ NavigatorGroupName_State_3046_incomingli NavigatorGroupName_State_3046_outgoinglinks=outgoing links NavigatorGroupName_Transition_4001_target=target NavigatorGroupName_Transition_4001_source=source +RaiseRaiseCompartmentEditPart_title=RaiseCompartment +ContentContentCompartment6EditPart_title=ContentCompartment +RaiseRaiseCompartment2EditPart_title=RaiseCompartment +FinalizeFinalizeCompartmentEditPart_title=FinalizeCompartment +IfIfCompartment3EditPart_title=IfCompartment +RaiseRaiseCompartment3EditPart_title=RaiseCompartment +SendSendCompartment3EditPart_title=SendCompartment +DataModelDataModelCompartment2EditPart_title=DataModelCompartment +FinalizeFinalizeCompartment2EditPart_title=FinalizeCompartment +InvokeInvokeCompartment2EditPart_title=InvokeCompartment +FinalizeFinalizeCompartment3EditPart_title=FinalizeCompartment Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/plugin.properties URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/plugin.properties?rev=960912&r1=960911&r2=960912&view=diff ============================================================================== --- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/plugin.properties (original) +++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/plugin.properties Tue Jul 6 15:11:16 2010 @@ -11,7 +11,7 @@ preferences.pathmaps=Path Maps editorName=Modeling Diagram Editing context.description=Modeling Diagram Editing context.name=In Modeling Diagram Editor -newWizardName=Modeling Diagram +newWizardName=SCXML Modeling Diagram newWizardDesc=Creates Modeling diagram. importWizardName=Import SCXML Document @@ -159,3 +159,19 @@ metatype.name.Content_3048=Content metatype.name.Transition_4001=Transition metatype.name.ExtenExecContent_3049=ExtenExecContent metatype.name.ExtenExecContent_3050=ExtenExecContent +metatype.name.Param_3051=Param +metatype.name.Content_3052=Content +metatype.name.If_3053=If +metatype.name.Assign_3054=Assign +metatype.name.Raise_3055=Raise +metatype.name.Log_3056=Log +metatype.name.Validate_3057=Validate +metatype.name.Cancel_3058=Cancel +metatype.name.Send_3059=Send +metatype.name.Param_3060=Param +metatype.name.Script_3061=Script +metatype.name.ExtenExecContent_3062=ExtenExecContent +metatype.name.DataModel_3063=DataModel +metatype.name.Finalize_3064=Finalize +metatype.name.Invoke_3065=Invoke +metatype.name.Finalize_3066=Finalize Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/plugin.xml URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/plugin.xml?rev=960912&r1=960911&r2=960912&view=diff ============================================================================== --- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/plugin.xml (original) +++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/plugin.xml Tue Jul 6 15:11:16 2010 @@ -57,8 +57,7 @@ <description>%newWizardDesc</description> </wizard> </extension> - - <extension point="org.eclipse.ui.newWizards"> +<extension point="org.eclipse.ui.newWizards"> <?gmfgen generated="true"?> <category id = "org.apache.commons.scxml.modeling.import" @@ -72,7 +71,8 @@ id="org.apache.commons.scxml.modeling.diagram.part.ModelingImportWizardID"> <description>%importWizardDesc</description> </wizard> - </extension> + </extension> + <extension point="org.eclipse.ui.popupMenus"> <?gmfgen generated="true"?> @@ -101,7 +101,6 @@ class="org.apache.commons.scxml.modeling.diagram.part.ModelingInitDiagramFileAction" menubarPath="additions" enablesFor="1" - icon="icons/obj16/ModelingDiagramFile.gif" id="org.apache.commons.scxml.modeling.diagram.InitDiagramAction"> </action> </objectContribution> @@ -333,15 +332,6 @@ </metamodel> <metamodel nsURI="org.apache.commons.scxml"> <specializationType - id="org.apache.commons.scxml.modeling.diagram.InitialState_2002" - name="%metatype.name.InitialState_2002" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.apache.commons.scxml.modeling.diagram.InitialState_3030"/> - <param name="semanticHint" value="2002"/> - </specializationType> - </metamodel> - <metamodel nsURI="org.apache.commons.scxml"> - <specializationType id="org.apache.commons.scxml.modeling.diagram.Script_2003" name="%metatype.name.Script_2003" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> @@ -359,14 +349,13 @@ </specializationType> </metamodel> <metamodel nsURI="org.apache.commons.scxml"> - <metamodelType + <specializationType id="org.apache.commons.scxml.modeling.diagram.DataModel_2005" name="%metatype.name.DataModel_2005" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="DataModel" - edithelper="org.apache.commons.scxml.modeling.diagram.edit.helpers.DataModelEditHelper"> + kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> + <specializes id="org.apache.commons.scxml.modeling.diagram.DataModel_3063"/> <param name="semanticHint" value="2005"/> - </metamodelType> + </specializationType> </metamodel> <metamodel nsURI="org.apache.commons.scxml"> <specializationType @@ -439,6 +428,35 @@ </metamodel> <metamodel nsURI="org.apache.commons.scxml"> <metamodelType + id="org.apache.commons.scxml.modeling.diagram.Param_3051" + name="%metatype.name.Param_3051" + kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" + eclass="Param" + edithelper="org.apache.commons.scxml.modeling.diagram.edit.helpers.ParamEditHelper"> + <param name="semanticHint" value="3051"/> + </metamodelType> + </metamodel> + <metamodel nsURI="org.apache.commons.scxml"> + <metamodelType + id="org.apache.commons.scxml.modeling.diagram.Content_3052" + name="%metatype.name.Content_3052" + kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" + eclass="Content" + edithelper="org.apache.commons.scxml.modeling.diagram.edit.helpers.ContentEditHelper"> + <param name="semanticHint" value="3052"/> + </metamodelType> + </metamodel> + <metamodel nsURI="org.apache.commons.scxml"> + <specializationType + id="org.apache.commons.scxml.modeling.diagram.Content_3013" + name="%metatype.name.Content_3013" + kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> + <specializes id="org.apache.commons.scxml.modeling.diagram.Content_3052"/> + <param name="semanticHint" value="3013"/> + </specializationType> + </metamodel> + <metamodel nsURI="org.apache.commons.scxml"> + <metamodelType id="org.apache.commons.scxml.modeling.diagram.Log_3007" name="%metatype.name.Log_3007" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" @@ -478,32 +496,21 @@ </metamodelType> </metamodel> <metamodel nsURI="org.apache.commons.scxml"> - <metamodelType + <specializationType id="org.apache.commons.scxml.modeling.diagram.Param_3011" name="%metatype.name.Param_3011" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="Param" - edithelper="org.apache.commons.scxml.modeling.diagram.edit.helpers.ParamEditHelper"> + kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> + <specializes id="org.apache.commons.scxml.modeling.diagram.Param_3051"/> <param name="semanticHint" value="3011"/> - </metamodelType> + </specializationType> </metamodel> <metamodel nsURI="org.apache.commons.scxml"> - <metamodelType + <specializationType id="org.apache.commons.scxml.modeling.diagram.Content_3012" name="%metatype.name.Content_3012" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="Content" - edithelper="org.apache.commons.scxml.modeling.diagram.edit.helpers.ContentEditHelper"> - <param name="semanticHint" value="3012"/> - </metamodelType> - </metamodel> - <metamodel nsURI="org.apache.commons.scxml"> - <specializationType - id="org.apache.commons.scxml.modeling.diagram.Content_3013" - name="%metatype.name.Content_3013" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.apache.commons.scxml.modeling.diagram.Content_3012"/> - <param name="semanticHint" value="3013"/> + <specializes id="org.apache.commons.scxml.modeling.diagram.Content_3052"/> + <param name="semanticHint" value="3012"/> </specializationType> </metamodel> <metamodel nsURI="org.apache.commons.scxml"> @@ -511,7 +518,7 @@ id="org.apache.commons.scxml.modeling.diagram.Param_3014" name="%metatype.name.Param_3014" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.apache.commons.scxml.modeling.diagram.Param_3011"/> + <specializes id="org.apache.commons.scxml.modeling.diagram.Param_3051"/> <param name="semanticHint" value="3014"/> </specializationType> </metamodel> @@ -604,7 +611,7 @@ id="org.apache.commons.scxml.modeling.diagram.Param_3023" name="%metatype.name.Param_3023" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.apache.commons.scxml.modeling.diagram.Param_3011"/> + <specializes id="org.apache.commons.scxml.modeling.diagram.Param_3051"/> <param name="semanticHint" value="3023"/> </specializationType> </metamodel> @@ -657,10 +664,100 @@ </metamodel> <metamodel nsURI="org.apache.commons.scxml"> <specializationType + id="org.apache.commons.scxml.modeling.diagram.If_3053" + name="%metatype.name.If_3053" + kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> + <specializes id="org.apache.commons.scxml.modeling.diagram.If_3002"/> + <param name="semanticHint" value="3053"/> + </specializationType> + </metamodel> + <metamodel nsURI="org.apache.commons.scxml"> + <specializationType + id="org.apache.commons.scxml.modeling.diagram.Assign_3054" + name="%metatype.name.Assign_3054" + kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> + <specializes id="org.apache.commons.scxml.modeling.diagram.Assign_3005"/> + <param name="semanticHint" value="3054"/> + </specializationType> + </metamodel> + <metamodel nsURI="org.apache.commons.scxml"> + <specializationType + id="org.apache.commons.scxml.modeling.diagram.Raise_3055" + name="%metatype.name.Raise_3055" + kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> + <specializes id="org.apache.commons.scxml.modeling.diagram.Raise_3006"/> + <param name="semanticHint" value="3055"/> + </specializationType> + </metamodel> + <metamodel nsURI="org.apache.commons.scxml"> + <specializationType + id="org.apache.commons.scxml.modeling.diagram.Log_3056" + name="%metatype.name.Log_3056" + kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> + <specializes id="org.apache.commons.scxml.modeling.diagram.Log_3007"/> + <param name="semanticHint" value="3056"/> + </specializationType> + </metamodel> + <metamodel nsURI="org.apache.commons.scxml"> + <specializationType + id="org.apache.commons.scxml.modeling.diagram.Validate_3057" + name="%metatype.name.Validate_3057" + kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> + <specializes id="org.apache.commons.scxml.modeling.diagram.Validate_3008"/> + <param name="semanticHint" value="3057"/> + </specializationType> + </metamodel> + <metamodel nsURI="org.apache.commons.scxml"> + <specializationType + id="org.apache.commons.scxml.modeling.diagram.Cancel_3058" + name="%metatype.name.Cancel_3058" + kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> + <specializes id="org.apache.commons.scxml.modeling.diagram.Cancel_3009"/> + <param name="semanticHint" value="3058"/> + </specializationType> + </metamodel> + <metamodel nsURI="org.apache.commons.scxml"> + <specializationType + id="org.apache.commons.scxml.modeling.diagram.Send_3059" + name="%metatype.name.Send_3059" + kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> + <specializes id="org.apache.commons.scxml.modeling.diagram.Send_3010"/> + <param name="semanticHint" value="3059"/> + </specializationType> + </metamodel> + <metamodel nsURI="org.apache.commons.scxml"> + <specializationType + id="org.apache.commons.scxml.modeling.diagram.Param_3060" + name="%metatype.name.Param_3060" + kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> + <specializes id="org.apache.commons.scxml.modeling.diagram.Param_3051"/> + <param name="semanticHint" value="3060"/> + </specializationType> + </metamodel> + <metamodel nsURI="org.apache.commons.scxml"> + <specializationType + id="org.apache.commons.scxml.modeling.diagram.Script_3061" + name="%metatype.name.Script_3061" + kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> + <specializes id="org.apache.commons.scxml.modeling.diagram.Script_3015"/> + <param name="semanticHint" value="3061"/> + </specializationType> + </metamodel> + <metamodel nsURI="org.apache.commons.scxml"> + <specializationType + id="org.apache.commons.scxml.modeling.diagram.ExtenExecContent_3062" + name="%metatype.name.ExtenExecContent_3062" + kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> + <specializes id="org.apache.commons.scxml.modeling.diagram.ExtenExecContent_3049"/> + <param name="semanticHint" value="3062"/> + </specializationType> + </metamodel> + <metamodel nsURI="org.apache.commons.scxml"> + <specializationType id="org.apache.commons.scxml.modeling.diagram.Param_3028" name="%metatype.name.Param_3028" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.apache.commons.scxml.modeling.diagram.Param_3011"/> + <specializes id="org.apache.commons.scxml.modeling.diagram.Param_3051"/> <param name="semanticHint" value="3028"/> </specializationType> </metamodel> @@ -669,7 +766,7 @@ id="org.apache.commons.scxml.modeling.diagram.Content_3029" name="%metatype.name.Content_3029" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.apache.commons.scxml.modeling.diagram.Content_3012"/> + <specializes id="org.apache.commons.scxml.modeling.diagram.Content_3052"/> <param name="semanticHint" value="3029"/> </specializationType> </metamodel> @@ -713,16 +810,6 @@ </specializationType> </metamodel> <metamodel nsURI="org.apache.commons.scxml"> - <metamodelType - id="org.apache.commons.scxml.modeling.diagram.Anchor_3034" - name="%metatype.name.Anchor_3034" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" - eclass="Anchor" - edithelper="org.apache.commons.scxml.modeling.diagram.edit.helpers.AnchorEditHelper"> - <param name="semanticHint" value="3034"/> - </metamodelType> - </metamodel> - <metamodel nsURI="org.apache.commons.scxml"> <specializationType id="org.apache.commons.scxml.modeling.diagram.Parallel_3035" name="%metatype.name.Parallel_3035" @@ -759,15 +846,6 @@ </specializationType> </metamodel> <metamodel nsURI="org.apache.commons.scxml"> - <specializationType - id="org.apache.commons.scxml.modeling.diagram.Anchor_3039" - name="%metatype.name.Anchor_3039" - kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.apache.commons.scxml.modeling.diagram.Anchor_3034"/> - <param name="semanticHint" value="3039"/> - </specializationType> - </metamodel> - <metamodel nsURI="org.apache.commons.scxml"> <metamodelType id="org.apache.commons.scxml.modeling.diagram.FinalState_3040" name="%metatype.name.FinalState_3040" @@ -792,7 +870,7 @@ id="org.apache.commons.scxml.modeling.diagram.Param_3042" name="%metatype.name.Param_3042" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.apache.commons.scxml.modeling.diagram.Param_3011"/> + <specializes id="org.apache.commons.scxml.modeling.diagram.Param_3051"/> <param name="semanticHint" value="3042"/> </specializationType> </metamodel> @@ -801,7 +879,7 @@ id="org.apache.commons.scxml.modeling.diagram.Content_3043" name="%metatype.name.Content_3043" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.apache.commons.scxml.modeling.diagram.Content_3012"/> + <specializes id="org.apache.commons.scxml.modeling.diagram.Content_3052"/> <param name="semanticHint" value="3043"/> </specializationType> </metamodel> @@ -834,6 +912,16 @@ </metamodel> <metamodel nsURI="org.apache.commons.scxml"> <metamodelType + id="org.apache.commons.scxml.modeling.diagram.DataModel_3063" + name="%metatype.name.DataModel_3063" + kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" + eclass="DataModel" + edithelper="org.apache.commons.scxml.modeling.diagram.edit.helpers.DataModelEditHelper"> + <param name="semanticHint" value="3063"/> + </metamodelType> + </metamodel> + <metamodel nsURI="org.apache.commons.scxml"> + <metamodelType id="org.apache.commons.scxml.modeling.diagram.Data_3047" name="%metatype.name.Data_3047" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" @@ -847,11 +935,38 @@ id="org.apache.commons.scxml.modeling.diagram.Content_3048" name="%metatype.name.Content_3048" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> - <specializes id="org.apache.commons.scxml.modeling.diagram.Content_3012"/> + <specializes id="org.apache.commons.scxml.modeling.diagram.Content_3052"/> <param name="semanticHint" value="3048"/> </specializationType> </metamodel> <metamodel nsURI="org.apache.commons.scxml"> + <specializationType + id="org.apache.commons.scxml.modeling.diagram.Finalize_3064" + name="%metatype.name.Finalize_3064" + kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> + <specializes id="org.apache.commons.scxml.modeling.diagram.Finalize_3027"/> + <param name="semanticHint" value="3064"/> + </specializationType> + </metamodel> + <metamodel nsURI="org.apache.commons.scxml"> + <specializationType + id="org.apache.commons.scxml.modeling.diagram.Invoke_3065" + name="%metatype.name.Invoke_3065" + kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> + <specializes id="org.apache.commons.scxml.modeling.diagram.Invoke_3026"/> + <param name="semanticHint" value="3065"/> + </specializationType> + </metamodel> + <metamodel nsURI="org.apache.commons.scxml"> + <specializationType + id="org.apache.commons.scxml.modeling.diagram.Finalize_3066" + name="%metatype.name.Finalize_3066" + kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> + <specializes id="org.apache.commons.scxml.modeling.diagram.Finalize_3027"/> + <param name="semanticHint" value="3066"/> + </specializationType> + </metamodel> + <metamodel nsURI="org.apache.commons.scxml"> <metamodelType id="org.apache.commons.scxml.modeling.diagram.Transition_4001" name="%metatype.name.Transition_4001" @@ -875,7 +990,6 @@ <binding context="ModelingClientContext"> <elementType ref="org.apache.commons.scxml.modeling.diagram.ServiceTemplate_1000"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.State_2001"/> - <elementType ref="org.apache.commons.scxml.modeling.diagram.InitialState_2002"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.Script_2003"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.Parallel_2004"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.DataModel_2005"/> @@ -886,13 +1000,15 @@ <elementType ref="org.apache.commons.scxml.modeling.diagram.Else_3004"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.Assign_3005"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.Raise_3006"/> + <elementType ref="org.apache.commons.scxml.modeling.diagram.Param_3051"/> + <elementType ref="org.apache.commons.scxml.modeling.diagram.Content_3052"/> + <elementType ref="org.apache.commons.scxml.modeling.diagram.Content_3013"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.Log_3007"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.Validate_3008"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.Cancel_3009"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.Send_3010"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.Param_3011"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.Content_3012"/> - <elementType ref="org.apache.commons.scxml.modeling.diagram.Content_3013"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.Param_3014"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.Script_3015"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.ExtenExecContent_3049"/> @@ -909,18 +1025,26 @@ <elementType ref="org.apache.commons.scxml.modeling.diagram.ExtenExecContent_3050"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.Invoke_3026"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.Finalize_3027"/> + <elementType ref="org.apache.commons.scxml.modeling.diagram.If_3053"/> + <elementType ref="org.apache.commons.scxml.modeling.diagram.Assign_3054"/> + <elementType ref="org.apache.commons.scxml.modeling.diagram.Raise_3055"/> + <elementType ref="org.apache.commons.scxml.modeling.diagram.Log_3056"/> + <elementType ref="org.apache.commons.scxml.modeling.diagram.Validate_3057"/> + <elementType ref="org.apache.commons.scxml.modeling.diagram.Cancel_3058"/> + <elementType ref="org.apache.commons.scxml.modeling.diagram.Send_3059"/> + <elementType ref="org.apache.commons.scxml.modeling.diagram.Param_3060"/> + <elementType ref="org.apache.commons.scxml.modeling.diagram.Script_3061"/> + <elementType ref="org.apache.commons.scxml.modeling.diagram.ExtenExecContent_3062"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.Param_3028"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.Content_3029"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.InitialState_3030"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.HistoryState_3031"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.Parallel_3032"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.HistoryState_3033"/> - <elementType ref="org.apache.commons.scxml.modeling.diagram.Anchor_3034"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.Parallel_3035"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.OnEntry_3036"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.OnExit_3037"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.State_3038"/> - <elementType ref="org.apache.commons.scxml.modeling.diagram.Anchor_3039"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.FinalState_3040"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.Donedata_3041"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.Param_3042"/> @@ -928,8 +1052,12 @@ <elementType ref="org.apache.commons.scxml.modeling.diagram.OnEntry_3044"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.OnExit_3045"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.State_3046"/> + <elementType ref="org.apache.commons.scxml.modeling.diagram.DataModel_3063"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.Data_3047"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.Content_3048"/> + <elementType ref="org.apache.commons.scxml.modeling.diagram.Finalize_3064"/> + <elementType ref="org.apache.commons.scxml.modeling.diagram.Invoke_3065"/> + <elementType ref="org.apache.commons.scxml.modeling.diagram.Finalize_3066"/> <elementType ref="org.apache.commons.scxml.modeling.diagram.Transition_4001"/> <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/> </binding>