12:01 p.m.
Author: koen.aers(a)jboss.com
Date: 2010-09-27 13:01:43 -0400 (Mon, 27 Sep 2010)
New Revision: 25238
Modified:
trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.gmfgraph
trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.gmfgen
trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.gmfmap
trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.gmftool
trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.trace
Log:
add script task
Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.gmfgraph
===================================================================
--- trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.gmfgraph 2010-09-27 16:22:47
UTC (rev 25237)
+++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.gmfgraph 2010-09-27 17:01:43
UTC (rev 25238)
@@ -631,6 +631,8 @@
<accessors
figure="//@figures.0/@descriptors.18/(a)actualFigure"/>
</descriptors>
+ <descriptors
+ name="EventBasedGatewayFigureDescriptor"/>
</figures>
<nodes
name="UserTask"
@@ -639,6 +641,9 @@
name="ServiceTask"
figure="TaskFigureDescriptor"/>
<nodes
+ name="ScriptTask"
+ figure="TaskFigureDescriptor"/>
+ <nodes
name="StartEvent"
figure="StartEventFigureDescriptor"
resizeConstraint="NONE">
Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.gmfgen
===================================================================
--- trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.gmfgen 2010-09-27
16:22:47 UTC (rev 25237)
+++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.gmfgen 2010-09-27
17:01:43 UTC (rev 25238)
@@ -28,7 +28,7 @@
itemSemanticEditPolicyClassName="SubProcess2ItemSemanticEditPolicy"
notationViewFactoryClassName="SubProcessViewFactory"
canonicalEditPolicyClassName="SubProcess2CanonicalEditPolicy"
- childNodes="//@diagram/(a)childNodes.0 //@diagram/(a)childNodes.1
//@diagram/(a)childNodes.2 //@diagram/(a)childNodes.3 //@diagram/(a)childNodes.4
//@diagram/(a)childNodes.5 //@diagram/(a)childNodes.6 //@diagram/(a)childNodes.7
//@diagram/(a)childNodes.8 //@diagram/(a)childNodes.9 //@diagram/(a)childNodes.10
//@diagram/(a)childNodes.11 //@diagram/(a)childNodes.12 //@diagram/(a)childNodes.13
//@diagram/(a)childNodes.14"
+ childNodes="//@diagram/(a)childNodes.0 //@diagram/(a)childNodes.1
//@diagram/(a)childNodes.2 //@diagram/(a)childNodes.3 //@diagram/(a)childNodes.4
//@diagram/(a)childNodes.5 //@diagram/(a)childNodes.6 //@diagram/(a)childNodes.7
//@diagram/(a)childNodes.8 //@diagram/(a)childNodes.9 //@diagram/(a)childNodes.10
//@diagram/(a)childNodes.11 //@diagram/(a)childNodes.12 //@diagram/(a)childNodes.13
//@diagram/(a)childNodes.14 //@diagram/(a)childNodes.15"
graphicalNodeEditPolicyClassName="SubProcess2GraphicalNodeEditPolicy"
createCommandClassName="SubProcess2CreateCommand"
containers="//@diagram/(a)childNodes.0 //@diagram/(a)topLevelNodes.15">
@@ -722,6 +722,7 @@
visualID="3015"
editPartClassName="TextAnnotation2EditPart"
itemSemanticEditPolicyClassName="TextAnnotation2ItemSemanticEditPolicy"
+ notationViewFactoryClassName="TextAnnotationViewFactory"
canonicalEditPolicyClassName="TextAnnotation2CanonicalEditPolicy"
graphicalNodeEditPolicyClassName="TextAnnotation2GraphicalNodeEditPolicy"
createCommandClassName="TextAnnotation2CreateCommand"
@@ -760,7 +761,8 @@
<labels
visualID="5008"
editPartClassName="TextAnnotationText2EditPart"
-
itemSemanticEditPolicyClassName="TextAnnotationText2ItemSemanticEditPolicy">
+
itemSemanticEditPolicyClassName="TextAnnotationText2ItemSemanticEditPolicy"
+ notationViewFactoryClassName="TextAnnotationTextViewFactory">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<viewmap
@@ -776,6 +778,66 @@
</modelFacet>
</labels>
</childNodes>
+ <childNodes
+ visualID="3016"
+ editPartClassName="ScriptTask2EditPart"
+ itemSemanticEditPolicyClassName="ScriptTask2ItemSemanticEditPolicy"
+ notationViewFactoryClassName="ScriptTaskViewFactory"
+ canonicalEditPolicyClassName="ScriptTask2CanonicalEditPolicy"
+ graphicalNodeEditPolicyClassName="ScriptTask2GraphicalNodeEditPolicy"
+ createCommandClassName="ScriptTask2CreateCommand"
+ containers="//@diagram/(a)childNodes.0 //@diagram/(a)topLevelNodes.15">
+ <diagramRunTimeClass
+
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+ <elementType
+ xsi:type="gmfgen:MetamodelType"
+ editHelperClassName="ScriptTaskEditHelper"/>
+ <viewmap
+ xsi:type="gmfgen:InnerClassViewmap"
+ className="TaskFigureDescriptor"
+ classBody="
/**
 * @generated
 */
public
class TaskFigureDescriptor extends org.eclipse.draw2d.RoundedRectangle
{


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


	/**
	 *
@generated
	 */
	public TaskFigureDescriptor()
{
		this.setLayoutManager(new
org.eclipse.draw2d.StackLayout());
		this.setCornerDimensions(new
org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(8)
,
getMapMode().DPtoLP(8)
));
this.setPreferredSize(new
org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(80)
,
getMapMode().DPtoLP(40)
));
this.setMinimumSize(new
org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(80)
,
getMapMode().DPtoLP(40)
));

this.setBorder(new
org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(5)
,
getMapMode().DPtoLP(5)
, getMapMode!
().DPtoLP(5)
,
getMapMode().DPtoLP(5)
));
		createContents();
	}
	/**
	
* @generated
	 */
	private void
createContents(){


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

this.add(fFigureName);


	}





	/**
	
* @generated
	 */
	public
org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getFigureName()
{
		return
fFigureName;
	}


}

">
+ <attributes
+ xsi:type="gmfgen:DefaultSizeAttributes"
+ width="80"
+ height="40"/>
+ </viewmap>
+ <modelFacet>
+ <metaClass
+
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/ScriptTask"/>
+ <containmentMetaFeature
+
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/FlowElementsContainer/flowElements"/>
+ <childMetaFeature
+
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/FlowElementsContainer/flowElements"/>
+ <modelElementInitializer
+ xsi:type="gmfgen:GenFeatureSeqInitializer">
+ <initializers
+ xsi:type="gmfgen:GenFeatureValueSpec"
+ value="//@expressionProviders/@providers.0/(a)expressions.32">
+ <feature
+
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
+ </initializers>
+ </modelElementInitializer>
+ </modelFacet>
+ <labels
+ visualID="5010"
+ editPartClassName="ScriptTaskName2EditPart"
+
itemSemanticEditPolicyClassName="ScriptTaskName2ItemSemanticEditPolicy"
+ notationViewFactoryClassName="ScriptTaskNameViewFactory"
+ elementIcon="true">
+ <diagramRunTimeClass
+
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+ <viewmap
+ xsi:type="gmfgen:ParentAssignedViewmap"
+ getterName="getFigureName"
+
figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
+ <modelFacet
+ xsi:type="gmfgen:FeatureLabelModelFacet"
+ parser="//@labelParsers/(a)implementations.0">
+ <metaFeatures
+
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/FlowElement/name"/>
+ </modelFacet>
+ </labels>
+ </childNodes>
<topLevelNodes
visualID="2001"
editPartClassName="UserTaskEditPart"
@@ -1530,7 +1592,7 @@
itemSemanticEditPolicyClassName="SubProcessItemSemanticEditPolicy"
notationViewFactoryClassName="SubProcessViewFactory"
canonicalEditPolicyClassName="SubProcessCanonicalEditPolicy"
- childNodes="//@diagram/(a)childNodes.0 //@diagram/(a)childNodes.1
//@diagram/(a)childNodes.2 //@diagram/(a)childNodes.3 //@diagram/(a)childNodes.4
//@diagram/(a)childNodes.5 //@diagram/(a)childNodes.6 //@diagram/(a)childNodes.7
//@diagram/(a)childNodes.8 //@diagram/(a)childNodes.9 //@diagram/(a)childNodes.10
//@diagram/(a)childNodes.11 //@diagram/(a)childNodes.12 //@diagram/(a)childNodes.13
//@diagram/(a)childNodes.14"
+ childNodes="//@diagram/(a)childNodes.0 //@diagram/(a)childNodes.1
//@diagram/(a)childNodes.2 //@diagram/(a)childNodes.3 //@diagram/(a)childNodes.4
//@diagram/(a)childNodes.5 //@diagram/(a)childNodes.6 //@diagram/(a)childNodes.7
//@diagram/(a)childNodes.8 //@diagram/(a)childNodes.9 //@diagram/(a)childNodes.10
//@diagram/(a)childNodes.11 //@diagram/(a)childNodes.12 //@diagram/(a)childNodes.13
//@diagram/(a)childNodes.14 //@diagram/(a)childNodes.15"
graphicalNodeEditPolicyClassName="SubProcessGraphicalNodeEditPolicy"
createCommandClassName="SubProcessCreateCommand">
<diagramRunTimeClass
@@ -1566,6 +1628,65 @@
</modelElementInitializer>
</modelFacet>
</topLevelNodes>
+ <topLevelNodes
+ visualID="2017"
+ editPartClassName="ScriptTaskEditPart"
+ itemSemanticEditPolicyClassName="ScriptTaskItemSemanticEditPolicy"
+ notationViewFactoryClassName="ScriptTaskViewFactory"
+ canonicalEditPolicyClassName="ScriptTaskCanonicalEditPolicy"
+ graphicalNodeEditPolicyClassName="ScriptTaskGraphicalNodeEditPolicy"
+ createCommandClassName="ScriptTaskCreateCommand">
+ <diagramRunTimeClass
+
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+ <elementType
+ xsi:type="gmfgen:SpecializationType"
+ metamodelType="//@diagram/@childNodes.15/(a)elementType"/>
+ <viewmap
+ xsi:type="gmfgen:InnerClassViewmap"
+ className="TaskFigureDescriptor"
+ classBody="
/**
 * @generated
 */
public
class TaskFigureDescriptor extends org.eclipse.draw2d.RoundedRectangle
{


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


	/**
	 *
@generated
	 */
	public TaskFigureDescriptor()
{
		this.setLayoutManager(new
org.eclipse.draw2d.StackLayout());
		this.setCornerDimensions(new
org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(8)
,
getMapMode().DPtoLP(8)
));
this.setPreferredSize(new
org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(80)
,
getMapMode().DPtoLP(40)
));
this.setMinimumSize(new
org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(80)
,
getMapMode().DPtoLP(40)
));

this.setBorder(new
org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(5)
,
getMapMode().DPtoLP(5)
, getMapMode!
().DPtoLP(5)
,
getMapMode().DPtoLP(5)
));
		createContents();
	}
	/**
	
* @generated
	 */
	private void
createContents(){


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

this.add(fFigureName);


	}





	/**
	
* @generated
	 */
	public
org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getFigureName()
{
		return
fFigureName;
	}


}

">
+ <attributes
+ xsi:type="gmfgen:DefaultSizeAttributes"
+ width="80"
+ height="40"/>
+ </viewmap>
+ <modelFacet>
+ <metaClass
+
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/ScriptTask"/>
+ <containmentMetaFeature
+
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/FlowElementsContainer/flowElements"/>
+ <childMetaFeature
+
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/FlowElementsContainer/flowElements"/>
+ <modelElementInitializer
+ xsi:type="gmfgen:GenFeatureSeqInitializer">
+ <initializers
+ xsi:type="gmfgen:GenFeatureValueSpec"
+ value="//@expressionProviders/@providers.0/(a)expressions.32">
+ <feature
+
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
+ </initializers>
+ </modelElementInitializer>
+ </modelFacet>
+ <labels
+ visualID="5009"
+ editPartClassName="ScriptTaskNameEditPart"
+
itemSemanticEditPolicyClassName="ScriptTaskNameItemSemanticEditPolicy"
+ notationViewFactoryClassName="ScriptTaskNameViewFactory"
+ elementIcon="true">
+ <diagramRunTimeClass
+
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+ <viewmap
+ xsi:type="gmfgen:ParentAssignedViewmap"
+ getterName="getFigureName"
+
figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
+ <modelFacet
+ xsi:type="gmfgen:FeatureLabelModelFacet"
+ parser="//@labelParsers/(a)implementations.0">
+ <metaFeatures
+
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/FlowElement/name"/>
+ </modelFacet>
+ </labels>
+ </topLevelNodes>
<links
visualID="4001"
editPartClassName="SequenceFlowEditPart"
@@ -1594,7 +1715,7 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.32">
+ value="//@expressionProviders/@providers.0/(a)expressions.33">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
@@ -1633,7 +1754,7 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.33">
+ value="//@expressionProviders/@providers.0/(a)expressions.34">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
@@ -1648,18 +1769,27 @@
<groups
title="Nodes">
<entries
- xsi:type="gmfgen:ToolEntry"
- title="User Task"
- genNodes="//@diagram/(a)topLevelNodes.0
//@diagram/(a)childNodes.1"/>
+ xsi:type="gmfgen:ToolGroup"
+ title="Activities"
+ stack="true">
+ <entries
+ xsi:type="gmfgen:ToolEntry"
+ title="User Task"
+ genNodes="//@diagram/(a)topLevelNodes.0
//@diagram/(a)childNodes.1"/>
+ <entries
+ xsi:type="gmfgen:ToolEntry"
+ title="Service Task"
+ genNodes="//@diagram/(a)topLevelNodes.1
//@diagram/(a)childNodes.2"/>
+ <entries
+ xsi:type="gmfgen:ToolEntry"
+ title="Script Task"
+ genNodes="//@diagram/(a)childNodes.15
//@diagram/(a)topLevelNodes.16"/>
+ <entries
+ xsi:type="gmfgen:ToolEntry"
+ title="Sub-Process"
+ genNodes="//@diagram/(a)topLevelNodes.15
//@diagram/(a)childNodes.0"/>
+ </entries>
<entries
- xsi:type="gmfgen:ToolEntry"
- title="Service Task"
- genNodes="//@diagram/(a)topLevelNodes.1
//@diagram/(a)childNodes.2"/>
- <entries
- xsi:type="gmfgen:ToolEntry"
- title="Sub-Process"
- genNodes="//@diagram/(a)topLevelNodes.15
//@diagram/(a)childNodes.0"/>
- <entries
xsi:type="gmfgen:ToolGroup"
title="Gateways"
description=""
@@ -1890,6 +2020,9 @@
parent="//@diagram/(a)childNodes.0"
child="//@diagram/(a)childNodes.14"/>
<childReferences
+ parent="//@diagram/(a)childNodes.0"
+ child="//@diagram/(a)childNodes.15"/>
+ <childReferences
parent="//@diagram/(a)topLevelNodes.15"
child="//@diagram/(a)childNodes.0"/>
<childReferences
@@ -1938,10 +2071,16 @@
parent="//@diagram/(a)topLevelNodes.15"
child="//@diagram/(a)childNodes.14"/>
<childReferences
+ parent="//@diagram/(a)topLevelNodes.15"
+ child="//@diagram/(a)childNodes.15"/>
+ <childReferences
parent="//@diagram"
child="//@diagram/(a)topLevelNodes.15"/>
<childReferences
parent="//@diagram"
+ child="//@diagram/(a)topLevelNodes.16"/>
+ <childReferences
+ parent="//@diagram"
child="//@diagram/(a)links.0"
groupName="links"
groupIcon="icons/linksNavigatorGroup.gif"/>
@@ -2115,6 +2254,18 @@
groupIcon="icons/incomingLinksNavigatorGroup.gif"/>
<childReferences
parent="//@diagram/(a)links.0"
+ child="//@diagram/(a)topLevelNodes.16"
+ referenceType="out_target"
+ groupName="target"
+ groupIcon="icons/linkTargetNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram/(a)topLevelNodes.16"
+ child="//@diagram/(a)links.0"
+ referenceType="in_source"
+ groupName="incoming links"
+ groupIcon="icons/incomingLinksNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram/(a)links.0"
child="//@diagram/(a)childNodes.0"
referenceType="out_target"
groupName="target"
@@ -2271,6 +2422,18 @@
groupIcon="icons/incomingLinksNavigatorGroup.gif"/>
<childReferences
parent="//@diagram/(a)links.0"
+ child="//@diagram/(a)childNodes.15"
+ referenceType="out_target"
+ groupName="target"
+ groupIcon="icons/linkTargetNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram/(a)childNodes.15"
+ child="//@diagram/(a)links.0"
+ referenceType="in_source"
+ groupName="incoming links"
+ groupIcon="icons/incomingLinksNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram/(a)links.0"
child="//@diagram/(a)topLevelNodes.0"
referenceType="in_source"
groupName="source"
@@ -2439,6 +2602,18 @@
groupIcon="icons/outgoingLinksNavigatorGroup.gif"/>
<childReferences
parent="//@diagram/(a)links.0"
+ child="//@diagram/(a)topLevelNodes.16"
+ referenceType="in_source"
+ groupName="source"
+ groupIcon="icons/linkSourceNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram/(a)topLevelNodes.16"
+ child="//@diagram/(a)links.0"
+ referenceType="out_target"
+ groupName="outgoing links"
+ groupIcon="icons/outgoingLinksNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram/(a)links.0"
child="//@diagram/(a)childNodes.0"
referenceType="in_source"
groupName="source"
@@ -2594,6 +2769,18 @@
groupName="outgoing links"
groupIcon="icons/outgoingLinksNavigatorGroup.gif"/>
<childReferences
+ parent="//@diagram/(a)links.0"
+ child="//@diagram/(a)childNodes.15"
+ referenceType="in_source"
+ groupName="source"
+ groupIcon="icons/linkSourceNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram/(a)childNodes.15"
+ child="//@diagram/(a)links.0"
+ referenceType="out_target"
+ groupName="outgoing links"
+ groupIcon="icons/outgoingLinksNavigatorGroup.gif"/>
+ <childReferences
parent="//@diagram"
child="//@diagram/(a)links.1"
groupName="links"
@@ -2792,6 +2979,18 @@
groupIcon="icons/incomingLinksNavigatorGroup.gif"/>
<childReferences
parent="//@diagram/(a)links.1"
+ child="//@diagram/(a)topLevelNodes.16"
+ referenceType="out_target"
+ groupName="target"
+ groupIcon="icons/linkTargetNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram/(a)topLevelNodes.16"
+ child="//@diagram/(a)links.1"
+ referenceType="in_source"
+ groupName="incoming links"
+ groupIcon="icons/incomingLinksNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram/(a)links.1"
child="//@diagram/(a)childNodes.0"
referenceType="out_target"
groupName="target"
@@ -2972,6 +3171,18 @@
groupIcon="icons/incomingLinksNavigatorGroup.gif"/>
<childReferences
parent="//@diagram/(a)links.1"
+ child="//@diagram/(a)childNodes.15"
+ referenceType="out_target"
+ groupName="target"
+ groupIcon="icons/linkTargetNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram/(a)childNodes.15"
+ child="//@diagram/(a)links.1"
+ referenceType="in_source"
+ groupName="incoming links"
+ groupIcon="icons/incomingLinksNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram/(a)links.1"
child="//@diagram/(a)links.0"
referenceType="out_target"
groupName="target"
@@ -3188,6 +3399,18 @@
groupIcon="icons/outgoingLinksNavigatorGroup.gif"/>
<childReferences
parent="//@diagram/(a)links.1"
+ child="//@diagram/(a)topLevelNodes.16"
+ referenceType="in_source"
+ groupName="source"
+ groupIcon="icons/linkSourceNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram/(a)topLevelNodes.16"
+ child="//@diagram/(a)links.1"
+ referenceType="out_target"
+ groupName="outgoing links"
+ groupIcon="icons/outgoingLinksNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram/(a)links.1"
child="//@diagram/(a)childNodes.0"
referenceType="in_source"
groupName="source"
@@ -3368,6 +3591,18 @@
groupIcon="icons/outgoingLinksNavigatorGroup.gif"/>
<childReferences
parent="//@diagram/(a)links.1"
+ child="//@diagram/(a)childNodes.15"
+ referenceType="in_source"
+ groupName="source"
+ groupIcon="icons/linkSourceNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram/(a)childNodes.15"
+ child="//@diagram/(a)links.1"
+ referenceType="out_target"
+ groupName="outgoing links"
+ groupIcon="icons/outgoingLinksNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram/(a)links.1"
child="//@diagram/(a)links.0"
referenceType="in_source"
groupName="source"
@@ -3493,13 +3728,15 @@
body="EcoreUtil.generateUUID()"/>
<expressions
body="EcoreUtil.generateUUID()"/>
+ <expressions
+ body="EcoreUtil.generateUUID()"/>
</providers>
</expressionProviders>
<labelParsers
extensibleViaService="true">
<implementations
xsi:type="gmfgen:PredefinedParser"
- uses="//@diagram/@topLevelNodes.0/@labels.0/(a)modelFacet
//@diagram/@topLevelNodes.1/@labels.0/(a)modelFacet
//@diagram/@topLevelNodes.13/@labels.0/(a)modelFacet
//@diagram/@topLevelNodes.14/@labels.0/(a)modelFacet
//@diagram/@childNodes.1/@labels.0/(a)modelFacet
//@diagram/@childNodes.2/@labels.0/(a)modelFacet
//@diagram/@childNodes.13/@labels.0/(a)modelFacet
//@diagram/@childNodes.14/@labels.0/(a)modelFacet"/>
+ uses="//@diagram/@topLevelNodes.0/@labels.0/(a)modelFacet
//@diagram/@topLevelNodes.1/@labels.0/(a)modelFacet
//@diagram/@topLevelNodes.13/@labels.0/(a)modelFacet
//@diagram/@topLevelNodes.14/@labels.0/(a)modelFacet
//@diagram/@childNodes.1/@labels.0/(a)modelFacet
//@diagram/@childNodes.2/@labels.0/(a)modelFacet
//@diagram/@childNodes.13/@labels.0/(a)modelFacet
//@diagram/@childNodes.14/@labels.0/(a)modelFacet
//@diagram/@childNodes.15/@labels.0/(a)modelFacet
//@diagram/@topLevelNodes.16/@labels.0/(a)modelFacet"/>
</labelParsers>
<contextMenus
context="//@diagram">
Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.gmfmap
===================================================================
--- trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.gmfmap 2010-09-27
16:22:47 UTC (rev 25237)
+++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.gmfmap 2010-09-27
17:01:43 UTC (rev 25238)
@@ -32,7 +32,7 @@
</labelMappings>
<tool
xsi:type="gmftool:CreationTool"
- href="bpmn.process.gmftool#//@palette/@tools.0/(a)tools.0"/>
+
href="bpmn.process.gmftool#//@palette/@tools.0/@tools.0/(a)tools.0"/>
<diagramNode
href="bpmn.gmfgraph#UserTask"/>
</ownedChild>
@@ -64,7 +64,7 @@
</labelMappings>
<tool
xsi:type="gmftool:CreationTool"
- href="bpmn.process.gmftool#//@palette/@tools.0/(a)tools.1"/>
+
href="bpmn.process.gmftool#//@palette/@tools.0/@tools.0/(a)tools.1"/>
<diagramNode
href="bpmn.gmfgraph#ServiceTask"/>
</ownedChild>
@@ -92,7 +92,7 @@
</domainInitializer>
<tool
xsi:type="gmftool:CreationTool"
-
href="bpmn.process.gmftool#//@palette/@tools.0/@tools.4/@tools.0/(a)tools.0"/>
+
href="bpmn.process.gmftool#//@palette/@tools.0/@tools.2/@tools.0/(a)tools.0"/>
<diagramNode
href="bpmn.gmfgraph#StartEvent"/>
</ownedChild>
@@ -129,7 +129,7 @@
</domainInitializer>
<tool
xsi:type="gmftool:CreationTool"
-
href="bpmn.process.gmftool#//@palette/@tools.0/@tools.4/@tools.0/(a)tools.1"/>
+
href="bpmn.process.gmftool#//@palette/@tools.0/@tools.2/@tools.0/(a)tools.1"/>
<diagramNode
href="bpmn.gmfgraph#MessageStartEvent"/>
</ownedChild>
@@ -157,7 +157,7 @@
</domainInitializer>
<tool
xsi:type="gmftool:CreationTool"
-
href="bpmn.process.gmftool#//@palette/@tools.0/@tools.4/@tools.2/(a)tools.0"/>
+
href="bpmn.process.gmftool#//@palette/@tools.0/@tools.2/@tools.2/(a)tools.0"/>
<diagramNode
href="bpmn.gmfgraph#EndEvent"/>
</ownedChild>
@@ -182,7 +182,7 @@
</domainInitializer>
<tool
xsi:type="gmftool:CreationTool"
-
href="bpmn.process.gmftool#//@palette/@tools.0/@tools.3/(a)tools.0"/>
+
href="bpmn.process.gmftool#//@palette/@tools.0/@tools.1/(a)tools.0"/>
<diagramNode
href="bpmn.gmfgraph#ExclusiveGateway"/>
</ownedChild>
@@ -207,7 +207,7 @@
</domainInitializer>
<tool
xsi:type="gmftool:CreationTool"
-
href="bpmn.process.gmftool#//@palette/@tools.0/@tools.3/(a)tools.1"/>
+
href="bpmn.process.gmftool#//@palette/@tools.0/@tools.1/(a)tools.1"/>
<diagramNode
href="bpmn.gmfgraph#ParallelGateway"/>
</ownedChild>
@@ -244,7 +244,7 @@
</domainInitializer>
<tool
xsi:type="gmftool:CreationTool"
-
href="bpmn.process.gmftool#//@palette/@tools.0/@tools.4/@tools.2/(a)tools.1"/>
+
href="bpmn.process.gmftool#//@palette/@tools.0/@tools.2/@tools.2/(a)tools.1"/>
<diagramNode
href="bpmn.gmfgraph#MessageEndEvent"/>
</ownedChild>
@@ -281,7 +281,7 @@
</domainInitializer>
<tool
xsi:type="gmftool:CreationTool"
-
href="bpmn.process.gmftool#//@palette/@tools.0/@tools.4/@tools.2/(a)tools.2"/>
+
href="bpmn.process.gmftool#//@palette/@tools.0/@tools.2/@tools.2/(a)tools.2"/>
<diagramNode
href="bpmn.gmfgraph#TerminateEndEvent"/>
</ownedChild>
@@ -318,7 +318,7 @@
</domainInitializer>
<tool
xsi:type="gmftool:CreationTool"
-
href="bpmn.process.gmftool#//@palette/@tools.0/@tools.4/@tools.1/(a)tools.0"/>
+
href="bpmn.process.gmftool#//@palette/@tools.0/@tools.2/@tools.1/(a)tools.0"/>
<diagramNode
href="bpmn.gmfgraph#MessageCatchIntermediateEvent"/>
</ownedChild>
@@ -355,7 +355,7 @@
</domainInitializer>
<tool
xsi:type="gmftool:CreationTool"
-
href="bpmn.process.gmftool#//@palette/@tools.0/@tools.4/@tools.1/(a)tools.1"/>
+
href="bpmn.process.gmftool#//@palette/@tools.0/@tools.2/@tools.1/(a)tools.1"/>
<diagramNode
href="bpmn.gmfgraph#MessageThrowIntermediateEvent"/>
</ownedChild>
@@ -392,7 +392,7 @@
</domainInitializer>
<tool
xsi:type="gmftool:CreationTool"
-
href="bpmn.process.gmftool#//@palette/@tools.0/@tools.4/@tools.1/(a)tools.2"/>
+
href="bpmn.process.gmftool#//@palette/@tools.0/@tools.2/@tools.1/(a)tools.2"/>
<diagramNode
href="bpmn.gmfgraph#TimerCatchIntermediateEvent"/>
</ownedChild>
@@ -429,7 +429,7 @@
</domainInitializer>
<tool
xsi:type="gmftool:CreationTool"
-
href="bpmn.process.gmftool#//@palette/@tools.0/@tools.4/@tools.1/(a)tools.3"/>
+
href="bpmn.process.gmftool#//@palette/@tools.0/@tools.2/@tools.1/(a)tools.3"/>
<diagramNode
href="bpmn.gmfgraph#ErrorCatchIntermediateEvent"/>
</ownedChild>
@@ -463,7 +463,7 @@
</labelMappings>
<tool
xsi:type="gmftool:CreationTool"
-
href="bpmn.process.gmftool#//@palette/@tools.0/@tools.5/(a)tools.0"/>
+
href="bpmn.process.gmftool#//@palette/@tools.0/@tools.3/(a)tools.0"/>
<diagramNode
href="bpmn.gmfgraph#DataObject"/>
</ownedChild>
@@ -496,7 +496,7 @@
</labelMappings>
<tool
xsi:type="gmftool:CreationTool"
-
href="bpmn.process.gmftool#//@palette/@tools.0/@tools.5/(a)tools.1"/>
+
href="bpmn.process.gmftool#//@palette/@tools.0/@tools.3/(a)tools.1"/>
<diagramNode
href="bpmn.gmfgraph#TextAnnotation"/>
</ownedChild>
@@ -521,7 +521,7 @@
</domainInitializer>
<tool
xsi:type="gmftool:CreationTool"
- href="bpmn.process.gmftool#//@palette/@tools.0/(a)tools.2"/>
+
href="bpmn.process.gmftool#//@palette/@tools.0/@tools.0/(a)tools.3"/>
<diagramNode
href="bpmn.gmfgraph#ExpandedSubprocess"/>
<children
@@ -604,8 +604,45 @@
<containmentFeature
href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//SubProcess/artifacts"/>
</children>
+ <children
+ referencedChild="//@nodes.16/(a)ownedChild">
+ <containmentFeature
+
href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//FlowElementsContainer/flowElements"/>
+ </children>
</ownedChild>
</nodes>
+ <nodes>
+ <containmentFeature
+
href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//FlowElementsContainer/flowElements"/>
+ <ownedChild>
+ <domainMetaElement
+ href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//ScriptTask"/>
+ <domainInitializer
+ xsi:type="gmfmap:FeatureSeqInitializer">
+ <initializers
+ xsi:type="gmfmap:FeatureValueSpec">
+ <feature
+ xsi:type="ecore:EAttribute"
+
href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//BaseElement/id"/>
+ <value
+ body="EcoreUtil.generateUUID()"
+ language="java"/>
+ </initializers>
+ </domainInitializer>
+ <labelMappings
+ xsi:type="gmfmap:FeatureLabelMapping">
+ <diagramLabel
+ href="bpmn.gmfgraph#RoundedRectangleLabel"/>
+ <features
+
href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//FlowElement/name"/>
+ </labelMappings>
+ <tool
+ xsi:type="gmftool:CreationTool"
+
href="bpmn.process.gmftool#//@palette/@tools.0/@tools.0/(a)tools.2"/>
+ <diagramNode
+ href="bpmn.gmfgraph#ScriptTask"/>
+ </ownedChild>
+ </nodes>
<links>
<domainMetaElement
href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//SequenceFlow"/>
Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.gmftool
===================================================================
--- trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.gmftool 2010-09-27
16:22:47 UTC (rev 25237)
+++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.gmftool 2010-09-27
17:01:43 UTC (rev 25238)
@@ -9,15 +9,23 @@
xsi:type="gmftool:ToolGroup"
title="Nodes">
<tools
- xsi:type="gmftool:CreationTool"
- title="User Task"/>
+ xsi:type="gmftool:ToolGroup"
+ title="Activities"
+ stack="true">
+ <tools
+ xsi:type="gmftool:CreationTool"
+ title="User Task"/>
+ <tools
+ xsi:type="gmftool:CreationTool"
+ title="Service Task"/>
+ <tools
+ xsi:type="gmftool:CreationTool"
+ title="Script Task"/>
+ <tools
+ xsi:type="gmftool:CreationTool"
+ title="Sub-Process"/>
+ </tools>
<tools
- xsi:type="gmftool:CreationTool"
- title="Service Task"/>
- <tools
- xsi:type="gmftool:CreationTool"
- title="Sub-Process"/>
- <tools
xsi:type="gmftool:ToolGroup"
title="Gateways"
description=""
Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.trace
===================================================================
--- trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.trace 2010-09-27
16:22:47 UTC (rev 25237)
+++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.trace 2010-09-27
17:01:43 UTC (rev 25238)
@@ -24,6 +24,9 @@
<nodeLabelTraces visualID="5004" queryText="true"/>
</nodeTraces>
<nodeTraces visualID="2016" queryText="(let _eClass_:ecore::EClass =
modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI =
'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name =
'SubProcess') and (let _containmentMF_:ecore::EStructuralFeature =
modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass =
_containmentMF_.eContainingClass in _eClass_.ePackage.nsURI =
'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name =
'FlowElementsContainer') and _containmentMF_.name =
'flowElements')"/>
+ <nodeTraces visualID="2017" queryText="(let _eClass_:ecore::EClass =
modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI =
'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name =
'ScriptTask') and (let _containmentMF_:ecore::EStructuralFeature =
modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass =
_containmentMF_.eContainingClass in _eClass_.ePackage.nsURI =
'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name =
'FlowElementsContainer') and _containmentMF_.name =
'flowElements')">
+ <nodeLabelTraces visualID="5009" queryText="true"/>
+ </nodeTraces>
<childNodeTraces visualID="3001" queryText="(let
_eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI =
'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name =
'SubProcess') and (let _containmentMF_:ecore::EStructuralFeature =
modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass =
_containmentMF_.eContainingClass in _eClass_.ePackage.nsURI =
'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name =
'FlowElementsContainer') and _containmentMF_.name =
'flowElements')"/>
<childNodeTraces visualID="3002" queryText="(let
_eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI =
'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name =
'UserTask') and (let _containmentMF_:ecore::EStructuralFeature =
modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass =
_containmentMF_.eContainingClass in _eClass_.ePackage.nsURI =
'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name =
'FlowElementsContainer') and _containmentMF_.name =
'flowElements')">
<nodeLabelTraces visualID="5005" queryText="true"/>
@@ -47,6 +50,9 @@
<childNodeTraces visualID="3015" queryText="(let
_eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI =
'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name =
'TextAnnotation') and (let _containmentMF_:ecore::EStructuralFeature =
modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass =
_containmentMF_.eContainingClass in _eClass_.ePackage.nsURI =
'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name =
'SubProcess') and _containmentMF_.name = 'artifacts')">
<nodeLabelTraces visualID="5008" queryText="true"/>
</childNodeTraces>
+ <childNodeTraces visualID="3016" queryText="(let
_eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI =
'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name =
'ScriptTask') and (let _containmentMF_:ecore::EStructuralFeature =
modelFacet.containmentMetaFeature.ecoreFeature in (let _eClass_:ecore::EClass =
_containmentMF_.eContainingClass in _eClass_.ePackage.nsURI =
'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name =
'FlowElementsContainer') and _containmentMF_.name =
'flowElements')">
+ <nodeLabelTraces visualID="5010" queryText="true"/>
+ </childNodeTraces>
<linkTraces visualID="4001"
queryText="modelFacet.oclIsKindOf(gmfgen::TypeLinkModelFacet) and (let
_eClass_:ecore::EClass =
modelFacet.oclAsType(gmfgen::TypeLinkModelFacet).metaClass.ecoreClass in
_eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and
_eClass_.name = 'SequenceFlow')"/>
<linkTraces visualID="4002"
queryText="modelFacet.oclIsKindOf(gmfgen::TypeLinkModelFacet) and (let
_eClass_:ecore::EClass =
modelFacet.oclAsType(gmfgen::TypeLinkModelFacet).metaClass.ecoreClass in
_eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and
_eClass_.name = 'Association')"/>
</trace:TraceModel>