JBoss Tools SVN: r29086 - trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-02-09 18:26:15 -0500 (Wed, 09 Feb 2011)
New Revision: 29086
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:
Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.gmfgraph
===================================================================
--- trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.gmfgraph 2011-02-09 22:43:27 UTC (rev 29085)
+++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.gmfgraph 2011-02-09 23:26:15 UTC (rev 29086)
@@ -8,27 +8,57 @@
<descriptors
name="TaskFigureDescriptor">
<actualFigure
- xsi:type="gmfgraph:RoundedRectangle"
- name="TaskFigure">
+ xsi:type="gmfgraph:Rectangle"
+ name="TaskFigure"
+ outline="false"
+ fill="false">
<layout
xsi:type="gmfgraph:StackLayout"/>
- <minimumSize
- dx="80"
- dy="40"/>
- <preferredSize
- dx="80"
- dy="40"/>
- <insets
- top="5"
- left="5"
- bottom="5"
- right="5"/>
<children
- xsi:type="gmfgraph:Label"
- name="Name"/>
+ xsi:type="gmfgraph:RoundedRectangle"
+ name=""
+ lineWidth="2"
+ cornerWidth="15"
+ cornerHeight="15">
+ <layout
+ xsi:type="gmfgraph:StackLayout"/>
+ <foregroundColor
+ xsi:type="gmfgraph:RGBColor"
+ green="100"
+ blue="185"/>
+ <backgroundColor
+ xsi:type="gmfgraph:RGBColor"
+ red="215"
+ green="235"
+ blue="255"/>
+ <insets
+ top="5"
+ left="5"
+ bottom="5"
+ right="5"/>
+ <children
+ xsi:type="gmfgraph:Label"
+ name="icon"
+ text="icon"/>
+ <children
+ xsi:type="gmfgraph:Rectangle"
+ outline="false"
+ fill="false">
+ <layout
+ xsi:type="gmfgraph:CustomLayout"
+ qualifiedClassName="org.jboss.tools.bpmn2.gmf.layout.CenteredLabelLayout"/>
+ <children
+ xsi:type="gmfgraph:Label"
+ name="Name">
+ <font
+ xsi:type="gmfgraph:BasicFont"
+ height="14"/>
+ </children>
+ </children>
+ </children>
</actualFigure>
<accessors
- figure="//@figures.0/@descriptors.0/@actualFigure/(a)children.0"/>
+ figure="//@figures.0/@descriptors.0/@actualFigure/@children.0/@children.1/(a)children.0"/>
</descriptors>
<descriptors
name="SequenceFlowFigureDescriptor">
@@ -246,6 +276,9 @@
name="ScriptTask"
figure="TaskFigureDescriptor"/>
<nodes
+ name="BusinessRuleTask"
+ figure="TaskFigureDescriptor"/>
+ <nodes
name="StartEvent"
figure="StartEventFigureDescriptor"
resizeConstraint="NONE">
@@ -391,15 +424,6 @@
name="Association"
figure="AssociationFigureDescriptor"/>
<labels
- name="RoundedRectangleLabel"
- figure="TaskFigureDescriptor"
- accessor="//@figures.0/@descriptors.0/(a)accessors.0"/>
- <labels
- name="Element Name"
- figure="TextAnnotationFigureDescriptor"
- elementIcon="false"
- accessor="//@figures.0/@descriptors.17/(a)accessors.0"/>
- <labels
name="DataObjectLabel"
figure="DataObjectLabelFigureDescriptor"
elementIcon="false"/>
@@ -408,4 +432,9 @@
figure="TextAnnotationFigureDescriptor"
elementIcon="false"
accessor="//@figures.0/@descriptors.17/(a)accessors.0"/>
+ <labels
+ name="TaskFigureNameLabel"
+ figure="TaskFigureDescriptor"
+ elementIcon="false"
+ accessor="//@figures.0/@descriptors.0/(a)accessors.0"/>
</gmfgraph:Canvas>
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 2011-02-09 22:43:27 UTC (rev 29085)
+++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.gmfgen 2011-02-09 23:26:15 UTC (rev 29086)
@@ -28,36 +28,34 @@
<domainDiagramElement
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/Process"/>
<childNodes
- visualID="3001"
- editPartClassName="SubProcess2EditPart"
- 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 //@diagram/(a)childNodes.15"
- graphicalNodeEditPolicyClassName="SubProcess2GraphicalNodeEditPolicy"
- createCommandClassName="SubProcess2CreateCommand"
- containers="//@diagram/(a)childNodes.0 //@diagram/(a)topLevelNodes.15">
+ visualID="3002"
+ editPartClassName="UserTask2EditPart"
+ itemSemanticEditPolicyClassName="UserTask2ItemSemanticEditPolicy"
+ notationViewFactoryClassName="UserTaskViewFactory"
+ canonicalEditPolicyClassName="UserTask2CanonicalEditPolicy"
+ graphicalNodeEditPolicyClassName="UserTask2GraphicalNodeEditPolicy"
+ createCommandClassName="UserTask2CreateCommand"
+ containers="//@diagram/(a)topLevelNodes.15 //@diagram/(a)childNodes.15">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
xsi:type="gmfgen:SpecializationType"
- metamodelType="//@diagram/@topLevelNodes.15/(a)elementType"/>
+ metamodelType="//@diagram/@topLevelNodes.0/(a)elementType"/>
<viewmap
xsi:type="gmfgen:InnerClassViewmap"
- layoutType="XY_LAYOUT"
- className="ExpandedSubprocessFigureDescriptor"
- classBody="
/**
 * @generated
 */
public class ExpandedSubprocessFigureDescriptor extends org.eclipse.draw2d.RoundedRectangle {


	/**
	 * @generated
	 */
	private org.eclipse.draw2d.RoundedRectangle fFigureExpandedSubprocessFigure; 


	/**
	 * @generated
	 */
	public ExpandedSubprocessFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.XYLayout());
		this.setCornerDimensions(new org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(8)
, getMapMode().DPtoLP(8)
));
this.setPreferredSize(new org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(240)
, getMapMode().DPtoLP(240)
));
	}



	/**
	 * @generated
	 */
	public org.eclipse.draw2d.RoundedRectangle getFigureExpandedSubprocessFigure() {
		return fFigureExpandedSubprocessFigure;
	}!



}

">
+ className="TaskFigureDescriptor"
+ classBody="
/**
 * @generated
 */
public class TaskFigureDescriptor extends org.eclipse.draw2d.RectangleFigure {


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


	/**
	 * @generated
	 */
	public TaskFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.StackLayout());
		this.setFill(false);
this.setOutline(false);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


org.eclipse.draw2d.RoundedRectangle rrect0 = new org.eclipse.draw2d.RoundedRectangle();
rrect0.setCornerDimensions(new org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(15)
, getMapMode().DPtoLP(15)
));
rrect0.setLineWidth(2);
	rrect0.setForegroundColor(RRECT0_FORE
);
	rrect!
0.setBackgroundColor(RRECT0_BACK
);

rrect0.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(5)
));

this.add(rrect0);
rrect0.setLayoutManager(new org.eclipse.draw2d.StackLayout());


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

rrect0.add(icon1);



org.eclipse.draw2d.RectangleFigure rect1 = new org.eclipse.draw2d.RectangleFigure();
rect1.setFill(false);
rect1.setOutline(false);

rrect0.add(rect1);

	org.jboss.tools.bpmn2.gmf.layout.CenteredLabelLayout layoutRect1 = new org.jboss.tools.bpmn2.gmf.layout.CenteredLabelLayout();


	rect1.setLayoutManager(layoutRect1);



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

fF!
igureNam
e.setFont(FFIGURENAME_FONT);



rect1.add(fFigureName);




	}





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


}

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Color RRECT0_FORE = new org.eclipse.swt.graphics.Color(null, 0, 100, 185);

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Color RRECT0_BACK = new org.eclipse.swt.graphics.Color(null, 215, 235, 255);

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Font FFIGURENAME_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), org.eclipse.swt.widgets.Display.getDefault().getSystemFont().getFontData()[0].getName(), 14, org.eclipse.swt.SWT.NORMAL);

">
<attributes
- xsi:type="gmfgen:DefaultSizeAttributes"
- width="240"
- height="240"/>
- <attributes
xsi:type="gmfgen:StyleAttributes"
fixedForeground="true"/>
+ <attributes
+ xsi:type="gmfgen:DefaultSizeAttributes"
+ width="120"
+ height="60"/>
</viewmap>
<modelFacet>
<metaClass
- href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/SubProcess"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/UserTask"/>
<containmentMetaFeature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/FlowElementsContainer/flowElements"/>
<childMetaFeature
@@ -66,43 +64,64 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.31">
+ value="//@expressionProviders/@providers.0/(a)expressions.0">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
</modelElementInitializer>
</modelFacet>
+ <labels
+ visualID="5010"
+ editPartClassName="UserTaskName2EditPart"
+ itemSemanticEditPolicyClassName="UserTaskName2ItemSemanticEditPolicy"
+ notationViewFactoryClassName="UserTaskNameViewFactory">
+ <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">
+ <attributes
+ xsi:type="gmfgen:StyleAttributes"
+ fixedFont="true"/>
+ </viewmap>
+ <modelFacet
+ xsi:type="gmfgen:FeatureLabelModelFacet"
+ parser="//@labelParsers/(a)implementations.0">
+ <metaFeatures
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/FlowElement/name"/>
+ </modelFacet>
+ </labels>
</childNodes>
<childNodes
- visualID="3002"
- editPartClassName="UserTask2EditPart"
- itemSemanticEditPolicyClassName="UserTask2ItemSemanticEditPolicy"
- notationViewFactoryClassName="UserTaskViewFactory"
- canonicalEditPolicyClassName="UserTask2CanonicalEditPolicy"
- graphicalNodeEditPolicyClassName="UserTask2GraphicalNodeEditPolicy"
- createCommandClassName="UserTask2CreateCommand"
- containers="//@diagram/(a)childNodes.0 //@diagram/(a)topLevelNodes.15">
+ visualID="3016"
+ editPartClassName="ScriptTask2EditPart"
+ itemSemanticEditPolicyClassName="ScriptTask2ItemSemanticEditPolicy"
+ notationViewFactoryClassName="ScriptTaskViewFactory"
+ canonicalEditPolicyClassName="ScriptTask2CanonicalEditPolicy"
+ graphicalNodeEditPolicyClassName="ScriptTask2GraphicalNodeEditPolicy"
+ createCommandClassName="ScriptTask2CreateCommand"
+ containers="//@diagram/(a)topLevelNodes.15 //@diagram/(a)childNodes.15">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
xsi:type="gmfgen:SpecializationType"
- metamodelType="//@diagram/@topLevelNodes.0/(a)elementType"/>
+ metamodelType="//@diagram/@topLevelNodes.1/(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;
	}


}

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


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


	/**
	 * @generated
	 */
	public TaskFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.StackLayout());
		this.setFill(false);
this.setOutline(false);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


org.eclipse.draw2d.RoundedRectangle rrect0 = new org.eclipse.draw2d.RoundedRectangle();
rrect0.setCornerDimensions(new org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(15)
, getMapMode().DPtoLP(15)
));
rrect0.setLineWidth(2);
	rrect0.setForegroundColor(RRECT0_FORE
);
	rrect!
0.setBackgroundColor(RRECT0_BACK
);

rrect0.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(5)
));

this.add(rrect0);
rrect0.setLayoutManager(new org.eclipse.draw2d.StackLayout());


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

rrect0.add(icon1);



org.eclipse.draw2d.RectangleFigure rect1 = new org.eclipse.draw2d.RectangleFigure();
rect1.setFill(false);
rect1.setOutline(false);

rrect0.add(rect1);

	org.jboss.tools.bpmn2.gmf.layout.CenteredLabelLayout layoutRect1 = new org.jboss.tools.bpmn2.gmf.layout.CenteredLabelLayout();


	rect1.setLayoutManager(layoutRect1);



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

fF!
igureNam
e.setFont(FFIGURENAME_FONT);



rect1.add(fFigureName);




	}





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


}

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Color RRECT0_FORE = new org.eclipse.swt.graphics.Color(null, 0, 100, 185);

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Color RRECT0_BACK = new org.eclipse.swt.graphics.Color(null, 215, 235, 255);

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Font FFIGURENAME_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), org.eclipse.swt.widgets.Display.getDefault().getSystemFont().getFontData()[0].getName(), 14, org.eclipse.swt.SWT.NORMAL);

">
<attributes
+ xsi:type="gmfgen:StyleAttributes"
+ fixedForeground="true"/>
+ <attributes
xsi:type="gmfgen:DefaultSizeAttributes"
- width="80"
- height="40"/>
- <attributes
- xsi:type="gmfgen:StyleAttributes"
- fixedForeground="true"
- fixedBackground="true"/>
+ width="120"
+ height="60"/>
</viewmap>
<modelFacet>
<metaClass
- href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/UserTask"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/ScriptTask"/>
<containmentMetaFeature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/FlowElementsContainer/flowElements"/>
<childMetaFeature
@@ -111,24 +130,27 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.0">
+ value="//@expressionProviders/@providers.0/(a)expressions.1">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
</modelElementInitializer>
</modelFacet>
<labels
- visualID="5005"
- editPartClassName="UserTaskName2EditPart"
- itemSemanticEditPolicyClassName="UserTaskName2ItemSemanticEditPolicy"
- notationViewFactoryClassName="UserTaskNameViewFactory"
- elementIcon="true">
+ visualID="5014"
+ editPartClassName="ScriptTaskName2EditPart"
+ itemSemanticEditPolicyClassName="ScriptTaskName2ItemSemanticEditPolicy"
+ notationViewFactoryClassName="ScriptTaskNameViewFactory">
<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"/>
+ figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
+ <attributes
+ xsi:type="gmfgen:StyleAttributes"
+ fixedFont="true"/>
+ </viewmap>
<modelFacet
xsi:type="gmfgen:FeatureLabelModelFacet"
parser="//@labelParsers/(a)implementations.0">
@@ -145,24 +167,23 @@
canonicalEditPolicyClassName="ServiceTask2CanonicalEditPolicy"
graphicalNodeEditPolicyClassName="ServiceTask2GraphicalNodeEditPolicy"
createCommandClassName="ServiceTask2CreateCommand"
- containers="//@diagram/(a)childNodes.0 //@diagram/(a)topLevelNodes.15">
+ containers="//@diagram/(a)topLevelNodes.15 //@diagram/(a)childNodes.15">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
xsi:type="gmfgen:SpecializationType"
- metamodelType="//@diagram/@topLevelNodes.1/(a)elementType"/>
+ metamodelType="//@diagram/@topLevelNodes.2/(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;
	}


}

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


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


	/**
	 * @generated
	 */
	public TaskFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.StackLayout());
		this.setFill(false);
this.setOutline(false);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


org.eclipse.draw2d.RoundedRectangle rrect0 = new org.eclipse.draw2d.RoundedRectangle();
rrect0.setCornerDimensions(new org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(15)
, getMapMode().DPtoLP(15)
));
rrect0.setLineWidth(2);
	rrect0.setForegroundColor(RRECT0_FORE
);
	rrect!
0.setBackgroundColor(RRECT0_BACK
);

rrect0.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(5)
));

this.add(rrect0);
rrect0.setLayoutManager(new org.eclipse.draw2d.StackLayout());


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

rrect0.add(icon1);



org.eclipse.draw2d.RectangleFigure rect1 = new org.eclipse.draw2d.RectangleFigure();
rect1.setFill(false);
rect1.setOutline(false);

rrect0.add(rect1);

	org.jboss.tools.bpmn2.gmf.layout.CenteredLabelLayout layoutRect1 = new org.jboss.tools.bpmn2.gmf.layout.CenteredLabelLayout();


	rect1.setLayoutManager(layoutRect1);



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

fF!
igureNam
e.setFont(FFIGURENAME_FONT);



rect1.add(fFigureName);




	}





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


}

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Color RRECT0_FORE = new org.eclipse.swt.graphics.Color(null, 0, 100, 185);

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Color RRECT0_BACK = new org.eclipse.swt.graphics.Color(null, 215, 235, 255);

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Font FFIGURENAME_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), org.eclipse.swt.widgets.Display.getDefault().getSystemFont().getFontData()[0].getName(), 14, org.eclipse.swt.SWT.NORMAL);

">
<attributes
+ xsi:type="gmfgen:StyleAttributes"
+ fixedForeground="true"/>
+ <attributes
xsi:type="gmfgen:DefaultSizeAttributes"
- width="80"
- height="40"/>
- <attributes
- xsi:type="gmfgen:StyleAttributes"
- fixedForeground="true"
- fixedBackground="true"/>
+ width="120"
+ height="60"/>
</viewmap>
<modelFacet>
<metaClass
@@ -175,24 +196,27 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.1">
+ value="//@expressionProviders/@providers.0/(a)expressions.2">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
</modelElementInitializer>
</modelFacet>
<labels
- visualID="5006"
+ visualID="5015"
editPartClassName="ServiceTaskName2EditPart"
itemSemanticEditPolicyClassName="ServiceTaskName2ItemSemanticEditPolicy"
- notationViewFactoryClassName="ServiceTaskNameViewFactory"
- elementIcon="true">
+ notationViewFactoryClassName="ServiceTaskNameViewFactory">
<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"/>
+ figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
+ <attributes
+ xsi:type="gmfgen:StyleAttributes"
+ fixedFont="true"/>
+ </viewmap>
<modelFacet
xsi:type="gmfgen:FeatureLabelModelFacet"
parser="//@labelParsers/(a)implementations.0">
@@ -202,6 +226,72 @@
</labels>
</childNodes>
<childNodes
+ visualID="3017"
+ editPartClassName="BusinessRuleTask2EditPart"
+ itemSemanticEditPolicyClassName="BusinessRuleTask2ItemSemanticEditPolicy"
+ notationViewFactoryClassName="BusinessRuleTaskViewFactory"
+ canonicalEditPolicyClassName="BusinessRuleTask2CanonicalEditPolicy"
+ graphicalNodeEditPolicyClassName="BusinessRuleTask2GraphicalNodeEditPolicy"
+ createCommandClassName="BusinessRuleTask2CreateCommand"
+ containers="//@diagram/(a)topLevelNodes.15 //@diagram/(a)childNodes.15">
+ <diagramRunTimeClass
+ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+ <elementType
+ xsi:type="gmfgen:SpecializationType"
+ metamodelType="//@diagram/@topLevelNodes.3/(a)elementType"/>
+ <viewmap
+ xsi:type="gmfgen:InnerClassViewmap"
+ className="TaskFigureDescriptor"
+ classBody="
/**
 * @generated
 */
public class TaskFigureDescriptor extends org.eclipse.draw2d.RectangleFigure {


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


	/**
	 * @generated
	 */
	public TaskFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.StackLayout());
		this.setFill(false);
this.setOutline(false);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


org.eclipse.draw2d.RoundedRectangle rrect0 = new org.eclipse.draw2d.RoundedRectangle();
rrect0.setCornerDimensions(new org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(15)
, getMapMode().DPtoLP(15)
));
rrect0.setLineWidth(2);
	rrect0.setForegroundColor(RRECT0_FORE
);
	rrect!
0.setBackgroundColor(RRECT0_BACK
);

rrect0.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(5)
));

this.add(rrect0);
rrect0.setLayoutManager(new org.eclipse.draw2d.StackLayout());


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

rrect0.add(icon1);



org.eclipse.draw2d.RectangleFigure rect1 = new org.eclipse.draw2d.RectangleFigure();
rect1.setFill(false);
rect1.setOutline(false);

rrect0.add(rect1);

	org.jboss.tools.bpmn2.gmf.layout.CenteredLabelLayout layoutRect1 = new org.jboss.tools.bpmn2.gmf.layout.CenteredLabelLayout();


	rect1.setLayoutManager(layoutRect1);



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

fF!
igureNam
e.setFont(FFIGURENAME_FONT);



rect1.add(fFigureName);




	}





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


}

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Color RRECT0_FORE = new org.eclipse.swt.graphics.Color(null, 0, 100, 185);

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Color RRECT0_BACK = new org.eclipse.swt.graphics.Color(null, 215, 235, 255);

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Font FFIGURENAME_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), org.eclipse.swt.widgets.Display.getDefault().getSystemFont().getFontData()[0].getName(), 14, org.eclipse.swt.SWT.NORMAL);

">
+ <attributes
+ xsi:type="gmfgen:StyleAttributes"
+ fixedForeground="true"/>
+ <attributes
+ xsi:type="gmfgen:DefaultSizeAttributes"
+ width="120"
+ height="60"/>
+ </viewmap>
+ <modelFacet>
+ <metaClass
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BusinessRuleTask"/>
+ <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.3">
+ <feature
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
+ </initializers>
+ </modelElementInitializer>
+ </modelFacet>
+ <labels
+ visualID="5016"
+ editPartClassName="BusinessRuleTaskName2EditPart"
+ itemSemanticEditPolicyClassName="BusinessRuleTaskName2ItemSemanticEditPolicy"
+ notationViewFactoryClassName="BusinessRuleTaskNameViewFactory">
+ <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">
+ <attributes
+ xsi:type="gmfgen:StyleAttributes"
+ fixedFont="true"/>
+ </viewmap>
+ <modelFacet
+ xsi:type="gmfgen:FeatureLabelModelFacet"
+ parser="//@labelParsers/(a)implementations.0">
+ <metaFeatures
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/FlowElement/name"/>
+ </modelFacet>
+ </labels>
+ </childNodes>
+ <childNodes
visualID="3003"
editPartClassName="StartEvent3EditPart"
itemSemanticEditPolicyClassName="StartEvent3ItemSemanticEditPolicy"
@@ -209,12 +299,12 @@
canonicalEditPolicyClassName="StartEvent3CanonicalEditPolicy"
graphicalNodeEditPolicyClassName="StartEvent3GraphicalNodeEditPolicy"
createCommandClassName="StartEvent3CreateCommand"
- containers="//@diagram/(a)childNodes.0 //@diagram/(a)topLevelNodes.15">
+ containers="//@diagram/(a)topLevelNodes.15 //@diagram/(a)childNodes.15">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
xsi:type="gmfgen:SpecializationType"
- metamodelType="//@diagram/@topLevelNodes.2/(a)elementType"/>
+ metamodelType="//@diagram/@topLevelNodes.4/(a)elementType"/>
<viewmap
xsi:type="gmfgen:InnerClassViewmap"
className="StartEventFigureDescriptor"
@@ -227,7 +317,7 @@
height="48"/>
</viewmap>
<modelFacet
- modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.2">
+ modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.4">
<metaClass
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/StartEvent"/>
<containmentMetaFeature
@@ -238,7 +328,7 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.3">
+ value="//@expressionProviders/@providers.0/(a)expressions.5">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
@@ -253,12 +343,12 @@
canonicalEditPolicyClassName="StartEvent4CanonicalEditPolicy"
graphicalNodeEditPolicyClassName="StartEvent4GraphicalNodeEditPolicy"
createCommandClassName="StartEvent4CreateCommand"
- containers="//@diagram/(a)childNodes.0 //@diagram/(a)topLevelNodes.15">
+ containers="//@diagram/(a)topLevelNodes.15 //@diagram/(a)childNodes.15">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
xsi:type="gmfgen:SpecializationType"
- metamodelType="//@diagram/@topLevelNodes.2/(a)elementType"/>
+ metamodelType="//@diagram/@topLevelNodes.4/(a)elementType"/>
<viewmap
xsi:type="gmfgen:InnerClassViewmap"
className="MessageStartEventFigureDescriptor"
@@ -271,7 +361,7 @@
height="48"/>
</viewmap>
<modelFacet
- modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.4">
+ modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.6">
<metaClass
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/StartEvent"/>
<containmentMetaFeature
@@ -282,13 +372,13 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.5">
+ value="//@expressionProviders/@providers.0/(a)expressions.7">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.6">
+ value="//@expressionProviders/@providers.0/(a)expressions.8">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/CatchEvent/eventDefinitions"/>
</initializers>
@@ -296,23 +386,23 @@
</modelFacet>
</childNodes>
<childNodes
- visualID="3006"
- editPartClassName="EndEvent4EditPart"
- itemSemanticEditPolicyClassName="EndEvent4ItemSemanticEditPolicy"
- notationViewFactoryClassName="EndEventViewFactory"
- canonicalEditPolicyClassName="EndEvent4CanonicalEditPolicy"
- graphicalNodeEditPolicyClassName="EndEvent4GraphicalNodeEditPolicy"
- createCommandClassName="EndEvent4CreateCommand"
- containers="//@diagram/(a)childNodes.0 //@diagram/(a)topLevelNodes.15">
+ visualID="3011"
+ editPartClassName="IntermediateCatchEvent4EditPart"
+ itemSemanticEditPolicyClassName="IntermediateCatchEvent4ItemSemanticEditPolicy"
+ notationViewFactoryClassName="IntermediateCatchEventViewFactory"
+ canonicalEditPolicyClassName="IntermediateCatchEvent4CanonicalEditPolicy"
+ graphicalNodeEditPolicyClassName="IntermediateCatchEvent4GraphicalNodeEditPolicy"
+ createCommandClassName="IntermediateCatchEvent4CreateCommand"
+ containers="//@diagram/(a)topLevelNodes.15 //@diagram/(a)childNodes.15">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
xsi:type="gmfgen:SpecializationType"
- metamodelType="//@diagram/@topLevelNodes.4/(a)elementType"/>
+ metamodelType="//@diagram/@topLevelNodes.6/(a)elementType"/>
<viewmap
xsi:type="gmfgen:InnerClassViewmap"
- className="EndEventFigureDescriptor"
- classBody="
/**
 * @generated
 */
public class EndEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public EndEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_none.svg");
	}





}

">
+ className="MessageCatchIntermediateEventFigureDescriptor"
+ classBody="
/**
 * @generated
 */
public class MessageCatchIntermediateEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public MessageCatchIntermediateEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_message_catch.svg");
	}





}

">
<attributes
xsi:type="gmfgen:ResizeConstraints"/>
<attributes
@@ -321,9 +411,9 @@
height="48"/>
</viewmap>
<modelFacet
- modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.7">
+ modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.9">
<metaClass
- href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/EndEvent"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/IntermediateCatchEvent"/>
<containmentMetaFeature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/FlowElementsContainer/flowElements"/>
<childMetaFeature
@@ -332,31 +422,37 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.8">
+ value="//@expressionProviders/@providers.0/(a)expressions.10">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
+ <initializers
+ xsi:type="gmfgen:GenFeatureValueSpec"
+ value="//@expressionProviders/@providers.0/(a)expressions.11">
+ <feature
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/CatchEvent/eventDefinitions"/>
+ </initializers>
</modelElementInitializer>
</modelFacet>
</childNodes>
<childNodes
- visualID="3007"
- editPartClassName="ExclusiveGateway2EditPart"
- itemSemanticEditPolicyClassName="ExclusiveGateway2ItemSemanticEditPolicy"
- notationViewFactoryClassName="ExclusiveGatewayViewFactory"
- canonicalEditPolicyClassName="ExclusiveGateway2CanonicalEditPolicy"
- graphicalNodeEditPolicyClassName="ExclusiveGateway2GraphicalNodeEditPolicy"
- createCommandClassName="ExclusiveGateway2CreateCommand"
- containers="//@diagram/(a)childNodes.0 //@diagram/(a)topLevelNodes.15">
+ visualID="3013"
+ editPartClassName="IntermediateCatchEvent5EditPart"
+ itemSemanticEditPolicyClassName="IntermediateCatchEvent5ItemSemanticEditPolicy"
+ notationViewFactoryClassName="IntermediateCatchEventViewFactory"
+ canonicalEditPolicyClassName="IntermediateCatchEvent5CanonicalEditPolicy"
+ graphicalNodeEditPolicyClassName="IntermediateCatchEvent5GraphicalNodeEditPolicy"
+ createCommandClassName="IntermediateCatchEvent5CreateCommand"
+ containers="//@diagram/(a)topLevelNodes.15 //@diagram/(a)childNodes.15">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
xsi:type="gmfgen:SpecializationType"
- metamodelType="//@diagram/@topLevelNodes.5/(a)elementType"/>
+ metamodelType="//@diagram/@topLevelNodes.6/(a)elementType"/>
<viewmap
xsi:type="gmfgen:InnerClassViewmap"
- className="ExclusiveGatewayFigureDescriptor"
- classBody="
/**
 * @generated
 */
public class ExclusiveGatewayFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public ExclusiveGatewayFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/gateways_48px_exclusive.svg");
	}





}

">
+ className="TimerCatchIntermediateEventFigureDescriptor"
+ classBody="
/**
 * @generated
 */
public class TimerCatchIntermediateEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public TimerCatchIntermediateEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_timer_catch.svg");
	}





}

">
<attributes
xsi:type="gmfgen:ResizeConstraints"/>
<attributes
@@ -364,9 +460,10 @@
width="48"
height="48"/>
</viewmap>
- <modelFacet>
+ <modelFacet
+ modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.12">
<metaClass
- href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/ExclusiveGateway"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/IntermediateCatchEvent"/>
<containmentMetaFeature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/FlowElementsContainer/flowElements"/>
<childMetaFeature
@@ -375,22 +472,28 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.9">
+ value="//@expressionProviders/@providers.0/(a)expressions.13">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
+ <initializers
+ xsi:type="gmfgen:GenFeatureValueSpec"
+ value="//@expressionProviders/@providers.0/(a)expressions.14">
+ <feature
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/CatchEvent/eventDefinitions"/>
+ </initializers>
</modelElementInitializer>
</modelFacet>
</childNodes>
<childNodes
- visualID="3008"
- editPartClassName="ParallelGateway2EditPart"
- itemSemanticEditPolicyClassName="ParallelGateway2ItemSemanticEditPolicy"
- notationViewFactoryClassName="ParallelGatewayViewFactory"
- canonicalEditPolicyClassName="ParallelGateway2CanonicalEditPolicy"
- graphicalNodeEditPolicyClassName="ParallelGateway2GraphicalNodeEditPolicy"
- createCommandClassName="ParallelGateway2CreateCommand"
- containers="//@diagram/(a)childNodes.0 //@diagram/(a)topLevelNodes.15">
+ visualID="3018"
+ editPartClassName="IntermediateCatchEvent6EditPart"
+ itemSemanticEditPolicyClassName="IntermediateCatchEvent6ItemSemanticEditPolicy"
+ notationViewFactoryClassName="IntermediateCatchEventViewFactory"
+ canonicalEditPolicyClassName="IntermediateCatchEvent6CanonicalEditPolicy"
+ graphicalNodeEditPolicyClassName="IntermediateCatchEvent6GraphicalNodeEditPolicy"
+ createCommandClassName="IntermediateCatchEvent6CreateCommand"
+ containers="//@diagram/(a)topLevelNodes.15 //@diagram/(a)childNodes.15">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
@@ -398,8 +501,8 @@
metamodelType="//@diagram/@topLevelNodes.6/(a)elementType"/>
<viewmap
xsi:type="gmfgen:InnerClassViewmap"
- className="ParallelGatewayFigureDescriptor"
- classBody="
/**
 * @generated
 */
public class ParallelGatewayFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public ParallelGatewayFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/gateways_48px_parallel.svg");
	}





}

">
+ className="ErrorCatchIntermediateEventFigureDescriptor"
+ classBody="
/**
 * @generated
 */
public class ErrorCatchIntermediateEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public ErrorCatchIntermediateEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_error_catch.svg");
	}





}

">
<attributes
xsi:type="gmfgen:ResizeConstraints"/>
<attributes
@@ -407,9 +510,10 @@
width="48"
height="48"/>
</viewmap>
- <modelFacet>
+ <modelFacet
+ modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.15">
<metaClass
- href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/ParallelGateway"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/IntermediateCatchEvent"/>
<containmentMetaFeature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/FlowElementsContainer/flowElements"/>
<childMetaFeature
@@ -418,14 +522,114 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.10">
+ value="//@expressionProviders/@providers.0/(a)expressions.16">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
+ <initializers
+ xsi:type="gmfgen:GenFeatureValueSpec"
+ value="//@expressionProviders/@providers.0/(a)expressions.17">
+ <feature
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/CatchEvent/eventDefinitions"/>
+ </initializers>
</modelElementInitializer>
</modelFacet>
</childNodes>
<childNodes
+ visualID="3012"
+ editPartClassName="IntermediateThrowEvent2EditPart"
+ itemSemanticEditPolicyClassName="IntermediateThrowEvent2ItemSemanticEditPolicy"
+ notationViewFactoryClassName="IntermediateThrowEventViewFactory"
+ canonicalEditPolicyClassName="IntermediateThrowEvent2CanonicalEditPolicy"
+ graphicalNodeEditPolicyClassName="IntermediateThrowEvent2GraphicalNodeEditPolicy"
+ createCommandClassName="IntermediateThrowEvent2CreateCommand"
+ containers="//@diagram/(a)topLevelNodes.15 //@diagram/(a)childNodes.15">
+ <diagramRunTimeClass
+ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+ <elementType
+ xsi:type="gmfgen:SpecializationType"
+ metamodelType="//@diagram/@topLevelNodes.9/(a)elementType"/>
+ <viewmap
+ xsi:type="gmfgen:InnerClassViewmap"
+ className="MessageThrowIntermediateEventFigureDescriptor"
+ classBody="
/**
 * @generated
 */
public class MessageThrowIntermediateEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public MessageThrowIntermediateEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_message_throw.svg");
	}





}

">
+ <attributes
+ xsi:type="gmfgen:ResizeConstraints"/>
+ <attributes
+ xsi:type="gmfgen:DefaultSizeAttributes"
+ width="48"
+ height="48"/>
+ </viewmap>
+ <modelFacet
+ modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.18">
+ <metaClass
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/IntermediateThrowEvent"/>
+ <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.19">
+ <feature
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
+ </initializers>
+ <initializers
+ xsi:type="gmfgen:GenFeatureValueSpec"
+ value="//@expressionProviders/@providers.0/(a)expressions.20">
+ <feature
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/ThrowEvent/eventDefinitions"/>
+ </initializers>
+ </modelElementInitializer>
+ </modelFacet>
+ </childNodes>
+ <childNodes
+ visualID="3006"
+ editPartClassName="EndEvent4EditPart"
+ itemSemanticEditPolicyClassName="EndEvent4ItemSemanticEditPolicy"
+ notationViewFactoryClassName="EndEventViewFactory"
+ canonicalEditPolicyClassName="EndEvent4CanonicalEditPolicy"
+ graphicalNodeEditPolicyClassName="EndEvent4GraphicalNodeEditPolicy"
+ createCommandClassName="EndEvent4CreateCommand"
+ containers="//@diagram/(a)topLevelNodes.15 //@diagram/(a)childNodes.15">
+ <diagramRunTimeClass
+ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+ <elementType
+ xsi:type="gmfgen:SpecializationType"
+ metamodelType="//@diagram/@topLevelNodes.10/(a)elementType"/>
+ <viewmap
+ xsi:type="gmfgen:InnerClassViewmap"
+ className="EndEventFigureDescriptor"
+ classBody="
/**
 * @generated
 */
public class EndEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public EndEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_none.svg");
	}





}

">
+ <attributes
+ xsi:type="gmfgen:ResizeConstraints"/>
+ <attributes
+ xsi:type="gmfgen:DefaultSizeAttributes"
+ width="48"
+ height="48"/>
+ </viewmap>
+ <modelFacet
+ modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.21">
+ <metaClass
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/EndEvent"/>
+ <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.22">
+ <feature
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
+ </initializers>
+ </modelElementInitializer>
+ </modelFacet>
+ </childNodes>
+ <childNodes
visualID="3009"
editPartClassName="EndEvent5EditPart"
itemSemanticEditPolicyClassName="EndEvent5ItemSemanticEditPolicy"
@@ -433,12 +637,12 @@
canonicalEditPolicyClassName="EndEvent5CanonicalEditPolicy"
graphicalNodeEditPolicyClassName="EndEvent5GraphicalNodeEditPolicy"
createCommandClassName="EndEvent5CreateCommand"
- containers="//@diagram/(a)childNodes.0 //@diagram/(a)topLevelNodes.15">
+ containers="//@diagram/(a)topLevelNodes.15 //@diagram/(a)childNodes.15">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
xsi:type="gmfgen:SpecializationType"
- metamodelType="//@diagram/@topLevelNodes.4/(a)elementType"/>
+ metamodelType="//@diagram/@topLevelNodes.10/(a)elementType"/>
<viewmap
xsi:type="gmfgen:InnerClassViewmap"
className="MessageEndEventFigureDescriptor"
@@ -451,7 +655,7 @@
height="48"/>
</viewmap>
<modelFacet
- modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.11">
+ modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.23">
<metaClass
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/EndEvent"/>
<containmentMetaFeature
@@ -462,13 +666,13 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.12">
+ value="//@expressionProviders/@providers.0/(a)expressions.24">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.13">
+ value="//@expressionProviders/@providers.0/(a)expressions.25">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/ThrowEvent/eventDefinitions"/>
</initializers>
@@ -483,12 +687,12 @@
canonicalEditPolicyClassName="EndEvent6CanonicalEditPolicy"
graphicalNodeEditPolicyClassName="EndEvent6GraphicalNodeEditPolicy"
createCommandClassName="EndEvent6CreateCommand"
- containers="//@diagram/(a)childNodes.0 //@diagram/(a)topLevelNodes.15">
+ containers="//@diagram/(a)topLevelNodes.15 //@diagram/(a)childNodes.15">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
xsi:type="gmfgen:SpecializationType"
- metamodelType="//@diagram/@topLevelNodes.4/(a)elementType"/>
+ metamodelType="//@diagram/@topLevelNodes.10/(a)elementType"/>
<viewmap
xsi:type="gmfgen:InnerClassViewmap"
className="TerminateEndEventFigureDescriptor"
@@ -501,7 +705,7 @@
height="48"/>
</viewmap>
<modelFacet
- modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.14">
+ modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.26">
<metaClass
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/EndEvent"/>
<containmentMetaFeature
@@ -512,13 +716,13 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.15">
+ value="//@expressionProviders/@providers.0/(a)expressions.27">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.16">
+ value="//@expressionProviders/@providers.0/(a)expressions.28">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/ThrowEvent/eventDefinitions"/>
</initializers>
@@ -526,23 +730,23 @@
</modelFacet>
</childNodes>
<childNodes
- visualID="3011"
- editPartClassName="IntermediateCatchEvent4EditPart"
- itemSemanticEditPolicyClassName="IntermediateCatchEvent4ItemSemanticEditPolicy"
- notationViewFactoryClassName="IntermediateCatchEventViewFactory"
- canonicalEditPolicyClassName="IntermediateCatchEvent4CanonicalEditPolicy"
- graphicalNodeEditPolicyClassName="IntermediateCatchEvent4GraphicalNodeEditPolicy"
- createCommandClassName="IntermediateCatchEvent4CreateCommand"
- containers="//@diagram/(a)childNodes.0 //@diagram/(a)topLevelNodes.15">
+ visualID="3007"
+ editPartClassName="ExclusiveGateway2EditPart"
+ itemSemanticEditPolicyClassName="ExclusiveGateway2ItemSemanticEditPolicy"
+ notationViewFactoryClassName="ExclusiveGatewayViewFactory"
+ canonicalEditPolicyClassName="ExclusiveGateway2CanonicalEditPolicy"
+ graphicalNodeEditPolicyClassName="ExclusiveGateway2GraphicalNodeEditPolicy"
+ createCommandClassName="ExclusiveGateway2CreateCommand"
+ containers="//@diagram/(a)topLevelNodes.15 //@diagram/(a)childNodes.15">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
xsi:type="gmfgen:SpecializationType"
- metamodelType="//@diagram/@topLevelNodes.9/(a)elementType"/>
+ metamodelType="//@diagram/@topLevelNodes.13/(a)elementType"/>
<viewmap
xsi:type="gmfgen:InnerClassViewmap"
- className="MessageCatchIntermediateEventFigureDescriptor"
- classBody="
/**
 * @generated
 */
public class MessageCatchIntermediateEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public MessageCatchIntermediateEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_message_catch.svg");
	}





}

">
+ className="ExclusiveGatewayFigureDescriptor"
+ classBody="
/**
 * @generated
 */
public class ExclusiveGatewayFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public ExclusiveGatewayFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/gateways_48px_exclusive.svg");
	}





}

">
<attributes
xsi:type="gmfgen:ResizeConstraints"/>
<attributes
@@ -550,10 +754,9 @@
width="48"
height="48"/>
</viewmap>
- <modelFacet
- modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.17">
+ <modelFacet>
<metaClass
- href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/IntermediateCatchEvent"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/ExclusiveGateway"/>
<containmentMetaFeature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/FlowElementsContainer/flowElements"/>
<childMetaFeature
@@ -562,37 +765,31 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.18">
+ value="//@expressionProviders/@providers.0/(a)expressions.29">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
- <initializers
- xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.19">
- <feature
- href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/CatchEvent/eventDefinitions"/>
- </initializers>
</modelElementInitializer>
</modelFacet>
</childNodes>
<childNodes
- visualID="3012"
- editPartClassName="IntermediateThrowEvent2EditPart"
- itemSemanticEditPolicyClassName="IntermediateThrowEvent2ItemSemanticEditPolicy"
- notationViewFactoryClassName="IntermediateThrowEventViewFactory"
- canonicalEditPolicyClassName="IntermediateThrowEvent2CanonicalEditPolicy"
- graphicalNodeEditPolicyClassName="IntermediateThrowEvent2GraphicalNodeEditPolicy"
- createCommandClassName="IntermediateThrowEvent2CreateCommand"
- containers="//@diagram/(a)childNodes.0 //@diagram/(a)topLevelNodes.15">
+ visualID="3008"
+ editPartClassName="ParallelGateway2EditPart"
+ itemSemanticEditPolicyClassName="ParallelGateway2ItemSemanticEditPolicy"
+ notationViewFactoryClassName="ParallelGatewayViewFactory"
+ canonicalEditPolicyClassName="ParallelGateway2CanonicalEditPolicy"
+ graphicalNodeEditPolicyClassName="ParallelGateway2GraphicalNodeEditPolicy"
+ createCommandClassName="ParallelGateway2CreateCommand"
+ containers="//@diagram/(a)topLevelNodes.15 //@diagram/(a)childNodes.15">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
xsi:type="gmfgen:SpecializationType"
- metamodelType="//@diagram/@topLevelNodes.10/(a)elementType"/>
+ metamodelType="//@diagram/@topLevelNodes.14/(a)elementType"/>
<viewmap
xsi:type="gmfgen:InnerClassViewmap"
- className="MessageThrowIntermediateEventFigureDescriptor"
- classBody="
/**
 * @generated
 */
public class MessageThrowIntermediateEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public MessageThrowIntermediateEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_message_throw.svg");
	}





}

">
+ className="ParallelGatewayFigureDescriptor"
+ classBody="
/**
 * @generated
 */
public class ParallelGatewayFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public ParallelGatewayFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/gateways_48px_parallel.svg");
	}





}

">
<attributes
xsi:type="gmfgen:ResizeConstraints"/>
<attributes
@@ -600,10 +797,9 @@
width="48"
height="48"/>
</viewmap>
- <modelFacet
- modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.20">
+ <modelFacet>
<metaClass
- href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/IntermediateThrowEvent"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/ParallelGateway"/>
<containmentMetaFeature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/FlowElementsContainer/flowElements"/>
<childMetaFeature
@@ -612,48 +808,44 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.21">
+ value="//@expressionProviders/@providers.0/(a)expressions.30">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
- <initializers
- xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.22">
- <feature
- href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/ThrowEvent/eventDefinitions"/>
- </initializers>
</modelElementInitializer>
</modelFacet>
</childNodes>
<childNodes
- visualID="3013"
- editPartClassName="IntermediateCatchEvent5EditPart"
- itemSemanticEditPolicyClassName="IntermediateCatchEvent5ItemSemanticEditPolicy"
- notationViewFactoryClassName="IntermediateCatchEventViewFactory"
- canonicalEditPolicyClassName="IntermediateCatchEvent5CanonicalEditPolicy"
- graphicalNodeEditPolicyClassName="IntermediateCatchEvent5GraphicalNodeEditPolicy"
- createCommandClassName="IntermediateCatchEvent5CreateCommand"
- containers="//@diagram/(a)childNodes.0 //@diagram/(a)topLevelNodes.15">
+ visualID="3001"
+ editPartClassName="SubProcess2EditPart"
+ 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 //@diagram/(a)childNodes.15 //@diagram/(a)childNodes.16 //@diagram/(a)childNodes.17"
+ graphicalNodeEditPolicyClassName="SubProcess2GraphicalNodeEditPolicy"
+ createCommandClassName="SubProcess2CreateCommand"
+ containers="//@diagram/(a)childNodes.15 //@diagram/(a)topLevelNodes.15">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
xsi:type="gmfgen:SpecializationType"
- metamodelType="//@diagram/@topLevelNodes.9/(a)elementType"/>
+ metamodelType="//@diagram/@topLevelNodes.15/(a)elementType"/>
<viewmap
xsi:type="gmfgen:InnerClassViewmap"
- className="TimerCatchIntermediateEventFigureDescriptor"
- classBody="
/**
 * @generated
 */
public class TimerCatchIntermediateEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public TimerCatchIntermediateEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_timer_catch.svg");
	}





}

">
+ layoutType="XY_LAYOUT"
+ className="ExpandedSubprocessFigureDescriptor"
+ classBody="
/**
 * @generated
 */
public class ExpandedSubprocessFigureDescriptor extends org.eclipse.draw2d.RoundedRectangle {


	/**
	 * @generated
	 */
	private org.eclipse.draw2d.RoundedRectangle fFigureExpandedSubprocessFigure; 


	/**
	 * @generated
	 */
	public ExpandedSubprocessFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.XYLayout());
		this.setCornerDimensions(new org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(8)
, getMapMode().DPtoLP(8)
));
this.setPreferredSize(new org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(240)
, getMapMode().DPtoLP(240)
));
	}



	/**
	 * @generated
	 */
	public org.eclipse.draw2d.RoundedRectangle getFigureExpandedSubprocessFigure() {
		return fFigureExpandedSubprocessFigure;
	}!



}

">
<attributes
- xsi:type="gmfgen:ResizeConstraints"/>
+ xsi:type="gmfgen:DefaultSizeAttributes"
+ width="240"
+ height="240"/>
<attributes
- xsi:type="gmfgen:DefaultSizeAttributes"
- width="48"
- height="48"/>
+ xsi:type="gmfgen:StyleAttributes"
+ fixedForeground="true"/>
</viewmap>
- <modelFacet
- modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.23">
+ <modelFacet>
<metaClass
- href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/IntermediateCatchEvent"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/SubProcess"/>
<containmentMetaFeature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/FlowElementsContainer/flowElements"/>
<childMetaFeature
@@ -662,16 +854,10 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.24">
+ value="//@expressionProviders/@providers.0/(a)expressions.31">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
- <initializers
- xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.25">
- <feature
- href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/CatchEvent/eventDefinitions"/>
- </initializers>
</modelElementInitializer>
</modelFacet>
</childNodes>
@@ -683,12 +869,12 @@
canonicalEditPolicyClassName="DataObject2CanonicalEditPolicy"
graphicalNodeEditPolicyClassName="DataObject2GraphicalNodeEditPolicy"
createCommandClassName="DataObject2CreateCommand"
- containers="//@diagram/(a)childNodes.0 //@diagram/(a)topLevelNodes.15">
+ containers="//@diagram/(a)childNodes.15 //@diagram/(a)topLevelNodes.15">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
- xsi:type="gmfgen:SpecializationType"
- metamodelType="//@diagram/@topLevelNodes.13/(a)elementType"/>
+ xsi:type="gmfgen:MetamodelType"
+ editHelperClassName="DataObjectEditHelper"/>
<viewmap
xsi:type="gmfgen:InnerClassViewmap"
className="DataObjectFigureDescriptor"
@@ -711,7 +897,7 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.29">
+ value="//@expressionProviders/@providers.0/(a)expressions.32">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
@@ -744,12 +930,12 @@
canonicalEditPolicyClassName="TextAnnotation2CanonicalEditPolicy"
graphicalNodeEditPolicyClassName="TextAnnotation2GraphicalNodeEditPolicy"
createCommandClassName="TextAnnotation2CreateCommand"
- containers="//@diagram/(a)childNodes.0 //@diagram/(a)topLevelNodes.15">
+ containers="//@diagram/(a)childNodes.15 //@diagram/(a)topLevelNodes.15">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
- xsi:type="gmfgen:SpecializationType"
- metamodelType="//@diagram/@topLevelNodes.14/(a)elementType"/>
+ xsi:type="gmfgen:MetamodelType"
+ editHelperClassName="TextAnnotationEditHelper"/>
<viewmap
xsi:type="gmfgen:InnerClassViewmap"
className="TextAnnotationFigureDescriptor"
@@ -773,7 +959,7 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.30">
+ value="//@expressionProviders/@providers.0/(a)expressions.33">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
@@ -799,36 +985,34 @@
</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">
+ <topLevelNodes
+ visualID="2001"
+ editPartClassName="UserTaskEditPart"
+ itemSemanticEditPolicyClassName="UserTaskItemSemanticEditPolicy"
+ notationViewFactoryClassName="UserTaskViewFactory"
+ canonicalEditPolicyClassName="UserTaskCanonicalEditPolicy"
+ graphicalNodeEditPolicyClassName="UserTaskGraphicalNodeEditPolicy"
+ createCommandClassName="UserTaskCreateCommand">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
xsi:type="gmfgen:MetamodelType"
- editHelperClassName="ScriptTaskEditHelper"/>
+ editHelperClassName="UserTaskEditHelper"/>
<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;
	}


}

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


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


	/**
	 * @generated
	 */
	public TaskFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.StackLayout());
		this.setFill(false);
this.setOutline(false);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


org.eclipse.draw2d.RoundedRectangle rrect0 = new org.eclipse.draw2d.RoundedRectangle();
rrect0.setCornerDimensions(new org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(15)
, getMapMode().DPtoLP(15)
));
rrect0.setLineWidth(2);
	rrect0.setForegroundColor(RRECT0_FORE
);
	rrect!
0.setBackgroundColor(RRECT0_BACK
);

rrect0.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(5)
));

this.add(rrect0);
rrect0.setLayoutManager(new org.eclipse.draw2d.StackLayout());


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

rrect0.add(icon1);



org.eclipse.draw2d.RectangleFigure rect1 = new org.eclipse.draw2d.RectangleFigure();
rect1.setFill(false);
rect1.setOutline(false);

rrect0.add(rect1);

	org.jboss.tools.bpmn2.gmf.layout.CenteredLabelLayout layoutRect1 = new org.jboss.tools.bpmn2.gmf.layout.CenteredLabelLayout();


	rect1.setLayoutManager(layoutRect1);



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

fF!
igureNam
e.setFont(FFIGURENAME_FONT);



rect1.add(fFigureName);




	}





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


}

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Color RRECT0_FORE = new org.eclipse.swt.graphics.Color(null, 0, 100, 185);

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Color RRECT0_BACK = new org.eclipse.swt.graphics.Color(null, 215, 235, 255);

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Font FFIGURENAME_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), org.eclipse.swt.widgets.Display.getDefault().getSystemFont().getFontData()[0].getName(), 14, org.eclipse.swt.SWT.NORMAL);

">
<attributes
+ xsi:type="gmfgen:StyleAttributes"
+ fixedForeground="true"/>
+ <attributes
xsi:type="gmfgen:DefaultSizeAttributes"
- width="80"
- height="40"/>
- <attributes
- xsi:type="gmfgen:StyleAttributes"
- fixedForeground="true"
- fixedBackground="true"/>
+ width="120"
+ height="60"/>
</viewmap>
<modelFacet>
<metaClass
- href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/ScriptTask"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/UserTask"/>
<containmentMetaFeature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/FlowElementsContainer/flowElements"/>
<childMetaFeature
@@ -837,24 +1021,27 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.32">
+ value="//@expressionProviders/@providers.0/(a)expressions.0">
<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">
+ visualID="5009"
+ editPartClassName="UserTaskNameEditPart"
+ itemSemanticEditPolicyClassName="UserTaskNameItemSemanticEditPolicy"
+ notationViewFactoryClassName="UserTaskNameViewFactory">
<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"/>
+ figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
+ <attributes
+ xsi:type="gmfgen:StyleAttributes"
+ fixedFont="true"/>
+ </viewmap>
<modelFacet
xsi:type="gmfgen:FeatureLabelModelFacet"
parser="//@labelParsers/(a)implementations.0">
@@ -862,36 +1049,35 @@
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/FlowElement/name"/>
</modelFacet>
</labels>
- </childNodes>
+ </topLevelNodes>
<topLevelNodes
- visualID="2001"
- editPartClassName="UserTaskEditPart"
- itemSemanticEditPolicyClassName="UserTaskItemSemanticEditPolicy"
- notationViewFactoryClassName="UserTaskViewFactory"
- canonicalEditPolicyClassName="UserTaskCanonicalEditPolicy"
- graphicalNodeEditPolicyClassName="UserTaskGraphicalNodeEditPolicy"
- createCommandClassName="UserTaskCreateCommand">
+ 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:MetamodelType"
- editHelperClassName="UserTaskEditHelper"/>
+ 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;
	}


}

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


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


	/**
	 * @generated
	 */
	public TaskFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.StackLayout());
		this.setFill(false);
this.setOutline(false);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


org.eclipse.draw2d.RoundedRectangle rrect0 = new org.eclipse.draw2d.RoundedRectangle();
rrect0.setCornerDimensions(new org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(15)
, getMapMode().DPtoLP(15)
));
rrect0.setLineWidth(2);
	rrect0.setForegroundColor(RRECT0_FORE
);
	rrect!
0.setBackgroundColor(RRECT0_BACK
);

rrect0.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(5)
));

this.add(rrect0);
rrect0.setLayoutManager(new org.eclipse.draw2d.StackLayout());


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

rrect0.add(icon1);



org.eclipse.draw2d.RectangleFigure rect1 = new org.eclipse.draw2d.RectangleFigure();
rect1.setFill(false);
rect1.setOutline(false);

rrect0.add(rect1);

	org.jboss.tools.bpmn2.gmf.layout.CenteredLabelLayout layoutRect1 = new org.jboss.tools.bpmn2.gmf.layout.CenteredLabelLayout();


	rect1.setLayoutManager(layoutRect1);



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

fF!
igureNam
e.setFont(FFIGURENAME_FONT);



rect1.add(fFigureName);




	}





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


}

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Color RRECT0_FORE = new org.eclipse.swt.graphics.Color(null, 0, 100, 185);

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Color RRECT0_BACK = new org.eclipse.swt.graphics.Color(null, 215, 235, 255);

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Font FFIGURENAME_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), org.eclipse.swt.widgets.Display.getDefault().getSystemFont().getFontData()[0].getName(), 14, org.eclipse.swt.SWT.NORMAL);

">
<attributes
+ xsi:type="gmfgen:StyleAttributes"
+ fixedForeground="true"/>
+ <attributes
xsi:type="gmfgen:DefaultSizeAttributes"
- width="80"
- height="40"/>
- <attributes
- xsi:type="gmfgen:StyleAttributes"
- fixedForeground="true"
- fixedBackground="true"/>
+ width="120"
+ height="60"/>
</viewmap>
<modelFacet>
<metaClass
- href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/UserTask"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/ScriptTask"/>
<containmentMetaFeature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/FlowElementsContainer/flowElements"/>
<childMetaFeature
@@ -900,24 +1086,27 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.0">
+ value="//@expressionProviders/@providers.0/(a)expressions.1">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
</modelElementInitializer>
</modelFacet>
<labels
- visualID="5001"
- editPartClassName="UserTaskNameEditPart"
- itemSemanticEditPolicyClassName="UserTaskNameItemSemanticEditPolicy"
- notationViewFactoryClassName="UserTaskNameViewFactory"
- elementIcon="true">
+ visualID="5011"
+ editPartClassName="ScriptTaskNameEditPart"
+ itemSemanticEditPolicyClassName="ScriptTaskNameItemSemanticEditPolicy"
+ notationViewFactoryClassName="ScriptTaskNameViewFactory">
<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"/>
+ figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
+ <attributes
+ xsi:type="gmfgen:StyleAttributes"
+ fixedFont="true"/>
+ </viewmap>
<modelFacet
xsi:type="gmfgen:FeatureLabelModelFacet"
parser="//@labelParsers/(a)implementations.0">
@@ -942,15 +1131,14 @@
<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;
	}


}

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


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


	/**
	 * @generated
	 */
	public TaskFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.StackLayout());
		this.setFill(false);
this.setOutline(false);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


org.eclipse.draw2d.RoundedRectangle rrect0 = new org.eclipse.draw2d.RoundedRectangle();
rrect0.setCornerDimensions(new org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(15)
, getMapMode().DPtoLP(15)
));
rrect0.setLineWidth(2);
	rrect0.setForegroundColor(RRECT0_FORE
);
	rrect!
0.setBackgroundColor(RRECT0_BACK
);

rrect0.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(5)
));

this.add(rrect0);
rrect0.setLayoutManager(new org.eclipse.draw2d.StackLayout());


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

rrect0.add(icon1);



org.eclipse.draw2d.RectangleFigure rect1 = new org.eclipse.draw2d.RectangleFigure();
rect1.setFill(false);
rect1.setOutline(false);

rrect0.add(rect1);

	org.jboss.tools.bpmn2.gmf.layout.CenteredLabelLayout layoutRect1 = new org.jboss.tools.bpmn2.gmf.layout.CenteredLabelLayout();


	rect1.setLayoutManager(layoutRect1);



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

fF!
igureNam
e.setFont(FFIGURENAME_FONT);



rect1.add(fFigureName);




	}





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


}

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Color RRECT0_FORE = new org.eclipse.swt.graphics.Color(null, 0, 100, 185);

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Color RRECT0_BACK = new org.eclipse.swt.graphics.Color(null, 215, 235, 255);

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Font FFIGURENAME_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), org.eclipse.swt.widgets.Display.getDefault().getSystemFont().getFontData()[0].getName(), 14, org.eclipse.swt.SWT.NORMAL);

">
<attributes
+ xsi:type="gmfgen:StyleAttributes"
+ fixedForeground="true"/>
+ <attributes
xsi:type="gmfgen:DefaultSizeAttributes"
- width="80"
- height="40"/>
- <attributes
- xsi:type="gmfgen:StyleAttributes"
- fixedForeground="true"
- fixedBackground="true"/>
+ width="120"
+ height="60"/>
</viewmap>
<modelFacet>
<metaClass
@@ -963,24 +1151,27 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.1">
+ value="//@expressionProviders/@providers.0/(a)expressions.2">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
</modelElementInitializer>
</modelFacet>
<labels
- visualID="5002"
+ visualID="5012"
editPartClassName="ServiceTaskNameEditPart"
itemSemanticEditPolicyClassName="ServiceTaskNameItemSemanticEditPolicy"
- notationViewFactoryClassName="ServiceTaskNameViewFactory"
- elementIcon="true">
+ notationViewFactoryClassName="ServiceTaskNameViewFactory">
<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"/>
+ figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
+ <attributes
+ xsi:type="gmfgen:StyleAttributes"
+ fixedFont="true"/>
+ </viewmap>
<modelFacet
xsi:type="gmfgen:FeatureLabelModelFacet"
parser="//@labelParsers/(a)implementations.0">
@@ -990,6 +1181,71 @@
</labels>
</topLevelNodes>
<topLevelNodes
+ visualID="2018"
+ editPartClassName="BusinessRuleTaskEditPart"
+ itemSemanticEditPolicyClassName="BusinessRuleTaskItemSemanticEditPolicy"
+ notationViewFactoryClassName="BusinessRuleTaskViewFactory"
+ canonicalEditPolicyClassName="BusinessRuleTaskCanonicalEditPolicy"
+ graphicalNodeEditPolicyClassName="BusinessRuleTaskGraphicalNodeEditPolicy"
+ createCommandClassName="BusinessRuleTaskCreateCommand">
+ <diagramRunTimeClass
+ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+ <elementType
+ xsi:type="gmfgen:MetamodelType"
+ editHelperClassName="BusinessRuleTaskEditHelper"/>
+ <viewmap
+ xsi:type="gmfgen:InnerClassViewmap"
+ className="TaskFigureDescriptor"
+ classBody="
/**
 * @generated
 */
public class TaskFigureDescriptor extends org.eclipse.draw2d.RectangleFigure {


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


	/**
	 * @generated
	 */
	public TaskFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.StackLayout());
		this.setFill(false);
this.setOutline(false);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


org.eclipse.draw2d.RoundedRectangle rrect0 = new org.eclipse.draw2d.RoundedRectangle();
rrect0.setCornerDimensions(new org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(15)
, getMapMode().DPtoLP(15)
));
rrect0.setLineWidth(2);
	rrect0.setForegroundColor(RRECT0_FORE
);
	rrect!
0.setBackgroundColor(RRECT0_BACK
);

rrect0.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(5)
));

this.add(rrect0);
rrect0.setLayoutManager(new org.eclipse.draw2d.StackLayout());


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

rrect0.add(icon1);



org.eclipse.draw2d.RectangleFigure rect1 = new org.eclipse.draw2d.RectangleFigure();
rect1.setFill(false);
rect1.setOutline(false);

rrect0.add(rect1);

	org.jboss.tools.bpmn2.gmf.layout.CenteredLabelLayout layoutRect1 = new org.jboss.tools.bpmn2.gmf.layout.CenteredLabelLayout();


	rect1.setLayoutManager(layoutRect1);



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

fF!
igureNam
e.setFont(FFIGURENAME_FONT);



rect1.add(fFigureName);




	}





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


}

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Color RRECT0_FORE = new org.eclipse.swt.graphics.Color(null, 0, 100, 185);

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Color RRECT0_BACK = new org.eclipse.swt.graphics.Color(null, 215, 235, 255);

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Font FFIGURENAME_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), org.eclipse.swt.widgets.Display.getDefault().getSystemFont().getFontData()[0].getName(), 14, org.eclipse.swt.SWT.NORMAL);

">
+ <attributes
+ xsi:type="gmfgen:StyleAttributes"
+ fixedForeground="true"/>
+ <attributes
+ xsi:type="gmfgen:DefaultSizeAttributes"
+ width="120"
+ height="60"/>
+ </viewmap>
+ <modelFacet>
+ <metaClass
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BusinessRuleTask"/>
+ <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.3">
+ <feature
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
+ </initializers>
+ </modelElementInitializer>
+ </modelFacet>
+ <labels
+ visualID="5013"
+ editPartClassName="BusinessRuleTaskNameEditPart"
+ itemSemanticEditPolicyClassName="BusinessRuleTaskNameItemSemanticEditPolicy"
+ notationViewFactoryClassName="BusinessRuleTaskNameViewFactory">
+ <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">
+ <attributes
+ xsi:type="gmfgen:StyleAttributes"
+ fixedFont="true"/>
+ </viewmap>
+ <modelFacet
+ xsi:type="gmfgen:FeatureLabelModelFacet"
+ parser="//@labelParsers/(a)implementations.0">
+ <metaFeatures
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/FlowElement/name"/>
+ </modelFacet>
+ </labels>
+ </topLevelNodes>
+ <topLevelNodes
visualID="2003"
editPartClassName="StartEventEditPart"
itemSemanticEditPolicyClassName="StartEventItemSemanticEditPolicy"
@@ -1014,7 +1270,7 @@
height="48"/>
</viewmap>
<modelFacet
- modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.2">
+ modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.4">
<metaClass
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/StartEvent"/>
<containmentMetaFeature
@@ -1025,7 +1281,7 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.3">
+ value="//@expressionProviders/@providers.0/(a)expressions.5">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
@@ -1044,7 +1300,7 @@
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
xsi:type="gmfgen:SpecializationType"
- metamodelType="//@diagram/@topLevelNodes.2/(a)elementType"/>
+ metamodelType="//@diagram/@topLevelNodes.4/(a)elementType"/>
<viewmap
xsi:type="gmfgen:InnerClassViewmap"
className="MessageStartEventFigureDescriptor"
@@ -1057,7 +1313,7 @@
height="48"/>
</viewmap>
<modelFacet
- modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.4">
+ modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.6">
<metaClass
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/StartEvent"/>
<containmentMetaFeature
@@ -1068,13 +1324,13 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.5">
+ value="//@expressionProviders/@providers.0/(a)expressions.7">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.6">
+ value="//@expressionProviders/@providers.0/(a)expressions.8">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/CatchEvent/eventDefinitions"/>
</initializers>
@@ -1082,22 +1338,22 @@
</modelFacet>
</topLevelNodes>
<topLevelNodes
- visualID="2004"
- editPartClassName="EndEventEditPart"
- itemSemanticEditPolicyClassName="EndEventItemSemanticEditPolicy"
- notationViewFactoryClassName="EndEventViewFactory"
- canonicalEditPolicyClassName="EndEventCanonicalEditPolicy"
- graphicalNodeEditPolicyClassName="EndEventGraphicalNodeEditPolicy"
- createCommandClassName="EndEventCreateCommand">
+ visualID="2010"
+ editPartClassName="IntermediateCatchEventEditPart"
+ itemSemanticEditPolicyClassName="IntermediateCatchEventItemSemanticEditPolicy"
+ notationViewFactoryClassName="IntermediateCatchEventViewFactory"
+ canonicalEditPolicyClassName="IntermediateCatchEventCanonicalEditPolicy"
+ graphicalNodeEditPolicyClassName="IntermediateCatchEventGraphicalNodeEditPolicy"
+ createCommandClassName="IntermediateCatchEventCreateCommand">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
xsi:type="gmfgen:MetamodelType"
- editHelperClassName="EndEventEditHelper"/>
+ editHelperClassName="IntermediateCatchEventEditHelper"/>
<viewmap
xsi:type="gmfgen:InnerClassViewmap"
- className="EndEventFigureDescriptor"
- classBody="
/**
 * @generated
 */
public class EndEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public EndEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_none.svg");
	}





}

">
+ className="MessageCatchIntermediateEventFigureDescriptor"
+ classBody="
/**
 * @generated
 */
public class MessageCatchIntermediateEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public MessageCatchIntermediateEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_message_catch.svg");
	}





}

">
<attributes
xsi:type="gmfgen:ResizeConstraints"/>
<attributes
@@ -1106,9 +1362,9 @@
height="48"/>
</viewmap>
<modelFacet
- modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.7">
+ modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.9">
<metaClass
- href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/EndEvent"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/IntermediateCatchEvent"/>
<containmentMetaFeature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/FlowElementsContainer/flowElements"/>
<childMetaFeature
@@ -1117,30 +1373,36 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.8">
+ value="//@expressionProviders/@providers.0/(a)expressions.10">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
+ <initializers
+ xsi:type="gmfgen:GenFeatureValueSpec"
+ value="//@expressionProviders/@providers.0/(a)expressions.11">
+ <feature
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/CatchEvent/eventDefinitions"/>
+ </initializers>
</modelElementInitializer>
</modelFacet>
</topLevelNodes>
<topLevelNodes
- visualID="2005"
- editPartClassName="ExclusiveGatewayEditPart"
- itemSemanticEditPolicyClassName="ExclusiveGatewayItemSemanticEditPolicy"
- notationViewFactoryClassName="ExclusiveGatewayViewFactory"
- canonicalEditPolicyClassName="ExclusiveGatewayCanonicalEditPolicy"
- graphicalNodeEditPolicyClassName="ExclusiveGatewayGraphicalNodeEditPolicy"
- createCommandClassName="ExclusiveGatewayCreateCommand">
+ visualID="2012"
+ editPartClassName="IntermediateCatchEvent2EditPart"
+ itemSemanticEditPolicyClassName="IntermediateCatchEvent2ItemSemanticEditPolicy"
+ notationViewFactoryClassName="IntermediateCatchEventViewFactory"
+ canonicalEditPolicyClassName="IntermediateCatchEvent2CanonicalEditPolicy"
+ graphicalNodeEditPolicyClassName="IntermediateCatchEvent2GraphicalNodeEditPolicy"
+ createCommandClassName="IntermediateCatchEvent2CreateCommand">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
- xsi:type="gmfgen:MetamodelType"
- editHelperClassName="ExclusiveGatewayEditHelper"/>
+ xsi:type="gmfgen:SpecializationType"
+ metamodelType="//@diagram/@topLevelNodes.6/(a)elementType"/>
<viewmap
xsi:type="gmfgen:InnerClassViewmap"
- className="ExclusiveGatewayFigureDescriptor"
- classBody="
/**
 * @generated
 */
public class ExclusiveGatewayFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public ExclusiveGatewayFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/gateways_48px_exclusive.svg");
	}





}

">
+ className="TimerCatchIntermediateEventFigureDescriptor"
+ classBody="
/**
 * @generated
 */
public class TimerCatchIntermediateEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public TimerCatchIntermediateEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_timer_catch.svg");
	}





}

">
<attributes
xsi:type="gmfgen:ResizeConstraints"/>
<attributes
@@ -1148,9 +1410,10 @@
width="48"
height="48"/>
</viewmap>
- <modelFacet>
+ <modelFacet
+ modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.12">
<metaClass
- href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/ExclusiveGateway"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/IntermediateCatchEvent"/>
<containmentMetaFeature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/FlowElementsContainer/flowElements"/>
<childMetaFeature
@@ -1159,30 +1422,36 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.9">
+ value="//@expressionProviders/@providers.0/(a)expressions.13">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
+ <initializers
+ xsi:type="gmfgen:GenFeatureValueSpec"
+ value="//@expressionProviders/@providers.0/(a)expressions.14">
+ <feature
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/CatchEvent/eventDefinitions"/>
+ </initializers>
</modelElementInitializer>
</modelFacet>
</topLevelNodes>
<topLevelNodes
- visualID="2006"
- editPartClassName="ParallelGatewayEditPart"
- itemSemanticEditPolicyClassName="ParallelGatewayItemSemanticEditPolicy"
- notationViewFactoryClassName="ParallelGatewayViewFactory"
- canonicalEditPolicyClassName="ParallelGatewayCanonicalEditPolicy"
- graphicalNodeEditPolicyClassName="ParallelGatewayGraphicalNodeEditPolicy"
- createCommandClassName="ParallelGatewayCreateCommand">
+ visualID="2013"
+ editPartClassName="IntermediateCatchEvent3EditPart"
+ itemSemanticEditPolicyClassName="IntermediateCatchEvent3ItemSemanticEditPolicy"
+ notationViewFactoryClassName="IntermediateCatchEventViewFactory"
+ canonicalEditPolicyClassName="IntermediateCatchEvent3CanonicalEditPolicy"
+ graphicalNodeEditPolicyClassName="IntermediateCatchEvent3GraphicalNodeEditPolicy"
+ createCommandClassName="IntermediateCatchEvent3CreateCommand">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
- xsi:type="gmfgen:MetamodelType"
- editHelperClassName="ParallelGatewayEditHelper"/>
+ xsi:type="gmfgen:SpecializationType"
+ metamodelType="//@diagram/@topLevelNodes.6/(a)elementType"/>
<viewmap
xsi:type="gmfgen:InnerClassViewmap"
- className="ParallelGatewayFigureDescriptor"
- classBody="
/**
 * @generated
 */
public class ParallelGatewayFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public ParallelGatewayFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/gateways_48px_parallel.svg");
	}





}

">
+ className="ErrorCatchIntermediateEventFigureDescriptor"
+ classBody="
/**
 * @generated
 */
public class ErrorCatchIntermediateEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public ErrorCatchIntermediateEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_error_catch.svg");
	}





}

">
<attributes
xsi:type="gmfgen:ResizeConstraints"/>
<attributes
@@ -1190,9 +1459,10 @@
width="48"
height="48"/>
</viewmap>
- <modelFacet>
+ <modelFacet
+ modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.15">
<metaClass
- href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/ParallelGateway"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/IntermediateCatchEvent"/>
<containmentMetaFeature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/FlowElementsContainer/flowElements"/>
<childMetaFeature
@@ -1201,30 +1471,36 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.10">
+ value="//@expressionProviders/@providers.0/(a)expressions.16">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
+ <initializers
+ xsi:type="gmfgen:GenFeatureValueSpec"
+ value="//@expressionProviders/@providers.0/(a)expressions.17">
+ <feature
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/CatchEvent/eventDefinitions"/>
+ </initializers>
</modelElementInitializer>
</modelFacet>
</topLevelNodes>
<topLevelNodes
- visualID="2008"
- editPartClassName="EndEvent2EditPart"
- itemSemanticEditPolicyClassName="EndEvent2ItemSemanticEditPolicy"
- notationViewFactoryClassName="EndEventViewFactory"
- canonicalEditPolicyClassName="EndEvent2CanonicalEditPolicy"
- graphicalNodeEditPolicyClassName="EndEvent2GraphicalNodeEditPolicy"
- createCommandClassName="EndEvent2CreateCommand">
+ visualID="2011"
+ editPartClassName="IntermediateThrowEventEditPart"
+ itemSemanticEditPolicyClassName="IntermediateThrowEventItemSemanticEditPolicy"
+ notationViewFactoryClassName="IntermediateThrowEventViewFactory"
+ canonicalEditPolicyClassName="IntermediateThrowEventCanonicalEditPolicy"
+ graphicalNodeEditPolicyClassName="IntermediateThrowEventGraphicalNodeEditPolicy"
+ createCommandClassName="IntermediateThrowEventCreateCommand">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
- xsi:type="gmfgen:SpecializationType"
- metamodelType="//@diagram/@topLevelNodes.4/(a)elementType"/>
+ xsi:type="gmfgen:MetamodelType"
+ editHelperClassName="IntermediateThrowEventEditHelper"/>
<viewmap
xsi:type="gmfgen:InnerClassViewmap"
- className="MessageEndEventFigureDescriptor"
- classBody="
/**
 * @generated
 */
public class MessageEndEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public MessageEndEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_message.svg");
	}





}

">
+ className="MessageThrowIntermediateEventFigureDescriptor"
+ classBody="
/**
 * @generated
 */
public class MessageThrowIntermediateEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public MessageThrowIntermediateEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_message_throw.svg");
	}





}

">
<attributes
xsi:type="gmfgen:ResizeConstraints"/>
<attributes
@@ -1233,9 +1509,9 @@
height="48"/>
</viewmap>
<modelFacet
- modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.11">
+ modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.18">
<metaClass
- href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/EndEvent"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/IntermediateThrowEvent"/>
<containmentMetaFeature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/FlowElementsContainer/flowElements"/>
<childMetaFeature
@@ -1244,13 +1520,13 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.12">
+ value="//@expressionProviders/@providers.0/(a)expressions.19">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.13">
+ value="//@expressionProviders/@providers.0/(a)expressions.20">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/ThrowEvent/eventDefinitions"/>
</initializers>
@@ -1258,22 +1534,22 @@
</modelFacet>
</topLevelNodes>
<topLevelNodes
- visualID="2009"
- editPartClassName="EndEvent3EditPart"
- itemSemanticEditPolicyClassName="EndEvent3ItemSemanticEditPolicy"
+ visualID="2004"
+ editPartClassName="EndEventEditPart"
+ itemSemanticEditPolicyClassName="EndEventItemSemanticEditPolicy"
notationViewFactoryClassName="EndEventViewFactory"
- canonicalEditPolicyClassName="EndEvent3CanonicalEditPolicy"
- graphicalNodeEditPolicyClassName="EndEvent3GraphicalNodeEditPolicy"
- createCommandClassName="EndEvent3CreateCommand">
+ canonicalEditPolicyClassName="EndEventCanonicalEditPolicy"
+ graphicalNodeEditPolicyClassName="EndEventGraphicalNodeEditPolicy"
+ createCommandClassName="EndEventCreateCommand">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
- xsi:type="gmfgen:SpecializationType"
- metamodelType="//@diagram/@topLevelNodes.4/(a)elementType"/>
+ xsi:type="gmfgen:MetamodelType"
+ editHelperClassName="EndEventEditHelper"/>
<viewmap
xsi:type="gmfgen:InnerClassViewmap"
- className="TerminateEndEventFigureDescriptor"
- classBody="
/**
 * @generated
 */
public class TerminateEndEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public TerminateEndEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_terminate.svg");
	}





}

">
+ className="EndEventFigureDescriptor"
+ classBody="
/**
 * @generated
 */
public class EndEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public EndEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_none.svg");
	}





}

">
<attributes
xsi:type="gmfgen:ResizeConstraints"/>
<attributes
@@ -1282,7 +1558,7 @@
height="48"/>
</viewmap>
<modelFacet
- modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.14">
+ modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.21">
<metaClass
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/EndEvent"/>
<containmentMetaFeature
@@ -1293,36 +1569,30 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.15">
+ value="//@expressionProviders/@providers.0/(a)expressions.22">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
- <initializers
- xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.16">
- <feature
- href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/ThrowEvent/eventDefinitions"/>
- </initializers>
</modelElementInitializer>
</modelFacet>
</topLevelNodes>
<topLevelNodes
- visualID="2010"
- editPartClassName="IntermediateCatchEventEditPart"
- itemSemanticEditPolicyClassName="IntermediateCatchEventItemSemanticEditPolicy"
- notationViewFactoryClassName="IntermediateCatchEventViewFactory"
- canonicalEditPolicyClassName="IntermediateCatchEventCanonicalEditPolicy"
- graphicalNodeEditPolicyClassName="IntermediateCatchEventGraphicalNodeEditPolicy"
- createCommandClassName="IntermediateCatchEventCreateCommand">
+ visualID="2008"
+ editPartClassName="EndEvent2EditPart"
+ itemSemanticEditPolicyClassName="EndEvent2ItemSemanticEditPolicy"
+ notationViewFactoryClassName="EndEventViewFactory"
+ canonicalEditPolicyClassName="EndEvent2CanonicalEditPolicy"
+ graphicalNodeEditPolicyClassName="EndEvent2GraphicalNodeEditPolicy"
+ createCommandClassName="EndEvent2CreateCommand">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
- xsi:type="gmfgen:MetamodelType"
- editHelperClassName="IntermediateCatchEventEditHelper"/>
+ xsi:type="gmfgen:SpecializationType"
+ metamodelType="//@diagram/@topLevelNodes.10/(a)elementType"/>
<viewmap
xsi:type="gmfgen:InnerClassViewmap"
- className="MessageCatchIntermediateEventFigureDescriptor"
- classBody="
/**
 * @generated
 */
public class MessageCatchIntermediateEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public MessageCatchIntermediateEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_message_catch.svg");
	}





}

">
+ className="MessageEndEventFigureDescriptor"
+ classBody="
/**
 * @generated
 */
public class MessageEndEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public MessageEndEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_message.svg");
	}





}

">
<attributes
xsi:type="gmfgen:ResizeConstraints"/>
<attributes
@@ -1331,9 +1601,9 @@
height="48"/>
</viewmap>
<modelFacet
- modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.17">
+ modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.23">
<metaClass
- href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/IntermediateCatchEvent"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/EndEvent"/>
<containmentMetaFeature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/FlowElementsContainer/flowElements"/>
<childMetaFeature
@@ -1342,36 +1612,36 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.18">
+ value="//@expressionProviders/@providers.0/(a)expressions.24">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.19">
+ value="//@expressionProviders/@providers.0/(a)expressions.25">
<feature
- href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/CatchEvent/eventDefinitions"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/ThrowEvent/eventDefinitions"/>
</initializers>
</modelElementInitializer>
</modelFacet>
</topLevelNodes>
<topLevelNodes
- visualID="2011"
- editPartClassName="IntermediateThrowEventEditPart"
- itemSemanticEditPolicyClassName="IntermediateThrowEventItemSemanticEditPolicy"
- notationViewFactoryClassName="IntermediateThrowEventViewFactory"
- canonicalEditPolicyClassName="IntermediateThrowEventCanonicalEditPolicy"
- graphicalNodeEditPolicyClassName="IntermediateThrowEventGraphicalNodeEditPolicy"
- createCommandClassName="IntermediateThrowEventCreateCommand">
+ visualID="2009"
+ editPartClassName="EndEvent3EditPart"
+ itemSemanticEditPolicyClassName="EndEvent3ItemSemanticEditPolicy"
+ notationViewFactoryClassName="EndEventViewFactory"
+ canonicalEditPolicyClassName="EndEvent3CanonicalEditPolicy"
+ graphicalNodeEditPolicyClassName="EndEvent3GraphicalNodeEditPolicy"
+ createCommandClassName="EndEvent3CreateCommand">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
- xsi:type="gmfgen:MetamodelType"
- editHelperClassName="IntermediateThrowEventEditHelper"/>
+ xsi:type="gmfgen:SpecializationType"
+ metamodelType="//@diagram/@topLevelNodes.10/(a)elementType"/>
<viewmap
xsi:type="gmfgen:InnerClassViewmap"
- className="MessageThrowIntermediateEventFigureDescriptor"
- classBody="
/**
 * @generated
 */
public class MessageThrowIntermediateEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public MessageThrowIntermediateEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_message_throw.svg");
	}





}

">
+ className="TerminateEndEventFigureDescriptor"
+ classBody="
/**
 * @generated
 */
public class TerminateEndEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public TerminateEndEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_end_terminate.svg");
	}





}

">
<attributes
xsi:type="gmfgen:ResizeConstraints"/>
<attributes
@@ -1380,9 +1650,9 @@
height="48"/>
</viewmap>
<modelFacet
- modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.20">
+ modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.26">
<metaClass
- href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/IntermediateThrowEvent"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/EndEvent"/>
<containmentMetaFeature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/FlowElementsContainer/flowElements"/>
<childMetaFeature
@@ -1391,13 +1661,13 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.21">
+ value="//@expressionProviders/@providers.0/(a)expressions.27">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.22">
+ value="//@expressionProviders/@providers.0/(a)expressions.28">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/ThrowEvent/eventDefinitions"/>
</initializers>
@@ -1405,22 +1675,22 @@
</modelFacet>
</topLevelNodes>
<topLevelNodes
- visualID="2012"
- editPartClassName="IntermediateCatchEvent2EditPart"
- itemSemanticEditPolicyClassName="IntermediateCatchEvent2ItemSemanticEditPolicy"
- notationViewFactoryClassName="IntermediateCatchEventViewFactory"
- canonicalEditPolicyClassName="IntermediateCatchEvent2CanonicalEditPolicy"
- graphicalNodeEditPolicyClassName="IntermediateCatchEvent2GraphicalNodeEditPolicy"
- createCommandClassName="IntermediateCatchEvent2CreateCommand">
+ visualID="2005"
+ editPartClassName="ExclusiveGatewayEditPart"
+ itemSemanticEditPolicyClassName="ExclusiveGatewayItemSemanticEditPolicy"
+ notationViewFactoryClassName="ExclusiveGatewayViewFactory"
+ canonicalEditPolicyClassName="ExclusiveGatewayCanonicalEditPolicy"
+ graphicalNodeEditPolicyClassName="ExclusiveGatewayGraphicalNodeEditPolicy"
+ createCommandClassName="ExclusiveGatewayCreateCommand">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
- xsi:type="gmfgen:SpecializationType"
- metamodelType="//@diagram/@topLevelNodes.9/(a)elementType"/>
+ xsi:type="gmfgen:MetamodelType"
+ editHelperClassName="ExclusiveGatewayEditHelper"/>
<viewmap
xsi:type="gmfgen:InnerClassViewmap"
- className="TimerCatchIntermediateEventFigureDescriptor"
- classBody="
/**
 * @generated
 */
public class TimerCatchIntermediateEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public TimerCatchIntermediateEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_timer_catch.svg");
	}





}

">
+ className="ExclusiveGatewayFigureDescriptor"
+ classBody="
/**
 * @generated
 */
public class ExclusiveGatewayFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public ExclusiveGatewayFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/gateways_48px_exclusive.svg");
	}





}

">
<attributes
xsi:type="gmfgen:ResizeConstraints"/>
<attributes
@@ -1428,10 +1698,9 @@
width="48"
height="48"/>
</viewmap>
- <modelFacet
- modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.23">
+ <modelFacet>
<metaClass
- href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/IntermediateCatchEvent"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/ExclusiveGateway"/>
<containmentMetaFeature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/FlowElementsContainer/flowElements"/>
<childMetaFeature
@@ -1440,36 +1709,30 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.24">
+ value="//@expressionProviders/@providers.0/(a)expressions.29">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
- <initializers
- xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.25">
- <feature
- href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/CatchEvent/eventDefinitions"/>
- </initializers>
</modelElementInitializer>
</modelFacet>
</topLevelNodes>
<topLevelNodes
- visualID="2013"
- editPartClassName="IntermediateCatchEvent3EditPart"
- itemSemanticEditPolicyClassName="IntermediateCatchEvent3ItemSemanticEditPolicy"
- notationViewFactoryClassName="IntermediateCatchEventViewFactory"
- canonicalEditPolicyClassName="IntermediateCatchEvent3CanonicalEditPolicy"
- graphicalNodeEditPolicyClassName="IntermediateCatchEvent3GraphicalNodeEditPolicy"
- createCommandClassName="IntermediateCatchEvent3CreateCommand">
+ visualID="2006"
+ editPartClassName="ParallelGatewayEditPart"
+ itemSemanticEditPolicyClassName="ParallelGatewayItemSemanticEditPolicy"
+ notationViewFactoryClassName="ParallelGatewayViewFactory"
+ canonicalEditPolicyClassName="ParallelGatewayCanonicalEditPolicy"
+ graphicalNodeEditPolicyClassName="ParallelGatewayGraphicalNodeEditPolicy"
+ createCommandClassName="ParallelGatewayCreateCommand">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
- xsi:type="gmfgen:SpecializationType"
- metamodelType="//@diagram/@topLevelNodes.9/(a)elementType"/>
+ xsi:type="gmfgen:MetamodelType"
+ editHelperClassName="ParallelGatewayEditHelper"/>
<viewmap
xsi:type="gmfgen:InnerClassViewmap"
- className="ErrorCatchIntermediateEventFigureDescriptor"
- classBody="
/**
 * @generated
 */
public class ErrorCatchIntermediateEventFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public ErrorCatchIntermediateEventFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/events_48px_intermediate_error_catch.svg");
	}





}

">
+ className="ParallelGatewayFigureDescriptor"
+ classBody="
/**
 * @generated
 */
public class ParallelGatewayFigureDescriptor extends org.eclipse.gmf.runtime.lite.svg.SVGFigure {




	/**
	 * @generated
	 */
	public ParallelGatewayFigureDescriptor() {
				this.setURI("platform:/plugin/org.jboss.tools.bpmn2.process.diagram/images/gateways_48px_parallel.svg");
	}





}

">
<attributes
xsi:type="gmfgen:ResizeConstraints"/>
<attributes
@@ -1477,10 +1740,9 @@
width="48"
height="48"/>
</viewmap>
- <modelFacet
- modelElementSelector="//@expressionProviders/@providers.0/(a)expressions.26">
+ <modelFacet>
<metaClass
- href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/IntermediateCatchEvent"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/ParallelGateway"/>
<containmentMetaFeature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/FlowElementsContainer/flowElements"/>
<childMetaFeature
@@ -1489,15 +1751,54 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.27">
+ value="//@expressionProviders/@providers.0/(a)expressions.30">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
+ </modelElementInitializer>
+ </modelFacet>
+ </topLevelNodes>
+ <topLevelNodes
+ visualID="2016"
+ editPartClassName="SubProcessEditPart"
+ 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 //@diagram/(a)childNodes.15 //@diagram/(a)childNodes.16 //@diagram/(a)childNodes.17"
+ graphicalNodeEditPolicyClassName="SubProcessGraphicalNodeEditPolicy"
+ createCommandClassName="SubProcessCreateCommand">
+ <diagramRunTimeClass
+ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+ <elementType
+ xsi:type="gmfgen:MetamodelType"
+ editHelperClassName="SubProcessEditHelper"/>
+ <viewmap
+ xsi:type="gmfgen:InnerClassViewmap"
+ layoutType="XY_LAYOUT"
+ className="ExpandedSubprocessFigureDescriptor"
+ classBody="
/**
 * @generated
 */
public class ExpandedSubprocessFigureDescriptor extends org.eclipse.draw2d.RoundedRectangle {


	/**
	 * @generated
	 */
	private org.eclipse.draw2d.RoundedRectangle fFigureExpandedSubprocessFigure; 


	/**
	 * @generated
	 */
	public ExpandedSubprocessFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.XYLayout());
		this.setCornerDimensions(new org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(8)
, getMapMode().DPtoLP(8)
));
this.setPreferredSize(new org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(240)
, getMapMode().DPtoLP(240)
));
	}



	/**
	 * @generated
	 */
	public org.eclipse.draw2d.RoundedRectangle getFigureExpandedSubprocessFigure() {
		return fFigureExpandedSubprocessFigure;
	}!



}

">
+ <attributes
+ xsi:type="gmfgen:DefaultSizeAttributes"
+ width="240"
+ height="240"/>
+ <attributes
+ xsi:type="gmfgen:StyleAttributes"
+ fixedForeground="true"/>
+ </viewmap>
+ <modelFacet>
+ <metaClass
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/SubProcess"/>
+ <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.28">
+ value="//@expressionProviders/@providers.0/(a)expressions.31">
<feature
- href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/CatchEvent/eventDefinitions"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
</modelElementInitializer>
</modelFacet>
@@ -1513,8 +1814,8 @@
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
- xsi:type="gmfgen:MetamodelType"
- editHelperClassName="DataObjectEditHelper"/>
+ xsi:type="gmfgen:SpecializationType"
+ metamodelType="//@diagram/@childNodes.16/(a)elementType"/>
<viewmap
xsi:type="gmfgen:InnerClassViewmap"
className="DataObjectFigureDescriptor"
@@ -1537,7 +1838,7 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.29">
+ value="//@expressionProviders/@providers.0/(a)expressions.32">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
@@ -1573,8 +1874,8 @@
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<elementType
- xsi:type="gmfgen:MetamodelType"
- editHelperClassName="TextAnnotationEditHelper"/>
+ xsi:type="gmfgen:SpecializationType"
+ metamodelType="//@diagram/@childNodes.17/(a)elementType"/>
<viewmap
xsi:type="gmfgen:InnerClassViewmap"
className="TextAnnotationFigureDescriptor"
@@ -1598,7 +1899,7 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.30">
+ value="//@expressionProviders/@providers.0/(a)expressions.33">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
@@ -1624,114 +1925,6 @@
</modelFacet>
</labels>
</topLevelNodes>
- <topLevelNodes
- visualID="2016"
- editPartClassName="SubProcessEditPart"
- 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 //@diagram/(a)childNodes.15"
- graphicalNodeEditPolicyClassName="SubProcessGraphicalNodeEditPolicy"
- createCommandClassName="SubProcessCreateCommand">
- <diagramRunTimeClass
- href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
- <elementType
- xsi:type="gmfgen:MetamodelType"
- editHelperClassName="SubProcessEditHelper"/>
- <viewmap
- xsi:type="gmfgen:InnerClassViewmap"
- layoutType="XY_LAYOUT"
- className="ExpandedSubprocessFigureDescriptor"
- classBody="
/**
 * @generated
 */
public class ExpandedSubprocessFigureDescriptor extends org.eclipse.draw2d.RoundedRectangle {


	/**
	 * @generated
	 */
	private org.eclipse.draw2d.RoundedRectangle fFigureExpandedSubprocessFigure; 


	/**
	 * @generated
	 */
	public ExpandedSubprocessFigureDescriptor() {
		this.setLayoutManager(new org.eclipse.draw2d.XYLayout());
		this.setCornerDimensions(new org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(8)
, getMapMode().DPtoLP(8)
));
this.setPreferredSize(new org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(240)
, getMapMode().DPtoLP(240)
));
	}



	/**
	 * @generated
	 */
	public org.eclipse.draw2d.RoundedRectangle getFigureExpandedSubprocessFigure() {
		return fFigureExpandedSubprocessFigure;
	}!



}

">
- <attributes
- xsi:type="gmfgen:DefaultSizeAttributes"
- width="240"
- height="240"/>
- <attributes
- xsi:type="gmfgen:StyleAttributes"
- fixedForeground="true"/>
- </viewmap>
- <modelFacet>
- <metaClass
- href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/SubProcess"/>
- <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.31">
- <feature
- href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
- </initializers>
- </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"/>
- <attributes
- xsi:type="gmfgen:StyleAttributes"
- fixedForeground="true"
- fixedBackground="true"/>
- </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"
@@ -1764,7 +1957,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>
@@ -1807,7 +2000,7 @@
xsi:type="gmfgen:GenFeatureSeqInitializer">
<initializers
xsi:type="gmfgen:GenFeatureValueSpec"
- value="//@expressionProviders/@providers.0/(a)expressions.34">
+ value="//@expressionProviders/@providers.0/(a)expressions.35">
<feature
href="../../org.eclipse.bpmn2/model/BPMN20.genmodel#//bpmn2/BaseElement/id"/>
</initializers>
@@ -1830,25 +2023,32 @@
title="User Task"
largeIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj32/tasks_32px_user.png"
smallIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj16/tasks_16px_user.png"
- genNodes="//@diagram/(a)topLevelNodes.0 //@diagram/(a)childNodes.1"/>
+ genNodes="//@diagram/(a)topLevelNodes.0 //@diagram/(a)childNodes.0"/>
<entries
xsi:type="gmfgen:ToolEntry"
title="Service Task"
largeIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj32/tasks_32px_service.png"
smallIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj16/tasks_16px_service.png"
- genNodes="//@diagram/(a)topLevelNodes.1 //@diagram/(a)childNodes.2"/>
+ genNodes="//@diagram/(a)topLevelNodes.2 //@diagram/(a)childNodes.2"/>
<entries
xsi:type="gmfgen:ToolEntry"
title="Script Task"
largeIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj32/tasks_32px_service.png"
smallIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj16/tasks_16px_script.png"
- genNodes="//@diagram/(a)childNodes.15 //@diagram/(a)topLevelNodes.16"/>
+ genNodes="//@diagram/(a)topLevelNodes.1 //@diagram/(a)childNodes.1"/>
<entries
xsi:type="gmfgen:ToolEntry"
+ title="Business Rule Task"
+ description=""
+ largeIconPath="icons/obj32/tasks_32px_business_rule.png"
+ smallIconPath="icons/obj16/tasks_16px_business_rule.png"
+ genNodes="//@diagram/(a)topLevelNodes.3 //@diagram/(a)childNodes.3"/>
+ <entries
+ xsi:type="gmfgen:ToolEntry"
title="Sub-Process"
largeIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj32/activity_32px_subprocess.png"
smallIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj16/activity_16px_subprocess.png"
- genNodes="//@diagram/(a)topLevelNodes.15 //@diagram/(a)childNodes.0"/>
+ genNodes="//@diagram/(a)topLevelNodes.15 //@diagram/(a)childNodes.15"/>
</entries>
<entries
xsi:type="gmfgen:ToolGroup"
@@ -1860,13 +2060,13 @@
title="Exclusive"
largeIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj32/gateways_32px_exclusive.png"
smallIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj16/gateways_16px_exclusive.png"
- genNodes="//@diagram/(a)topLevelNodes.5 //@diagram/(a)childNodes.6"/>
+ genNodes="//@diagram/(a)topLevelNodes.13 //@diagram/(a)childNodes.13"/>
<entries
xsi:type="gmfgen:ToolEntry"
title="Parallel"
largeIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj32/gateways_32px_parallel.png"
smallIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj16/gateways_16px_parallel.png"
- genNodes="//@diagram/(a)topLevelNodes.6 //@diagram/(a)childNodes.7"/>
+ genNodes="//@diagram/(a)topLevelNodes.14 //@diagram/(a)childNodes.14"/>
</entries>
<entries
xsi:type="gmfgen:ToolGroup"
@@ -1880,13 +2080,13 @@
title="Start"
largeIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_start_none.png"
smallIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_start_none.png"
- genNodes="//@diagram/(a)topLevelNodes.2 //@diagram/(a)childNodes.3"/>
+ genNodes="//@diagram/(a)topLevelNodes.4 //@diagram/(a)childNodes.4"/>
<entries
xsi:type="gmfgen:ToolEntry"
title="Message Start"
largeIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_start_message.png"
smallIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_start_message.png"
- genNodes="//@diagram/(a)topLevelNodes.3 //@diagram/(a)childNodes.4"/>
+ genNodes="//@diagram/(a)topLevelNodes.5 //@diagram/(a)childNodes.5"/>
</entries>
<entries
xsi:type="gmfgen:ToolGroup"
@@ -1897,26 +2097,26 @@
title="Message Catch"
largeIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_intermediate_message_catch.png"
smallIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_intermediate_message_catch.png"
- genNodes="//@diagram/(a)topLevelNodes.9 //@diagram/(a)childNodes.10"/>
+ genNodes="//@diagram/(a)topLevelNodes.6 //@diagram/(a)childNodes.6"/>
<entries
xsi:type="gmfgen:ToolEntry"
title="Message Throw"
largeIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_intermediate_message_throw.png"
smallIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_intermediate_message_throw.png"
- genNodes="//@diagram/(a)topLevelNodes.10 //@diagram/(a)childNodes.11"/>
+ genNodes="//@diagram/(a)topLevelNodes.9 //@diagram/(a)childNodes.9"/>
<entries
xsi:type="gmfgen:ToolEntry"
title="Timer Catch"
description=""
largeIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_intermediate_timer_catch.png"
smallIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_intermediate_timer_catch.png"
- genNodes="//@diagram/(a)topLevelNodes.11 //@diagram/(a)childNodes.12"/>
+ genNodes="//@diagram/(a)topLevelNodes.7 //@diagram/(a)childNodes.7"/>
<entries
xsi:type="gmfgen:ToolEntry"
title="Error Catch"
largeIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_intermediate_error_catch.png"
smallIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_intermediate_error_catch.png"
- genNodes="//@diagram/(a)topLevelNodes.12"/>
+ genNodes="//@diagram/(a)topLevelNodes.8 //@diagram/(a)childNodes.8"/>
</entries>
<entries
xsi:type="gmfgen:ToolGroup"
@@ -1927,19 +2127,19 @@
title="End"
largeIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_end_none.png"
smallIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_end_none.png"
- genNodes="//@diagram/(a)topLevelNodes.4 //@diagram/(a)childNodes.5"/>
+ genNodes="//@diagram/(a)topLevelNodes.10 //@diagram/(a)childNodes.10"/>
<entries
xsi:type="gmfgen:ToolEntry"
title="Message End"
largeIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_end_message.png"
smallIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_end_message.png"
- genNodes="//@diagram/(a)topLevelNodes.7 //@diagram/(a)childNodes.8"/>
+ genNodes="//@diagram/(a)topLevelNodes.11 //@diagram/(a)childNodes.11"/>
<entries
xsi:type="gmfgen:ToolEntry"
title="Terminate"
largeIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj32/events_32px_end_terminate.png"
smallIconPath="/org.jboss.tools.bpmn2.process.diagram/icons/obj16/events_16px_end_terminate.png"
- genNodes="//@diagram/(a)topLevelNodes.8 //@diagram/(a)childNodes.9"/>
+ genNodes="//@diagram/(a)topLevelNodes.12 //@diagram/(a)childNodes.12"/>
</entries>
</entries>
<entries
@@ -1948,11 +2148,11 @@
<entries
xsi:type="gmfgen:ToolEntry"
title="Data Object"
- genNodes="//@diagram/(a)topLevelNodes.13 //@diagram/(a)childNodes.13"/>
+ genNodes="//@diagram/(a)childNodes.16 //@diagram/(a)topLevelNodes.16"/>
<entries
xsi:type="gmfgen:ToolEntry"
title="Text Annotation"
- genNodes="//@diagram/(a)topLevelNodes.14 //@diagram/(a)childNodes.14"/>
+ genNodes="//@diagram/(a)childNodes.17 //@diagram/(a)topLevelNodes.17"/>
</entries>
</groups>
<groups
@@ -2058,108 +2258,114 @@
parent="//@diagram"
child="//@diagram/(a)topLevelNodes.14"/>
<childReferences
- parent="//@diagram/(a)childNodes.0"
+ parent="//@diagram/(a)topLevelNodes.15"
child="//@diagram/(a)childNodes.0"/>
<childReferences
- parent="//@diagram/(a)childNodes.0"
+ parent="//@diagram/(a)topLevelNodes.15"
child="//@diagram/(a)childNodes.1"/>
<childReferences
- parent="//@diagram/(a)childNodes.0"
+ parent="//@diagram/(a)topLevelNodes.15"
child="//@diagram/(a)childNodes.2"/>
<childReferences
- parent="//@diagram/(a)childNodes.0"
+ parent="//@diagram/(a)topLevelNodes.15"
child="//@diagram/(a)childNodes.3"/>
<childReferences
- parent="//@diagram/(a)childNodes.0"
+ parent="//@diagram/(a)topLevelNodes.15"
child="//@diagram/(a)childNodes.4"/>
<childReferences
- parent="//@diagram/(a)childNodes.0"
+ parent="//@diagram/(a)topLevelNodes.15"
child="//@diagram/(a)childNodes.5"/>
<childReferences
- parent="//@diagram/(a)childNodes.0"
+ parent="//@diagram/(a)topLevelNodes.15"
child="//@diagram/(a)childNodes.6"/>
<childReferences
- parent="//@diagram/(a)childNodes.0"
+ parent="//@diagram/(a)topLevelNodes.15"
child="//@diagram/(a)childNodes.7"/>
<childReferences
- parent="//@diagram/(a)childNodes.0"
+ parent="//@diagram/(a)topLevelNodes.15"
child="//@diagram/(a)childNodes.8"/>
<childReferences
- parent="//@diagram/(a)childNodes.0"
+ parent="//@diagram/(a)topLevelNodes.15"
child="//@diagram/(a)childNodes.9"/>
<childReferences
- parent="//@diagram/(a)childNodes.0"
+ parent="//@diagram/(a)topLevelNodes.15"
child="//@diagram/(a)childNodes.10"/>
<childReferences
- parent="//@diagram/(a)childNodes.0"
+ parent="//@diagram/(a)topLevelNodes.15"
child="//@diagram/(a)childNodes.11"/>
<childReferences
- parent="//@diagram/(a)childNodes.0"
+ parent="//@diagram/(a)topLevelNodes.15"
child="//@diagram/(a)childNodes.12"/>
<childReferences
- parent="//@diagram/(a)childNodes.0"
- child="//@diagram/(a)childNodes.10"/>
- <childReferences
- parent="//@diagram/(a)childNodes.0"
+ parent="//@diagram/(a)topLevelNodes.15"
child="//@diagram/(a)childNodes.13"/>
<childReferences
- parent="//@diagram/(a)childNodes.0"
+ parent="//@diagram/(a)topLevelNodes.15"
child="//@diagram/(a)childNodes.14"/>
<childReferences
- parent="//@diagram/(a)childNodes.0"
- child="//@diagram/(a)childNodes.15"/>
- <childReferences
- parent="//@diagram/(a)topLevelNodes.15"
+ parent="//@diagram/(a)childNodes.15"
child="//@diagram/(a)childNodes.0"/>
<childReferences
- parent="//@diagram/(a)topLevelNodes.15"
+ parent="//@diagram/(a)childNodes.15"
child="//@diagram/(a)childNodes.1"/>
<childReferences
- parent="//@diagram/(a)topLevelNodes.15"
+ parent="//@diagram/(a)childNodes.15"
child="//@diagram/(a)childNodes.2"/>
<childReferences
- parent="//@diagram/(a)topLevelNodes.15"
+ parent="//@diagram/(a)childNodes.15"
child="//@diagram/(a)childNodes.3"/>
<childReferences
- parent="//@diagram/(a)topLevelNodes.15"
+ parent="//@diagram/(a)childNodes.15"
child="//@diagram/(a)childNodes.4"/>
<childReferences
- parent="//@diagram/(a)topLevelNodes.15"
+ parent="//@diagram/(a)childNodes.15"
child="//@diagram/(a)childNodes.5"/>
<childReferences
- parent="//@diagram/(a)topLevelNodes.15"
+ parent="//@diagram/(a)childNodes.15"
child="//@diagram/(a)childNodes.6"/>
<childReferences
- parent="//@diagram/(a)topLevelNodes.15"
+ parent="//@diagram/(a)childNodes.15"
child="//@diagram/(a)childNodes.7"/>
<childReferences
- parent="//@diagram/(a)topLevelNodes.15"
+ parent="//@diagram/(a)childNodes.15"
child="//@diagram/(a)childNodes.8"/>
<childReferences
- parent="//@diagram/(a)topLevelNodes.15"
+ parent="//@diagram/(a)childNodes.15"
child="//@diagram/(a)childNodes.9"/>
<childReferences
- parent="//@diagram/(a)topLevelNodes.15"
+ parent="//@diagram/(a)childNodes.15"
child="//@diagram/(a)childNodes.10"/>
<childReferences
- parent="//@diagram/(a)topLevelNodes.15"
+ parent="//@diagram/(a)childNodes.15"
child="//@diagram/(a)childNodes.11"/>
<childReferences
- parent="//@diagram/(a)topLevelNodes.15"
+ parent="//@diagram/(a)childNodes.15"
child="//@diagram/(a)childNodes.12"/>
<childReferences
- parent="//@diagram/(a)topLevelNodes.15"
- child="//@diagram/(a)childNodes.10"/>
- <childReferences
- parent="//@diagram/(a)topLevelNodes.15"
+ parent="//@diagram/(a)childNodes.15"
child="//@diagram/(a)childNodes.13"/>
<childReferences
- parent="//@diagram/(a)topLevelNodes.15"
+ parent="//@diagram/(a)childNodes.15"
child="//@diagram/(a)childNodes.14"/>
<childReferences
+ parent="//@diagram/(a)childNodes.15"
+ child="//@diagram/(a)childNodes.15"/>
+ <childReferences
+ parent="//@diagram/(a)childNodes.15"
+ child="//@diagram/(a)childNodes.16"/>
+ <childReferences
+ parent="//@diagram/(a)childNodes.15"
+ child="//@diagram/(a)childNodes.17"/>
+ <childReferences
parent="//@diagram/(a)topLevelNodes.15"
child="//@diagram/(a)childNodes.15"/>
<childReferences
+ parent="//@diagram/(a)topLevelNodes.15"
+ child="//@diagram/(a)childNodes.16"/>
+ <childReferences
+ parent="//@diagram/(a)topLevelNodes.15"
+ child="//@diagram/(a)childNodes.17"/>
+ <childReferences
parent="//@diagram"
child="//@diagram/(a)topLevelNodes.15"/>
<childReferences
@@ -2167,6 +2373,9 @@
child="//@diagram/(a)topLevelNodes.16"/>
<childReferences
parent="//@diagram"
+ child="//@diagram/(a)topLevelNodes.17"/>
+ <childReferences
+ parent="//@diagram"
child="//@diagram/(a)links.0"
groupName="links"
groupIcon="icons/linksNavigatorGroup.gif"/>
@@ -2328,30 +2537,42 @@
groupIcon="icons/incomingLinksNavigatorGroup.gif"/>
<childReferences
parent="//@diagram/(a)links.0"
- child="//@diagram/(a)topLevelNodes.15"
+ child="//@diagram/(a)topLevelNodes.13"
referenceType="out_target"
groupName="target"
groupIcon="icons/linkTargetNavigatorGroup.gif"/>
<childReferences
- parent="//@diagram/(a)topLevelNodes.15"
+ parent="//@diagram/(a)topLevelNodes.13"
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.16"
+ child="//@diagram/(a)topLevelNodes.14"
referenceType="out_target"
groupName="target"
groupIcon="icons/linkTargetNavigatorGroup.gif"/>
<childReferences
- parent="//@diagram/(a)topLevelNodes.16"
+ parent="//@diagram/(a)topLevelNodes.14"
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.15"
+ referenceType="out_target"
+ groupName="target"
+ groupIcon="icons/linkTargetNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram/(a)topLevelNodes.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)childNodes.0"
referenceType="out_target"
groupName="target"
@@ -2508,6 +2729,30 @@
groupIcon="icons/incomingLinksNavigatorGroup.gif"/>
<childReferences
parent="//@diagram/(a)links.0"
+ child="//@diagram/(a)childNodes.13"
+ referenceType="out_target"
+ groupName="target"
+ groupIcon="icons/linkTargetNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram/(a)childNodes.13"
+ 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.14"
+ referenceType="out_target"
+ groupName="target"
+ groupIcon="icons/linkTargetNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram/(a)childNodes.14"
+ 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.15"
referenceType="out_target"
groupName="target"
@@ -2676,30 +2921,42 @@
groupIcon="icons/outgoingLinksNavigatorGroup.gif"/>
<childReferences
parent="//@diagram/(a)links.0"
- child="//@diagram/(a)topLevelNodes.15"
+ child="//@diagram/(a)topLevelNodes.13"
referenceType="in_source"
groupName="source"
groupIcon="icons/linkSourceNavigatorGroup.gif"/>
<childReferences
- parent="//@diagram/(a)topLevelNodes.15"
+ parent="//@diagram/(a)topLevelNodes.13"
child="//@diagram/(a)links.0"
referenceType="out_target"
groupName="outgoing links"
groupIcon="icons/outgoingLinksNavigatorGroup.gif"/>
<childReferences
parent="//@diagram/(a)links.0"
- child="//@diagram/(a)topLevelNodes.16"
+ child="//@diagram/(a)topLevelNodes.14"
referenceType="in_source"
groupName="source"
groupIcon="icons/linkSourceNavigatorGroup.gif"/>
<childReferences
- parent="//@diagram/(a)topLevelNodes.16"
+ parent="//@diagram/(a)topLevelNodes.14"
child="//@diagram/(a)links.0"
referenceType="out_target"
groupName="outgoing links"
groupIcon="icons/outgoingLinksNavigatorGroup.gif"/>
<childReferences
parent="//@diagram/(a)links.0"
+ child="//@diagram/(a)topLevelNodes.15"
+ referenceType="in_source"
+ groupName="source"
+ groupIcon="icons/linkSourceNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram/(a)topLevelNodes.15"
+ 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"
@@ -2856,6 +3113,30 @@
groupIcon="icons/outgoingLinksNavigatorGroup.gif"/>
<childReferences
parent="//@diagram/(a)links.0"
+ child="//@diagram/(a)childNodes.13"
+ referenceType="in_source"
+ groupName="source"
+ groupIcon="icons/linkSourceNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram/(a)childNodes.13"
+ 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.14"
+ referenceType="in_source"
+ groupName="source"
+ groupIcon="icons/linkSourceNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram/(a)childNodes.14"
+ 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.15"
referenceType="in_source"
groupName="source"
@@ -3077,6 +3358,18 @@
groupIcon="icons/incomingLinksNavigatorGroup.gif"/>
<childReferences
parent="//@diagram/(a)links.1"
+ child="//@diagram/(a)topLevelNodes.17"
+ referenceType="out_target"
+ groupName="target"
+ groupIcon="icons/linkTargetNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram/(a)topLevelNodes.17"
+ 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"
@@ -3269,6 +3562,30 @@
groupIcon="icons/incomingLinksNavigatorGroup.gif"/>
<childReferences
parent="//@diagram/(a)links.1"
+ child="//@diagram/(a)childNodes.16"
+ referenceType="out_target"
+ groupName="target"
+ groupIcon="icons/linkTargetNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram/(a)childNodes.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.17"
+ referenceType="out_target"
+ groupName="target"
+ groupIcon="icons/linkTargetNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram/(a)childNodes.17"
+ 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"
@@ -3497,6 +3814,18 @@
groupIcon="icons/outgoingLinksNavigatorGroup.gif"/>
<childReferences
parent="//@diagram/(a)links.1"
+ child="//@diagram/(a)topLevelNodes.17"
+ referenceType="in_source"
+ groupName="source"
+ groupIcon="icons/linkSourceNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram/(a)topLevelNodes.17"
+ 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"
@@ -3689,6 +4018,30 @@
groupIcon="icons/outgoingLinksNavigatorGroup.gif"/>
<childReferences
parent="//@diagram/(a)links.1"
+ child="//@diagram/(a)childNodes.16"
+ referenceType="in_source"
+ groupName="source"
+ groupIcon="icons/linkSourceNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram/(a)childNodes.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.17"
+ referenceType="in_source"
+ groupName="source"
+ groupIcon="icons/linkSourceNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram/(a)childNodes.17"
+ 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"
@@ -3742,6 +4095,10 @@
<expressions
body="EcoreUtil.generateUUID()"/>
<expressions
+ body="EcoreUtil.generateUUID()"/>
+ <expressions
+ body="EcoreUtil.generateUUID()"/>
+ <expressions
xsi:type="gmfgen:GenConstraint"
body="getEventDefinitions().isEmpty()"/>
<expressions
@@ -3755,55 +4112,51 @@
body="getEventDefinitions().add(Bpmn2Factory.INSTANCE.createMessageEventDefinition());"/>
<expressions
xsi:type="gmfgen:GenConstraint"
- body="getEventDefinitions().isEmpty()"/>
+ body="getEventDefinitions().size() == 1 && getEventDefinitions().get(0) instanceof MessageEventDefinition"/>
<expressions
body="EcoreUtil.generateUUID()"/>
<expressions
- body="EcoreUtil.generateUUID()"/>
+ body="getEventDefinitions().add(Bpmn2Factory.INSTANCE.createMessageEventDefinition());"/>
<expressions
- body="EcoreUtil.generateUUID()"/>
- <expressions
xsi:type="gmfgen:GenConstraint"
- body="getEventDefinitions().size() == 1 && getEventDefinitions().get(0) instanceof MessageEventDefinition"/>
+ body="getEventDefinitions().size() == 1 && getEventDefinitions().get(0) instanceof TimerEventDefinition"/>
<expressions
body="EcoreUtil.generateUUID()"/>
<expressions
- body="getEventDefinitions().add(Bpmn2Factory.INSTANCE.createMessageEventDefinition());"/>
+ body="getEventDefinitions().add(Bpmn2Factory.INSTANCE.createTimerEventDefinition());"/>
<expressions
xsi:type="gmfgen:GenConstraint"
- body="getEventDefinitions().size() == 1 && getEventDefinitions().get(0) instanceof TerminateEventDefinition"/>
+ body="getEventDefinitions().size() == 1 && getEventDefinitions().get(0) instanceof ErrorEventDefinition"/>
<expressions
body="EcoreUtil.generateUUID()"/>
<expressions
- body="getEventDefinitions().add(Bpmn2Factory.INSTANCE.createTerminateEventDefinition());"/>
+ body="getEventDefinitions().add(Bpmn2Factory.INSTANCE.createErrorEventDefinition());"/>
<expressions
xsi:type="gmfgen:GenConstraint"
body="getEventDefinitions().size() == 1 && getEventDefinitions().get(0) instanceof MessageEventDefinition"/>
<expressions
body="EcoreUtil.generateUUID()"/>
<expressions
- body="getEventDefinitions().add(Bpmn2Factory.INSTANCE.createMessageEventDefinition());"/>
+ body="getEventDefinitions().add(Bpmn2Factory.INSTANCE.createTerminateEventDefinition());"/>
<expressions
xsi:type="gmfgen:GenConstraint"
- body="getEventDefinitions().size() == 1 && getEventDefinitions().get(0) instanceof MessageEventDefinition"/>
+ body="getEventDefinitions().isEmpty()"/>
<expressions
body="EcoreUtil.generateUUID()"/>
<expressions
- body="getEventDefinitions().add(Bpmn2Factory.INSTANCE.createTerminateEventDefinition());"/>
- <expressions
xsi:type="gmfgen:GenConstraint"
- body="getEventDefinitions().size() == 1 && getEventDefinitions().get(0) instanceof TimerEventDefinition"/>
+ body="getEventDefinitions().size() == 1 && getEventDefinitions().get(0) instanceof MessageEventDefinition"/>
<expressions
body="EcoreUtil.generateUUID()"/>
<expressions
- body="getEventDefinitions().add(Bpmn2Factory.INSTANCE.createTimerEventDefinition());"/>
+ body="getEventDefinitions().add(Bpmn2Factory.INSTANCE.createMessageEventDefinition());"/>
<expressions
xsi:type="gmfgen:GenConstraint"
- body="getEventDefinitions().size() == 1 && getEventDefinitions().get(0) instanceof ErrorEventDefinition"/>
+ body="getEventDefinitions().size() == 1 && getEventDefinitions().get(0) instanceof TerminateEventDefinition"/>
<expressions
body="EcoreUtil.generateUUID()"/>
<expressions
- body="getEventDefinitions().add(Bpmn2Factory.INSTANCE.createErrorEventDefinition());"/>
+ body="getEventDefinitions().add(Bpmn2Factory.INSTANCE.createTerminateEventDefinition());"/>
<expressions
body="EcoreUtil.generateUUID()"/>
<expressions
@@ -3816,13 +4169,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 //@diagram/@childNodes.15/@labels.0/(a)modelFacet //@diagram/@topLevelNodes.16/@labels.0/(a)modelFacet"/>
+ uses="//@diagram/@topLevelNodes.0/@labels.0/(a)modelFacet //@diagram/@topLevelNodes.1/@labels.0/(a)modelFacet //@diagram/@topLevelNodes.2/@labels.0/(a)modelFacet //@diagram/@topLevelNodes.3/@labels.0/(a)modelFacet //@diagram/@childNodes.0/@labels.0/(a)modelFacet //@diagram/@childNodes.1/@labels.0/(a)modelFacet //@diagram/@childNodes.2/@labels.0/(a)modelFacet //@diagram/@childNodes.3/@labels.0/(a)modelFacet //@diagram/@childNodes.16/@labels.0/(a)modelFacet //@diagram/@childNodes.17/@labels.0/(a)modelFacet //@diagram/@topLevelNodes.16/@labels.0/(a)modelFacet //@diagram/@topLevelNodes.17/@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 2011-02-09 22:43:27 UTC (rev 29085)
+++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.gmfmap 2011-02-09 23:26:15 UTC (rev 29086)
@@ -26,7 +26,7 @@
<labelMappings
xsi:type="gmfmap:FeatureLabelMapping">
<diagramLabel
- href="bpmn.gmfgraph#RoundedRectangleLabel"/>
+ href="bpmn.gmfgraph#TaskFigureNameLabel"/>
<features
href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//FlowElement/name"/>
</labelMappings>
@@ -42,7 +42,7 @@
href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//FlowElementsContainer/flowElements"/>
<ownedChild>
<domainMetaElement
- href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//ServiceTask"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//ScriptTask"/>
<domainInitializer
xsi:type="gmfmap:FeatureSeqInitializer">
<initializers
@@ -58,15 +58,15 @@
<labelMappings
xsi:type="gmfmap:FeatureLabelMapping">
<diagramLabel
- href="bpmn.gmfgraph#RoundedRectangleLabel"/>
+ href="bpmn.gmfgraph#TaskFigureNameLabel"/>
<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.1"/>
+ href="bpmn.process.gmftool#//@palette/@tools.0/@tools.0/(a)tools.2"/>
<diagramNode
- href="bpmn.gmfgraph#ServiceTask"/>
+ href="bpmn.gmfgraph#ScriptTask"/>
</ownedChild>
</nodes>
<nodes>
@@ -74,10 +74,7 @@
href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//FlowElementsContainer/flowElements"/>
<ownedChild>
<domainMetaElement
- href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//StartEvent"/>
- <domainSpecialization
- body="getEventDefinitions().isEmpty()"
- language="java"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//ServiceTask"/>
<domainInitializer
xsi:type="gmfmap:FeatureSeqInitializer">
<initializers
@@ -90,11 +87,18 @@
language="java"/>
</initializers>
</domainInitializer>
+ <labelMappings
+ xsi:type="gmfmap:FeatureLabelMapping">
+ <diagramLabel
+ href="bpmn.gmfgraph#TaskFigureNameLabel"/>
+ <features
+ href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//FlowElement/name"/>
+ </labelMappings>
<tool
xsi:type="gmftool:CreationTool"
- href="bpmn.process.gmftool#//@palette/@tools.0/@tools.2/@tools.0/(a)tools.0"/>
+ href="bpmn.process.gmftool#//@palette/@tools.0/@tools.0/(a)tools.1"/>
<diagramNode
- href="bpmn.gmfgraph#StartEvent"/>
+ href="bpmn.gmfgraph#ServiceTask"/>
</ownedChild>
</nodes>
<nodes>
@@ -102,10 +106,7 @@
href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//FlowElementsContainer/flowElements"/>
<ownedChild>
<domainMetaElement
- href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//StartEvent"/>
- <domainSpecialization
- body="getEventDefinitions().size() == 1 && getEventDefinitions().get(0) instanceof MessageEventDefinition"
- language="java"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//BusinessRuleTask"/>
<domainInitializer
xsi:type="gmfmap:FeatureSeqInitializer">
<initializers
@@ -117,21 +118,19 @@
body="EcoreUtil.generateUUID()"
language="java"/>
</initializers>
- <initializers
- xsi:type="gmfmap:FeatureValueSpec">
- <feature
- xsi:type="ecore:EReference"
- href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//CatchEvent/eventDefinitions"/>
- <value
- body="getEventDefinitions().add(Bpmn2Factory.INSTANCE.createMessageEventDefinition());"
- language="java"/>
- </initializers>
</domainInitializer>
+ <labelMappings
+ xsi:type="gmfmap:FeatureLabelMapping">
+ <diagramLabel
+ href="bpmn.gmfgraph#TaskFigureNameLabel"/>
+ <features
+ href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//FlowElement/name"/>
+ </labelMappings>
<tool
xsi:type="gmftool:CreationTool"
- href="bpmn.process.gmftool#//@palette/@tools.0/@tools.2/@tools.0/(a)tools.1"/>
+ href="bpmn.process.gmftool#//@palette/@tools.0/@tools.0/(a)tools.3"/>
<diagramNode
- href="bpmn.gmfgraph#MessageStartEvent"/>
+ href="bpmn.gmfgraph#BusinessRuleTask"/>
</ownedChild>
</nodes>
<nodes>
@@ -139,7 +138,7 @@
href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//FlowElementsContainer/flowElements"/>
<ownedChild>
<domainMetaElement
- href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//EndEvent"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//StartEvent"/>
<domainSpecialization
body="getEventDefinitions().isEmpty()"
language="java"/>
@@ -157,9 +156,9 @@
</domainInitializer>
<tool
xsi:type="gmftool:CreationTool"
- href="bpmn.process.gmftool#//@palette/@tools.0/@tools.2/@tools.2/(a)tools.0"/>
+ href="bpmn.process.gmftool#//@palette/@tools.0/@tools.2/@tools.0/(a)tools.0"/>
<diagramNode
- href="bpmn.gmfgraph#EndEvent"/>
+ href="bpmn.gmfgraph#StartEvent"/>
</ownedChild>
</nodes>
<nodes>
@@ -167,7 +166,10 @@
href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//FlowElementsContainer/flowElements"/>
<ownedChild>
<domainMetaElement
- href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//ExclusiveGateway"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//StartEvent"/>
+ <domainSpecialization
+ body="getEventDefinitions().size() == 1 && getEventDefinitions().get(0) instanceof MessageEventDefinition"
+ language="java"/>
<domainInitializer
xsi:type="gmfmap:FeatureSeqInitializer">
<initializers
@@ -179,37 +181,21 @@
body="EcoreUtil.generateUUID()"
language="java"/>
</initializers>
- </domainInitializer>
- <tool
- xsi:type="gmftool:CreationTool"
- href="bpmn.process.gmftool#//@palette/@tools.0/@tools.1/(a)tools.0"/>
- <diagramNode
- href="bpmn.gmfgraph#ExclusiveGateway"/>
- </ownedChild>
- </nodes>
- <nodes>
- <containmentFeature
- href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//FlowElementsContainer/flowElements"/>
- <ownedChild>
- <domainMetaElement
- href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//ParallelGateway"/>
- <domainInitializer
- xsi:type="gmfmap:FeatureSeqInitializer">
<initializers
xsi:type="gmfmap:FeatureValueSpec">
<feature
- xsi:type="ecore:EAttribute"
- href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//BaseElement/id"/>
+ xsi:type="ecore:EReference"
+ href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//CatchEvent/eventDefinitions"/>
<value
- body="EcoreUtil.generateUUID()"
+ body="getEventDefinitions().add(Bpmn2Factory.INSTANCE.createMessageEventDefinition());"
language="java"/>
</initializers>
</domainInitializer>
<tool
xsi:type="gmftool:CreationTool"
- href="bpmn.process.gmftool#//@palette/@tools.0/@tools.1/(a)tools.1"/>
+ href="bpmn.process.gmftool#//@palette/@tools.0/@tools.2/@tools.0/(a)tools.1"/>
<diagramNode
- href="bpmn.gmfgraph#ParallelGateway"/>
+ href="bpmn.gmfgraph#MessageStartEvent"/>
</ownedChild>
</nodes>
<nodes>
@@ -217,7 +203,7 @@
href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//FlowElementsContainer/flowElements"/>
<ownedChild>
<domainMetaElement
- href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//EndEvent"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//IntermediateCatchEvent"/>
<domainSpecialization
body="getEventDefinitions().size() == 1 && getEventDefinitions().get(0) instanceof MessageEventDefinition"
language="java"/>
@@ -236,7 +222,7 @@
xsi:type="gmfmap:FeatureValueSpec">
<feature
xsi:type="ecore:EReference"
- href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//ThrowEvent/eventDefinitions"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//CatchEvent/eventDefinitions"/>
<value
body="getEventDefinitions().add(Bpmn2Factory.INSTANCE.createMessageEventDefinition());"
language="java"/>
@@ -244,9 +230,9 @@
</domainInitializer>
<tool
xsi:type="gmftool:CreationTool"
- href="bpmn.process.gmftool#//@palette/@tools.0/@tools.2/@tools.2/(a)tools.1"/>
+ href="bpmn.process.gmftool#//@palette/@tools.0/@tools.2/@tools.1/(a)tools.0"/>
<diagramNode
- href="bpmn.gmfgraph#MessageEndEvent"/>
+ href="bpmn.gmfgraph#MessageCatchIntermediateEvent"/>
</ownedChild>
</nodes>
<nodes>
@@ -254,9 +240,9 @@
href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//FlowElementsContainer/flowElements"/>
<ownedChild>
<domainMetaElement
- href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//EndEvent"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//IntermediateCatchEvent"/>
<domainSpecialization
- body="getEventDefinitions().size() == 1 && getEventDefinitions().get(0) instanceof TerminateEventDefinition"
+ body="getEventDefinitions().size() == 1 && getEventDefinitions().get(0) instanceof TimerEventDefinition"
language="java"/>
<domainInitializer
xsi:type="gmfmap:FeatureSeqInitializer">
@@ -273,17 +259,17 @@
xsi:type="gmfmap:FeatureValueSpec">
<feature
xsi:type="ecore:EReference"
- href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//ThrowEvent/eventDefinitions"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//CatchEvent/eventDefinitions"/>
<value
- body="getEventDefinitions().add(Bpmn2Factory.INSTANCE.createTerminateEventDefinition());"
+ body="getEventDefinitions().add(Bpmn2Factory.INSTANCE.createTimerEventDefinition());"
language="java"/>
</initializers>
</domainInitializer>
<tool
xsi:type="gmftool:CreationTool"
- href="bpmn.process.gmftool#//@palette/@tools.0/@tools.2/@tools.2/(a)tools.2"/>
+ href="bpmn.process.gmftool#//@palette/@tools.0/@tools.2/@tools.1/(a)tools.2"/>
<diagramNode
- href="bpmn.gmfgraph#TerminateEndEvent"/>
+ href="bpmn.gmfgraph#TimerCatchIntermediateEvent"/>
</ownedChild>
</nodes>
<nodes>
@@ -293,7 +279,7 @@
<domainMetaElement
href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//IntermediateCatchEvent"/>
<domainSpecialization
- body="getEventDefinitions().size() == 1 && getEventDefinitions().get(0) instanceof MessageEventDefinition"
+ body="getEventDefinitions().size() == 1 && getEventDefinitions().get(0) instanceof ErrorEventDefinition"
language="java"/>
<domainInitializer
xsi:type="gmfmap:FeatureSeqInitializer">
@@ -312,15 +298,15 @@
xsi:type="ecore:EReference"
href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//CatchEvent/eventDefinitions"/>
<value
- body="getEventDefinitions().add(Bpmn2Factory.INSTANCE.createMessageEventDefinition());"
+ body="getEventDefinitions().add(Bpmn2Factory.INSTANCE.createErrorEventDefinition());"
language="java"/>
</initializers>
</domainInitializer>
<tool
xsi:type="gmftool:CreationTool"
- href="bpmn.process.gmftool#//@palette/@tools.0/@tools.2/@tools.1/(a)tools.0"/>
+ href="bpmn.process.gmftool#//@palette/@tools.0/@tools.2/@tools.1/(a)tools.3"/>
<diagramNode
- href="bpmn.gmfgraph#MessageCatchIntermediateEvent"/>
+ href="bpmn.gmfgraph#ErrorCatchIntermediateEvent"/>
</ownedChild>
</nodes>
<nodes>
@@ -365,9 +351,9 @@
href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//FlowElementsContainer/flowElements"/>
<ownedChild>
<domainMetaElement
- href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//IntermediateCatchEvent"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//EndEvent"/>
<domainSpecialization
- body="getEventDefinitions().size() == 1 && getEventDefinitions().get(0) instanceof TimerEventDefinition"
+ body="getEventDefinitions().isEmpty()"
language="java"/>
<domainInitializer
xsi:type="gmfmap:FeatureSeqInitializer">
@@ -380,21 +366,49 @@
body="EcoreUtil.generateUUID()"
language="java"/>
</initializers>
+ </domainInitializer>
+ <tool
+ xsi:type="gmftool:CreationTool"
+ href="bpmn.process.gmftool#//@palette/@tools.0/@tools.2/@tools.2/(a)tools.0"/>
+ <diagramNode
+ href="bpmn.gmfgraph#EndEvent"/>
+ </ownedChild>
+ </nodes>
+ <nodes>
+ <containmentFeature
+ href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//FlowElementsContainer/flowElements"/>
+ <ownedChild>
+ <domainMetaElement
+ href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//EndEvent"/>
+ <domainSpecialization
+ body="getEventDefinitions().size() == 1 && getEventDefinitions().get(0) instanceof MessageEventDefinition"
+ language="java"/>
+ <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>
+ <initializers
+ xsi:type="gmfmap:FeatureValueSpec">
+ <feature
xsi:type="ecore:EReference"
- href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//CatchEvent/eventDefinitions"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//ThrowEvent/eventDefinitions"/>
<value
- body="getEventDefinitions().add(Bpmn2Factory.INSTANCE.createTimerEventDefinition());"
+ body="getEventDefinitions().add(Bpmn2Factory.INSTANCE.createMessageEventDefinition());"
language="java"/>
</initializers>
</domainInitializer>
<tool
xsi:type="gmftool:CreationTool"
- href="bpmn.process.gmftool#//@palette/@tools.0/@tools.2/@tools.1/(a)tools.2"/>
+ href="bpmn.process.gmftool#//@palette/@tools.0/@tools.2/@tools.2/(a)tools.1"/>
<diagramNode
- href="bpmn.gmfgraph#TimerCatchIntermediateEvent"/>
+ href="bpmn.gmfgraph#MessageEndEvent"/>
</ownedChild>
</nodes>
<nodes>
@@ -402,9 +416,9 @@
href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//FlowElementsContainer/flowElements"/>
<ownedChild>
<domainMetaElement
- href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//IntermediateCatchEvent"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//EndEvent"/>
<domainSpecialization
- body="getEventDefinitions().size() == 1 && getEventDefinitions().get(0) instanceof ErrorEventDefinition"
+ body="getEventDefinitions().size() == 1 && getEventDefinitions().get(0) instanceof TerminateEventDefinition"
language="java"/>
<domainInitializer
xsi:type="gmfmap:FeatureSeqInitializer">
@@ -421,27 +435,25 @@
xsi:type="gmfmap:FeatureValueSpec">
<feature
xsi:type="ecore:EReference"
- href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//CatchEvent/eventDefinitions"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//ThrowEvent/eventDefinitions"/>
<value
- body="getEventDefinitions().add(Bpmn2Factory.INSTANCE.createErrorEventDefinition());"
+ body="getEventDefinitions().add(Bpmn2Factory.INSTANCE.createTerminateEventDefinition());"
language="java"/>
</initializers>
</domainInitializer>
<tool
xsi:type="gmftool:CreationTool"
- href="bpmn.process.gmftool#//@palette/@tools.0/@tools.2/@tools.1/(a)tools.3"/>
+ href="bpmn.process.gmftool#//@palette/@tools.0/@tools.2/@tools.2/(a)tools.2"/>
<diagramNode
- href="bpmn.gmfgraph#ErrorCatchIntermediateEvent"/>
+ href="bpmn.gmfgraph#TerminateEndEvent"/>
</ownedChild>
</nodes>
<nodes>
<containmentFeature
href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//FlowElementsContainer/flowElements"/>
- <childrenFeature
- href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//FlowElementsContainer/flowElements"/>
<ownedChild>
<domainMetaElement
- href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//DataObject"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//ExclusiveGateway"/>
<domainInitializer
xsi:type="gmfmap:FeatureSeqInitializer">
<initializers
@@ -454,26 +466,19 @@
language="java"/>
</initializers>
</domainInitializer>
- <labelMappings
- xsi:type="gmfmap:FeatureLabelMapping">
- <diagramLabel
- href="bpmn.gmfgraph#DataObjectLabel"/>
- <features
- href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//FlowElement/name"/>
- </labelMappings>
<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#DataObject"/>
+ href="bpmn.gmfgraph#ExclusiveGateway"/>
</ownedChild>
</nodes>
<nodes>
<containmentFeature
- href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//Process/artifacts"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//FlowElementsContainer/flowElements"/>
<ownedChild>
<domainMetaElement
- href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//TextAnnotation"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//ParallelGateway"/>
<domainInitializer
xsi:type="gmfmap:FeatureSeqInitializer">
<initializers
@@ -486,19 +491,11 @@
language="java"/>
</initializers>
</domainInitializer>
- <labelMappings
- xsi:type="gmfmap:FeatureLabelMapping"
- editPattern="">
- <diagramLabel
- href="bpmn.gmfgraph#TextAnnotationLabel"/>
- <features
- href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//TextAnnotation/text"/>
- </labelMappings>
<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#TextAnnotation"/>
+ href="bpmn.gmfgraph#ParallelGateway"/>
</ownedChild>
</nodes>
<nodes>
@@ -521,15 +518,10 @@
</domainInitializer>
<tool
xsi:type="gmftool:CreationTool"
- href="bpmn.process.gmftool#//@palette/@tools.0/@tools.0/(a)tools.3"/>
+ href="bpmn.process.gmftool#//@palette/@tools.0/@tools.0/(a)tools.4"/>
<diagramNode
href="bpmn.gmfgraph#ExpandedSubprocess"/>
<children
- referencedChild="//@nodes.15/(a)ownedChild">
- <containmentFeature
- href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//FlowElementsContainer/flowElements"/>
- </children>
- <children
referencedChild="//@nodes.0/(a)ownedChild">
<containmentFeature
href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//FlowElementsContainer/flowElements"/>
@@ -590,7 +582,7 @@
href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//FlowElementsContainer/flowElements"/>
</children>
<children
- referencedChild="//@nodes.9/(a)ownedChild">
+ referencedChild="//@nodes.12/(a)ownedChild">
<containmentFeature
href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//FlowElementsContainer/flowElements"/>
</children>
@@ -602,21 +594,33 @@
<children
referencedChild="//@nodes.14/(a)ownedChild">
<containmentFeature
- href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//SubProcess/artifacts"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//FlowElementsContainer/flowElements"/>
</children>
<children
+ referencedChild="//@nodes.15/(a)ownedChild">
+ <containmentFeature
+ href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//FlowElementsContainer/flowElements"/>
+ </children>
+ <children
referencedChild="//@nodes.16/(a)ownedChild">
<containmentFeature
href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//FlowElementsContainer/flowElements"/>
</children>
+ <children
+ referencedChild="//@nodes.17/(a)ownedChild">
+ <containmentFeature
+ href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//SubProcess/artifacts"/>
+ </children>
</ownedChild>
</nodes>
<nodes>
<containmentFeature
href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//FlowElementsContainer/flowElements"/>
+ <childrenFeature
+ href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//FlowElementsContainer/flowElements"/>
<ownedChild>
<domainMetaElement
- href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//ScriptTask"/>
+ href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//DataObject"/>
<domainInitializer
xsi:type="gmfmap:FeatureSeqInitializer">
<initializers
@@ -632,17 +636,50 @@
<labelMappings
xsi:type="gmfmap:FeatureLabelMapping">
<diagramLabel
- href="bpmn.gmfgraph#RoundedRectangleLabel"/>
+ href="bpmn.gmfgraph#DataObjectLabel"/>
<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"/>
+ href="bpmn.process.gmftool#//@palette/@tools.0/@tools.3/(a)tools.0"/>
<diagramNode
- href="bpmn.gmfgraph#ScriptTask"/>
+ href="bpmn.gmfgraph#DataObject"/>
</ownedChild>
</nodes>
+ <nodes>
+ <containmentFeature
+ href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//Process/artifacts"/>
+ <ownedChild>
+ <domainMetaElement
+ href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//TextAnnotation"/>
+ <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"
+ editPattern="">
+ <diagramLabel
+ href="bpmn.gmfgraph#TextAnnotationLabel"/>
+ <features
+ href="../../org.eclipse.bpmn2/model/BPMN20.ecore#//TextAnnotation/text"/>
+ </labelMappings>
+ <tool
+ xsi:type="gmftool:CreationTool"
+ href="bpmn.process.gmftool#//@palette/@tools.0/@tools.3/(a)tools.1"/>
+ <diagramNode
+ href="bpmn.gmfgraph#TextAnnotation"/>
+ </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 2011-02-09 22:43:27 UTC (rev 29085)
+++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.gmftool 2011-02-09 23:26:15 UTC (rev 29086)
@@ -50,6 +50,17 @@
</tools>
<tools
xsi:type="gmftool:CreationTool"
+ title="Business Rule Task"
+ description="">
+ <smallIcon
+ xsi:type="gmftool:BundleImage"
+ path="icons/obj16/tasks_16px_business_rule.png"/>
+ <largeIcon
+ xsi:type="gmftool:BundleImage"
+ path="icons/obj32/tasks_32px_business_rule.png"/>
+ </tools>
+ <tools
+ xsi:type="gmftool:CreationTool"
title="Sub-Process">
<smallIcon
xsi:type="gmftool:BundleImage"
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 2011-02-09 22:43:27 UTC (rev 29085)
+++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.model/model/bpmn.process.trace 2011-02-09 23:26:15 UTC (rev 29086)
@@ -6,14 +6,14 @@
visualID="2001"
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="5001"
+ visualID="5009"
queryText="true"/>
</nodeTraces>
<nodeTraces
visualID="2002"
queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'ServiceTask') 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="5002"
+ visualID="5012"
queryText="true"/>
</nodeTraces>
<nodeTraces
@@ -70,9 +70,16 @@
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"
+ visualID="5011"
queryText="true"/>
</nodeTraces>
+ <nodeTraces
+ visualID="2018"
+ queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'BusinessRuleTask') 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="5013"
+ 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')"/>
@@ -80,7 +87,7 @@
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"
+ visualID="5010"
queryText="true"/>
</childNodeTraces>
<childNodeTraces
@@ -90,7 +97,7 @@
visualID="3004"
queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'ServiceTask') 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="5006"
+ visualID="5015"
queryText="true"/>
</childNodeTraces>
<childNodeTraces
@@ -138,9 +145,19 @@
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"
+ visualID="5014"
queryText="true"/>
</childNodeTraces>
+ <childNodeTraces
+ visualID="3017"
+ queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'BusinessRuleTask') 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="5016"
+ queryText="true"/>
+ </childNodeTraces>
+ <childNodeTraces
+ visualID="3018"
+ queryText="(let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in _eClass_.ePackage.nsURI = 'http://www.omg.org/spec/BPMN/20100524/MODEL-XMI' and _eClass_.name = 'IntermediateCatchEvent') 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')"/>
<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')"/>
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r29085 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-02-09 17:43:27 -0500 (Wed, 09 Feb 2011)
New Revision: 29085
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/SingleDeployableFactory.java
Log:
JBIDE-8335 to trunk
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/SingleDeployableFactory.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/SingleDeployableFactory.java 2011-02-09 21:42:56 UTC (rev 29084)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/SingleDeployableFactory.java 2011-02-09 22:43:27 UTC (rev 29085)
@@ -211,7 +211,7 @@
}
String qualifier = JBossServerCorePlugin.getDefault().getDescriptor().getUniqueIdentifier();
- if( project.exists() ) {
+ if( project.exists() && project.isAccessible()) {
IScopeContext context = new ProjectScope(project);
IEclipsePreferences node = context.getNode(qualifier);
if (node != null)
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r29084 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-02-09 16:42:56 -0500 (Wed, 09 Feb 2011)
New Revision: 29084
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java
Log:
JBIDE-8388 to trunk
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java 2011-02-09 21:03:40 UTC (rev 29083)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java 2011-02-09 21:42:56 UTC (rev 29084)
@@ -17,7 +17,10 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
+import org.eclipse.rse.services.files.IFileService;
+import org.eclipse.rse.subsystems.files.core.servicesubsystem.IFileServiceSubSystem;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.model.IModuleResourceDelta;
@@ -59,6 +62,9 @@
int publishType, IModuleResourceDelta[] delta,
IProgressMonitor monitor) throws CoreException {
+ if( module.length > 1 )
+ return Status.OK_STATUS;
+
// Locally zip it up into the remote tmp folder
IStatus sup = super.publishModule(method, server, module, publishType, delta, monitor);
@@ -73,6 +79,8 @@
String name = sourcePath.lastSegment();
// Now transfer the file to RSE
+ IFileService fs = method2.getFileService();
+ IFileServiceSubSystem system = method2.getFileServiceSubSystem();
try {
method2.getFileService().upload(sourcePath.toFile(), destFolder.toString(), name, true, null, null, new NullProgressMonitor());
//method2.getFileService().move(tempDestFolder.toString(), name, destFolder.toString(), name, new NullProgressMonitor());
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r29083 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-02-09 16:03:40 -0500 (Wed, 09 Feb 2011)
New Revision: 29083
Modified:
trunk/build/target-platform/multiple.target
trunk/build/target-platform/multiple.target.p2mirror.xml
trunk/build/target-platform/unified.target
trunk/build/target-platform/unified.target.p2mirror.xml
Log:
remove datatools.sdk.feature from target platform (JBIDE-8361)
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-02-09 18:21:10 UTC (rev 29082)
+++ trunk/build/target-platform/multiple.target 2011-02-09 21:03:40 UTC (rev 29083)
@@ -137,7 +137,6 @@
<unit id="org.eclipse.birt.feature.group" version="2.6.1.v20100709a-9iF7A8FGLY4z0pxX3ORrsdrp6JXb"/>
<unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.8.1.v20100618-7C7b8hEt1ZvtiLkdlO7BVoL_wm6"/>
<unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.8.1.v20100618-7J8x7FBWwUL6z-2z-fcrYC2s55KI"/>
- <unit id="org.eclipse.datatools.sdk.feature.feature.group" version="1.8.1.v20100618-7P9i7KFDxNYrp4cjPjqnPaRKxeyT"/>
<unit id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="1.8.1.v20100618-2-07w31211518181A"/>
<unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.8.1.v20100618-77078CcNBGKBZI_FcRd"/>
<unit id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version="1.8.1.v20100618-77778eBmKDNOMgJvJ8Of7QBR"/>
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2011-02-09 18:21:10 UTC (rev 29082)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2011-02-09 21:03:40 UTC (rev 29083)
@@ -124,7 +124,6 @@
<iu id="org.eclipse.birt.feature.group" version=""/>
<iu id="org.eclipse.datatools.connectivity.feature.feature.group" version=""/>
<iu id="org.eclipse.datatools.enablement.feature.feature.group" version=""/>
-<iu id="org.eclipse.datatools.sdk.feature.feature.group" version=""/>
<iu id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version=""/>
<iu id="org.eclipse.datatools.modelbase.feature.feature.group" version=""/>
<iu id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version=""/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2011-02-09 18:21:10 UTC (rev 29082)
+++ trunk/build/target-platform/unified.target 2011-02-09 21:03:40 UTC (rev 29083)
@@ -137,7 +137,6 @@
<unit id="org.eclipse.birt.feature.group" version="2.6.1.v20100709a-9iF7A8FGLY4z0pxX3ORrsdrp6JXb"/>
<unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.8.1.v20100618-7C7b8hEt1ZvtiLkdlO7BVoL_wm6"/>
<unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.8.1.v20100618-7J8x7FBWwUL6z-2z-fcrYC2s55KI"/>
- <unit id="org.eclipse.datatools.sdk.feature.feature.group" version="1.8.1.v20100618-7P9i7KFDxNYrp4cjPjqnPaRKxeyT"/>
<unit id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="1.8.1.v20100618-2-07w31211518181A"/>
<unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.8.1.v20100618-77078CcNBGKBZI_FcRd"/>
<unit id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version="1.8.1.v20100618-77778eBmKDNOMgJvJ8Of7QBR"/>
Modified: trunk/build/target-platform/unified.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/unified.target.p2mirror.xml 2011-02-09 18:21:10 UTC (rev 29082)
+++ trunk/build/target-platform/unified.target.p2mirror.xml 2011-02-09 21:03:40 UTC (rev 29083)
@@ -124,7 +124,6 @@
<iu id="org.eclipse.birt.feature.group" version=""/>
<iu id="org.eclipse.datatools.connectivity.feature.feature.group" version=""/>
<iu id="org.eclipse.datatools.enablement.feature.feature.group" version=""/>
-<iu id="org.eclipse.datatools.sdk.feature.feature.group" version=""/>
<iu id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version=""/>
<iu id="org.eclipse.datatools.modelbase.feature.feature.group" version=""/>
<iu id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version=""/>
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r29082 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2011-02-09 13:21:10 -0500 (Wed, 09 Feb 2011)
New Revision: 29082
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmLabelProvider.java
Log:
https://issues.jboss.org/browse/JBIDE-8380 - do not swallow exception for getSqlType, getSqlType now in execution context - fixed
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmLabelProvider.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmLabelProvider.java 2011-02-09 18:16:50 UTC (rev 29081)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmLabelProvider.java 2011-02-09 18:21:10 UTC (rev 29082)
@@ -30,6 +30,7 @@
import org.hibernate.console.KnownConfigurations;
import org.hibernate.console.execution.ExecutionContext;
import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.resolver.DialectFactory;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.engine.Mapping;
import org.hibernate.mapping.Column;
@@ -154,27 +155,37 @@
}
final Configuration config = getConfig();
if (mapping == null && config != null) {
- mapping = config.buildMapping();
+ final ConsoleConfiguration consoleConfig = getConsoleConfig();
+ mapping = (Mapping)consoleConfig.execute(new ExecutionContext.Command() {
+ public Object execute() {
+ return config.buildMapping();
+ }
+ } );
}
if (dialect == null && config != null) {
final String dialectName = config.getProperty(Environment.DIALECT);
if (dialectName != null) {
try {
- dialect = (Dialect) Class.forName(dialectName).newInstance();
- } catch (InstantiationException e) {
- HibernateConsolePlugin.getDefault().logErrorMessage("Exception: ", e); //$NON-NLS-1$
- } catch (IllegalAccessException e) {
- HibernateConsolePlugin.getDefault().logErrorMessage("Exception: ", e); //$NON-NLS-1$
- } catch (ClassNotFoundException e) {
- HibernateConsolePlugin.getDefault().logErrorMessage("Exception: ", e); //$NON-NLS-1$
+ dialect = DialectFactory.buildDialect(config.getProperties());
+ } catch (HibernateException e) {
+ HibernateConsolePlugin.getDefault().logErrorMessage("HibernateException: ", e); //$NON-NLS-1$
}
}
}
if (dialect != null) {
+ final ConsoleConfiguration consoleConfig = getConsoleConfig();
try {
- sqlType = column.getSqlType(dialect, mapping);
- } catch (Exception ex) {
- // ignore it
+ sqlType = (String)consoleConfig.execute(new ExecutionContext.Command() {
+ public Object execute() {
+ return column.getSqlType(dialect, mapping);
+ }
+ } );
+ } catch (HibernateException e) {
+ //type is not accessible
+ HibernateConsolePlugin.getDefault().logErrorMessage("HibernateException: ", e); //$NON-NLS-1$
+ } catch (Exception e) {
+ // do not ignore it - print in Error Log
+ HibernateConsolePlugin.getDefault().logErrorMessage("Exception: ", e); //$NON-NLS-1$
}
}
if (sqlType != null) {
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r29081 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-02-09 13:16:50 -0500 (Wed, 09 Feb 2011)
New Revision: 29081
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/JSF2ComponentsValidator.java
Log:
https://issues.jboss.org/browse/JBIDE-8377
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/JSF2ComponentsValidator.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/JSF2ComponentsValidator.java 2011-02-09 16:58:32 UTC (rev 29080)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/JSF2ComponentsValidator.java 2011-02-09 18:16:50 UTC (rev 29081)
@@ -73,8 +73,8 @@
protected boolean isValidate(IFile file) {
boolean isValidate = false;
- if (file.getProject() == null
- || file.getProject().isAccessible() == false) {
+ if (!file.isAccessible() || !file.isSynchronized(IResource.DEPTH_ZERO) || file.getProject() == null
+ || !file.getProject().isAccessible()) {
return false;
}
try {
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r29080 - trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2011-02-09 11:58:32 -0500 (Wed, 09 Feb 2011)
New Revision: 29080
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/TestProject.java
Log:
https://issues.jboss.org/browse/JBIDE-8358 - turn some constans and full build process, so fixed
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/TestProject.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/TestProject.java 2011-02-09 16:10:47 UTC (rev 29079)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/TestProject.java 2011-02-09 16:58:32 UTC (rev 29080)
@@ -89,18 +89,19 @@
public void deleteIProject(boolean deleteContent) {
Exception ex = null;
- for (int i = 0; i < 4; i++) {
+ final int maxTryNum = 20;
+ for (int i = 0; i < maxTryNum; i++) {
ex = null;
try {
IContainer container = project.getParent();
project.delete(deleteContent, true, null);
container.refreshLocal(IResource.DEPTH_ONE, null);
- i = 4;
+ i = maxTryNum;
} catch (CoreException e) {
ex = e;
- if (i < 3) {
+ if (i + 1 < maxTryNum) {
try {
- Thread.sleep(3000);
+ Thread.sleep((i + 1) * 500);
} catch (InterruptedException e1) {
}
}
@@ -226,7 +227,12 @@
public void fullBuild() throws CoreException {
IPackageFragmentRoot sourcePackageFragment = createSourceFolder();
project.refreshLocal(IResource.DEPTH_INFINITE, null);
- //sourcePackageFragment.getResource().refreshLocal();
+ ////sourcePackageFragment.getResource().refreshLocal();
+ //project.build(IncrementalProjectBuilder.CLEAN_BUILD, new NullProgressMonitor());
+ //project.refreshLocal(IResource.DEPTH_INFINITE, null);
project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
+ project.refreshLocal(IResource.DEPTH_INFINITE, null);
+ project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
+ project.refreshLocal(IResource.DEPTH_INFINITE, null);
}
}
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r29079 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-02-09 11:10:47 -0500 (Wed, 09 Feb 2011)
New Revision: 29079
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java
Log:
removed system.out debug output
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java 2011-02-09 15:39:52 UTC (rev 29078)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java 2011-02-09 16:10:47 UTC (rev 29079)
@@ -84,7 +84,6 @@
}
protected IStatus run(IProgressMonitor monitor) {
- System.out.println(imageId);
try {
IServer result = null;
if( type.equals(CREATE_DEPLOY_ONLY_SERVER) ) {
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r29078 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-02-09 10:39:52 -0500 (Wed, 09 Feb 2011)
New Revision: 29078
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/WebKbPlugin.java
Log:
JBIDE-8375
https://issues.jboss.org/browse/JBIDE-8375
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/WebKbPlugin.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/WebKbPlugin.java 2011-02-09 14:35:03 UTC (rev 29077)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/WebKbPlugin.java 2011-02-09 15:39:52 UTC (rev 29078)
@@ -61,7 +61,7 @@
}
break;
case ISaveContext.PROJECT_SAVE:
- KbProject sp = (KbProject)KbProjectFactory.getKbProject(context.getProject(), false);
+ KbProject sp = (KbProject)KbProjectFactory.getKbProject(context.getProject(), false, true);
try {
if(sp != null && sp.getModificationsSinceLastStore() > 0) {
// sp.printModifications();
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r29077 - in trunk/jst: tests/org.jboss.tools.jst.jsp.test/META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-02-09 09:35:03 -0500 (Wed, 09 Feb 2011)
New Revision: 29077
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF
trunk/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF
Log:
https://issues.jboss.org/browse/JBIDE-8366 Changed the execution environment to JavaSE-1.6
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2011-02-09 14:29:58 UTC (rev 29076)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2011-02-09 14:35:03 UTC (rev 29077)
@@ -56,4 +56,4 @@
org.eclipse.jst.standard.schemas,
org.eclipse.wst.standard.schemas
Bundle-Version: 3.2.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF 2011-02-09 14:29:58 UTC (rev 29076)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF 2011-02-09 14:35:03 UTC (rev 29077)
@@ -24,4 +24,4 @@
org.jboss.tools.jst.jsp.test.ca
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
13 years, 11 months
- 1
- 0