Author: koen.aers(a)jboss.com Date: 2010-09-27 13:04:43 -0400 (Mon, 27 Sep 2010) New Revision: 25240 Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/commands/ScriptTask2CreateCommand.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/commands/ScriptTaskCreateCommand.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/helpers/ScriptTaskEditHelper.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ScriptTask2EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ScriptTaskEditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ScriptTaskName2EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ScriptTaskNameEditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/ScriptTask2ItemSemanticEditPolicy.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/ScriptTaskItemSemanticEditPolicy.java Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/messages.properties trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/plugin.properties trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/plugin.xml trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/Bpmn2EditPartFactory.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/DataObject2EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/DataObjectEditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent2EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent3EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent4EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent5EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent6EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEventEditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ExclusiveGateway2EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ExclusiveGatewayEditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent2EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent3EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent4EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent5EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEventEditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateThrowEvent2EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateThrowEventEditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ParallelGateway2EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ParallelGatewayEditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ServiceTask2EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ServiceTaskEditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEvent2EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEvent3EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEvent4EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEventEditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/SubProcess2EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/SubProcessEditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/TextAnnotation2EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/TextAnnotationEditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/UserTask2EditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/UserTaskEditPart.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/ProcessCanonicalEditPolicy.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/ProcessItemSemanticEditPolicy.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/SubProcess2CanonicalEditPolicy.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/SubProcess2ItemSemanticEditPolicy.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/SubProcessCanonicalEditPolicy.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/SubProcessItemSemanticEditPolicy.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2NavigatorContentProvider.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2NavigatorLabelProvider.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2DiagramUpdater.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2PaletteFactory.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2VisualIDRegistry.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Messages.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ElementTypes.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ModelingAssistantProvider.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ParserProvider.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ViewProvider.java trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/ElementInitializers.java Log: add script task Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/messages.properties =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/messages.properties 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/messages.properties 2010-09-27 17:04:43 UTC (rev 25240) @@ -170,3 +170,13 @@ NavigatorGroupName_EndEvent_3010_outgoinglinks=outgoing links NavigatorGroupName_TextAnnotation_3015_incominglinks=incoming links NavigatorGroupName_TextAnnotation_3015_outgoinglinks=outgoing links +Activities1Group_title=Activities +Artifacts4Group_title=Artifacts +Gateways2Group_title=Gateways +Gateways2Group_desc= +ScriptTask3CreationTool_title=Script Task +SubProcess4CreationTool_title=Sub-Process +NavigatorGroupName_ScriptTask_2017_incominglinks=incoming links +NavigatorGroupName_ScriptTask_2017_outgoinglinks=outgoing links +NavigatorGroupName_ScriptTask_3016_incominglinks=incoming links +NavigatorGroupName_ScriptTask_3016_outgoinglinks=outgoing links Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/plugin.properties =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/plugin.properties 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/plugin.properties 2010-09-27 17:04:43 UTC (rev 25240) @@ -69,3 +69,5 @@ metatype.name.IntermediateCatchEvent_3013=IntermediateCatchEvent metatype.name.DataObject_3014=DataObject metatype.name.TextAnnotation_3015=TextAnnotation +metatype.name.ScriptTask_2017=ScriptTask +metatype.name.ScriptTask_3016=ScriptTask Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/plugin.xml =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/plugin.xml 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/plugin.xml 2010-09-27 17:04:43 UTC (rev 25240) @@ -213,7 +213,7 @@ <viewProvider class="org.jboss.tools.bpmn2.process.diagram.providers.Bpmn2ViewProvider"> <Priority name="Lowest"/> <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="bpmn2"/> - <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2001,2002,2003,2007,2004,2005,2006,2008,2009,2010,2011,2012,2013,2014,2015,2016,3001,3002,3004,3003,3005,3006,3007,3008,3009,3010,3011,3012,3013,3014,3015"/> + <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2001,2002,2003,2007,2004,2005,2006,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,3001,3002,3004,3003,3005,3006,3007,3008,3009,3010,3011,3012,3013,3014,3015,3016"/> <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4001,4002"/> </viewProvider> </extension> @@ -226,13 +226,13 @@ <method name="getType()" value="bpmn2"/> </object> <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-nodes"> - <method name="getType()" value="2001,2002,2003,2007,2004,2005,2006,2008,2009,2010,2011,2012,2013,2014,2015,2016,3001,3002,3004,3003,3005,3006,3007,3008,3009,3010,3011,3012,3013,3014,3015"/> + <method name="getType()" value="2001,2002,2003,2007,2004,2005,2006,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,3001,3002,3004,3003,3005,3006,3007,3008,3009,3010,3011,3012,3013,3014,3015,3016"/> </object> <object class="org.eclipse.gmf.runtime.notation.Edge" id="generated-links"> <method name="getType()" value="4001,4002"/> </object> <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-labels"> - <method name="getType()" value="5001,5002,5003,5004,5005,5006,5007,5008"/> + <method name="getType()" value="5001,5002,5003,5004,5009,5005,5006,5007,5008,5010"/> </object> <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-compartments"> <method name="getType()" value=""/> @@ -262,7 +262,8 @@ <object class="org.jboss.tools.bpmn2.process.diagram.edit.parts.DataObjectEditPart" id="DataObject_2014"/> <object class="org.jboss.tools.bpmn2.process.diagram.edit.parts.TextAnnotationEditPart" id="TextAnnotation_2015"/> <object class="org.jboss.tools.bpmn2.process.diagram.edit.parts.SubProcessEditPart" id="SubProcess_2016"/> - <context elements="Process_1000,UserTask_2001,ServiceTask_2002,StartEvent_2003,StartEvent_2007,EndEvent_2004,ExclusiveGateway_2005,ParallelGateway_2006,EndEvent_2008,EndEvent_2009,IntermediateCatchEvent_2010,IntermediateThrowEvent_2011,IntermediateCatchEvent_2012,IntermediateCatchEvent_2013,DataObject_2014,TextAnnotation_2015,SubProcess_2016"/> + <object class="org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTaskEditPart" id="ScriptTask_2017"/> + <context elements="Process_1000,UserTask_2001,ServiceTask_2002,StartEvent_2003,StartEvent_2007,EndEvent_2004,ExclusiveGateway_2005,ParallelGateway_2006,EndEvent_2008,EndEvent_2009,IntermediateCatchEvent_2010,IntermediateThrowEvent_2011,IntermediateCatchEvent_2012,IntermediateCatchEvent_2013,DataObject_2014,TextAnnotation_2015,SubProcess_2016,ScriptTask_2017"/> </modelingAssistantProvider> </extension> @@ -449,6 +450,15 @@ </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <specializationType + id="org.eclipse.bpmn2.diagram.ScriptTask_2017" + name="%metatype.name.ScriptTask_2017" + kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> + <specializes id="org.eclipse.bpmn2.diagram.ScriptTask_3016"/> + <param name="semanticHint" value="2017"/> + </specializationType> + </metamodel> + <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> + <specializationType id="org.eclipse.bpmn2.diagram.SubProcess_3001" name="%metatype.name.SubProcess_3001" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"> @@ -584,6 +594,16 @@ </metamodel> <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> <metamodelType + id="org.eclipse.bpmn2.diagram.ScriptTask_3016" + name="%metatype.name.ScriptTask_3016" + kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" + eclass="ScriptTask" + edithelper="org.jboss.tools.bpmn2.process.diagram.edit.helpers.ScriptTaskEditHelper"> + <param name="semanticHint" value="3016"/> + </metamodelType> + </metamodel> + <metamodel nsURI="http://www.omg.org/spec/BPMN/20100524/MODEL-XMI"> + <metamodelType id="org.eclipse.bpmn2.diagram.SequenceFlow_4001" name="%metatype.name.SequenceFlow_4001" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" @@ -631,6 +651,7 @@ <elementType ref="org.eclipse.bpmn2.diagram.DataObject_2014"/> <elementType ref="org.eclipse.bpmn2.diagram.TextAnnotation_2015"/> <elementType ref="org.eclipse.bpmn2.diagram.SubProcess_2016"/> + <elementType ref="org.eclipse.bpmn2.diagram.ScriptTask_2017"/> <elementType ref="org.eclipse.bpmn2.diagram.SubProcess_3001"/> <elementType ref="org.eclipse.bpmn2.diagram.UserTask_3002"/> <elementType ref="org.eclipse.bpmn2.diagram.ServiceTask_3004"/> @@ -646,6 +667,7 @@ <elementType ref="org.eclipse.bpmn2.diagram.IntermediateCatchEvent_3013"/> <elementType ref="org.eclipse.bpmn2.diagram.DataObject_3014"/> <elementType ref="org.eclipse.bpmn2.diagram.TextAnnotation_3015"/> + <elementType ref="org.eclipse.bpmn2.diagram.ScriptTask_3016"/> <elementType ref="org.eclipse.bpmn2.diagram.SequenceFlow_4001"/> <elementType ref="org.eclipse.bpmn2.diagram.Association_4002"/> <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/> Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/commands/ScriptTask2CreateCommand.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/commands/ScriptTask2CreateCommand.java (rev 0) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/commands/ScriptTask2CreateCommand.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -0,0 +1,89 @@ +package org.jboss.tools.bpmn2.process.diagram.edit.commands; + +import org.eclipse.bpmn2.Bpmn2Factory; +import org.eclipse.bpmn2.FlowElementsContainer; +import org.eclipse.bpmn2.ScriptTask; +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.gmf.runtime.common.core.command.CommandResult; +import org.eclipse.gmf.runtime.common.core.command.ICommand; +import org.eclipse.gmf.runtime.emf.type.core.IElementType; +import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand; +import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest; +import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest; +import org.eclipse.gmf.runtime.notation.View; +import org.jboss.tools.bpmn2.process.diagram.providers.ElementInitializers; + +/** + * @generated + */ +public class ScriptTask2CreateCommand extends EditElementCommand { + + /** + * @generated + */ + public ScriptTask2CreateCommand(CreateElementRequest req) { + super(req.getLabel(), null, req); + } + + /** + * FIXME: replace with setElementToEdit() + * @generated + */ + protected EObject getElementToEdit() { + EObject container = ((CreateElementRequest) getRequest()) + .getContainer(); + if (container instanceof View) { + container = ((View) container).getElement(); + } + return container; + } + + /** + * @generated + */ + public boolean canExecute() { + return true; + + } + + /** + * @generated + */ + protected CommandResult doExecuteWithResult(IProgressMonitor monitor, + IAdaptable info) throws ExecutionException { + ScriptTask newElement = Bpmn2Factory.eINSTANCE.createScriptTask(); + + FlowElementsContainer owner = (FlowElementsContainer) getElementToEdit(); + owner.getFlowElements().add(newElement); + + ElementInitializers.getInstance().init_ScriptTask_3016(newElement); + + doConfigure(newElement, monitor, info); + + ((CreateElementRequest) getRequest()).setNewElement(newElement); + return CommandResult.newOKCommandResult(newElement); + } + + /** + * @generated + */ + protected void doConfigure(ScriptTask newElement, IProgressMonitor monitor, + IAdaptable info) throws ExecutionException { + IElementType elementType = ((CreateElementRequest) getRequest()) + .getElementType(); + ConfigureRequest configureRequest = new ConfigureRequest( + getEditingDomain(), newElement, elementType); + configureRequest.setClientContext(((CreateElementRequest) getRequest()) + .getClientContext()); + configureRequest.addParameters(getRequest().getParameters()); + ICommand configureCommand = elementType + .getEditCommand(configureRequest); + if (configureCommand != null && configureCommand.canExecute()) { + configureCommand.execute(monitor, info); + } + } + +} Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/commands/ScriptTask2CreateCommand.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/commands/ScriptTaskCreateCommand.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/commands/ScriptTaskCreateCommand.java (rev 0) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/commands/ScriptTaskCreateCommand.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -0,0 +1,89 @@ +package org.jboss.tools.bpmn2.process.diagram.edit.commands; + +import org.eclipse.bpmn2.Bpmn2Factory; +import org.eclipse.bpmn2.FlowElementsContainer; +import org.eclipse.bpmn2.ScriptTask; +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.gmf.runtime.common.core.command.CommandResult; +import org.eclipse.gmf.runtime.common.core.command.ICommand; +import org.eclipse.gmf.runtime.emf.type.core.IElementType; +import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand; +import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest; +import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest; +import org.eclipse.gmf.runtime.notation.View; +import org.jboss.tools.bpmn2.process.diagram.providers.ElementInitializers; + +/** + * @generated + */ +public class ScriptTaskCreateCommand extends EditElementCommand { + + /** + * @generated + */ + public ScriptTaskCreateCommand(CreateElementRequest req) { + super(req.getLabel(), null, req); + } + + /** + * FIXME: replace with setElementToEdit() + * @generated + */ + protected EObject getElementToEdit() { + EObject container = ((CreateElementRequest) getRequest()) + .getContainer(); + if (container instanceof View) { + container = ((View) container).getElement(); + } + return container; + } + + /** + * @generated + */ + public boolean canExecute() { + return true; + + } + + /** + * @generated + */ + protected CommandResult doExecuteWithResult(IProgressMonitor monitor, + IAdaptable info) throws ExecutionException { + ScriptTask newElement = Bpmn2Factory.eINSTANCE.createScriptTask(); + + FlowElementsContainer owner = (FlowElementsContainer) getElementToEdit(); + owner.getFlowElements().add(newElement); + + ElementInitializers.getInstance().init_ScriptTask_2017(newElement); + + doConfigure(newElement, monitor, info); + + ((CreateElementRequest) getRequest()).setNewElement(newElement); + return CommandResult.newOKCommandResult(newElement); + } + + /** + * @generated + */ + protected void doConfigure(ScriptTask newElement, IProgressMonitor monitor, + IAdaptable info) throws ExecutionException { + IElementType elementType = ((CreateElementRequest) getRequest()) + .getElementType(); + ConfigureRequest configureRequest = new ConfigureRequest( + getEditingDomain(), newElement, elementType); + configureRequest.setClientContext(((CreateElementRequest) getRequest()) + .getClientContext()); + configureRequest.addParameters(getRequest().getParameters()); + ICommand configureCommand = elementType + .getEditCommand(configureRequest); + if (configureCommand != null && configureCommand.canExecute()) { + configureCommand.execute(monitor, info); + } + } + +} Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/commands/ScriptTaskCreateCommand.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/helpers/ScriptTaskEditHelper.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/helpers/ScriptTaskEditHelper.java (rev 0) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/helpers/ScriptTaskEditHelper.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -0,0 +1,7 @@ +package org.jboss.tools.bpmn2.process.diagram.edit.helpers; + +/** + * @generated + */ +public class ScriptTaskEditHelper extends Bpmn2BaseEditHelper { +} Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/helpers/ScriptTaskEditHelper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/Bpmn2EditPartFactory.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/Bpmn2EditPartFactory.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/Bpmn2EditPartFactory.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -91,6 +91,12 @@ case SubProcessEditPart.VISUAL_ID: return new SubProcessEditPart(view); + case ScriptTaskEditPart.VISUAL_ID: + return new ScriptTaskEditPart(view); + + case ScriptTaskNameEditPart.VISUAL_ID: + return new ScriptTaskNameEditPart(view); + case SubProcess2EditPart.VISUAL_ID: return new SubProcess2EditPart(view); @@ -148,6 +154,12 @@ case TextAnnotationText2EditPart.VISUAL_ID: return new TextAnnotationText2EditPart(view); + case ScriptTask2EditPart.VISUAL_ID: + return new ScriptTask2EditPart(view); + + case ScriptTaskName2EditPart.VISUAL_ID: + return new ScriptTaskName2EditPart(view); + case SequenceFlowEditPart.VISUAL_ID: return new SequenceFlowEditPart(view); Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/DataObject2EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/DataObject2EditPart.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/DataObject2EditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -309,6 +309,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -354,6 +357,9 @@ if (targetEditPart instanceof TextAnnotation2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } return types; } @@ -379,6 +385,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -394,6 +401,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } @@ -429,6 +437,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -444,6 +453,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/DataObjectEditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/DataObjectEditPart.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/DataObjectEditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -313,6 +313,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -358,6 +361,9 @@ if (targetEditPart instanceof TextAnnotation2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } return types; } @@ -383,6 +389,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -398,6 +405,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } @@ -433,6 +441,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -448,6 +457,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent2EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent2EditPart.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent2EditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -263,6 +263,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } @@ -302,6 +305,9 @@ if (targetEditPart instanceof IntermediateCatchEvent5EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof UserTaskEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -350,6 +356,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -395,6 +404,9 @@ if (targetEditPart instanceof TextAnnotation2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } return types; } @@ -418,6 +430,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -431,6 +444,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -448,6 +462,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -463,6 +478,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } @@ -497,6 +513,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -510,6 +527,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -527,6 +545,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -542,6 +561,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent3EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent3EditPart.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent3EditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -261,6 +261,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } @@ -300,6 +303,9 @@ if (targetEditPart instanceof IntermediateCatchEvent5EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof UserTaskEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -348,6 +354,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -393,6 +402,9 @@ if (targetEditPart instanceof TextAnnotation2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } return types; } @@ -416,6 +428,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -429,6 +442,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -446,6 +460,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -461,6 +476,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } @@ -495,6 +511,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -508,6 +525,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -525,6 +543,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -540,6 +559,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent4EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent4EditPart.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent4EditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -259,6 +259,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } @@ -298,6 +301,9 @@ if (targetEditPart instanceof IntermediateCatchEvent5EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof UserTaskEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -346,6 +352,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -391,6 +400,9 @@ if (targetEditPart instanceof TextAnnotation2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } return types; } @@ -414,6 +426,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -427,6 +440,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -444,6 +458,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -459,6 +474,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } @@ -493,6 +509,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -506,6 +523,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -523,6 +541,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -538,6 +557,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent5EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent5EditPart.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent5EditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -263,6 +263,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } @@ -302,6 +305,9 @@ if (targetEditPart instanceof IntermediateCatchEvent5EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof UserTaskEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -350,6 +356,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -395,6 +404,9 @@ if (targetEditPart instanceof TextAnnotation2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } return types; } @@ -418,6 +430,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -431,6 +444,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -448,6 +462,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -463,6 +478,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } @@ -497,6 +513,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -510,6 +527,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -527,6 +545,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -542,6 +561,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent6EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent6EditPart.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEvent6EditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -261,6 +261,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } @@ -300,6 +303,9 @@ if (targetEditPart instanceof IntermediateCatchEvent5EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof UserTaskEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -348,6 +354,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -393,6 +402,9 @@ if (targetEditPart instanceof TextAnnotation2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } return types; } @@ -416,6 +428,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -429,6 +442,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -446,6 +460,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -461,6 +476,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } @@ -495,6 +511,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -508,6 +525,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -525,6 +543,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -540,6 +559,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEventEditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEventEditPart.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/EndEventEditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -259,6 +259,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } @@ -298,6 +301,9 @@ if (targetEditPart instanceof IntermediateCatchEvent5EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof UserTaskEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -346,6 +352,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -391,6 +400,9 @@ if (targetEditPart instanceof TextAnnotation2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } return types; } @@ -414,6 +426,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -427,6 +440,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -444,6 +458,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -459,6 +474,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } @@ -493,6 +509,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -506,6 +523,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -523,6 +541,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -538,6 +557,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ExclusiveGateway2EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ExclusiveGateway2EditPart.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ExclusiveGateway2EditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -260,6 +260,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } @@ -299,6 +302,9 @@ if (targetEditPart instanceof IntermediateCatchEvent5EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof UserTaskEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -347,6 +353,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -392,6 +401,9 @@ if (targetEditPart instanceof TextAnnotation2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } return types; } @@ -415,6 +427,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -428,6 +441,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -445,6 +459,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -460,6 +475,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } @@ -494,6 +510,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -507,6 +524,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -524,6 +542,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -539,6 +558,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ExclusiveGatewayEditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ExclusiveGatewayEditPart.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ExclusiveGatewayEditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -260,6 +260,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } @@ -299,6 +302,9 @@ if (targetEditPart instanceof IntermediateCatchEvent5EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof UserTaskEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -347,6 +353,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -392,6 +401,9 @@ if (targetEditPart instanceof TextAnnotation2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } return types; } @@ -415,6 +427,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -428,6 +441,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -445,6 +459,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -460,6 +475,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } @@ -494,6 +510,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -507,6 +524,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -524,6 +542,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -539,6 +558,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent2EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent2EditPart.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent2EditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -262,6 +262,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } @@ -301,6 +304,9 @@ if (targetEditPart instanceof IntermediateCatchEvent5EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof UserTaskEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -349,6 +355,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -394,6 +403,9 @@ if (targetEditPart instanceof TextAnnotation2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } return types; } @@ -417,6 +429,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -430,6 +443,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -447,6 +461,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -462,6 +477,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } @@ -496,6 +512,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -509,6 +526,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -526,6 +544,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -541,6 +560,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent3EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent3EditPart.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent3EditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -262,6 +262,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } @@ -301,6 +304,9 @@ if (targetEditPart instanceof IntermediateCatchEvent5EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof UserTaskEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -349,6 +355,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -394,6 +403,9 @@ if (targetEditPart instanceof TextAnnotation2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } return types; } @@ -417,6 +429,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -430,6 +443,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -447,6 +461,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -462,6 +477,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } @@ -496,6 +512,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -509,6 +526,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -526,6 +544,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -541,6 +560,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent4EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent4EditPart.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent4EditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -248,6 +248,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } @@ -287,6 +290,9 @@ if (targetEditPart instanceof IntermediateCatchEvent5EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof UserTaskEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -335,6 +341,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -380,6 +389,9 @@ if (targetEditPart instanceof TextAnnotation2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } return types; } @@ -403,6 +415,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -416,6 +429,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -433,6 +447,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -448,6 +463,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } @@ -482,6 +498,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -495,6 +512,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -512,6 +530,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -527,6 +546,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent5EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent5EditPart.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEvent5EditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -262,6 +262,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } @@ -301,6 +304,9 @@ if (targetEditPart instanceof org.jboss.tools.bpmn2.process.diagram.edit.parts.IntermediateCatchEvent5EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof UserTaskEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -349,6 +355,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -394,6 +403,9 @@ if (targetEditPart instanceof TextAnnotation2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } return types; } @@ -417,6 +429,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -430,6 +443,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -447,6 +461,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -462,6 +477,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } @@ -496,6 +512,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -509,6 +526,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -526,6 +544,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -541,6 +560,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEventEditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEventEditPart.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateCatchEventEditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -248,6 +248,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } @@ -287,6 +290,9 @@ if (targetEditPart instanceof IntermediateCatchEvent5EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof UserTaskEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -335,6 +341,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -380,6 +389,9 @@ if (targetEditPart instanceof TextAnnotation2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } return types; } @@ -403,6 +415,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -416,6 +429,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -433,6 +447,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -448,6 +463,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } @@ -482,6 +498,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -495,6 +512,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -512,6 +530,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -527,6 +546,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateThrowEvent2EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateThrowEvent2EditPart.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateThrowEvent2EditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -263,6 +263,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } @@ -302,6 +305,9 @@ if (targetEditPart instanceof IntermediateCatchEvent5EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof UserTaskEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -350,6 +356,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -395,6 +404,9 @@ if (targetEditPart instanceof TextAnnotation2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } return types; } @@ -418,6 +430,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -431,6 +444,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -448,6 +462,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -463,6 +478,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } @@ -497,6 +513,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -510,6 +527,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -527,6 +545,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -542,6 +561,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateThrowEventEditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateThrowEventEditPart.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/IntermediateThrowEventEditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -263,6 +263,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } @@ -302,6 +305,9 @@ if (targetEditPart instanceof IntermediateCatchEvent5EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof UserTaskEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -350,6 +356,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -395,6 +404,9 @@ if (targetEditPart instanceof TextAnnotation2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } return types; } @@ -418,6 +430,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -431,6 +444,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -448,6 +462,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -463,6 +478,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } @@ -497,6 +513,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -510,6 +527,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -527,6 +545,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -542,6 +561,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ParallelGateway2EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ParallelGateway2EditPart.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ParallelGateway2EditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -261,6 +261,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } @@ -300,6 +303,9 @@ if (targetEditPart instanceof IntermediateCatchEvent5EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof UserTaskEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -348,6 +354,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -393,6 +402,9 @@ if (targetEditPart instanceof TextAnnotation2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } return types; } @@ -416,6 +428,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -429,6 +442,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -446,6 +460,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -461,6 +476,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } @@ -495,6 +511,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -508,6 +525,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -525,6 +543,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -540,6 +559,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ParallelGatewayEditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ParallelGatewayEditPart.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ParallelGatewayEditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -261,6 +261,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } @@ -300,6 +303,9 @@ if (targetEditPart instanceof IntermediateCatchEvent5EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof UserTaskEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -348,6 +354,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -393,6 +402,9 @@ if (targetEditPart instanceof TextAnnotation2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } return types; } @@ -416,6 +428,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -429,6 +442,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -446,6 +460,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -461,6 +476,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } @@ -495,6 +511,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -508,6 +525,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -525,6 +543,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -540,6 +559,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ScriptTask2EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ScriptTask2EditPart.java (rev 0) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ScriptTask2EditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -0,0 +1,666 @@ +package org.jboss.tools.bpmn2.process.diagram.edit.parts; + +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; + +import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.MarginBorder; +import org.eclipse.draw2d.RoundedRectangle; +import org.eclipse.draw2d.Shape; +import org.eclipse.draw2d.StackLayout; +import org.eclipse.draw2d.geometry.Dimension; +import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; +import org.eclipse.gef.Request; +import org.eclipse.gef.commands.Command; +import org.eclipse.gef.editpolicies.LayoutEditPolicy; +import org.eclipse.gef.editpolicies.NonResizableEditPolicy; +import org.eclipse.gef.requests.CreateRequest; +import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart; +import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart; +import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles; +import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout; +import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel; +import org.eclipse.gmf.runtime.emf.type.core.IElementType; +import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; +import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; +import org.eclipse.gmf.runtime.notation.View; +import org.eclipse.swt.graphics.Color; +import org.jboss.tools.bpmn2.process.diagram.edit.policies.ScriptTask2ItemSemanticEditPolicy; +import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2VisualIDRegistry; +import org.jboss.tools.bpmn2.process.diagram.providers.Bpmn2ElementTypes; + +/** + * @generated + */ +public class ScriptTask2EditPart extends ShapeNodeEditPart { + + /** + * @generated + */ + public static final int VISUAL_ID = 3016; + + /** + * @generated + */ + protected IFigure contentPane; + + /** + * @generated + */ + protected IFigure primaryShape; + + /** + * @generated + */ + public ScriptTask2EditPart(View view) { + super(view); + } + + /** + * @generated + */ + protected void createDefaultEditPolicies() { + super.createDefaultEditPolicies(); + installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, + new ScriptTask2ItemSemanticEditPolicy()); + installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); + // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies + // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); + } + + /** + * @generated + */ + protected LayoutEditPolicy createLayoutEditPolicy() { + org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() { + + protected EditPolicy createChildEditPolicy(EditPart child) { + EditPolicy result = child + .getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); + if (result == null) { + result = new NonResizableEditPolicy(); + } + return result; + } + + protected Command getMoveChildrenCommand(Request request) { + return null; + } + + protected Command getCreateCommand(CreateRequest request) { + return null; + } + }; + return lep; + } + + /** + * @generated + */ + protected IFigure createNodeShape() { + return primaryShape = new TaskFigureDescriptor(); + } + + /** + * @generated + */ + public TaskFigureDescriptor getPrimaryShape() { + return (TaskFigureDescriptor) primaryShape; + } + + /** + * @generated + */ + protected boolean addFixedChild(EditPart childEditPart) { + if (childEditPart instanceof ScriptTaskName2EditPart) { + ((ScriptTaskName2EditPart) childEditPart) + .setLabel(getPrimaryShape().getFigureName()); + return true; + } + return false; + } + + /** + * @generated + */ + protected boolean removeFixedChild(EditPart childEditPart) { + if (childEditPart instanceof ScriptTaskName2EditPart) { + return true; + } + return false; + } + + /** + * @generated + */ + protected void addChildVisual(EditPart childEditPart, int index) { + if (addFixedChild(childEditPart)) { + return; + } + super.addChildVisual(childEditPart, -1); + } + + /** + * @generated + */ + protected void removeChildVisual(EditPart childEditPart) { + if (removeFixedChild(childEditPart)) { + return; + } + super.removeChildVisual(childEditPart); + } + + /** + * @generated + */ + protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { + return getContentPane(); + } + + /** + * @generated + */ + protected NodeFigure createNodePlate() { + DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(80, 40); + return result; + } + + /** + * Creates figure for this edit part. + * + * Body of this method does not depend on settings in generation model + * so you may safely remove <i>generated</i> tag and modify it. + * + * @generated + */ + protected NodeFigure createNodeFigure() { + NodeFigure figure = createNodePlate(); + figure.setLayoutManager(new StackLayout()); + IFigure shape = createNodeShape(); + figure.add(shape); + contentPane = setupContentPane(shape); + return figure; + } + + /** + * Default implementation treats passed figure as content pane. + * Respects layout one may have set for generated figure. + * @param nodeShape instance of generated figure class + * @generated + */ + protected IFigure setupContentPane(IFigure nodeShape) { + if (nodeShape.getLayoutManager() == null) { + ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); + layout.setSpacing(5); + nodeShape.setLayoutManager(layout); + } + return nodeShape; // use nodeShape itself as contentPane + } + + /** + * @generated + */ + public IFigure getContentPane() { + if (contentPane != null) { + return contentPane; + } + return super.getContentPane(); + } + + /** + * @generated + */ + protected void setForegroundColor(Color color) { + if (primaryShape != null) { + primaryShape.setForegroundColor(color); + } + } + + /** + * @generated + */ + protected void setBackgroundColor(Color color) { + if (primaryShape != null) { + primaryShape.setBackgroundColor(color); + } + } + + /** + * @generated + */ + protected void setLineWidth(int width) { + if (primaryShape instanceof Shape) { + ((Shape) primaryShape).setLineWidth(width); + } + } + + /** + * @generated + */ + protected void setLineType(int style) { + if (primaryShape instanceof Shape) { + ((Shape) primaryShape).setLineStyle(style); + } + } + + /** + * @generated + */ + public EditPart getPrimaryChildEditPart() { + return getChildBySemanticHint(Bpmn2VisualIDRegistry + .getType(ScriptTaskName2EditPart.VISUAL_ID)); + } + + /** + * @generated + */ + public List<IElementType> getMARelTypesOnSource() { + ArrayList<IElementType> types = new ArrayList<IElementType>(2); + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + types.add(Bpmn2ElementTypes.Association_4002); + return types; + } + + /** + * @generated + */ + public List<IElementType> getMARelTypesOnSourceAndTarget( + IGraphicalEditPart targetEditPart) { + LinkedList<IElementType> types = new LinkedList<IElementType>(); + if (targetEditPart instanceof UserTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof ServiceTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof StartEventEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof StartEvent2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof EndEventEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof ExclusiveGatewayEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof ParallelGatewayEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof EndEvent2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof EndEvent3EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof IntermediateCatchEventEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof IntermediateThrowEventEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof IntermediateCatchEvent2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof IntermediateCatchEvent3EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof SubProcessEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof SubProcess2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof UserTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof ServiceTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof StartEvent3EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof StartEvent4EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof EndEvent4EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof ExclusiveGateway2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof ParallelGateway2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof EndEvent5EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof EndEvent6EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof IntermediateCatchEvent4EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof IntermediateThrowEvent2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof IntermediateCatchEvent5EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof UserTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof ServiceTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof StartEventEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof StartEvent2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof EndEventEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof ExclusiveGatewayEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof ParallelGatewayEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof EndEvent2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof EndEvent3EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof IntermediateCatchEventEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof IntermediateThrowEventEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof IntermediateCatchEvent2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof IntermediateCatchEvent3EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof DataObjectEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof TextAnnotationEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof SubProcessEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof SubProcess2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof UserTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof ServiceTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof StartEvent3EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof StartEvent4EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof EndEvent4EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof ExclusiveGateway2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof ParallelGateway2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof EndEvent5EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof EndEvent6EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof IntermediateCatchEvent4EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof IntermediateThrowEvent2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof IntermediateCatchEvent5EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof DataObject2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof TextAnnotation2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + return types; + } + + /** + * @generated + */ + public List<IElementType> getMATypesForTarget(IElementType relationshipType) { + LinkedList<IElementType> types = new LinkedList<IElementType>(); + if (relationshipType == Bpmn2ElementTypes.SequenceFlow_4001) { + types.add(Bpmn2ElementTypes.UserTask_2001); + types.add(Bpmn2ElementTypes.ServiceTask_2002); + types.add(Bpmn2ElementTypes.StartEvent_2003); + types.add(Bpmn2ElementTypes.StartEvent_2007); + types.add(Bpmn2ElementTypes.EndEvent_2004); + types.add(Bpmn2ElementTypes.ExclusiveGateway_2005); + types.add(Bpmn2ElementTypes.ParallelGateway_2006); + types.add(Bpmn2ElementTypes.EndEvent_2008); + types.add(Bpmn2ElementTypes.EndEvent_2009); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2010); + types.add(Bpmn2ElementTypes.IntermediateThrowEvent_2011); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); + types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); + types.add(Bpmn2ElementTypes.SubProcess_3001); + types.add(Bpmn2ElementTypes.UserTask_3002); + types.add(Bpmn2ElementTypes.ServiceTask_3004); + types.add(Bpmn2ElementTypes.StartEvent_3003); + types.add(Bpmn2ElementTypes.StartEvent_3005); + types.add(Bpmn2ElementTypes.EndEvent_3006); + types.add(Bpmn2ElementTypes.ExclusiveGateway_3007); + types.add(Bpmn2ElementTypes.ParallelGateway_3008); + types.add(Bpmn2ElementTypes.EndEvent_3009); + types.add(Bpmn2ElementTypes.EndEvent_3010); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); + types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); + } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { + types.add(Bpmn2ElementTypes.UserTask_2001); + types.add(Bpmn2ElementTypes.ServiceTask_2002); + types.add(Bpmn2ElementTypes.StartEvent_2003); + types.add(Bpmn2ElementTypes.StartEvent_2007); + types.add(Bpmn2ElementTypes.EndEvent_2004); + types.add(Bpmn2ElementTypes.ExclusiveGateway_2005); + types.add(Bpmn2ElementTypes.ParallelGateway_2006); + types.add(Bpmn2ElementTypes.EndEvent_2008); + types.add(Bpmn2ElementTypes.EndEvent_2009); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2010); + types.add(Bpmn2ElementTypes.IntermediateThrowEvent_2011); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); + types.add(Bpmn2ElementTypes.DataObject_2014); + types.add(Bpmn2ElementTypes.TextAnnotation_2015); + types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); + types.add(Bpmn2ElementTypes.SubProcess_3001); + types.add(Bpmn2ElementTypes.UserTask_3002); + types.add(Bpmn2ElementTypes.ServiceTask_3004); + types.add(Bpmn2ElementTypes.StartEvent_3003); + types.add(Bpmn2ElementTypes.StartEvent_3005); + types.add(Bpmn2ElementTypes.EndEvent_3006); + types.add(Bpmn2ElementTypes.ExclusiveGateway_3007); + types.add(Bpmn2ElementTypes.ParallelGateway_3008); + types.add(Bpmn2ElementTypes.EndEvent_3009); + types.add(Bpmn2ElementTypes.EndEvent_3010); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); + types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.DataObject_3014); + types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); + } + return types; + } + + /** + * @generated + */ + public List<IElementType> getMARelTypesOnTarget() { + ArrayList<IElementType> types = new ArrayList<IElementType>(2); + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + types.add(Bpmn2ElementTypes.Association_4002); + return types; + } + + /** + * @generated + */ + public List<IElementType> getMATypesForSource(IElementType relationshipType) { + LinkedList<IElementType> types = new LinkedList<IElementType>(); + if (relationshipType == Bpmn2ElementTypes.SequenceFlow_4001) { + types.add(Bpmn2ElementTypes.UserTask_2001); + types.add(Bpmn2ElementTypes.ServiceTask_2002); + types.add(Bpmn2ElementTypes.StartEvent_2003); + types.add(Bpmn2ElementTypes.StartEvent_2007); + types.add(Bpmn2ElementTypes.EndEvent_2004); + types.add(Bpmn2ElementTypes.ExclusiveGateway_2005); + types.add(Bpmn2ElementTypes.ParallelGateway_2006); + types.add(Bpmn2ElementTypes.EndEvent_2008); + types.add(Bpmn2ElementTypes.EndEvent_2009); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2010); + types.add(Bpmn2ElementTypes.IntermediateThrowEvent_2011); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); + types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); + types.add(Bpmn2ElementTypes.SubProcess_3001); + types.add(Bpmn2ElementTypes.UserTask_3002); + types.add(Bpmn2ElementTypes.ServiceTask_3004); + types.add(Bpmn2ElementTypes.StartEvent_3003); + types.add(Bpmn2ElementTypes.StartEvent_3005); + types.add(Bpmn2ElementTypes.EndEvent_3006); + types.add(Bpmn2ElementTypes.ExclusiveGateway_3007); + types.add(Bpmn2ElementTypes.ParallelGateway_3008); + types.add(Bpmn2ElementTypes.EndEvent_3009); + types.add(Bpmn2ElementTypes.EndEvent_3010); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); + types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); + } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { + types.add(Bpmn2ElementTypes.UserTask_2001); + types.add(Bpmn2ElementTypes.ServiceTask_2002); + types.add(Bpmn2ElementTypes.StartEvent_2003); + types.add(Bpmn2ElementTypes.StartEvent_2007); + types.add(Bpmn2ElementTypes.EndEvent_2004); + types.add(Bpmn2ElementTypes.ExclusiveGateway_2005); + types.add(Bpmn2ElementTypes.ParallelGateway_2006); + types.add(Bpmn2ElementTypes.EndEvent_2008); + types.add(Bpmn2ElementTypes.EndEvent_2009); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2010); + types.add(Bpmn2ElementTypes.IntermediateThrowEvent_2011); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); + types.add(Bpmn2ElementTypes.DataObject_2014); + types.add(Bpmn2ElementTypes.TextAnnotation_2015); + types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); + types.add(Bpmn2ElementTypes.SubProcess_3001); + types.add(Bpmn2ElementTypes.UserTask_3002); + types.add(Bpmn2ElementTypes.ServiceTask_3004); + types.add(Bpmn2ElementTypes.StartEvent_3003); + types.add(Bpmn2ElementTypes.StartEvent_3005); + types.add(Bpmn2ElementTypes.EndEvent_3006); + types.add(Bpmn2ElementTypes.ExclusiveGateway_3007); + types.add(Bpmn2ElementTypes.ParallelGateway_3008); + types.add(Bpmn2ElementTypes.EndEvent_3009); + types.add(Bpmn2ElementTypes.EndEvent_3010); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); + types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.DataObject_3014); + types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); + } + return types; + } + + /** + * @generated + */ + public class TaskFigureDescriptor extends RoundedRectangle { + + /** + * @generated + */ + private WrappingLabel fFigureName; + + /** + * @generated + */ + public TaskFigureDescriptor() { + this.setLayoutManager(new StackLayout()); + this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8), + getMapMode().DPtoLP(8))); + this.setPreferredSize(new Dimension(getMapMode().DPtoLP(80), + getMapMode().DPtoLP(40))); + this.setMinimumSize(new Dimension(getMapMode().DPtoLP(80), + getMapMode().DPtoLP(40))); + + this.setBorder(new MarginBorder(getMapMode().DPtoLP(5), + getMapMode().DPtoLP(5), getMapMode().DPtoLP(5), + getMapMode().DPtoLP(5))); + createContents(); + } + + /** + * @generated + */ + private void createContents() { + + fFigureName = new WrappingLabel(); + fFigureName.setText(""); + + this.add(fFigureName); + + } + + /** + * @generated + */ + public WrappingLabel getFigureName() { + return fFigureName; + } + + } + +} Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ScriptTask2EditPart.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ScriptTaskEditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ScriptTaskEditPart.java (rev 0) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ScriptTaskEditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -0,0 +1,666 @@ +package org.jboss.tools.bpmn2.process.diagram.edit.parts; + +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; + +import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.MarginBorder; +import org.eclipse.draw2d.RoundedRectangle; +import org.eclipse.draw2d.Shape; +import org.eclipse.draw2d.StackLayout; +import org.eclipse.draw2d.geometry.Dimension; +import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; +import org.eclipse.gef.Request; +import org.eclipse.gef.commands.Command; +import org.eclipse.gef.editpolicies.LayoutEditPolicy; +import org.eclipse.gef.editpolicies.NonResizableEditPolicy; +import org.eclipse.gef.requests.CreateRequest; +import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart; +import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart; +import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles; +import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout; +import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel; +import org.eclipse.gmf.runtime.emf.type.core.IElementType; +import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; +import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; +import org.eclipse.gmf.runtime.notation.View; +import org.eclipse.swt.graphics.Color; +import org.jboss.tools.bpmn2.process.diagram.edit.policies.ScriptTaskItemSemanticEditPolicy; +import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2VisualIDRegistry; +import org.jboss.tools.bpmn2.process.diagram.providers.Bpmn2ElementTypes; + +/** + * @generated + */ +public class ScriptTaskEditPart extends ShapeNodeEditPart { + + /** + * @generated + */ + public static final int VISUAL_ID = 2017; + + /** + * @generated + */ + protected IFigure contentPane; + + /** + * @generated + */ + protected IFigure primaryShape; + + /** + * @generated + */ + public ScriptTaskEditPart(View view) { + super(view); + } + + /** + * @generated + */ + protected void createDefaultEditPolicies() { + super.createDefaultEditPolicies(); + installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, + new ScriptTaskItemSemanticEditPolicy()); + installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); + // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies + // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); + } + + /** + * @generated + */ + protected LayoutEditPolicy createLayoutEditPolicy() { + org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() { + + protected EditPolicy createChildEditPolicy(EditPart child) { + EditPolicy result = child + .getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); + if (result == null) { + result = new NonResizableEditPolicy(); + } + return result; + } + + protected Command getMoveChildrenCommand(Request request) { + return null; + } + + protected Command getCreateCommand(CreateRequest request) { + return null; + } + }; + return lep; + } + + /** + * @generated + */ + protected IFigure createNodeShape() { + return primaryShape = new TaskFigureDescriptor(); + } + + /** + * @generated + */ + public TaskFigureDescriptor getPrimaryShape() { + return (TaskFigureDescriptor) primaryShape; + } + + /** + * @generated + */ + protected boolean addFixedChild(EditPart childEditPart) { + if (childEditPart instanceof ScriptTaskNameEditPart) { + ((ScriptTaskNameEditPart) childEditPart).setLabel(getPrimaryShape() + .getFigureName()); + return true; + } + return false; + } + + /** + * @generated + */ + protected boolean removeFixedChild(EditPart childEditPart) { + if (childEditPart instanceof ScriptTaskNameEditPart) { + return true; + } + return false; + } + + /** + * @generated + */ + protected void addChildVisual(EditPart childEditPart, int index) { + if (addFixedChild(childEditPart)) { + return; + } + super.addChildVisual(childEditPart, -1); + } + + /** + * @generated + */ + protected void removeChildVisual(EditPart childEditPart) { + if (removeFixedChild(childEditPart)) { + return; + } + super.removeChildVisual(childEditPart); + } + + /** + * @generated + */ + protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { + return getContentPane(); + } + + /** + * @generated + */ + protected NodeFigure createNodePlate() { + DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(80, 40); + return result; + } + + /** + * Creates figure for this edit part. + * + * Body of this method does not depend on settings in generation model + * so you may safely remove <i>generated</i> tag and modify it. + * + * @generated + */ + protected NodeFigure createNodeFigure() { + NodeFigure figure = createNodePlate(); + figure.setLayoutManager(new StackLayout()); + IFigure shape = createNodeShape(); + figure.add(shape); + contentPane = setupContentPane(shape); + return figure; + } + + /** + * Default implementation treats passed figure as content pane. + * Respects layout one may have set for generated figure. + * @param nodeShape instance of generated figure class + * @generated + */ + protected IFigure setupContentPane(IFigure nodeShape) { + if (nodeShape.getLayoutManager() == null) { + ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); + layout.setSpacing(5); + nodeShape.setLayoutManager(layout); + } + return nodeShape; // use nodeShape itself as contentPane + } + + /** + * @generated + */ + public IFigure getContentPane() { + if (contentPane != null) { + return contentPane; + } + return super.getContentPane(); + } + + /** + * @generated + */ + protected void setForegroundColor(Color color) { + if (primaryShape != null) { + primaryShape.setForegroundColor(color); + } + } + + /** + * @generated + */ + protected void setBackgroundColor(Color color) { + if (primaryShape != null) { + primaryShape.setBackgroundColor(color); + } + } + + /** + * @generated + */ + protected void setLineWidth(int width) { + if (primaryShape instanceof Shape) { + ((Shape) primaryShape).setLineWidth(width); + } + } + + /** + * @generated + */ + protected void setLineType(int style) { + if (primaryShape instanceof Shape) { + ((Shape) primaryShape).setLineStyle(style); + } + } + + /** + * @generated + */ + public EditPart getPrimaryChildEditPart() { + return getChildBySemanticHint(Bpmn2VisualIDRegistry + .getType(ScriptTaskNameEditPart.VISUAL_ID)); + } + + /** + * @generated + */ + public List<IElementType> getMARelTypesOnSource() { + ArrayList<IElementType> types = new ArrayList<IElementType>(2); + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + types.add(Bpmn2ElementTypes.Association_4002); + return types; + } + + /** + * @generated + */ + public List<IElementType> getMARelTypesOnSourceAndTarget( + IGraphicalEditPart targetEditPart) { + LinkedList<IElementType> types = new LinkedList<IElementType>(); + if (targetEditPart instanceof UserTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof ServiceTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof StartEventEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof StartEvent2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof EndEventEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof ExclusiveGatewayEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof ParallelGatewayEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof EndEvent2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof EndEvent3EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof IntermediateCatchEventEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof IntermediateThrowEventEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof IntermediateCatchEvent2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof IntermediateCatchEvent3EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof SubProcessEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof SubProcess2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof UserTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof ServiceTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof StartEvent3EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof StartEvent4EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof EndEvent4EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof ExclusiveGateway2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof ParallelGateway2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof EndEvent5EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof EndEvent6EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof IntermediateCatchEvent4EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof IntermediateThrowEvent2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof IntermediateCatchEvent5EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } + if (targetEditPart instanceof UserTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof ServiceTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof StartEventEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof StartEvent2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof EndEventEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof ExclusiveGatewayEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof ParallelGatewayEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof EndEvent2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof EndEvent3EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof IntermediateCatchEventEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof IntermediateThrowEventEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof IntermediateCatchEvent2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof IntermediateCatchEvent3EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof DataObjectEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof TextAnnotationEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof SubProcessEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof SubProcess2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof UserTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof ServiceTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof StartEvent3EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof StartEvent4EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof EndEvent4EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof ExclusiveGateway2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof ParallelGateway2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof EndEvent5EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof EndEvent6EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof IntermediateCatchEvent4EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof IntermediateThrowEvent2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof IntermediateCatchEvent5EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof DataObject2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof TextAnnotation2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } + return types; + } + + /** + * @generated + */ + public List<IElementType> getMATypesForTarget(IElementType relationshipType) { + LinkedList<IElementType> types = new LinkedList<IElementType>(); + if (relationshipType == Bpmn2ElementTypes.SequenceFlow_4001) { + types.add(Bpmn2ElementTypes.UserTask_2001); + types.add(Bpmn2ElementTypes.ServiceTask_2002); + types.add(Bpmn2ElementTypes.StartEvent_2003); + types.add(Bpmn2ElementTypes.StartEvent_2007); + types.add(Bpmn2ElementTypes.EndEvent_2004); + types.add(Bpmn2ElementTypes.ExclusiveGateway_2005); + types.add(Bpmn2ElementTypes.ParallelGateway_2006); + types.add(Bpmn2ElementTypes.EndEvent_2008); + types.add(Bpmn2ElementTypes.EndEvent_2009); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2010); + types.add(Bpmn2ElementTypes.IntermediateThrowEvent_2011); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); + types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); + types.add(Bpmn2ElementTypes.SubProcess_3001); + types.add(Bpmn2ElementTypes.UserTask_3002); + types.add(Bpmn2ElementTypes.ServiceTask_3004); + types.add(Bpmn2ElementTypes.StartEvent_3003); + types.add(Bpmn2ElementTypes.StartEvent_3005); + types.add(Bpmn2ElementTypes.EndEvent_3006); + types.add(Bpmn2ElementTypes.ExclusiveGateway_3007); + types.add(Bpmn2ElementTypes.ParallelGateway_3008); + types.add(Bpmn2ElementTypes.EndEvent_3009); + types.add(Bpmn2ElementTypes.EndEvent_3010); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); + types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); + } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { + types.add(Bpmn2ElementTypes.UserTask_2001); + types.add(Bpmn2ElementTypes.ServiceTask_2002); + types.add(Bpmn2ElementTypes.StartEvent_2003); + types.add(Bpmn2ElementTypes.StartEvent_2007); + types.add(Bpmn2ElementTypes.EndEvent_2004); + types.add(Bpmn2ElementTypes.ExclusiveGateway_2005); + types.add(Bpmn2ElementTypes.ParallelGateway_2006); + types.add(Bpmn2ElementTypes.EndEvent_2008); + types.add(Bpmn2ElementTypes.EndEvent_2009); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2010); + types.add(Bpmn2ElementTypes.IntermediateThrowEvent_2011); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); + types.add(Bpmn2ElementTypes.DataObject_2014); + types.add(Bpmn2ElementTypes.TextAnnotation_2015); + types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); + types.add(Bpmn2ElementTypes.SubProcess_3001); + types.add(Bpmn2ElementTypes.UserTask_3002); + types.add(Bpmn2ElementTypes.ServiceTask_3004); + types.add(Bpmn2ElementTypes.StartEvent_3003); + types.add(Bpmn2ElementTypes.StartEvent_3005); + types.add(Bpmn2ElementTypes.EndEvent_3006); + types.add(Bpmn2ElementTypes.ExclusiveGateway_3007); + types.add(Bpmn2ElementTypes.ParallelGateway_3008); + types.add(Bpmn2ElementTypes.EndEvent_3009); + types.add(Bpmn2ElementTypes.EndEvent_3010); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); + types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.DataObject_3014); + types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); + } + return types; + } + + /** + * @generated + */ + public List<IElementType> getMARelTypesOnTarget() { + ArrayList<IElementType> types = new ArrayList<IElementType>(2); + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + types.add(Bpmn2ElementTypes.Association_4002); + return types; + } + + /** + * @generated + */ + public List<IElementType> getMATypesForSource(IElementType relationshipType) { + LinkedList<IElementType> types = new LinkedList<IElementType>(); + if (relationshipType == Bpmn2ElementTypes.SequenceFlow_4001) { + types.add(Bpmn2ElementTypes.UserTask_2001); + types.add(Bpmn2ElementTypes.ServiceTask_2002); + types.add(Bpmn2ElementTypes.StartEvent_2003); + types.add(Bpmn2ElementTypes.StartEvent_2007); + types.add(Bpmn2ElementTypes.EndEvent_2004); + types.add(Bpmn2ElementTypes.ExclusiveGateway_2005); + types.add(Bpmn2ElementTypes.ParallelGateway_2006); + types.add(Bpmn2ElementTypes.EndEvent_2008); + types.add(Bpmn2ElementTypes.EndEvent_2009); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2010); + types.add(Bpmn2ElementTypes.IntermediateThrowEvent_2011); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); + types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); + types.add(Bpmn2ElementTypes.SubProcess_3001); + types.add(Bpmn2ElementTypes.UserTask_3002); + types.add(Bpmn2ElementTypes.ServiceTask_3004); + types.add(Bpmn2ElementTypes.StartEvent_3003); + types.add(Bpmn2ElementTypes.StartEvent_3005); + types.add(Bpmn2ElementTypes.EndEvent_3006); + types.add(Bpmn2ElementTypes.ExclusiveGateway_3007); + types.add(Bpmn2ElementTypes.ParallelGateway_3008); + types.add(Bpmn2ElementTypes.EndEvent_3009); + types.add(Bpmn2ElementTypes.EndEvent_3010); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); + types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); + } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { + types.add(Bpmn2ElementTypes.UserTask_2001); + types.add(Bpmn2ElementTypes.ServiceTask_2002); + types.add(Bpmn2ElementTypes.StartEvent_2003); + types.add(Bpmn2ElementTypes.StartEvent_2007); + types.add(Bpmn2ElementTypes.EndEvent_2004); + types.add(Bpmn2ElementTypes.ExclusiveGateway_2005); + types.add(Bpmn2ElementTypes.ParallelGateway_2006); + types.add(Bpmn2ElementTypes.EndEvent_2008); + types.add(Bpmn2ElementTypes.EndEvent_2009); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2010); + types.add(Bpmn2ElementTypes.IntermediateThrowEvent_2011); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); + types.add(Bpmn2ElementTypes.DataObject_2014); + types.add(Bpmn2ElementTypes.TextAnnotation_2015); + types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); + types.add(Bpmn2ElementTypes.SubProcess_3001); + types.add(Bpmn2ElementTypes.UserTask_3002); + types.add(Bpmn2ElementTypes.ServiceTask_3004); + types.add(Bpmn2ElementTypes.StartEvent_3003); + types.add(Bpmn2ElementTypes.StartEvent_3005); + types.add(Bpmn2ElementTypes.EndEvent_3006); + types.add(Bpmn2ElementTypes.ExclusiveGateway_3007); + types.add(Bpmn2ElementTypes.ParallelGateway_3008); + types.add(Bpmn2ElementTypes.EndEvent_3009); + types.add(Bpmn2ElementTypes.EndEvent_3010); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); + types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); + types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.DataObject_3014); + types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); + } + return types; + } + + /** + * @generated + */ + public class TaskFigureDescriptor extends RoundedRectangle { + + /** + * @generated + */ + private WrappingLabel fFigureName; + + /** + * @generated + */ + public TaskFigureDescriptor() { + this.setLayoutManager(new StackLayout()); + this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(8), + getMapMode().DPtoLP(8))); + this.setPreferredSize(new Dimension(getMapMode().DPtoLP(80), + getMapMode().DPtoLP(40))); + this.setMinimumSize(new Dimension(getMapMode().DPtoLP(80), + getMapMode().DPtoLP(40))); + + this.setBorder(new MarginBorder(getMapMode().DPtoLP(5), + getMapMode().DPtoLP(5), getMapMode().DPtoLP(5), + getMapMode().DPtoLP(5))); + createContents(); + } + + /** + * @generated + */ + private void createContents() { + + fFigureName = new WrappingLabel(); + fFigureName.setText(""); + + this.add(fFigureName); + + } + + /** + * @generated + */ + public WrappingLabel getFigureName() { + return fFigureName; + } + + } + +} Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ScriptTaskEditPart.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ScriptTaskName2EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ScriptTaskName2EditPart.java (rev 0) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ScriptTaskName2EditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -0,0 +1,576 @@ +package org.jboss.tools.bpmn2.process.diagram.edit.parts; + +import java.util.Collections; +import java.util.List; + +import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Label; +import org.eclipse.draw2d.geometry.Point; +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.transaction.RunnableWithResult; +import org.eclipse.gef.AccessibleEditPart; +import org.eclipse.gef.EditPolicy; +import org.eclipse.gef.Request; +import org.eclipse.gef.requests.DirectEditRequest; +import org.eclipse.gef.tools.DirectEditManager; +import org.eclipse.gmf.runtime.common.ui.services.parser.IParser; +import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus; +import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus; +import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions; +import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart; +import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart; +import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart; +import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy; +import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry; +import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants; +import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager; +import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel; +import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter; +import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser; +import org.eclipse.gmf.runtime.notation.FontStyle; +import org.eclipse.gmf.runtime.notation.NotationPackage; +import org.eclipse.gmf.runtime.notation.View; +import org.eclipse.jface.text.contentassist.IContentAssistProcessor; +import org.eclipse.jface.viewers.ICellEditorValidator; +import org.eclipse.swt.SWT; +import org.eclipse.swt.accessibility.AccessibleEvent; +import org.eclipse.swt.graphics.Color; +import org.eclipse.swt.graphics.FontData; +import org.eclipse.swt.graphics.Image; +import org.jboss.tools.bpmn2.process.diagram.edit.policies.Bpmn2TextSelectionEditPolicy; +import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2VisualIDRegistry; +import org.jboss.tools.bpmn2.process.diagram.providers.Bpmn2ElementTypes; +import org.jboss.tools.bpmn2.process.diagram.providers.Bpmn2ParserProvider; + +/** + * @generated + */ +public class ScriptTaskName2EditPart extends CompartmentEditPart implements + ITextAwareEditPart { + + /** + * @generated + */ + public static final int VISUAL_ID = 5010; + + /** + * @generated + */ + private DirectEditManager manager; + + /** + * @generated + */ + private IParser parser; + + /** + * @generated + */ + private List<?> parserElements; + + /** + * @generated + */ + private String defaultText; + + /** + * @generated + */ + public ScriptTaskName2EditPart(View view) { + super(view); + } + + /** + * @generated + */ + protected void createDefaultEditPolicies() { + super.createDefaultEditPolicies(); + installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, + new Bpmn2TextSelectionEditPolicy()); + installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, + new LabelDirectEditPolicy()); + installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, + new ProcessEditPart.NodeLabelDragPolicy()); + } + + /** + * @generated + */ + protected String getLabelTextHelper(IFigure figure) { + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else { + return ((Label) figure).getText(); + } + } + + /** + * @generated + */ + protected void setLabelTextHelper(IFigure figure, String text) { + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else { + ((Label) figure).setText(text); + } + } + + /** + * @generated + */ + protected Image getLabelIconHelper(IFigure figure) { + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else { + return ((Label) figure).getIcon(); + } + } + + /** + * @generated + */ + protected void setLabelIconHelper(IFigure figure, Image icon) { + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else { + ((Label) figure).setIcon(icon); + } + } + + /** + * @generated + */ + public void setLabel(WrappingLabel figure) { + unregisterVisuals(); + setFigure(figure); + defaultText = getLabelTextHelper(figure); + registerVisuals(); + refreshVisuals(); + } + + /** + * @generated + */ + @SuppressWarnings("rawtypes") + protected List getModelChildren() { + return Collections.EMPTY_LIST; + } + + /** + * @generated + */ + public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { + return null; + } + + /** + * @generated + */ + protected EObject getParserElement() { + return resolveSemanticElement(); + } + + /** + * @generated + */ + protected Image getLabelIcon() { + EObject parserElement = getParserElement(); + if (parserElement == null) { + return null; + } + return Bpmn2ElementTypes.getImage(parserElement.eClass()); + } + + /** + * @generated + */ + protected String getLabelText() { + String text = null; + EObject parserElement = getParserElement(); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString( + new EObjectAdapter(parserElement), + getParserOptions().intValue()); + } + if (text == null || text.length() == 0) { + text = defaultText; + } + return text; + } + + /** + * @generated + */ + public void setLabelText(String text) { + setLabelTextHelper(getFigure(), text); + Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); + if (pdEditPolicy instanceof Bpmn2TextSelectionEditPolicy) { + ((Bpmn2TextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); + } + Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); + if (sfEditPolicy instanceof Bpmn2TextSelectionEditPolicy) { + ((Bpmn2TextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); + } + } + + /** + * @generated + */ + public String getEditText() { + if (getParserElement() == null || getParser() == null) { + return ""; //$NON-NLS-1$ + } + return getParser().getEditString( + new EObjectAdapter(getParserElement()), + getParserOptions().intValue()); + } + + /** + * @generated + */ + protected boolean isEditable() { + return getParser() != null; + } + + /** + * @generated + */ + public ICellEditorValidator getEditTextValidator() { + return new ICellEditorValidator() { + + public String isValid(final Object value) { + if (value instanceof String) { + final EObject element = getParserElement(); + final IParser parser = getParser(); + try { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive( + new RunnableWithResult.Impl<IParserEditStatus>() { + + public void run() { + setResult(parser + .isValidEditString( + new EObjectAdapter( + element), + (String) value)); + } + }); + return valid.getCode() == ParserEditStatus.EDITABLE ? null + : valid.getMessage(); + } catch (InterruptedException ie) { + ie.printStackTrace(); + } + } + + // shouldn't get here + return null; + } + }; + } + + /** + * @generated + */ + public IContentAssistProcessor getCompletionProcessor() { + if (getParserElement() == null || getParser() == null) { + return null; + } + return getParser().getCompletionProcessor( + new EObjectAdapter(getParserElement())); + } + + /** + * @generated + */ + public ParserOptions getParserOptions() { + return ParserOptions.NONE; + } + + /** + * @generated + */ + public IParser getParser() { + if (parser == null) { + parser = Bpmn2ParserProvider + .getParser( + Bpmn2ElementTypes.ScriptTask_3016, + getParserElement(), + Bpmn2VisualIDRegistry + .getType(org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTaskName2EditPart.VISUAL_ID)); + } + return parser; + } + + /** + * @generated + */ + protected DirectEditManager getManager() { + if (manager == null) { + setManager(new TextDirectEditManager(this, + TextDirectEditManager.getTextCellEditorClass(this), + Bpmn2EditPartFactory.getTextCellEditorLocator(this))); + } + return manager; + } + + /** + * @generated + */ + protected void setManager(DirectEditManager manager) { + this.manager = manager; + } + + /** + * @generated + */ + protected void performDirectEdit() { + getManager().show(); + } + + /** + * @generated + */ + protected void performDirectEdit(Point eventLocation) { + if (getManager().getClass() == TextDirectEditManager.class) { + ((TextDirectEditManager) getManager()).show(eventLocation + .getSWTPoint()); + } + } + + /** + * @generated + */ + private void performDirectEdit(char initialCharacter) { + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); + } else { + performDirectEdit(); + } + } + + /** + * @generated + */ + protected void performDirectEditRequest(Request request) { + final Request theRequest = request; + try { + getEditingDomain().runExclusive(new Runnable() { + + public void run() { + if (isActive() && isEditable()) { + if (theRequest + .getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest + .getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + performDirectEdit(initialChar.charValue()); + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; + performDirectEdit(editRequest.getLocation()); + } else { + performDirectEdit(); + } + } + } + }); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + + /** + * @generated + */ + protected void refreshVisuals() { + super.refreshVisuals(); + refreshLabel(); + refreshFont(); + refreshFontColor(); + refreshUnderline(); + refreshStrikeThrough(); + } + + /** + * @generated + */ + protected void refreshLabel() { + setLabelTextHelper(getFigure(), getLabelText()); + setLabelIconHelper(getFigure(), getLabelIcon()); + Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); + if (pdEditPolicy instanceof Bpmn2TextSelectionEditPolicy) { + ((Bpmn2TextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); + } + Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); + if (sfEditPolicy instanceof Bpmn2TextSelectionEditPolicy) { + ((Bpmn2TextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); + } + } + + /** + * @generated + */ + protected void refreshUnderline() { + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); + } + } + + /** + * @generated + */ + protected void refreshStrikeThrough() { + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style + .isStrikeThrough()); + } + } + + /** + * @generated + */ + protected void refreshFont() { + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), + style.getFontHeight(), (style.isBold() ? SWT.BOLD + : SWT.NORMAL) + | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + setFont(fontData); + } + } + + /** + * @generated + */ + protected void setFontColor(Color color) { + getFigure().setForegroundColor(color); + } + + /** + * @generated + */ + protected void addSemanticListeners() { + if (getParser() instanceof ISemanticParser) { + EObject element = resolveSemanticElement(); + parserElements = ((ISemanticParser) getParser()) + .getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter( + "SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ + } + } else { + super.addSemanticListeners(); + } + } + + /** + * @generated + */ + protected void removeSemanticListeners() { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { + removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ + } + } else { + super.removeSemanticListeners(); + } + } + + /** + * @generated + */ + protected AccessibleEditPart getAccessibleEditPart() { + if (accessibleEP == null) { + accessibleEP = new AccessibleGraphicalEditPart() { + + public void getName(AccessibleEvent e) { + e.result = getLabelTextHelper(getFigure()); + } + }; + } + return accessibleEP; + } + + /** + * @generated + */ + private View getFontStyleOwnerView() { + return getPrimaryView(); + } + + /** + * @generated + */ + protected void addNotationalListeners() { + super.addNotationalListeners(); + addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ + } + + /** + * @generated + */ + protected void removeNotationalListeners() { + super.removeNotationalListeners(); + removeListenerFilter("PrimaryView"); //$NON-NLS-1$ + } + + /** + * @generated + */ + protected void handleNotificationEvent(Notification event) { + Object feature = event.getFeature(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); + setFontColor(DiagramColorRegistry.getInstance().getColor(c)); + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals( + feature)) { + refreshUnderline(); + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough() + .equals(feature)) { + refreshStrikeThrough(); + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals( + feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals( + feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold() + .equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals( + feature)) { + refreshFont(); + } else { + if (getParser() != null + && getParser().isAffectingEvent(event, + getParserOptions().intValue())) { + refreshLabel(); + } + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { + removeSemanticListeners(); + if (resolveSemanticElement() != null) { + addSemanticListeners(); + } + refreshLabel(); + } + } + } + super.handleNotificationEvent(event); + } + + /** + * @generated + */ + protected IFigure createFigure() { + // Parent should assign one using setLabel() method + return null; + } + +} Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ScriptTaskName2EditPart.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ScriptTaskNameEditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ScriptTaskNameEditPart.java (rev 0) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ScriptTaskNameEditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -0,0 +1,576 @@ +package org.jboss.tools.bpmn2.process.diagram.edit.parts; + +import java.util.Collections; +import java.util.List; + +import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.Label; +import org.eclipse.draw2d.geometry.Point; +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.transaction.RunnableWithResult; +import org.eclipse.gef.AccessibleEditPart; +import org.eclipse.gef.EditPolicy; +import org.eclipse.gef.Request; +import org.eclipse.gef.requests.DirectEditRequest; +import org.eclipse.gef.tools.DirectEditManager; +import org.eclipse.gmf.runtime.common.ui.services.parser.IParser; +import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus; +import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus; +import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions; +import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart; +import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart; +import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart; +import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy; +import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry; +import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants; +import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager; +import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel; +import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter; +import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser; +import org.eclipse.gmf.runtime.notation.FontStyle; +import org.eclipse.gmf.runtime.notation.NotationPackage; +import org.eclipse.gmf.runtime.notation.View; +import org.eclipse.jface.text.contentassist.IContentAssistProcessor; +import org.eclipse.jface.viewers.ICellEditorValidator; +import org.eclipse.swt.SWT; +import org.eclipse.swt.accessibility.AccessibleEvent; +import org.eclipse.swt.graphics.Color; +import org.eclipse.swt.graphics.FontData; +import org.eclipse.swt.graphics.Image; +import org.jboss.tools.bpmn2.process.diagram.edit.policies.Bpmn2TextSelectionEditPolicy; +import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2VisualIDRegistry; +import org.jboss.tools.bpmn2.process.diagram.providers.Bpmn2ElementTypes; +import org.jboss.tools.bpmn2.process.diagram.providers.Bpmn2ParserProvider; + +/** + * @generated + */ +public class ScriptTaskNameEditPart extends CompartmentEditPart implements + ITextAwareEditPart { + + /** + * @generated + */ + public static final int VISUAL_ID = 5009; + + /** + * @generated + */ + private DirectEditManager manager; + + /** + * @generated + */ + private IParser parser; + + /** + * @generated + */ + private List<?> parserElements; + + /** + * @generated + */ + private String defaultText; + + /** + * @generated + */ + public ScriptTaskNameEditPart(View view) { + super(view); + } + + /** + * @generated + */ + protected void createDefaultEditPolicies() { + super.createDefaultEditPolicies(); + installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, + new Bpmn2TextSelectionEditPolicy()); + installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, + new LabelDirectEditPolicy()); + installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, + new ProcessEditPart.NodeLabelDragPolicy()); + } + + /** + * @generated + */ + protected String getLabelTextHelper(IFigure figure) { + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else { + return ((Label) figure).getText(); + } + } + + /** + * @generated + */ + protected void setLabelTextHelper(IFigure figure, String text) { + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else { + ((Label) figure).setText(text); + } + } + + /** + * @generated + */ + protected Image getLabelIconHelper(IFigure figure) { + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else { + return ((Label) figure).getIcon(); + } + } + + /** + * @generated + */ + protected void setLabelIconHelper(IFigure figure, Image icon) { + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else { + ((Label) figure).setIcon(icon); + } + } + + /** + * @generated + */ + public void setLabel(WrappingLabel figure) { + unregisterVisuals(); + setFigure(figure); + defaultText = getLabelTextHelper(figure); + registerVisuals(); + refreshVisuals(); + } + + /** + * @generated + */ + @SuppressWarnings("rawtypes") + protected List getModelChildren() { + return Collections.EMPTY_LIST; + } + + /** + * @generated + */ + public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { + return null; + } + + /** + * @generated + */ + protected EObject getParserElement() { + return resolveSemanticElement(); + } + + /** + * @generated + */ + protected Image getLabelIcon() { + EObject parserElement = getParserElement(); + if (parserElement == null) { + return null; + } + return Bpmn2ElementTypes.getImage(parserElement.eClass()); + } + + /** + * @generated + */ + protected String getLabelText() { + String text = null; + EObject parserElement = getParserElement(); + if (parserElement != null && getParser() != null) { + text = getParser().getPrintString( + new EObjectAdapter(parserElement), + getParserOptions().intValue()); + } + if (text == null || text.length() == 0) { + text = defaultText; + } + return text; + } + + /** + * @generated + */ + public void setLabelText(String text) { + setLabelTextHelper(getFigure(), text); + Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); + if (pdEditPolicy instanceof Bpmn2TextSelectionEditPolicy) { + ((Bpmn2TextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); + } + Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); + if (sfEditPolicy instanceof Bpmn2TextSelectionEditPolicy) { + ((Bpmn2TextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); + } + } + + /** + * @generated + */ + public String getEditText() { + if (getParserElement() == null || getParser() == null) { + return ""; //$NON-NLS-1$ + } + return getParser().getEditString( + new EObjectAdapter(getParserElement()), + getParserOptions().intValue()); + } + + /** + * @generated + */ + protected boolean isEditable() { + return getParser() != null; + } + + /** + * @generated + */ + public ICellEditorValidator getEditTextValidator() { + return new ICellEditorValidator() { + + public String isValid(final Object value) { + if (value instanceof String) { + final EObject element = getParserElement(); + final IParser parser = getParser(); + try { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain() + .runExclusive( + new RunnableWithResult.Impl<IParserEditStatus>() { + + public void run() { + setResult(parser + .isValidEditString( + new EObjectAdapter( + element), + (String) value)); + } + }); + return valid.getCode() == ParserEditStatus.EDITABLE ? null + : valid.getMessage(); + } catch (InterruptedException ie) { + ie.printStackTrace(); + } + } + + // shouldn't get here + return null; + } + }; + } + + /** + * @generated + */ + public IContentAssistProcessor getCompletionProcessor() { + if (getParserElement() == null || getParser() == null) { + return null; + } + return getParser().getCompletionProcessor( + new EObjectAdapter(getParserElement())); + } + + /** + * @generated + */ + public ParserOptions getParserOptions() { + return ParserOptions.NONE; + } + + /** + * @generated + */ + public IParser getParser() { + if (parser == null) { + parser = Bpmn2ParserProvider + .getParser( + Bpmn2ElementTypes.ScriptTask_2017, + getParserElement(), + Bpmn2VisualIDRegistry + .getType(org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTaskNameEditPart.VISUAL_ID)); + } + return parser; + } + + /** + * @generated + */ + protected DirectEditManager getManager() { + if (manager == null) { + setManager(new TextDirectEditManager(this, + TextDirectEditManager.getTextCellEditorClass(this), + Bpmn2EditPartFactory.getTextCellEditorLocator(this))); + } + return manager; + } + + /** + * @generated + */ + protected void setManager(DirectEditManager manager) { + this.manager = manager; + } + + /** + * @generated + */ + protected void performDirectEdit() { + getManager().show(); + } + + /** + * @generated + */ + protected void performDirectEdit(Point eventLocation) { + if (getManager().getClass() == TextDirectEditManager.class) { + ((TextDirectEditManager) getManager()).show(eventLocation + .getSWTPoint()); + } + } + + /** + * @generated + */ + private void performDirectEdit(char initialCharacter) { + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); + } else { + performDirectEdit(); + } + } + + /** + * @generated + */ + protected void performDirectEditRequest(Request request) { + final Request theRequest = request; + try { + getEditingDomain().runExclusive(new Runnable() { + + public void run() { + if (isActive() && isEditable()) { + if (theRequest + .getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest + .getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + performDirectEdit(initialChar.charValue()); + } else if ((theRequest instanceof DirectEditRequest) + && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; + performDirectEdit(editRequest.getLocation()); + } else { + performDirectEdit(); + } + } + } + }); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + + /** + * @generated + */ + protected void refreshVisuals() { + super.refreshVisuals(); + refreshLabel(); + refreshFont(); + refreshFontColor(); + refreshUnderline(); + refreshStrikeThrough(); + } + + /** + * @generated + */ + protected void refreshLabel() { + setLabelTextHelper(getFigure(), getLabelText()); + setLabelIconHelper(getFigure(), getLabelIcon()); + Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); + if (pdEditPolicy instanceof Bpmn2TextSelectionEditPolicy) { + ((Bpmn2TextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); + } + Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); + if (sfEditPolicy instanceof Bpmn2TextSelectionEditPolicy) { + ((Bpmn2TextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); + } + } + + /** + * @generated + */ + protected void refreshUnderline() { + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); + } + } + + /** + * @generated + */ + protected void refreshStrikeThrough() { + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style + .isStrikeThrough()); + } + } + + /** + * @generated + */ + protected void refreshFont() { + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { + FontData fontData = new FontData(style.getFontName(), + style.getFontHeight(), (style.isBold() ? SWT.BOLD + : SWT.NORMAL) + | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + setFont(fontData); + } + } + + /** + * @generated + */ + protected void setFontColor(Color color) { + getFigure().setForegroundColor(color); + } + + /** + * @generated + */ + protected void addSemanticListeners() { + if (getParser() instanceof ISemanticParser) { + EObject element = resolveSemanticElement(); + parserElements = ((ISemanticParser) getParser()) + .getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter( + "SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ + } + } else { + super.addSemanticListeners(); + } + } + + /** + * @generated + */ + protected void removeSemanticListeners() { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { + removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ + } + } else { + super.removeSemanticListeners(); + } + } + + /** + * @generated + */ + protected AccessibleEditPart getAccessibleEditPart() { + if (accessibleEP == null) { + accessibleEP = new AccessibleGraphicalEditPart() { + + public void getName(AccessibleEvent e) { + e.result = getLabelTextHelper(getFigure()); + } + }; + } + return accessibleEP; + } + + /** + * @generated + */ + private View getFontStyleOwnerView() { + return getPrimaryView(); + } + + /** + * @generated + */ + protected void addNotationalListeners() { + super.addNotationalListeners(); + addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ + } + + /** + * @generated + */ + protected void removeNotationalListeners() { + super.removeNotationalListeners(); + removeListenerFilter("PrimaryView"); //$NON-NLS-1$ + } + + /** + * @generated + */ + protected void handleNotificationEvent(Notification event) { + Object feature = event.getFeature(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); + setFontColor(DiagramColorRegistry.getInstance().getColor(c)); + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals( + feature)) { + refreshUnderline(); + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough() + .equals(feature)) { + refreshStrikeThrough(); + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals( + feature) + || NotationPackage.eINSTANCE.getFontStyle_FontName().equals( + feature) + || NotationPackage.eINSTANCE.getFontStyle_Bold() + .equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals( + feature)) { + refreshFont(); + } else { + if (getParser() != null + && getParser().isAffectingEvent(event, + getParserOptions().intValue())) { + refreshLabel(); + } + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { + removeSemanticListeners(); + if (resolveSemanticElement() != null) { + addSemanticListeners(); + } + refreshLabel(); + } + } + } + super.handleNotificationEvent(event); + } + + /** + * @generated + */ + protected IFigure createFigure() { + // Parent should assign one using setLabel() method + return null; + } + +} Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ScriptTaskNameEditPart.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ServiceTask2EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ServiceTask2EditPart.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ServiceTask2EditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -311,6 +311,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } @@ -350,6 +353,9 @@ if (targetEditPart instanceof IntermediateCatchEvent5EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof UserTaskEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -398,6 +404,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -443,6 +452,9 @@ if (targetEditPart instanceof TextAnnotation2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } return types; } @@ -466,6 +478,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -479,6 +492,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -496,6 +510,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -511,6 +526,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } @@ -545,6 +561,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -558,6 +575,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -575,6 +593,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -590,6 +609,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ServiceTaskEditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ServiceTaskEditPart.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/ServiceTaskEditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -311,6 +311,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } @@ -350,6 +353,9 @@ if (targetEditPart instanceof IntermediateCatchEvent5EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof UserTaskEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -398,6 +404,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -443,6 +452,9 @@ if (targetEditPart instanceof TextAnnotation2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } return types; } @@ -466,6 +478,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -479,6 +492,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -496,6 +510,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -511,6 +526,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } @@ -545,6 +561,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -558,6 +575,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -575,6 +593,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -590,6 +609,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEvent2EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEvent2EditPart.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEvent2EditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -264,6 +264,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } @@ -303,6 +306,9 @@ if (targetEditPart instanceof IntermediateCatchEvent5EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof UserTaskEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -351,6 +357,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -396,6 +405,9 @@ if (targetEditPart instanceof TextAnnotation2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } return types; } @@ -419,6 +431,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -432,6 +445,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -449,6 +463,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -464,6 +479,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } @@ -498,6 +514,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -511,6 +528,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -528,6 +546,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -543,6 +562,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEvent3EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEvent3EditPart.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEvent3EditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -259,6 +259,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } @@ -298,6 +301,9 @@ if (targetEditPart instanceof IntermediateCatchEvent5EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof UserTaskEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -346,6 +352,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -391,6 +400,9 @@ if (targetEditPart instanceof TextAnnotation2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } return types; } @@ -414,6 +426,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -427,6 +440,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -444,6 +458,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -459,6 +474,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } @@ -493,6 +509,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -506,6 +523,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -523,6 +541,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -538,6 +557,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEvent4EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEvent4EditPart.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEvent4EditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -262,6 +262,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } @@ -301,6 +304,9 @@ if (targetEditPart instanceof IntermediateCatchEvent5EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof UserTaskEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -349,6 +355,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -394,6 +403,9 @@ if (targetEditPart instanceof TextAnnotation2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } return types; } @@ -417,6 +429,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -430,6 +443,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -447,6 +461,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -462,6 +477,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } @@ -496,6 +512,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -509,6 +526,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -526,6 +544,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -541,6 +560,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEventEditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEventEditPart.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/StartEventEditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -262,6 +262,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } @@ -301,6 +304,9 @@ if (targetEditPart instanceof IntermediateCatchEvent5EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof UserTaskEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -349,6 +355,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -394,6 +403,9 @@ if (targetEditPart instanceof TextAnnotation2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } return types; } @@ -417,6 +429,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -430,6 +443,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -447,6 +461,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -462,6 +477,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } @@ -496,6 +512,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -509,6 +526,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -526,6 +544,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -541,6 +560,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/SubProcess2EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/SubProcess2EditPart.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/SubProcess2EditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -262,6 +262,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof org.jboss.tools.bpmn2.process.diagram.edit.parts.SubProcess2EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } @@ -301,6 +304,9 @@ if (targetEditPart instanceof IntermediateCatchEvent5EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof UserTaskEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -349,6 +355,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } if (targetEditPart instanceof org.jboss.tools.bpmn2.process.diagram.edit.parts.SubProcess2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -394,6 +403,9 @@ if (targetEditPart instanceof TextAnnotation2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } return types; } @@ -417,6 +429,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -430,6 +443,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -447,6 +461,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -462,6 +477,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } @@ -496,6 +512,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -509,6 +526,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -526,6 +544,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -541,6 +560,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/SubProcessEditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/SubProcessEditPart.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/SubProcessEditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -262,6 +262,9 @@ if (targetEditPart instanceof org.jboss.tools.bpmn2.process.diagram.edit.parts.SubProcessEditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } @@ -301,6 +304,9 @@ if (targetEditPart instanceof IntermediateCatchEvent5EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof UserTaskEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -349,6 +355,9 @@ if (targetEditPart instanceof org.jboss.tools.bpmn2.process.diagram.edit.parts.SubProcessEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -394,6 +403,9 @@ if (targetEditPart instanceof TextAnnotation2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } return types; } @@ -417,6 +429,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -430,6 +443,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -447,6 +461,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -462,6 +477,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } @@ -496,6 +512,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -509,6 +526,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -526,6 +544,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -541,6 +560,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/TextAnnotation2EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/TextAnnotation2EditPart.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/TextAnnotation2EditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -319,6 +319,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -364,6 +367,9 @@ if (targetEditPart instanceof org.jboss.tools.bpmn2.process.diagram.edit.parts.TextAnnotation2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } return types; } @@ -389,6 +395,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -404,6 +411,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } @@ -439,6 +447,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -454,6 +463,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/TextAnnotationEditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/TextAnnotationEditPart.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/TextAnnotationEditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -321,6 +321,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -366,6 +369,9 @@ if (targetEditPart instanceof TextAnnotation2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } return types; } @@ -391,6 +397,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -406,6 +413,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } @@ -441,6 +449,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -456,6 +465,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/UserTask2EditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/UserTask2EditPart.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/UserTask2EditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -311,6 +311,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } @@ -350,6 +353,9 @@ if (targetEditPart instanceof IntermediateCatchEvent5EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof UserTaskEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -398,6 +404,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -443,6 +452,9 @@ if (targetEditPart instanceof TextAnnotation2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } return types; } @@ -466,6 +478,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -479,6 +492,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -496,6 +510,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -511,6 +526,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } @@ -545,6 +561,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -558,6 +575,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -575,6 +593,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -590,6 +609,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/UserTaskEditPart.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/UserTaskEditPart.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/parts/UserTaskEditPart.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -311,6 +311,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } @@ -350,6 +353,9 @@ if (targetEditPart instanceof IntermediateCatchEvent5EditPart) { types.add(Bpmn2ElementTypes.SequenceFlow_4001); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.SequenceFlow_4001); + } if (targetEditPart instanceof org.jboss.tools.bpmn2.process.diagram.edit.parts.UserTaskEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -398,6 +404,9 @@ if (targetEditPart instanceof SubProcessEditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTaskEditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } if (targetEditPart instanceof SubProcess2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } @@ -443,6 +452,9 @@ if (targetEditPart instanceof TextAnnotation2EditPart) { types.add(Bpmn2ElementTypes.Association_4002); } + if (targetEditPart instanceof ScriptTask2EditPart) { + types.add(Bpmn2ElementTypes.Association_4002); + } return types; } @@ -466,6 +478,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -479,6 +492,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -496,6 +510,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -511,6 +526,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } @@ -545,6 +561,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_2013); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -558,6 +575,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3011); types.add(Bpmn2ElementTypes.IntermediateThrowEvent_3012); types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } else if (relationshipType == Bpmn2ElementTypes.Association_4002) { types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); @@ -575,6 +593,7 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -590,6 +609,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); } return types; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/ProcessCanonicalEditPolicy.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/ProcessCanonicalEditPolicy.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/ProcessCanonicalEditPolicy.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -61,6 +61,8 @@ import org.jboss.tools.bpmn2.process.diagram.edit.parts.ParallelGateway2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ParallelGatewayEditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ProcessEditPart; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTask2EditPart; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTaskEditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.SequenceFlowEditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ServiceTask2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ServiceTaskEditPart; @@ -149,6 +151,7 @@ case DataObjectEditPart.VISUAL_ID: case TextAnnotationEditPart.VISUAL_ID: case SubProcessEditPart.VISUAL_ID: + case ScriptTaskEditPart.VISUAL_ID: return true; } return false; @@ -532,6 +535,17 @@ } break; } + case ScriptTaskEditPart.VISUAL_ID: { + if (!domain2NotationMap.containsKey(view.getElement())) { + result.addAll(Bpmn2DiagramUpdater + .getScriptTask_2017ContainedLinks(view)); + } + if (!domain2NotationMap.containsKey(view.getElement()) + || view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$ + domain2NotationMap.put(view.getElement(), view); + } + break; + } case SubProcess2EditPart.VISUAL_ID: { if (!domain2NotationMap.containsKey(view.getElement())) { result.addAll(Bpmn2DiagramUpdater @@ -697,6 +711,17 @@ } break; } + case ScriptTask2EditPart.VISUAL_ID: { + if (!domain2NotationMap.containsKey(view.getElement())) { + result.addAll(Bpmn2DiagramUpdater + .getScriptTask_3016ContainedLinks(view)); + } + if (!domain2NotationMap.containsKey(view.getElement()) + || view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$ + domain2NotationMap.put(view.getElement(), view); + } + break; + } case SequenceFlowEditPart.VISUAL_ID: { if (!domain2NotationMap.containsKey(view.getElement())) { result.addAll(Bpmn2DiagramUpdater Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/ProcessItemSemanticEditPolicy.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/ProcessItemSemanticEditPolicy.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/ProcessItemSemanticEditPolicy.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -16,6 +16,7 @@ import org.jboss.tools.bpmn2.process.diagram.edit.commands.IntermediateCatchEventCreateCommand; import org.jboss.tools.bpmn2.process.diagram.edit.commands.IntermediateThrowEventCreateCommand; import org.jboss.tools.bpmn2.process.diagram.edit.commands.ParallelGatewayCreateCommand; +import org.jboss.tools.bpmn2.process.diagram.edit.commands.ScriptTaskCreateCommand; import org.jboss.tools.bpmn2.process.diagram.edit.commands.ServiceTaskCreateCommand; import org.jboss.tools.bpmn2.process.diagram.edit.commands.StartEvent2CreateCommand; import org.jboss.tools.bpmn2.process.diagram.edit.commands.StartEventCreateCommand; @@ -93,6 +94,9 @@ if (Bpmn2ElementTypes.SubProcess_2016 == req.getElementType()) { return getGEFWrapper(new SubProcessCreateCommand(req)); } + if (Bpmn2ElementTypes.ScriptTask_2017 == req.getElementType()) { + return getGEFWrapper(new ScriptTaskCreateCommand(req)); + } return super.getCreateCommand(req); } Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/ScriptTask2ItemSemanticEditPolicy.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/ScriptTask2ItemSemanticEditPolicy.java (rev 0) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/ScriptTask2ItemSemanticEditPolicy.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -0,0 +1,150 @@ +package org.jboss.tools.bpmn2.process.diagram.edit.policies; + +import java.util.Iterator; + +import org.eclipse.emf.ecore.EAnnotation; +import org.eclipse.gef.commands.Command; +import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand; +import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand; +import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand; +import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest; +import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest; +import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest; +import org.eclipse.gmf.runtime.notation.Edge; +import org.eclipse.gmf.runtime.notation.View; +import org.jboss.tools.bpmn2.process.diagram.edit.commands.AssociationCreateCommand; +import org.jboss.tools.bpmn2.process.diagram.edit.commands.AssociationReorientCommand; +import org.jboss.tools.bpmn2.process.diagram.edit.commands.SequenceFlowCreateCommand; +import org.jboss.tools.bpmn2.process.diagram.edit.commands.SequenceFlowReorientCommand; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.AssociationEditPart; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.SequenceFlowEditPart; +import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2VisualIDRegistry; +import org.jboss.tools.bpmn2.process.diagram.providers.Bpmn2ElementTypes; + +/** + * @generated + */ +public class ScriptTask2ItemSemanticEditPolicy extends + Bpmn2BaseItemSemanticEditPolicy { + + /** + * @generated + */ + public ScriptTask2ItemSemanticEditPolicy() { + super(Bpmn2ElementTypes.ScriptTask_3016); + } + + /** + * @generated + */ + protected Command getDestroyElementCommand(DestroyElementRequest req) { + View view = (View) getHost().getModel(); + CompositeTransactionalCommand cmd = new CompositeTransactionalCommand( + getEditingDomain(), null); + cmd.setTransactionNestingEnabled(false); + for (Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) { + Edge incomingLink = (Edge) it.next(); + if (Bpmn2VisualIDRegistry.getVisualID(incomingLink) == SequenceFlowEditPart.VISUAL_ID) { + DestroyElementRequest r = new DestroyElementRequest( + incomingLink.getElement(), false); + cmd.add(new DestroyElementCommand(r)); + cmd.add(new DeleteCommand(getEditingDomain(), incomingLink)); + continue; + } + if (Bpmn2VisualIDRegistry.getVisualID(incomingLink) == AssociationEditPart.VISUAL_ID) { + DestroyElementRequest r = new DestroyElementRequest( + incomingLink.getElement(), false); + cmd.add(new DestroyElementCommand(r)); + cmd.add(new DeleteCommand(getEditingDomain(), incomingLink)); + continue; + } + } + for (Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) { + Edge outgoingLink = (Edge) it.next(); + if (Bpmn2VisualIDRegistry.getVisualID(outgoingLink) == SequenceFlowEditPart.VISUAL_ID) { + DestroyElementRequest r = new DestroyElementRequest( + outgoingLink.getElement(), false); + cmd.add(new DestroyElementCommand(r)); + cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink)); + continue; + } + if (Bpmn2VisualIDRegistry.getVisualID(outgoingLink) == AssociationEditPart.VISUAL_ID) { + DestroyElementRequest r = new DestroyElementRequest( + outgoingLink.getElement(), false); + cmd.add(new DestroyElementCommand(r)); + cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink)); + continue; + } + } + EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$ + if (annotation == null) { + // there are indirectly referenced children, need extra commands: false + addDestroyShortcutsCommand(cmd, view); + // delete host element + cmd.add(new DestroyElementCommand(req)); + } else { + cmd.add(new DeleteCommand(getEditingDomain(), view)); + } + return getGEFWrapper(cmd.reduce()); + } + + /** + * @generated + */ + protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) { + Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) + : getCompleteCreateRelationshipCommand(req); + return command != null ? command : super + .getCreateRelationshipCommand(req); + } + + /** + * @generated + */ + protected Command getStartCreateRelationshipCommand( + CreateRelationshipRequest req) { + if (Bpmn2ElementTypes.SequenceFlow_4001 == req.getElementType()) { + return getGEFWrapper(new SequenceFlowCreateCommand(req, + req.getSource(), req.getTarget())); + } + if (Bpmn2ElementTypes.Association_4002 == req.getElementType()) { + return getGEFWrapper(new AssociationCreateCommand(req, + req.getSource(), req.getTarget())); + } + return null; + } + + /** + * @generated + */ + protected Command getCompleteCreateRelationshipCommand( + CreateRelationshipRequest req) { + if (Bpmn2ElementTypes.SequenceFlow_4001 == req.getElementType()) { + return getGEFWrapper(new SequenceFlowCreateCommand(req, + req.getSource(), req.getTarget())); + } + if (Bpmn2ElementTypes.Association_4002 == req.getElementType()) { + return getGEFWrapper(new AssociationCreateCommand(req, + req.getSource(), req.getTarget())); + } + return null; + } + + /** + * Returns command to reorient EClass based link. New link target or source + * should be the domain model element associated with this node. + * + * @generated + */ + protected Command getReorientRelationshipCommand( + ReorientRelationshipRequest req) { + switch (getVisualID(req)) { + case SequenceFlowEditPart.VISUAL_ID: + return getGEFWrapper(new SequenceFlowReorientCommand(req)); + case AssociationEditPart.VISUAL_ID: + return getGEFWrapper(new AssociationReorientCommand(req)); + } + return super.getReorientRelationshipCommand(req); + } + +} Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/ScriptTask2ItemSemanticEditPolicy.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/ScriptTaskItemSemanticEditPolicy.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/ScriptTaskItemSemanticEditPolicy.java (rev 0) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/ScriptTaskItemSemanticEditPolicy.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -0,0 +1,150 @@ +package org.jboss.tools.bpmn2.process.diagram.edit.policies; + +import java.util.Iterator; + +import org.eclipse.emf.ecore.EAnnotation; +import org.eclipse.gef.commands.Command; +import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand; +import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand; +import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand; +import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest; +import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest; +import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest; +import org.eclipse.gmf.runtime.notation.Edge; +import org.eclipse.gmf.runtime.notation.View; +import org.jboss.tools.bpmn2.process.diagram.edit.commands.AssociationCreateCommand; +import org.jboss.tools.bpmn2.process.diagram.edit.commands.AssociationReorientCommand; +import org.jboss.tools.bpmn2.process.diagram.edit.commands.SequenceFlowCreateCommand; +import org.jboss.tools.bpmn2.process.diagram.edit.commands.SequenceFlowReorientCommand; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.AssociationEditPart; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.SequenceFlowEditPart; +import org.jboss.tools.bpmn2.process.diagram.part.Bpmn2VisualIDRegistry; +import org.jboss.tools.bpmn2.process.diagram.providers.Bpmn2ElementTypes; + +/** + * @generated + */ +public class ScriptTaskItemSemanticEditPolicy extends + Bpmn2BaseItemSemanticEditPolicy { + + /** + * @generated + */ + public ScriptTaskItemSemanticEditPolicy() { + super(Bpmn2ElementTypes.ScriptTask_2017); + } + + /** + * @generated + */ + protected Command getDestroyElementCommand(DestroyElementRequest req) { + View view = (View) getHost().getModel(); + CompositeTransactionalCommand cmd = new CompositeTransactionalCommand( + getEditingDomain(), null); + cmd.setTransactionNestingEnabled(false); + for (Iterator<?> it = view.getTargetEdges().iterator(); it.hasNext();) { + Edge incomingLink = (Edge) it.next(); + if (Bpmn2VisualIDRegistry.getVisualID(incomingLink) == SequenceFlowEditPart.VISUAL_ID) { + DestroyElementRequest r = new DestroyElementRequest( + incomingLink.getElement(), false); + cmd.add(new DestroyElementCommand(r)); + cmd.add(new DeleteCommand(getEditingDomain(), incomingLink)); + continue; + } + if (Bpmn2VisualIDRegistry.getVisualID(incomingLink) == AssociationEditPart.VISUAL_ID) { + DestroyElementRequest r = new DestroyElementRequest( + incomingLink.getElement(), false); + cmd.add(new DestroyElementCommand(r)); + cmd.add(new DeleteCommand(getEditingDomain(), incomingLink)); + continue; + } + } + for (Iterator<?> it = view.getSourceEdges().iterator(); it.hasNext();) { + Edge outgoingLink = (Edge) it.next(); + if (Bpmn2VisualIDRegistry.getVisualID(outgoingLink) == SequenceFlowEditPart.VISUAL_ID) { + DestroyElementRequest r = new DestroyElementRequest( + outgoingLink.getElement(), false); + cmd.add(new DestroyElementCommand(r)); + cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink)); + continue; + } + if (Bpmn2VisualIDRegistry.getVisualID(outgoingLink) == AssociationEditPart.VISUAL_ID) { + DestroyElementRequest r = new DestroyElementRequest( + outgoingLink.getElement(), false); + cmd.add(new DestroyElementCommand(r)); + cmd.add(new DeleteCommand(getEditingDomain(), outgoingLink)); + continue; + } + } + EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$ + if (annotation == null) { + // there are indirectly referenced children, need extra commands: false + addDestroyShortcutsCommand(cmd, view); + // delete host element + cmd.add(new DestroyElementCommand(req)); + } else { + cmd.add(new DeleteCommand(getEditingDomain(), view)); + } + return getGEFWrapper(cmd.reduce()); + } + + /** + * @generated + */ + protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) { + Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) + : getCompleteCreateRelationshipCommand(req); + return command != null ? command : super + .getCreateRelationshipCommand(req); + } + + /** + * @generated + */ + protected Command getStartCreateRelationshipCommand( + CreateRelationshipRequest req) { + if (Bpmn2ElementTypes.SequenceFlow_4001 == req.getElementType()) { + return getGEFWrapper(new SequenceFlowCreateCommand(req, + req.getSource(), req.getTarget())); + } + if (Bpmn2ElementTypes.Association_4002 == req.getElementType()) { + return getGEFWrapper(new AssociationCreateCommand(req, + req.getSource(), req.getTarget())); + } + return null; + } + + /** + * @generated + */ + protected Command getCompleteCreateRelationshipCommand( + CreateRelationshipRequest req) { + if (Bpmn2ElementTypes.SequenceFlow_4001 == req.getElementType()) { + return getGEFWrapper(new SequenceFlowCreateCommand(req, + req.getSource(), req.getTarget())); + } + if (Bpmn2ElementTypes.Association_4002 == req.getElementType()) { + return getGEFWrapper(new AssociationCreateCommand(req, + req.getSource(), req.getTarget())); + } + return null; + } + + /** + * Returns command to reorient EClass based link. New link target or source + * should be the domain model element associated with this node. + * + * @generated + */ + protected Command getReorientRelationshipCommand( + ReorientRelationshipRequest req) { + switch (getVisualID(req)) { + case SequenceFlowEditPart.VISUAL_ID: + return getGEFWrapper(new SequenceFlowReorientCommand(req)); + case AssociationEditPart.VISUAL_ID: + return getGEFWrapper(new AssociationReorientCommand(req)); + } + return super.getReorientRelationshipCommand(req); + } + +} Property changes on: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/ScriptTaskItemSemanticEditPolicy.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/SubProcess2CanonicalEditPolicy.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/SubProcess2CanonicalEditPolicy.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/SubProcess2CanonicalEditPolicy.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -41,6 +41,7 @@ import org.jboss.tools.bpmn2.process.diagram.edit.parts.IntermediateCatchEvent5EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.IntermediateThrowEvent2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ParallelGateway2EditPart; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTask2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ServiceTask2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.StartEvent3EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.StartEvent4EditPart; @@ -120,6 +121,7 @@ case IntermediateCatchEvent5EditPart.VISUAL_ID: case DataObject2EditPart.VISUAL_ID: case TextAnnotation2EditPart.VISUAL_ID: + case ScriptTask2EditPart.VISUAL_ID: return true; } return false; Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/SubProcess2ItemSemanticEditPolicy.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/SubProcess2ItemSemanticEditPolicy.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/SubProcess2ItemSemanticEditPolicy.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -26,6 +26,7 @@ import org.jboss.tools.bpmn2.process.diagram.edit.commands.IntermediateCatchEvent5CreateCommand; import org.jboss.tools.bpmn2.process.diagram.edit.commands.IntermediateThrowEvent2CreateCommand; import org.jboss.tools.bpmn2.process.diagram.edit.commands.ParallelGateway2CreateCommand; +import org.jboss.tools.bpmn2.process.diagram.edit.commands.ScriptTask2CreateCommand; import org.jboss.tools.bpmn2.process.diagram.edit.commands.SequenceFlowCreateCommand; import org.jboss.tools.bpmn2.process.diagram.edit.commands.SequenceFlowReorientCommand; import org.jboss.tools.bpmn2.process.diagram.edit.commands.ServiceTask2CreateCommand; @@ -44,6 +45,7 @@ import org.jboss.tools.bpmn2.process.diagram.edit.parts.IntermediateCatchEvent5EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.IntermediateThrowEvent2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ParallelGateway2EditPart; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTask2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.SequenceFlowEditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ServiceTask2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.StartEvent3EditPart; @@ -119,6 +121,9 @@ if (Bpmn2ElementTypes.TextAnnotation_3015 == req.getElementType()) { return getGEFWrapper(new TextAnnotation2CreateCommand(req)); } + if (Bpmn2ElementTypes.ScriptTask_3016 == req.getElementType()) { + return getGEFWrapper(new ScriptTask2CreateCommand(req)); + } return super.getCreateCommand(req); } @@ -843,6 +848,52 @@ // don't need explicit deletion of node as parent's view deletion would clean child views as well // cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node)); break; + case ScriptTask2EditPart.VISUAL_ID: + for (Iterator<?> it = node.getTargetEdges().iterator(); it + .hasNext();) { + Edge incomingLink = (Edge) it.next(); + if (Bpmn2VisualIDRegistry.getVisualID(incomingLink) == SequenceFlowEditPart.VISUAL_ID) { + DestroyElementRequest r = new DestroyElementRequest( + incomingLink.getElement(), false); + cmd.add(new DestroyElementCommand(r)); + cmd.add(new DeleteCommand(getEditingDomain(), + incomingLink)); + continue; + } + if (Bpmn2VisualIDRegistry.getVisualID(incomingLink) == AssociationEditPart.VISUAL_ID) { + DestroyElementRequest r = new DestroyElementRequest( + incomingLink.getElement(), false); + cmd.add(new DestroyElementCommand(r)); + cmd.add(new DeleteCommand(getEditingDomain(), + incomingLink)); + continue; + } + } + for (Iterator<?> it = node.getSourceEdges().iterator(); it + .hasNext();) { + Edge outgoingLink = (Edge) it.next(); + if (Bpmn2VisualIDRegistry.getVisualID(outgoingLink) == SequenceFlowEditPart.VISUAL_ID) { + DestroyElementRequest r = new DestroyElementRequest( + outgoingLink.getElement(), false); + cmd.add(new DestroyElementCommand(r)); + cmd.add(new DeleteCommand(getEditingDomain(), + outgoingLink)); + continue; + } + if (Bpmn2VisualIDRegistry.getVisualID(outgoingLink) == AssociationEditPart.VISUAL_ID) { + DestroyElementRequest r = new DestroyElementRequest( + outgoingLink.getElement(), false); + cmd.add(new DestroyElementCommand(r)); + cmd.add(new DeleteCommand(getEditingDomain(), + outgoingLink)); + continue; + } + } + cmd.add(new DestroyElementCommand(new DestroyElementRequest( + getEditingDomain(), node.getElement(), false))); // directlyOwned: true + // don't need explicit deletion of node as parent's view deletion would clean child views as well + // cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node)); + break; } } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/SubProcessCanonicalEditPolicy.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/SubProcessCanonicalEditPolicy.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/SubProcessCanonicalEditPolicy.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -41,6 +41,7 @@ import org.jboss.tools.bpmn2.process.diagram.edit.parts.IntermediateCatchEvent5EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.IntermediateThrowEvent2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ParallelGateway2EditPart; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTask2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ServiceTask2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.StartEvent3EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.StartEvent4EditPart; @@ -120,6 +121,7 @@ case IntermediateCatchEvent5EditPart.VISUAL_ID: case DataObject2EditPart.VISUAL_ID: case TextAnnotation2EditPart.VISUAL_ID: + case ScriptTask2EditPart.VISUAL_ID: return true; } return false; Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/SubProcessItemSemanticEditPolicy.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/SubProcessItemSemanticEditPolicy.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/edit/policies/SubProcessItemSemanticEditPolicy.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -26,6 +26,7 @@ import org.jboss.tools.bpmn2.process.diagram.edit.commands.IntermediateCatchEvent5CreateCommand; import org.jboss.tools.bpmn2.process.diagram.edit.commands.IntermediateThrowEvent2CreateCommand; import org.jboss.tools.bpmn2.process.diagram.edit.commands.ParallelGateway2CreateCommand; +import org.jboss.tools.bpmn2.process.diagram.edit.commands.ScriptTask2CreateCommand; import org.jboss.tools.bpmn2.process.diagram.edit.commands.SequenceFlowCreateCommand; import org.jboss.tools.bpmn2.process.diagram.edit.commands.SequenceFlowReorientCommand; import org.jboss.tools.bpmn2.process.diagram.edit.commands.ServiceTask2CreateCommand; @@ -44,6 +45,7 @@ import org.jboss.tools.bpmn2.process.diagram.edit.parts.IntermediateCatchEvent5EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.IntermediateThrowEvent2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ParallelGateway2EditPart; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTask2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.SequenceFlowEditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ServiceTask2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.StartEvent3EditPart; @@ -119,6 +121,9 @@ if (Bpmn2ElementTypes.TextAnnotation_3015 == req.getElementType()) { return getGEFWrapper(new TextAnnotation2CreateCommand(req)); } + if (Bpmn2ElementTypes.ScriptTask_3016 == req.getElementType()) { + return getGEFWrapper(new ScriptTask2CreateCommand(req)); + } return super.getCreateCommand(req); } @@ -843,6 +848,52 @@ // don't need explicit deletion of node as parent's view deletion would clean child views as well // cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node)); break; + case ScriptTask2EditPart.VISUAL_ID: + for (Iterator<?> it = node.getTargetEdges().iterator(); it + .hasNext();) { + Edge incomingLink = (Edge) it.next(); + if (Bpmn2VisualIDRegistry.getVisualID(incomingLink) == SequenceFlowEditPart.VISUAL_ID) { + DestroyElementRequest r = new DestroyElementRequest( + incomingLink.getElement(), false); + cmd.add(new DestroyElementCommand(r)); + cmd.add(new DeleteCommand(getEditingDomain(), + incomingLink)); + continue; + } + if (Bpmn2VisualIDRegistry.getVisualID(incomingLink) == AssociationEditPart.VISUAL_ID) { + DestroyElementRequest r = new DestroyElementRequest( + incomingLink.getElement(), false); + cmd.add(new DestroyElementCommand(r)); + cmd.add(new DeleteCommand(getEditingDomain(), + incomingLink)); + continue; + } + } + for (Iterator<?> it = node.getSourceEdges().iterator(); it + .hasNext();) { + Edge outgoingLink = (Edge) it.next(); + if (Bpmn2VisualIDRegistry.getVisualID(outgoingLink) == SequenceFlowEditPart.VISUAL_ID) { + DestroyElementRequest r = new DestroyElementRequest( + outgoingLink.getElement(), false); + cmd.add(new DestroyElementCommand(r)); + cmd.add(new DeleteCommand(getEditingDomain(), + outgoingLink)); + continue; + } + if (Bpmn2VisualIDRegistry.getVisualID(outgoingLink) == AssociationEditPart.VISUAL_ID) { + DestroyElementRequest r = new DestroyElementRequest( + outgoingLink.getElement(), false); + cmd.add(new DestroyElementCommand(r)); + cmd.add(new DeleteCommand(getEditingDomain(), + outgoingLink)); + continue; + } + } + cmd.add(new DestroyElementCommand(new DestroyElementRequest( + getEditingDomain(), node.getElement(), false))); // directlyOwned: true + // don't need explicit deletion of node as parent's view deletion would clean child views as well + // cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node)); + break; } } } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2NavigatorContentProvider.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2NavigatorContentProvider.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2NavigatorContentProvider.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -43,6 +43,8 @@ import org.jboss.tools.bpmn2.process.diagram.edit.parts.ParallelGateway2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ParallelGatewayEditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ProcessEditPart; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTask2EditPart; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTaskEditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.SequenceFlowEditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ServiceTask2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ServiceTaskEditPart; @@ -249,42 +251,101 @@ private Object[] getViewChildren(View view, Object parentElement) { switch (Bpmn2VisualIDRegistry.getVisualID(view)) { - case IntermediateCatchEvent3EditPart.VISUAL_ID: { + case ProcessEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); - Node sv = (Node) view; - Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateCatchEvent_2013_incominglinks, - "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ - Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateCatchEvent_2013_outgoinglinks, - "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + Diagram sv = (Diagram) view; + Bpmn2NavigatorGroup links = new Bpmn2NavigatorGroup( + Messages.NavigatorGroupName_Process_1000_links, + "icons/linksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; - connectedViews = getIncomingLinksByType(Collections.singleton(sv), + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(UserTaskEditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), Bpmn2VisualIDRegistry - .getType(SequenceFlowEditPart.VISUAL_ID)); - incominglinks.addChildren(createNavigatorItems(connectedViews, - incominglinks, true)); - connectedViews = getOutgoingLinksByType(Collections.singleton(sv), + .getType(ServiceTaskEditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(StartEventEditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), Bpmn2VisualIDRegistry + .getType(StartEvent2EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(EndEventEditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(ExclusiveGatewayEditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(ParallelGatewayEditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(EndEvent2EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(EndEvent3EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(IntermediateCatchEventEditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(IntermediateThrowEventEditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(IntermediateCatchEvent2EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(IntermediateCatchEvent3EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(DataObjectEditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(TextAnnotationEditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(SubProcessEditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(ScriptTaskEditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getDiagramLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry .getType(SequenceFlowEditPart.VISUAL_ID)); - outgoinglinks.addChildren(createNavigatorItems(connectedViews, - outgoinglinks, true)); - connectedViews = getIncomingLinksByType(Collections.singleton(sv), + links.addChildren(createNavigatorItems(connectedViews, links, false)); + connectedViews = getDiagramLinksByType(Collections.singleton(sv), Bpmn2VisualIDRegistry .getType(AssociationEditPart.VISUAL_ID)); - incominglinks.addChildren(createNavigatorItems(connectedViews, - incominglinks, true)); - connectedViews = getOutgoingLinksByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(AssociationEditPart.VISUAL_ID)); - outgoinglinks.addChildren(createNavigatorItems(connectedViews, - outgoinglinks, true)); - if (!incominglinks.isEmpty()) { - result.add(incominglinks); + links.addChildren(createNavigatorItems(connectedViews, links, false)); + if (!links.isEmpty()) { + result.add(links); } - if (!outgoinglinks.isEmpty()) { - result.add(outgoinglinks); - } return result.toArray(); } @@ -327,14 +388,14 @@ return result.toArray(); } - case ServiceTask2EditPart.VISUAL_ID: { + case ExclusiveGatewayEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ServiceTask_3004_incominglinks, + Messages.NavigatorGroupName_ExclusiveGateway_2005_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ServiceTask_3004_outgoinglinks, + Messages.NavigatorGroupName_ExclusiveGateway_2005_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -366,14 +427,14 @@ return result.toArray(); } - case ServiceTaskEditPart.VISUAL_ID: { + case ScriptTask2EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ServiceTask_2002_incominglinks, + Messages.NavigatorGroupName_ScriptTask_3016_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ServiceTask_2002_outgoinglinks, + Messages.NavigatorGroupName_ScriptTask_3016_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -405,14 +466,14 @@ return result.toArray(); } - case IntermediateCatchEvent5EditPart.VISUAL_ID: { + case StartEvent3EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateCatchEvent_3013_incominglinks, + Messages.NavigatorGroupName_StartEvent_3003_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateCatchEvent_3013_outgoinglinks, + Messages.NavigatorGroupName_StartEvent_3003_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -444,14 +505,14 @@ return result.toArray(); } - case EndEvent4EditPart.VISUAL_ID: { + case EndEvent3EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_3006_incominglinks, + Messages.NavigatorGroupName_EndEvent_2009_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_3006_outgoinglinks, + Messages.NavigatorGroupName_EndEvent_2009_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -483,14 +544,14 @@ return result.toArray(); } - case StartEventEditPart.VISUAL_ID: { + case EndEventEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_StartEvent_2003_incominglinks, + Messages.NavigatorGroupName_EndEvent_2004_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_StartEvent_2003_outgoinglinks, + Messages.NavigatorGroupName_EndEvent_2004_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -522,14 +583,14 @@ return result.toArray(); } - case ParallelGateway2EditPart.VISUAL_ID: { + case IntermediateThrowEvent2EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ParallelGateway_3008_incominglinks, + Messages.NavigatorGroupName_IntermediateThrowEvent_3012_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ParallelGateway_3008_outgoinglinks, + Messages.NavigatorGroupName_IntermediateThrowEvent_3012_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -561,14 +622,14 @@ return result.toArray(); } - case IntermediateCatchEvent2EditPart.VISUAL_ID: { + case IntermediateThrowEventEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateCatchEvent_2012_incominglinks, + Messages.NavigatorGroupName_IntermediateThrowEvent_2011_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateCatchEvent_2012_outgoinglinks, + Messages.NavigatorGroupName_IntermediateThrowEvent_2011_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -600,28 +661,18 @@ return result.toArray(); } - case EndEvent6EditPart.VISUAL_ID: { + case TextAnnotation2EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_3010_incominglinks, + Messages.NavigatorGroupName_TextAnnotation_3015_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_3010_outgoinglinks, + Messages.NavigatorGroupName_TextAnnotation_3015_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), Bpmn2VisualIDRegistry - .getType(SequenceFlowEditPart.VISUAL_ID)); - incominglinks.addChildren(createNavigatorItems(connectedViews, - incominglinks, true)); - connectedViews = getOutgoingLinksByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(SequenceFlowEditPart.VISUAL_ID)); - outgoinglinks.addChildren(createNavigatorItems(connectedViews, - outgoinglinks, true)); - connectedViews = getIncomingLinksByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry .getType(AssociationEditPart.VISUAL_ID)); incominglinks.addChildren(createNavigatorItems(connectedViews, incominglinks, true)); @@ -639,14 +690,14 @@ return result.toArray(); } - case EndEventEditPart.VISUAL_ID: { + case EndEvent5EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_2004_incominglinks, + Messages.NavigatorGroupName_EndEvent_3009_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_2004_outgoinglinks, + Messages.NavigatorGroupName_EndEvent_3009_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -678,18 +729,28 @@ return result.toArray(); } - case TextAnnotation2EditPart.VISUAL_ID: { + case ServiceTaskEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_TextAnnotation_3015_incominglinks, + Messages.NavigatorGroupName_ServiceTask_2002_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_TextAnnotation_3015_outgoinglinks, + Messages.NavigatorGroupName_ServiceTask_2002_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), Bpmn2VisualIDRegistry + .getType(SequenceFlowEditPart.VISUAL_ID)); + incominglinks.addChildren(createNavigatorItems(connectedViews, + incominglinks, true)); + connectedViews = getOutgoingLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(SequenceFlowEditPart.VISUAL_ID)); + outgoinglinks.addChildren(createNavigatorItems(connectedViews, + outgoinglinks, true)); + connectedViews = getIncomingLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry .getType(AssociationEditPart.VISUAL_ID)); incominglinks.addChildren(createNavigatorItems(connectedViews, incominglinks, true)); @@ -707,14 +768,14 @@ return result.toArray(); } - case IntermediateCatchEvent4EditPart.VISUAL_ID: { + case IntermediateCatchEventEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateCatchEvent_3011_incominglinks, + Messages.NavigatorGroupName_IntermediateCatchEvent_2010_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateCatchEvent_3011_outgoinglinks, + Messages.NavigatorGroupName_IntermediateCatchEvent_2010_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -746,18 +807,28 @@ return result.toArray(); } - case DataObjectEditPart.VISUAL_ID: { + case IntermediateCatchEvent4EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_DataObject_2014_incominglinks, + Messages.NavigatorGroupName_IntermediateCatchEvent_3011_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_DataObject_2014_outgoinglinks, + Messages.NavigatorGroupName_IntermediateCatchEvent_3011_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), Bpmn2VisualIDRegistry + .getType(SequenceFlowEditPart.VISUAL_ID)); + incominglinks.addChildren(createNavigatorItems(connectedViews, + incominglinks, true)); + connectedViews = getOutgoingLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(SequenceFlowEditPart.VISUAL_ID)); + outgoinglinks.addChildren(createNavigatorItems(connectedViews, + outgoinglinks, true)); + connectedViews = getIncomingLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry .getType(AssociationEditPart.VISUAL_ID)); incominglinks.addChildren(createNavigatorItems(connectedViews, incominglinks, true)); @@ -775,14 +846,14 @@ return result.toArray(); } - case EndEvent3EditPart.VISUAL_ID: { + case EndEvent6EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_2009_incominglinks, + Messages.NavigatorGroupName_EndEvent_3010_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_2009_outgoinglinks, + Messages.NavigatorGroupName_EndEvent_3010_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -853,14 +924,14 @@ return result.toArray(); } - case UserTask2EditPart.VISUAL_ID: { + case IntermediateCatchEvent3EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_UserTask_3002_incominglinks, + Messages.NavigatorGroupName_IntermediateCatchEvent_2013_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_UserTask_3002_outgoinglinks, + Messages.NavigatorGroupName_IntermediateCatchEvent_2013_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -892,123 +963,18 @@ return result.toArray(); } - case DataObject2EditPart.VISUAL_ID: { + case ExclusiveGateway2EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_DataObject_3014_incominglinks, + Messages.NavigatorGroupName_ExclusiveGateway_3007_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_DataObject_3014_outgoinglinks, + Messages.NavigatorGroupName_ExclusiveGateway_3007_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), Bpmn2VisualIDRegistry - .getType(AssociationEditPart.VISUAL_ID)); - incominglinks.addChildren(createNavigatorItems(connectedViews, - incominglinks, true)); - connectedViews = getOutgoingLinksByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(AssociationEditPart.VISUAL_ID)); - outgoinglinks.addChildren(createNavigatorItems(connectedViews, - outgoinglinks, true)); - if (!incominglinks.isEmpty()) { - result.add(incominglinks); - } - if (!outgoinglinks.isEmpty()) { - result.add(outgoinglinks); - } - return result.toArray(); - } - - case SubProcessEditPart.VISUAL_ID: { - LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); - Node sv = (Node) view; - Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_SubProcess_2016_incominglinks, - "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ - Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_SubProcess_2016_outgoinglinks, - "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ - Collection<View> connectedViews; - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(SubProcess2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(UserTask2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(ServiceTask2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(StartEvent3EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(StartEvent4EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(EndEvent4EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(ExclusiveGateway2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(ParallelGateway2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(EndEvent5EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(EndEvent6EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(IntermediateCatchEvent4EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(IntermediateThrowEvent2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(IntermediateCatchEvent5EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(IntermediateCatchEvent4EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(DataObject2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(TextAnnotation2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getIncomingLinksByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry .getType(SequenceFlowEditPart.VISUAL_ID)); incominglinks.addChildren(createNavigatorItems(connectedViews, incominglinks, true)); @@ -1036,14 +1002,14 @@ return result.toArray(); } - case StartEvent3EditPart.VISUAL_ID: { + case StartEvent2EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_StartEvent_3003_incominglinks, + Messages.NavigatorGroupName_StartEvent_2007_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_StartEvent_3003_outgoinglinks, + Messages.NavigatorGroupName_StartEvent_2007_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -1075,92 +1041,16 @@ return result.toArray(); } - case SubProcess2EditPart.VISUAL_ID: { + case ServiceTask2EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_SubProcess_3001_incominglinks, + Messages.NavigatorGroupName_ServiceTask_3004_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_SubProcess_3001_outgoinglinks, + Messages.NavigatorGroupName_ServiceTask_3004_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(SubProcess2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(UserTask2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(ServiceTask2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(StartEvent3EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(StartEvent4EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(EndEvent4EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(ExclusiveGateway2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(ParallelGateway2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(EndEvent5EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(EndEvent6EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(IntermediateCatchEvent4EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(IntermediateThrowEvent2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(IntermediateCatchEvent5EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(IntermediateCatchEvent4EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(DataObject2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); - connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(TextAnnotation2EditPart.VISUAL_ID)); - result.addAll(createNavigatorItems(connectedViews, parentElement, - false)); connectedViews = getIncomingLinksByType(Collections.singleton(sv), Bpmn2VisualIDRegistry .getType(SequenceFlowEditPart.VISUAL_ID)); @@ -1190,28 +1080,18 @@ return result.toArray(); } - case UserTaskEditPart.VISUAL_ID: { + case TextAnnotationEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_UserTask_2001_incominglinks, + Messages.NavigatorGroupName_TextAnnotation_2015_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_UserTask_2001_outgoinglinks, + Messages.NavigatorGroupName_TextAnnotation_2015_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), Bpmn2VisualIDRegistry - .getType(SequenceFlowEditPart.VISUAL_ID)); - incominglinks.addChildren(createNavigatorItems(connectedViews, - incominglinks, true)); - connectedViews = getOutgoingLinksByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(SequenceFlowEditPart.VISUAL_ID)); - outgoinglinks.addChildren(createNavigatorItems(connectedViews, - outgoinglinks, true)); - connectedViews = getIncomingLinksByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry .getType(AssociationEditPart.VISUAL_ID)); incominglinks.addChildren(createNavigatorItems(connectedViews, incominglinks, true)); @@ -1229,20 +1109,20 @@ return result.toArray(); } - case AssociationEditPart.VISUAL_ID: { + case SequenceFlowEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Edge sv = (Edge) view; Bpmn2NavigatorGroup target = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_Association_4002_target, + Messages.NavigatorGroupName_SequenceFlow_4001_target, "icons/linkTargetNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + Bpmn2NavigatorGroup source = new Bpmn2NavigatorGroup( + Messages.NavigatorGroupName_SequenceFlow_4001_source, + "icons/linkSourceNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_Association_4002_incominglinks, + Messages.NavigatorGroupName_SequenceFlow_4001_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ - Bpmn2NavigatorGroup source = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_Association_4002_source, - "icons/linkSourceNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_Association_4002_outgoinglinks, + Messages.NavigatorGroupName_SequenceFlow_4001_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getLinksTargetByType(Collections.singleton(sv), @@ -1306,19 +1186,14 @@ target.addChildren(createNavigatorItems(connectedViews, target, true)); connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(DataObjectEditPart.VISUAL_ID)); + Bpmn2VisualIDRegistry.getType(SubProcessEditPart.VISUAL_ID)); target.addChildren(createNavigatorItems(connectedViews, target, true)); connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(TextAnnotationEditPart.VISUAL_ID)); + Bpmn2VisualIDRegistry.getType(ScriptTaskEditPart.VISUAL_ID)); target.addChildren(createNavigatorItems(connectedViews, target, true)); connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(SubProcessEditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), Bpmn2VisualIDRegistry .getType(SubProcess2EditPart.VISUAL_ID)); target.addChildren(createNavigatorItems(connectedViews, target, @@ -1381,14 +1256,9 @@ true)); connectedViews = getLinksTargetByType(Collections.singleton(sv), Bpmn2VisualIDRegistry - .getType(DataObject2EditPart.VISUAL_ID)); + .getType(ScriptTask2EditPart.VISUAL_ID)); target.addChildren(createNavigatorItems(connectedViews, target, true)); - connectedViews = getLinksTargetByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(TextAnnotation2EditPart.VISUAL_ID)); - target.addChildren(createNavigatorItems(connectedViews, target, - true)); connectedViews = getLinksSourceByType(Collections.singleton(sv), Bpmn2VisualIDRegistry.getType(UserTaskEditPart.VISUAL_ID)); source.addChildren(createNavigatorItems(connectedViews, source, @@ -1450,19 +1320,14 @@ source.addChildren(createNavigatorItems(connectedViews, source, true)); connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(DataObjectEditPart.VISUAL_ID)); + Bpmn2VisualIDRegistry.getType(SubProcessEditPart.VISUAL_ID)); source.addChildren(createNavigatorItems(connectedViews, source, true)); connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(TextAnnotationEditPart.VISUAL_ID)); + Bpmn2VisualIDRegistry.getType(ScriptTaskEditPart.VISUAL_ID)); source.addChildren(createNavigatorItems(connectedViews, source, true)); connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(SubProcessEditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), Bpmn2VisualIDRegistry .getType(SubProcess2EditPart.VISUAL_ID)); source.addChildren(createNavigatorItems(connectedViews, source, @@ -1525,137 +1390,197 @@ true)); connectedViews = getLinksSourceByType(Collections.singleton(sv), Bpmn2VisualIDRegistry - .getType(DataObject2EditPart.VISUAL_ID)); + .getType(ScriptTask2EditPart.VISUAL_ID)); source.addChildren(createNavigatorItems(connectedViews, source, true)); - connectedViews = getLinksSourceByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry - .getType(TextAnnotation2EditPart.VISUAL_ID)); - source.addChildren(createNavigatorItems(connectedViews, source, - true)); if (!target.isEmpty()) { result.add(target); } + if (!source.isEmpty()) { + result.add(source); + } if (!incominglinks.isEmpty()) { result.add(incominglinks); } - if (!source.isEmpty()) { - result.add(source); - } if (!outgoinglinks.isEmpty()) { result.add(outgoinglinks); } return result.toArray(); } - case ProcessEditPart.VISUAL_ID: { + case SubProcessEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); - Diagram sv = (Diagram) view; - Bpmn2NavigatorGroup links = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_Process_1000_links, - "icons/linksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + Node sv = (Node) view; + Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( + Messages.NavigatorGroupName_SubProcess_2016_incominglinks, + "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( + Messages.NavigatorGroupName_SubProcess_2016_outgoinglinks, + "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(UserTaskEditPart.VISUAL_ID)); + Bpmn2VisualIDRegistry + .getType(SubProcess2EditPart.VISUAL_ID)); result.addAll(createNavigatorItems(connectedViews, parentElement, false)); connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(UserTask2EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), Bpmn2VisualIDRegistry - .getType(ServiceTaskEditPart.VISUAL_ID)); + .getType(ServiceTask2EditPart.VISUAL_ID)); result.addAll(createNavigatorItems(connectedViews, parentElement, false)); connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(StartEventEditPart.VISUAL_ID)); + Bpmn2VisualIDRegistry + .getType(StartEvent3EditPart.VISUAL_ID)); result.addAll(createNavigatorItems(connectedViews, parentElement, false)); connectedViews = getChildrenByType(Collections.singleton(sv), Bpmn2VisualIDRegistry - .getType(StartEvent2EditPart.VISUAL_ID)); + .getType(StartEvent4EditPart.VISUAL_ID)); result.addAll(createNavigatorItems(connectedViews, parentElement, false)); connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(EndEventEditPart.VISUAL_ID)); + Bpmn2VisualIDRegistry.getType(EndEvent4EditPart.VISUAL_ID)); result.addAll(createNavigatorItems(connectedViews, parentElement, false)); connectedViews = getChildrenByType(Collections.singleton(sv), Bpmn2VisualIDRegistry - .getType(ExclusiveGatewayEditPart.VISUAL_ID)); + .getType(ExclusiveGateway2EditPart.VISUAL_ID)); result.addAll(createNavigatorItems(connectedViews, parentElement, false)); connectedViews = getChildrenByType(Collections.singleton(sv), Bpmn2VisualIDRegistry - .getType(ParallelGatewayEditPart.VISUAL_ID)); + .getType(ParallelGateway2EditPart.VISUAL_ID)); result.addAll(createNavigatorItems(connectedViews, parentElement, false)); connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(EndEvent2EditPart.VISUAL_ID)); + Bpmn2VisualIDRegistry.getType(EndEvent5EditPart.VISUAL_ID)); result.addAll(createNavigatorItems(connectedViews, parentElement, false)); connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(EndEvent3EditPart.VISUAL_ID)); + Bpmn2VisualIDRegistry.getType(EndEvent6EditPart.VISUAL_ID)); result.addAll(createNavigatorItems(connectedViews, parentElement, false)); connectedViews = getChildrenByType(Collections.singleton(sv), Bpmn2VisualIDRegistry - .getType(IntermediateCatchEventEditPart.VISUAL_ID)); + .getType(IntermediateCatchEvent4EditPart.VISUAL_ID)); result.addAll(createNavigatorItems(connectedViews, parentElement, false)); connectedViews = getChildrenByType(Collections.singleton(sv), Bpmn2VisualIDRegistry - .getType(IntermediateThrowEventEditPart.VISUAL_ID)); + .getType(IntermediateThrowEvent2EditPart.VISUAL_ID)); result.addAll(createNavigatorItems(connectedViews, parentElement, false)); connectedViews = getChildrenByType(Collections.singleton(sv), Bpmn2VisualIDRegistry - .getType(IntermediateCatchEvent2EditPart.VISUAL_ID)); + .getType(IntermediateCatchEvent5EditPart.VISUAL_ID)); result.addAll(createNavigatorItems(connectedViews, parentElement, false)); connectedViews = getChildrenByType(Collections.singleton(sv), Bpmn2VisualIDRegistry - .getType(IntermediateCatchEvent3EditPart.VISUAL_ID)); + .getType(IntermediateCatchEvent4EditPart.VISUAL_ID)); result.addAll(createNavigatorItems(connectedViews, parentElement, false)); connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(DataObjectEditPart.VISUAL_ID)); + Bpmn2VisualIDRegistry + .getType(DataObject2EditPart.VISUAL_ID)); result.addAll(createNavigatorItems(connectedViews, parentElement, false)); connectedViews = getChildrenByType(Collections.singleton(sv), Bpmn2VisualIDRegistry - .getType(TextAnnotationEditPart.VISUAL_ID)); + .getType(TextAnnotation2EditPart.VISUAL_ID)); result.addAll(createNavigatorItems(connectedViews, parentElement, false)); connectedViews = getChildrenByType(Collections.singleton(sv), - Bpmn2VisualIDRegistry.getType(SubProcessEditPart.VISUAL_ID)); + Bpmn2VisualIDRegistry + .getType(ScriptTask2EditPart.VISUAL_ID)); result.addAll(createNavigatorItems(connectedViews, parentElement, false)); - connectedViews = getDiagramLinksByType(Collections.singleton(sv), + connectedViews = getIncomingLinksByType(Collections.singleton(sv), Bpmn2VisualIDRegistry .getType(SequenceFlowEditPart.VISUAL_ID)); - links.addChildren(createNavigatorItems(connectedViews, links, false)); - connectedViews = getDiagramLinksByType(Collections.singleton(sv), + incominglinks.addChildren(createNavigatorItems(connectedViews, + incominglinks, true)); + connectedViews = getOutgoingLinksByType(Collections.singleton(sv), Bpmn2VisualIDRegistry + .getType(SequenceFlowEditPart.VISUAL_ID)); + outgoinglinks.addChildren(createNavigatorItems(connectedViews, + outgoinglinks, true)); + connectedViews = getIncomingLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry .getType(AssociationEditPart.VISUAL_ID)); - links.addChildren(createNavigatorItems(connectedViews, links, false)); - if (!links.isEmpty()) { - result.add(links); + incominglinks.addChildren(createNavigatorItems(connectedViews, + incominglinks, true)); + connectedViews = getOutgoingLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(AssociationEditPart.VISUAL_ID)); + outgoinglinks.addChildren(createNavigatorItems(connectedViews, + outgoinglinks, true)); + if (!incominglinks.isEmpty()) { + result.add(incominglinks); } + if (!outgoinglinks.isEmpty()) { + result.add(outgoinglinks); + } return result.toArray(); } - case SequenceFlowEditPart.VISUAL_ID: { + case ParallelGateway2EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); + Node sv = (Node) view; + Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( + Messages.NavigatorGroupName_ParallelGateway_3008_incominglinks, + "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( + Messages.NavigatorGroupName_ParallelGateway_3008_outgoinglinks, + "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + Collection<View> connectedViews; + connectedViews = getIncomingLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(SequenceFlowEditPart.VISUAL_ID)); + incominglinks.addChildren(createNavigatorItems(connectedViews, + incominglinks, true)); + connectedViews = getOutgoingLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(SequenceFlowEditPart.VISUAL_ID)); + outgoinglinks.addChildren(createNavigatorItems(connectedViews, + outgoinglinks, true)); + connectedViews = getIncomingLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(AssociationEditPart.VISUAL_ID)); + incominglinks.addChildren(createNavigatorItems(connectedViews, + incominglinks, true)); + connectedViews = getOutgoingLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(AssociationEditPart.VISUAL_ID)); + outgoinglinks.addChildren(createNavigatorItems(connectedViews, + outgoinglinks, true)); + if (!incominglinks.isEmpty()) { + result.add(incominglinks); + } + if (!outgoinglinks.isEmpty()) { + result.add(outgoinglinks); + } + return result.toArray(); + } + + case AssociationEditPart.VISUAL_ID: { + LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Edge sv = (Edge) view; Bpmn2NavigatorGroup target = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_SequenceFlow_4001_target, + Messages.NavigatorGroupName_Association_4002_target, "icons/linkTargetNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( + Messages.NavigatorGroupName_Association_4002_incominglinks, + "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup source = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_SequenceFlow_4001_source, + Messages.NavigatorGroupName_Association_4002_source, "icons/linkSourceNavigatorGroup.gif", parentElement); //$NON-NLS-1$ - Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_SequenceFlow_4001_incominglinks, - "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_SequenceFlow_4001_outgoinglinks, + Messages.NavigatorGroupName_Association_4002_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getLinksTargetByType(Collections.singleton(sv), @@ -1719,10 +1644,23 @@ target.addChildren(createNavigatorItems(connectedViews, target, true)); connectedViews = getLinksTargetByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(DataObjectEditPart.VISUAL_ID)); + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(TextAnnotationEditPart.VISUAL_ID)); + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), Bpmn2VisualIDRegistry.getType(SubProcessEditPart.VISUAL_ID)); target.addChildren(createNavigatorItems(connectedViews, target, true)); connectedViews = getLinksTargetByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(ScriptTaskEditPart.VISUAL_ID)); + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), Bpmn2VisualIDRegistry .getType(SubProcess2EditPart.VISUAL_ID)); target.addChildren(createNavigatorItems(connectedViews, target, @@ -1783,6 +1721,21 @@ .getType(IntermediateCatchEvent5EditPart.VISUAL_ID)); target.addChildren(createNavigatorItems(connectedViews, target, true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(DataObject2EditPart.VISUAL_ID)); + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(TextAnnotation2EditPart.VISUAL_ID)); + target.addChildren(createNavigatorItems(connectedViews, target, + true)); + connectedViews = getLinksTargetByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(ScriptTask2EditPart.VISUAL_ID)); + target.addChildren(createNavigatorItems(connectedViews, target, + true)); connectedViews = getLinksSourceByType(Collections.singleton(sv), Bpmn2VisualIDRegistry.getType(UserTaskEditPart.VISUAL_ID)); source.addChildren(createNavigatorItems(connectedViews, source, @@ -1844,10 +1797,23 @@ source.addChildren(createNavigatorItems(connectedViews, source, true)); connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(DataObjectEditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(TextAnnotationEditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), Bpmn2VisualIDRegistry.getType(SubProcessEditPart.VISUAL_ID)); source.addChildren(createNavigatorItems(connectedViews, source, true)); connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(ScriptTaskEditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), Bpmn2VisualIDRegistry .getType(SubProcess2EditPart.VISUAL_ID)); source.addChildren(createNavigatorItems(connectedViews, source, @@ -1908,29 +1874,44 @@ .getType(IntermediateCatchEvent5EditPart.VISUAL_ID)); source.addChildren(createNavigatorItems(connectedViews, source, true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(DataObject2EditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(TextAnnotation2EditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); + connectedViews = getLinksSourceByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(ScriptTask2EditPart.VISUAL_ID)); + source.addChildren(createNavigatorItems(connectedViews, source, + true)); if (!target.isEmpty()) { result.add(target); } + if (!incominglinks.isEmpty()) { + result.add(incominglinks); + } if (!source.isEmpty()) { result.add(source); } - if (!incominglinks.isEmpty()) { - result.add(incominglinks); - } if (!outgoinglinks.isEmpty()) { result.add(outgoinglinks); } return result.toArray(); } - case IntermediateCatchEventEditPart.VISUAL_ID: { + case EndEvent4EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateCatchEvent_2010_incominglinks, + Messages.NavigatorGroupName_EndEvent_3006_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateCatchEvent_2010_outgoinglinks, + Messages.NavigatorGroupName_EndEvent_3006_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -1962,14 +1943,14 @@ return result.toArray(); } - case StartEvent2EditPart.VISUAL_ID: { + case ScriptTaskEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_StartEvent_2007_incominglinks, + Messages.NavigatorGroupName_ScriptTask_2017_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_StartEvent_2007_outgoinglinks, + Messages.NavigatorGroupName_ScriptTask_2017_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -2001,14 +1982,14 @@ return result.toArray(); } - case ExclusiveGatewayEditPart.VISUAL_ID: { + case ParallelGatewayEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ExclusiveGateway_2005_incominglinks, + Messages.NavigatorGroupName_ParallelGateway_2006_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ExclusiveGateway_2005_outgoinglinks, + Messages.NavigatorGroupName_ParallelGateway_2006_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -2040,14 +2021,14 @@ return result.toArray(); } - case EndEvent5EditPart.VISUAL_ID: { + case UserTaskEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_3009_incominglinks, + Messages.NavigatorGroupName_UserTask_2001_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_EndEvent_3009_outgoinglinks, + Messages.NavigatorGroupName_UserTask_2001_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -2079,14 +2060,14 @@ return result.toArray(); } - case ParallelGatewayEditPart.VISUAL_ID: { + case UserTask2EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ParallelGateway_2006_incominglinks, + Messages.NavigatorGroupName_UserTask_3002_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ParallelGateway_2006_outgoinglinks, + Messages.NavigatorGroupName_UserTask_3002_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -2118,16 +2099,97 @@ return result.toArray(); } - case ExclusiveGateway2EditPart.VISUAL_ID: { + case SubProcess2EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ExclusiveGateway_3007_incominglinks, + Messages.NavigatorGroupName_SubProcess_3001_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_ExclusiveGateway_3007_outgoinglinks, + Messages.NavigatorGroupName_SubProcess_3001_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(SubProcess2EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(UserTask2EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(ServiceTask2EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(StartEvent3EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(StartEvent4EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(EndEvent4EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(ExclusiveGateway2EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(ParallelGateway2EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(EndEvent5EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry.getType(EndEvent6EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(IntermediateCatchEvent4EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(IntermediateThrowEvent2EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(IntermediateCatchEvent5EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(IntermediateCatchEvent4EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(DataObject2EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(TextAnnotation2EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); + connectedViews = getChildrenByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(ScriptTask2EditPart.VISUAL_ID)); + result.addAll(createNavigatorItems(connectedViews, parentElement, + false)); connectedViews = getIncomingLinksByType(Collections.singleton(sv), Bpmn2VisualIDRegistry .getType(SequenceFlowEditPart.VISUAL_ID)); @@ -2157,14 +2219,14 @@ return result.toArray(); } - case TextAnnotationEditPart.VISUAL_ID: { + case DataObjectEditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_TextAnnotation_2015_incominglinks, + Messages.NavigatorGroupName_DataObject_2014_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_TextAnnotation_2015_outgoinglinks, + Messages.NavigatorGroupName_DataObject_2014_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -2186,14 +2248,14 @@ return result.toArray(); } - case IntermediateThrowEvent2EditPart.VISUAL_ID: { + case IntermediateCatchEvent5EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateThrowEvent_3012_incominglinks, + Messages.NavigatorGroupName_IntermediateCatchEvent_3013_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateThrowEvent_3012_outgoinglinks, + Messages.NavigatorGroupName_IntermediateCatchEvent_3013_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -2225,14 +2287,14 @@ return result.toArray(); } - case IntermediateThrowEventEditPart.VISUAL_ID: { + case IntermediateCatchEvent2EditPart.VISUAL_ID: { LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); Node sv = (Node) view; Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateThrowEvent_2011_incominglinks, + Messages.NavigatorGroupName_IntermediateCatchEvent_2012_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( - Messages.NavigatorGroupName_IntermediateThrowEvent_2011_outgoinglinks, + Messages.NavigatorGroupName_IntermediateCatchEvent_2012_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getIncomingLinksByType(Collections.singleton(sv), @@ -2263,7 +2325,75 @@ } return result.toArray(); } + + case StartEventEditPart.VISUAL_ID: { + LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); + Node sv = (Node) view; + Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( + Messages.NavigatorGroupName_StartEvent_2003_incominglinks, + "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( + Messages.NavigatorGroupName_StartEvent_2003_outgoinglinks, + "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + Collection<View> connectedViews; + connectedViews = getIncomingLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(SequenceFlowEditPart.VISUAL_ID)); + incominglinks.addChildren(createNavigatorItems(connectedViews, + incominglinks, true)); + connectedViews = getOutgoingLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(SequenceFlowEditPart.VISUAL_ID)); + outgoinglinks.addChildren(createNavigatorItems(connectedViews, + outgoinglinks, true)); + connectedViews = getIncomingLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(AssociationEditPart.VISUAL_ID)); + incominglinks.addChildren(createNavigatorItems(connectedViews, + incominglinks, true)); + connectedViews = getOutgoingLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(AssociationEditPart.VISUAL_ID)); + outgoinglinks.addChildren(createNavigatorItems(connectedViews, + outgoinglinks, true)); + if (!incominglinks.isEmpty()) { + result.add(incominglinks); + } + if (!outgoinglinks.isEmpty()) { + result.add(outgoinglinks); + } + return result.toArray(); } + + case DataObject2EditPart.VISUAL_ID: { + LinkedList<Bpmn2AbstractNavigatorItem> result = new LinkedList<Bpmn2AbstractNavigatorItem>(); + Node sv = (Node) view; + Bpmn2NavigatorGroup incominglinks = new Bpmn2NavigatorGroup( + Messages.NavigatorGroupName_DataObject_3014_incominglinks, + "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + Bpmn2NavigatorGroup outgoinglinks = new Bpmn2NavigatorGroup( + Messages.NavigatorGroupName_DataObject_3014_outgoinglinks, + "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + Collection<View> connectedViews; + connectedViews = getIncomingLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(AssociationEditPart.VISUAL_ID)); + incominglinks.addChildren(createNavigatorItems(connectedViews, + incominglinks, true)); + connectedViews = getOutgoingLinksByType(Collections.singleton(sv), + Bpmn2VisualIDRegistry + .getType(AssociationEditPart.VISUAL_ID)); + outgoinglinks.addChildren(createNavigatorItems(connectedViews, + outgoinglinks, true)); + if (!incominglinks.isEmpty()) { + result.add(incominglinks); + } + if (!outgoinglinks.isEmpty()) { + result.add(outgoinglinks); + } + return result.toArray(); + } + } return EMPTY_ARRAY; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2NavigatorLabelProvider.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2NavigatorLabelProvider.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/navigator/Bpmn2NavigatorLabelProvider.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -48,6 +48,10 @@ import org.jboss.tools.bpmn2.process.diagram.edit.parts.ParallelGateway2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ParallelGatewayEditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ProcessEditPart; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTask2EditPart; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTaskEditPart; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTaskName2EditPart; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTaskNameEditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.SequenceFlowEditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ServiceTask2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ServiceTaskEditPart; @@ -131,108 +135,114 @@ */ public Image getImage(View view) { switch (Bpmn2VisualIDRegistry.getVisualID(view)) { - case IntermediateCatchEvent3EditPart.VISUAL_ID: + case ProcessEditPart.VISUAL_ID: return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?IntermediateCatchEvent", Bpmn2ElementTypes.IntermediateCatchEvent_2013); //$NON-NLS-1$ + "Navigator?Diagram?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Process", Bpmn2ElementTypes.Process_1000); //$NON-NLS-1$ case EndEvent2EditPart.VISUAL_ID: return getImage( "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?EndEvent", Bpmn2ElementTypes.EndEvent_2008); //$NON-NLS-1$ - case ServiceTask2EditPart.VISUAL_ID: + case ExclusiveGatewayEditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?ServiceTask", Bpmn2ElementTypes.ServiceTask_3004); //$NON-NLS-1$ - case ServiceTaskEditPart.VISUAL_ID: + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?ExclusiveGateway", Bpmn2ElementTypes.ExclusiveGateway_2005); //$NON-NLS-1$ + case ScriptTask2EditPart.VISUAL_ID: return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?ServiceTask", Bpmn2ElementTypes.ServiceTask_2002); //$NON-NLS-1$ - case IntermediateCatchEvent5EditPart.VISUAL_ID: + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?ScriptTask", Bpmn2ElementTypes.ScriptTask_3016); //$NON-NLS-1$ + case StartEvent3EditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?IntermediateCatchEvent", Bpmn2ElementTypes.IntermediateCatchEvent_3013); //$NON-NLS-1$ - case EndEvent4EditPart.VISUAL_ID: + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?StartEvent", Bpmn2ElementTypes.StartEvent_3003); //$NON-NLS-1$ + case EndEvent3EditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?EndEvent", Bpmn2ElementTypes.EndEvent_3006); //$NON-NLS-1$ - case StartEventEditPart.VISUAL_ID: + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?EndEvent", Bpmn2ElementTypes.EndEvent_2009); //$NON-NLS-1$ + case EndEventEditPart.VISUAL_ID: return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?StartEvent", Bpmn2ElementTypes.StartEvent_2003); //$NON-NLS-1$ - case ParallelGateway2EditPart.VISUAL_ID: + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?EndEvent", Bpmn2ElementTypes.EndEvent_2004); //$NON-NLS-1$ + case IntermediateThrowEvent2EditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?ParallelGateway", Bpmn2ElementTypes.ParallelGateway_3008); //$NON-NLS-1$ - case IntermediateCatchEvent2EditPart.VISUAL_ID: + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?IntermediateThrowEvent", Bpmn2ElementTypes.IntermediateThrowEvent_3012); //$NON-NLS-1$ + case IntermediateThrowEventEditPart.VISUAL_ID: return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?IntermediateCatchEvent", Bpmn2ElementTypes.IntermediateCatchEvent_2012); //$NON-NLS-1$ - case EndEvent6EditPart.VISUAL_ID: + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?IntermediateThrowEvent", Bpmn2ElementTypes.IntermediateThrowEvent_2011); //$NON-NLS-1$ + case TextAnnotation2EditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?EndEvent", Bpmn2ElementTypes.EndEvent_3010); //$NON-NLS-1$ - case EndEventEditPart.VISUAL_ID: + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?TextAnnotation", Bpmn2ElementTypes.TextAnnotation_3015); //$NON-NLS-1$ + case EndEvent5EditPart.VISUAL_ID: return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?EndEvent", Bpmn2ElementTypes.EndEvent_2004); //$NON-NLS-1$ - case TextAnnotation2EditPart.VISUAL_ID: + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?EndEvent", Bpmn2ElementTypes.EndEvent_3009); //$NON-NLS-1$ + case ServiceTaskEditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?TextAnnotation", Bpmn2ElementTypes.TextAnnotation_3015); //$NON-NLS-1$ + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?ServiceTask", Bpmn2ElementTypes.ServiceTask_2002); //$NON-NLS-1$ + case IntermediateCatchEventEditPart.VISUAL_ID: + return getImage( + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?IntermediateCatchEvent", Bpmn2ElementTypes.IntermediateCatchEvent_2010); //$NON-NLS-1$ case IntermediateCatchEvent4EditPart.VISUAL_ID: return getImage( "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?IntermediateCatchEvent", Bpmn2ElementTypes.IntermediateCatchEvent_3011); //$NON-NLS-1$ - case DataObjectEditPart.VISUAL_ID: + case EndEvent6EditPart.VISUAL_ID: return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?DataObject", Bpmn2ElementTypes.DataObject_2014); //$NON-NLS-1$ - case EndEvent3EditPart.VISUAL_ID: - return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?EndEvent", Bpmn2ElementTypes.EndEvent_2009); //$NON-NLS-1$ + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?EndEvent", Bpmn2ElementTypes.EndEvent_3010); //$NON-NLS-1$ case StartEvent4EditPart.VISUAL_ID: return getImage( "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?StartEvent", Bpmn2ElementTypes.StartEvent_3005); //$NON-NLS-1$ - case UserTask2EditPart.VISUAL_ID: + case IntermediateCatchEvent3EditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?UserTask", Bpmn2ElementTypes.UserTask_3002); //$NON-NLS-1$ - case DataObject2EditPart.VISUAL_ID: + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?IntermediateCatchEvent", Bpmn2ElementTypes.IntermediateCatchEvent_2013); //$NON-NLS-1$ + case ExclusiveGateway2EditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?DataObject", Bpmn2ElementTypes.DataObject_3014); //$NON-NLS-1$ + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?ExclusiveGateway", Bpmn2ElementTypes.ExclusiveGateway_3007); //$NON-NLS-1$ + case StartEvent2EditPart.VISUAL_ID: + return getImage( + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?StartEvent", Bpmn2ElementTypes.StartEvent_2007); //$NON-NLS-1$ + case ServiceTask2EditPart.VISUAL_ID: + return getImage( + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?ServiceTask", Bpmn2ElementTypes.ServiceTask_3004); //$NON-NLS-1$ + case TextAnnotationEditPart.VISUAL_ID: + return getImage( + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?TextAnnotation", Bpmn2ElementTypes.TextAnnotation_2015); //$NON-NLS-1$ + case SequenceFlowEditPart.VISUAL_ID: + return getImage( + "Navigator?Link?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?SequenceFlow", Bpmn2ElementTypes.SequenceFlow_4001); //$NON-NLS-1$ case SubProcessEditPart.VISUAL_ID: return getImage( "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?SubProcess", Bpmn2ElementTypes.SubProcess_2016); //$NON-NLS-1$ - case StartEvent3EditPart.VISUAL_ID: + case ParallelGateway2EditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?StartEvent", Bpmn2ElementTypes.StartEvent_3003); //$NON-NLS-1$ - case SubProcess2EditPart.VISUAL_ID: - return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?SubProcess", Bpmn2ElementTypes.SubProcess_3001); //$NON-NLS-1$ - case UserTaskEditPart.VISUAL_ID: - return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?UserTask", Bpmn2ElementTypes.UserTask_2001); //$NON-NLS-1$ + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?ParallelGateway", Bpmn2ElementTypes.ParallelGateway_3008); //$NON-NLS-1$ case AssociationEditPart.VISUAL_ID: return getImage( "Navigator?Link?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Association", Bpmn2ElementTypes.Association_4002); //$NON-NLS-1$ - case ProcessEditPart.VISUAL_ID: + case EndEvent4EditPart.VISUAL_ID: return getImage( - "Navigator?Diagram?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?Process", Bpmn2ElementTypes.Process_1000); //$NON-NLS-1$ - case SequenceFlowEditPart.VISUAL_ID: + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?EndEvent", Bpmn2ElementTypes.EndEvent_3006); //$NON-NLS-1$ + case ScriptTaskEditPart.VISUAL_ID: return getImage( - "Navigator?Link?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?SequenceFlow", Bpmn2ElementTypes.SequenceFlow_4001); //$NON-NLS-1$ - case IntermediateCatchEventEditPart.VISUAL_ID: + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?ScriptTask", Bpmn2ElementTypes.ScriptTask_2017); //$NON-NLS-1$ + case ParallelGatewayEditPart.VISUAL_ID: return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?IntermediateCatchEvent", Bpmn2ElementTypes.IntermediateCatchEvent_2010); //$NON-NLS-1$ - case StartEvent2EditPart.VISUAL_ID: + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?ParallelGateway", Bpmn2ElementTypes.ParallelGateway_2006); //$NON-NLS-1$ + case UserTaskEditPart.VISUAL_ID: return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?StartEvent", Bpmn2ElementTypes.StartEvent_2007); //$NON-NLS-1$ - case ExclusiveGatewayEditPart.VISUAL_ID: + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?UserTask", Bpmn2ElementTypes.UserTask_2001); //$NON-NLS-1$ + case UserTask2EditPart.VISUAL_ID: return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?ExclusiveGateway", Bpmn2ElementTypes.ExclusiveGateway_2005); //$NON-NLS-1$ - case EndEvent5EditPart.VISUAL_ID: + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?UserTask", Bpmn2ElementTypes.UserTask_3002); //$NON-NLS-1$ + case SubProcess2EditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?EndEvent", Bpmn2ElementTypes.EndEvent_3009); //$NON-NLS-1$ - case ParallelGatewayEditPart.VISUAL_ID: + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?SubProcess", Bpmn2ElementTypes.SubProcess_3001); //$NON-NLS-1$ + case DataObjectEditPart.VISUAL_ID: return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?ParallelGateway", Bpmn2ElementTypes.ParallelGateway_2006); //$NON-NLS-1$ - case ExclusiveGateway2EditPart.VISUAL_ID: + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?DataObject", Bpmn2ElementTypes.DataObject_2014); //$NON-NLS-1$ + case IntermediateCatchEvent5EditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?ExclusiveGateway", Bpmn2ElementTypes.ExclusiveGateway_3007); //$NON-NLS-1$ - case TextAnnotationEditPart.VISUAL_ID: + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?IntermediateCatchEvent", Bpmn2ElementTypes.IntermediateCatchEvent_3013); //$NON-NLS-1$ + case IntermediateCatchEvent2EditPart.VISUAL_ID: return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?TextAnnotation", Bpmn2ElementTypes.TextAnnotation_2015); //$NON-NLS-1$ - case IntermediateThrowEvent2EditPart.VISUAL_ID: + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?IntermediateCatchEvent", Bpmn2ElementTypes.IntermediateCatchEvent_2012); //$NON-NLS-1$ + case StartEventEditPart.VISUAL_ID: return getImage( - "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?IntermediateThrowEvent", Bpmn2ElementTypes.IntermediateThrowEvent_3012); //$NON-NLS-1$ - case IntermediateThrowEventEditPart.VISUAL_ID: + "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?StartEvent", Bpmn2ElementTypes.StartEvent_2003); //$NON-NLS-1$ + case DataObject2EditPart.VISUAL_ID: return getImage( - "Navigator?TopLevelNode?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?IntermediateThrowEvent", Bpmn2ElementTypes.IntermediateThrowEvent_2011); //$NON-NLS-1$ + "Navigator?Node?http://www.omg.org/spec/BPMN/20100524/MODEL-XMI?DataObject", Bpmn2ElementTypes.DataObject_3014); //$NON-NLS-1$ } return getImage("Navigator?UnknownElement", null); //$NON-NLS-1$ } @@ -285,74 +295,78 @@ return getUnresolvedDomainElementProxyText(view); } switch (Bpmn2VisualIDRegistry.getVisualID(view)) { - case IntermediateCatchEvent3EditPart.VISUAL_ID: - return getIntermediateCatchEvent_2013Text(view); + case ProcessEditPart.VISUAL_ID: + return getProcess_1000Text(view); case EndEvent2EditPart.VISUAL_ID: return getEndEvent_2008Text(view); - case ServiceTask2EditPart.VISUAL_ID: - return getServiceTask_3004Text(view); - case ServiceTaskEditPart.VISUAL_ID: - return getServiceTask_2002Text(view); - case IntermediateCatchEvent5EditPart.VISUAL_ID: - return getIntermediateCatchEvent_3013Text(view); - case EndEvent4EditPart.VISUAL_ID: - return getEndEvent_3006Text(view); - case StartEventEditPart.VISUAL_ID: - return getStartEvent_2003Text(view); - case ParallelGateway2EditPart.VISUAL_ID: - return getParallelGateway_3008Text(view); - case IntermediateCatchEvent2EditPart.VISUAL_ID: - return getIntermediateCatchEvent_2012Text(view); - case EndEvent6EditPart.VISUAL_ID: - return getEndEvent_3010Text(view); + case ExclusiveGatewayEditPart.VISUAL_ID: + return getExclusiveGateway_2005Text(view); + case ScriptTask2EditPart.VISUAL_ID: + return getScriptTask_3016Text(view); + case StartEvent3EditPart.VISUAL_ID: + return getStartEvent_3003Text(view); + case EndEvent3EditPart.VISUAL_ID: + return getEndEvent_2009Text(view); case EndEventEditPart.VISUAL_ID: return getEndEvent_2004Text(view); + case IntermediateThrowEvent2EditPart.VISUAL_ID: + return getIntermediateThrowEvent_3012Text(view); + case IntermediateThrowEventEditPart.VISUAL_ID: + return getIntermediateThrowEvent_2011Text(view); case TextAnnotation2EditPart.VISUAL_ID: return getTextAnnotation_3015Text(view); + case EndEvent5EditPart.VISUAL_ID: + return getEndEvent_3009Text(view); + case ServiceTaskEditPart.VISUAL_ID: + return getServiceTask_2002Text(view); + case IntermediateCatchEventEditPart.VISUAL_ID: + return getIntermediateCatchEvent_2010Text(view); case IntermediateCatchEvent4EditPart.VISUAL_ID: return getIntermediateCatchEvent_3011Text(view); - case DataObjectEditPart.VISUAL_ID: - return getDataObject_2014Text(view); - case EndEvent3EditPart.VISUAL_ID: - return getEndEvent_2009Text(view); + case EndEvent6EditPart.VISUAL_ID: + return getEndEvent_3010Text(view); case StartEvent4EditPart.VISUAL_ID: return getStartEvent_3005Text(view); - case UserTask2EditPart.VISUAL_ID: - return getUserTask_3002Text(view); - case DataObject2EditPart.VISUAL_ID: - return getDataObject_3014Text(view); + case IntermediateCatchEvent3EditPart.VISUAL_ID: + return getIntermediateCatchEvent_2013Text(view); + case ExclusiveGateway2EditPart.VISUAL_ID: + return getExclusiveGateway_3007Text(view); + case StartEvent2EditPart.VISUAL_ID: + return getStartEvent_2007Text(view); + case ServiceTask2EditPart.VISUAL_ID: + return getServiceTask_3004Text(view); + case TextAnnotationEditPart.VISUAL_ID: + return getTextAnnotation_2015Text(view); + case SequenceFlowEditPart.VISUAL_ID: + return getSequenceFlow_4001Text(view); case SubProcessEditPart.VISUAL_ID: return getSubProcess_2016Text(view); - case StartEvent3EditPart.VISUAL_ID: - return getStartEvent_3003Text(view); - case SubProcess2EditPart.VISUAL_ID: - return getSubProcess_3001Text(view); - case UserTaskEditPart.VISUAL_ID: - return getUserTask_2001Text(view); + case ParallelGateway2EditPart.VISUAL_ID: + return getParallelGateway_3008Text(view); case AssociationEditPart.VISUAL_ID: return getAssociation_4002Text(view); - case ProcessEditPart.VISUAL_ID: - return getProcess_1000Text(view); - case SequenceFlowEditPart.VISUAL_ID: - return getSequenceFlow_4001Text(view); - case IntermediateCatchEventEditPart.VISUAL_ID: - return getIntermediateCatchEvent_2010Text(view); - case StartEvent2EditPart.VISUAL_ID: - return getStartEvent_2007Text(view); - case ExclusiveGatewayEditPart.VISUAL_ID: - return getExclusiveGateway_2005Text(view); - case EndEvent5EditPart.VISUAL_ID: - return getEndEvent_3009Text(view); + case EndEvent4EditPart.VISUAL_ID: + return getEndEvent_3006Text(view); + case ScriptTaskEditPart.VISUAL_ID: + return getScriptTask_2017Text(view); case ParallelGatewayEditPart.VISUAL_ID: return getParallelGateway_2006Text(view); - case ExclusiveGateway2EditPart.VISUAL_ID: - return getExclusiveGateway_3007Text(view); - case TextAnnotationEditPart.VISUAL_ID: - return getTextAnnotation_2015Text(view); - case IntermediateThrowEvent2EditPart.VISUAL_ID: - return getIntermediateThrowEvent_3012Text(view); - case IntermediateThrowEventEditPart.VISUAL_ID: - return getIntermediateThrowEvent_2011Text(view); + case UserTaskEditPart.VISUAL_ID: + return getUserTask_2001Text(view); + case UserTask2EditPart.VISUAL_ID: + return getUserTask_3002Text(view); + case SubProcess2EditPart.VISUAL_ID: + return getSubProcess_3001Text(view); + case DataObjectEditPart.VISUAL_ID: + return getDataObject_2014Text(view); + case IntermediateCatchEvent5EditPart.VISUAL_ID: + return getIntermediateCatchEvent_3013Text(view); + case IntermediateCatchEvent2EditPart.VISUAL_ID: + return getIntermediateCatchEvent_2012Text(view); + case StartEventEditPart.VISUAL_ID: + return getStartEvent_2003Text(view); + case DataObject2EditPart.VISUAL_ID: + return getDataObject_3014Text(view); } return getUnknownElementText(view); } @@ -375,6 +389,26 @@ /** * @generated */ + private String getScriptTask_2017Text(View view) { + IParser parser = Bpmn2ParserProvider + .getParser(Bpmn2ElementTypes.ScriptTask_2017, + view.getElement() != null ? view.getElement() : view, + Bpmn2VisualIDRegistry + .getType(ScriptTaskNameEditPart.VISUAL_ID)); + if (parser != null) { + return parser.getPrintString(new EObjectAdapter( + view.getElement() != null ? view.getElement() : view), + ParserOptions.NONE.intValue()); + } else { + Bpmn2DiagramEditorPlugin.getInstance().logError( + "Parser was not found for label " + 5009); //$NON-NLS-1$ + return ""; //$NON-NLS-1$ + } + } + + /** + * @generated + */ private String getEndEvent_2009Text(View view) { EndEvent domainModelElement = (EndEvent) view.getElement(); if (domainModelElement != null) { @@ -563,6 +597,26 @@ /** * @generated */ + private String getScriptTask_3016Text(View view) { + IParser parser = Bpmn2ParserProvider.getParser( + Bpmn2ElementTypes.ScriptTask_3016, + view.getElement() != null ? view.getElement() : view, + Bpmn2VisualIDRegistry + .getType(ScriptTaskName2EditPart.VISUAL_ID)); + if (parser != null) { + return parser.getPrintString(new EObjectAdapter( + view.getElement() != null ? view.getElement() : view), + ParserOptions.NONE.intValue()); + } else { + Bpmn2DiagramEditorPlugin.getInstance().logError( + "Parser was not found for label " + 5010); //$NON-NLS-1$ + return ""; //$NON-NLS-1$ + } + } + + /** + * @generated + */ private String getProcess_1000Text(View view) { Process domainModelElement = (Process) view.getElement(); if (domainModelElement != null) { Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2DiagramUpdater.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2DiagramUpdater.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2DiagramUpdater.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -21,6 +21,7 @@ import org.eclipse.bpmn2.IntermediateThrowEvent; import org.eclipse.bpmn2.ParallelGateway; import org.eclipse.bpmn2.Process; +import org.eclipse.bpmn2.ScriptTask; import org.eclipse.bpmn2.SequenceFlow; import org.eclipse.bpmn2.ServiceTask; import org.eclipse.bpmn2.StartEvent; @@ -52,6 +53,8 @@ import org.jboss.tools.bpmn2.process.diagram.edit.parts.ParallelGateway2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ParallelGatewayEditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ProcessEditPart; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTask2EditPart; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTaskEditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.SequenceFlowEditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ServiceTask2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ServiceTaskEditPart; @@ -162,6 +165,10 @@ result.add(new Bpmn2NodeDescriptor(childElement, visualID)); continue; } + if (visualID == ScriptTaskEditPart.VISUAL_ID) { + result.add(new Bpmn2NodeDescriptor(childElement, visualID)); + continue; + } } for (Iterator<?> it = modelElement.getArtifacts().iterator(); it .hasNext();) { @@ -247,6 +254,10 @@ result.add(new Bpmn2NodeDescriptor(childElement, visualID)); continue; } + if (visualID == ScriptTask2EditPart.VISUAL_ID) { + result.add(new Bpmn2NodeDescriptor(childElement, visualID)); + continue; + } } for (Iterator<?> it = modelElement.getArtifacts().iterator(); it .hasNext();) { @@ -332,6 +343,10 @@ result.add(new Bpmn2NodeDescriptor(childElement, visualID)); continue; } + if (visualID == ScriptTask2EditPart.VISUAL_ID) { + result.add(new Bpmn2NodeDescriptor(childElement, visualID)); + continue; + } } for (Iterator<?> it = modelElement.getArtifacts().iterator(); it .hasNext();) { @@ -385,6 +400,8 @@ return getTextAnnotation_2015ContainedLinks(view); case SubProcessEditPart.VISUAL_ID: return getSubProcess_2016ContainedLinks(view); + case ScriptTaskEditPart.VISUAL_ID: + return getScriptTask_2017ContainedLinks(view); case SubProcess2EditPart.VISUAL_ID: return getSubProcess_3001ContainedLinks(view); case UserTask2EditPart.VISUAL_ID: @@ -415,6 +432,8 @@ return getDataObject_3014ContainedLinks(view); case TextAnnotation2EditPart.VISUAL_ID: return getTextAnnotation_3015ContainedLinks(view); + case ScriptTask2EditPart.VISUAL_ID: + return getScriptTask_3016ContainedLinks(view); case SequenceFlowEditPart.VISUAL_ID: return getSequenceFlow_4001ContainedLinks(view); case AssociationEditPart.VISUAL_ID: @@ -460,6 +479,8 @@ return getTextAnnotation_2015IncomingLinks(view); case SubProcessEditPart.VISUAL_ID: return getSubProcess_2016IncomingLinks(view); + case ScriptTaskEditPart.VISUAL_ID: + return getScriptTask_2017IncomingLinks(view); case SubProcess2EditPart.VISUAL_ID: return getSubProcess_3001IncomingLinks(view); case UserTask2EditPart.VISUAL_ID: @@ -490,6 +511,8 @@ return getDataObject_3014IncomingLinks(view); case TextAnnotation2EditPart.VISUAL_ID: return getTextAnnotation_3015IncomingLinks(view); + case ScriptTask2EditPart.VISUAL_ID: + return getScriptTask_3016IncomingLinks(view); case SequenceFlowEditPart.VISUAL_ID: return getSequenceFlow_4001IncomingLinks(view); case AssociationEditPart.VISUAL_ID: @@ -535,6 +558,8 @@ return getTextAnnotation_2015OutgoingLinks(view); case SubProcessEditPart.VISUAL_ID: return getSubProcess_2016OutgoingLinks(view); + case ScriptTaskEditPart.VISUAL_ID: + return getScriptTask_2017OutgoingLinks(view); case SubProcess2EditPart.VISUAL_ID: return getSubProcess_3001OutgoingLinks(view); case UserTask2EditPart.VISUAL_ID: @@ -565,6 +590,8 @@ return getDataObject_3014OutgoingLinks(view); case TextAnnotation2EditPart.VISUAL_ID: return getTextAnnotation_3015OutgoingLinks(view); + case ScriptTask2EditPart.VISUAL_ID: + return getScriptTask_3016OutgoingLinks(view); case SequenceFlowEditPart.VISUAL_ID: return getSequenceFlow_4001OutgoingLinks(view); case AssociationEditPart.VISUAL_ID: @@ -719,6 +746,14 @@ /** * @generated */ + public static List<Bpmn2LinkDescriptor> getScriptTask_2017ContainedLinks( + View view) { + return Collections.emptyList(); + } + + /** + * @generated + */ public static List<Bpmn2LinkDescriptor> getSubProcess_3001ContainedLinks( View view) { SubProcess modelElement = (SubProcess) view.getElement(); @@ -842,6 +877,14 @@ /** * @generated */ + public static List<Bpmn2LinkDescriptor> getScriptTask_3016ContainedLinks( + View view) { + return Collections.emptyList(); + } + + /** + * @generated + */ public static List<Bpmn2LinkDescriptor> getSequenceFlow_4001ContainedLinks( View view) { return Collections.emptyList(); @@ -1114,6 +1157,22 @@ /** * @generated */ + public static List<Bpmn2LinkDescriptor> getScriptTask_2017IncomingLinks( + View view) { + ScriptTask modelElement = (ScriptTask) view.getElement(); + Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer + .find(view.eResource().getResourceSet().getResources()); + LinkedList<Bpmn2LinkDescriptor> result = new LinkedList<Bpmn2LinkDescriptor>(); + result.addAll(getIncomingTypeModelFacetLinks_SequenceFlow_4001( + modelElement, crossReferences)); + result.addAll(getIncomingTypeModelFacetLinks_Association_4002( + modelElement, crossReferences)); + return result; + } + + /** + * @generated + */ public static List<Bpmn2LinkDescriptor> getSubProcess_3001IncomingLinks( View view) { SubProcess modelElement = (SubProcess) view.getElement(); @@ -1353,6 +1412,22 @@ /** * @generated */ + public static List<Bpmn2LinkDescriptor> getScriptTask_3016IncomingLinks( + View view) { + ScriptTask modelElement = (ScriptTask) view.getElement(); + Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer + .find(view.eResource().getResourceSet().getResources()); + LinkedList<Bpmn2LinkDescriptor> result = new LinkedList<Bpmn2LinkDescriptor>(); + result.addAll(getIncomingTypeModelFacetLinks_SequenceFlow_4001( + modelElement, crossReferences)); + result.addAll(getIncomingTypeModelFacetLinks_Association_4002( + modelElement, crossReferences)); + return result; + } + + /** + * @generated + */ public static List<Bpmn2LinkDescriptor> getSequenceFlow_4001IncomingLinks( View view) { SequenceFlow modelElement = (SequenceFlow) view.getElement(); @@ -1575,6 +1650,18 @@ /** * @generated */ + public static List<Bpmn2LinkDescriptor> getScriptTask_2017OutgoingLinks( + View view) { + ScriptTask modelElement = (ScriptTask) view.getElement(); + LinkedList<Bpmn2LinkDescriptor> result = new LinkedList<Bpmn2LinkDescriptor>(); + result.addAll(getOutgoingTypeModelFacetLinks_SequenceFlow_4001(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_4002(modelElement)); + return result; + } + + /** + * @generated + */ public static List<Bpmn2LinkDescriptor> getSubProcess_3001OutgoingLinks( View view) { SubProcess modelElement = (SubProcess) view.getElement(); @@ -1756,6 +1843,18 @@ /** * @generated */ + public static List<Bpmn2LinkDescriptor> getScriptTask_3016OutgoingLinks( + View view) { + ScriptTask modelElement = (ScriptTask) view.getElement(); + LinkedList<Bpmn2LinkDescriptor> result = new LinkedList<Bpmn2LinkDescriptor>(); + result.addAll(getOutgoingTypeModelFacetLinks_SequenceFlow_4001(modelElement)); + result.addAll(getOutgoingTypeModelFacetLinks_Association_4002(modelElement)); + return result; + } + + /** + * @generated + */ public static List<Bpmn2LinkDescriptor> getSequenceFlow_4001OutgoingLinks( View view) { SequenceFlow modelElement = (SequenceFlow) view.getElement(); Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2PaletteFactory.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2PaletteFactory.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2PaletteFactory.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -38,12 +38,10 @@ PaletteGroup paletteContainer = new PaletteGroup( Messages.Nodes1Group_title); paletteContainer.setId("createNodes1Group"); //$NON-NLS-1$ - paletteContainer.add(createUserTask1CreationTool()); - paletteContainer.add(createServiceTask2CreationTool()); - paletteContainer.add(createSubProcess3CreationTool()); - paletteContainer.add(createGateways4Group()); - paletteContainer.add(createEvents5Group()); - paletteContainer.add(createArtifacts6Group()); + paletteContainer.add(createActivities1Group()); + paletteContainer.add(createGateways2Group()); + paletteContainer.add(createEvents3Group()); + paletteContainer.add(createArtifacts4Group()); return paletteContainer; } @@ -61,15 +59,17 @@ } /** - * Creates "Artifacts" palette tool group + * Creates "Activities" palette tool group * @generated */ - private PaletteContainer createArtifacts6Group() { - PaletteGroup paletteContainer = new PaletteGroup( - Messages.Artifacts6Group_title); - paletteContainer.setId("createArtifacts6Group"); //$NON-NLS-1$ - paletteContainer.add(createDataObject1CreationTool()); - paletteContainer.add(createTextAnnotation2CreationTool()); + private PaletteContainer createActivities1Group() { + PaletteStack paletteContainer = new PaletteStack( + Messages.Activities1Group_title, null, null); + paletteContainer.setId("createActivities1Group"); //$NON-NLS-1$ + paletteContainer.add(createUserTask1CreationTool()); + paletteContainer.add(createServiceTask2CreationTool()); + paletteContainer.add(createScriptTask3CreationTool()); + paletteContainer.add(createSubProcess4CreationTool()); return paletteContainer; } @@ -87,6 +87,33 @@ } /** + * Creates "Events" palette tool group + * @generated + */ + private PaletteContainer createEvents3Group() { + PaletteGroup paletteContainer = new PaletteGroup( + Messages.Events3Group_title); + paletteContainer.setId("createEvents3Group"); //$NON-NLS-1$ + paletteContainer.add(createStartEvents1Group()); + paletteContainer.add(createIntermediateEvents2Group()); + paletteContainer.add(createEndEvents3Group()); + return paletteContainer; + } + + /** + * Creates "Artifacts" palette tool group + * @generated + */ + private PaletteContainer createArtifacts4Group() { + PaletteGroup paletteContainer = new PaletteGroup( + Messages.Artifacts4Group_title); + paletteContainer.setId("createArtifacts4Group"); //$NON-NLS-1$ + paletteContainer.add(createDataObject1CreationTool()); + paletteContainer.add(createTextAnnotation2CreationTool()); + return paletteContainer; + } + + /** * Creates "Intermediate Events" palette tool group * @generated */ @@ -102,20 +129,6 @@ } /** - * Creates "Events" palette tool group - * @generated - */ - private PaletteContainer createEvents5Group() { - PaletteGroup paletteContainer = new PaletteGroup( - Messages.Events5Group_title); - paletteContainer.setId("createEvents5Group"); //$NON-NLS-1$ - paletteContainer.add(createStartEvents1Group()); - paletteContainer.add(createIntermediateEvents2Group()); - paletteContainer.add(createEndEvents3Group()); - return paletteContainer; - } - - /** * Creates "End Events" palette tool group * @generated */ @@ -133,11 +146,11 @@ * Creates "Gateways" palette tool group * @generated */ - private PaletteContainer createGateways4Group() { + private PaletteContainer createGateways2Group() { PaletteStack paletteContainer = new PaletteStack( - Messages.Gateways4Group_title, null, null); - paletteContainer.setId("createGateways4Group"); //$NON-NLS-1$ - paletteContainer.setDescription(Messages.Gateways4Group_desc); + Messages.Gateways2Group_title, null, null); + paletteContainer.setId("createGateways2Group"); //$NON-NLS-1$ + paletteContainer.setDescription(Messages.Gateways2Group_desc); paletteContainer.add(createExclusive1CreationTool()); paletteContainer.add(createParallel2CreationTool()); return paletteContainer; @@ -202,13 +215,29 @@ /** * @generated */ - private ToolEntry createSubProcess3CreationTool() { + private ToolEntry createScriptTask3CreationTool() { ArrayList<IElementType> types = new ArrayList<IElementType>(2); + types.add(Bpmn2ElementTypes.ScriptTask_3016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); + NodeToolEntry entry = new NodeToolEntry( + Messages.ScriptTask3CreationTool_title, null, types); + entry.setId("createScriptTask3CreationTool"); //$NON-NLS-1$ + entry.setSmallIcon(Bpmn2ElementTypes + .getImageDescriptor(Bpmn2ElementTypes.ScriptTask_3016)); + entry.setLargeIcon(entry.getSmallIcon()); + return entry; + } + + /** + * @generated + */ + private ToolEntry createSubProcess4CreationTool() { + ArrayList<IElementType> types = new ArrayList<IElementType>(2); types.add(Bpmn2ElementTypes.SubProcess_2016); types.add(Bpmn2ElementTypes.SubProcess_3001); NodeToolEntry entry = new NodeToolEntry( - Messages.SubProcess3CreationTool_title, null, types); - entry.setId("createSubProcess3CreationTool"); //$NON-NLS-1$ + Messages.SubProcess4CreationTool_title, null, types); + entry.setId("createSubProcess4CreationTool"); //$NON-NLS-1$ entry.setSmallIcon(Bpmn2ElementTypes .getImageDescriptor(Bpmn2ElementTypes.SubProcess_2016)); entry.setLargeIcon(entry.getSmallIcon()); Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2VisualIDRegistry.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2VisualIDRegistry.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Bpmn2VisualIDRegistry.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -38,6 +38,10 @@ import org.jboss.tools.bpmn2.process.diagram.edit.parts.ParallelGateway2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ParallelGatewayEditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ProcessEditPart; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTask2EditPart; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTaskEditPart; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTaskName2EditPart; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTaskNameEditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.SequenceFlowEditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ServiceTask2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ServiceTaskEditPart; @@ -239,6 +243,10 @@ domainElement.eClass())) { return SubProcessEditPart.VISUAL_ID; } + if (Bpmn2Package.eINSTANCE.getScriptTask().isSuperTypeOf( + domainElement.eClass())) { + return ScriptTaskEditPart.VISUAL_ID; + } break; case SubProcessEditPart.VISUAL_ID: if (Bpmn2Package.eINSTANCE.getSubProcess().isSuperTypeOf( @@ -309,6 +317,10 @@ domainElement.eClass())) { return TextAnnotation2EditPart.VISUAL_ID; } + if (Bpmn2Package.eINSTANCE.getScriptTask().isSuperTypeOf( + domainElement.eClass())) { + return ScriptTask2EditPart.VISUAL_ID; + } break; case SubProcess2EditPart.VISUAL_ID: if (Bpmn2Package.eINSTANCE.getSubProcess().isSuperTypeOf( @@ -379,6 +391,10 @@ domainElement.eClass())) { return TextAnnotation2EditPart.VISUAL_ID; } + if (Bpmn2Package.eINSTANCE.getScriptTask().isSuperTypeOf( + domainElement.eClass())) { + return ScriptTask2EditPart.VISUAL_ID; + } break; } return -1; @@ -454,6 +470,9 @@ if (SubProcessEditPart.VISUAL_ID == nodeVisualID) { return true; } + if (ScriptTaskEditPart.VISUAL_ID == nodeVisualID) { + return true; + } break; case UserTaskEditPart.VISUAL_ID: if (UserTaskNameEditPart.VISUAL_ID == nodeVisualID) { @@ -521,7 +540,15 @@ if (TextAnnotation2EditPart.VISUAL_ID == nodeVisualID) { return true; } + if (ScriptTask2EditPart.VISUAL_ID == nodeVisualID) { + return true; + } break; + case ScriptTaskEditPart.VISUAL_ID: + if (ScriptTaskNameEditPart.VISUAL_ID == nodeVisualID) { + return true; + } + break; case SubProcess2EditPart.VISUAL_ID: if (SubProcess2EditPart.VISUAL_ID == nodeVisualID) { return true; @@ -568,6 +595,9 @@ if (TextAnnotation2EditPart.VISUAL_ID == nodeVisualID) { return true; } + if (ScriptTask2EditPart.VISUAL_ID == nodeVisualID) { + return true; + } break; case UserTask2EditPart.VISUAL_ID: if (UserTaskName2EditPart.VISUAL_ID == nodeVisualID) { @@ -589,6 +619,11 @@ return true; } break; + case ScriptTask2EditPart.VISUAL_ID: + if (ScriptTaskName2EditPart.VISUAL_ID == nodeVisualID) { + return true; + } + break; } return false; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Messages.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Messages.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/part/Messages.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -253,7 +253,7 @@ /** * @generated */ - public static String Artifacts6Group_title; + public static String Activities1Group_title; /** * @generated @@ -263,27 +263,32 @@ /** * @generated */ - public static String IntermediateEvents2Group_title; + public static String Events3Group_title; /** * @generated */ - public static String Events5Group_title; + public static String Artifacts4Group_title; /** * @generated */ + public static String IntermediateEvents2Group_title; + + /** + * @generated + */ public static String EndEvents3Group_title; /** * @generated */ - public static String Gateways4Group_title; + public static String Gateways2Group_title; /** * @generated */ - public static String Gateways4Group_desc; + public static String Gateways2Group_desc; /** * @generated @@ -308,11 +313,16 @@ /** * @generated */ - public static String SubProcess3CreationTool_title; + public static String ScriptTask3CreationTool_title; /** * @generated */ + public static String SubProcess4CreationTool_title; + + /** + * @generated + */ public static String DataObject1CreationTool_title; /** @@ -408,6 +418,16 @@ /** * @generated */ + public static String NavigatorGroupName_ScriptTask_2017_incominglinks; + + /** + * @generated + */ + public static String NavigatorGroupName_ScriptTask_2017_outgoinglinks; + + /** + * @generated + */ public static String NavigatorGroupName_EndEvent_2009_incominglinks; /** @@ -508,6 +528,16 @@ /** * @generated */ + public static String NavigatorGroupName_ScriptTask_3016_incominglinks; + + /** + * @generated + */ + public static String NavigatorGroupName_ScriptTask_3016_outgoinglinks; + + /** + * @generated + */ public static String NavigatorGroupName_Process_1000_links; /** Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ElementTypes.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ElementTypes.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ElementTypes.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -37,6 +37,8 @@ import org.jboss.tools.bpmn2.process.diagram.edit.parts.ParallelGateway2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ParallelGatewayEditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ProcessEditPart; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTask2EditPart; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTaskEditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.SequenceFlowEditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ServiceTask2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ServiceTaskEditPart; @@ -163,6 +165,11 @@ /** * @generated */ + public static final IElementType ScriptTask_2017 = getElementType("org.eclipse.bpmn2.diagram.ScriptTask_2017"); //$NON-NLS-1$ + + /** + * @generated + */ public static final IElementType SubProcess_3001 = getElementType("org.eclipse.bpmn2.diagram.SubProcess_3001"); //$NON-NLS-1$ /** @@ -238,6 +245,11 @@ /** * @generated */ + public static final IElementType ScriptTask_3016 = getElementType("org.eclipse.bpmn2.diagram.ScriptTask_3016"); //$NON-NLS-1$ + + /** + * @generated + */ public static final IElementType SequenceFlow_4001 = getElementType("org.eclipse.bpmn2.diagram.SequenceFlow_4001"); //$NON-NLS-1$ /** @@ -402,6 +414,9 @@ elements.put(SubProcess_2016, Bpmn2Package.eINSTANCE.getSubProcess()); + elements.put(ScriptTask_2017, + Bpmn2Package.eINSTANCE.getScriptTask()); + elements.put(SubProcess_3001, Bpmn2Package.eINSTANCE.getSubProcess()); @@ -443,6 +458,9 @@ elements.put(TextAnnotation_3015, Bpmn2Package.eINSTANCE.getTextAnnotation()); + elements.put(ScriptTask_3016, + Bpmn2Package.eINSTANCE.getScriptTask()); + elements.put(SequenceFlow_4001, Bpmn2Package.eINSTANCE.getSequenceFlow()); @@ -482,6 +500,7 @@ KNOWN_ELEMENT_TYPES.add(DataObject_2014); KNOWN_ELEMENT_TYPES.add(TextAnnotation_2015); KNOWN_ELEMENT_TYPES.add(SubProcess_2016); + KNOWN_ELEMENT_TYPES.add(ScriptTask_2017); KNOWN_ELEMENT_TYPES.add(SubProcess_3001); KNOWN_ELEMENT_TYPES.add(UserTask_3002); KNOWN_ELEMENT_TYPES.add(ServiceTask_3004); @@ -497,6 +516,7 @@ KNOWN_ELEMENT_TYPES.add(IntermediateCatchEvent_3013); KNOWN_ELEMENT_TYPES.add(DataObject_3014); KNOWN_ELEMENT_TYPES.add(TextAnnotation_3015); + KNOWN_ELEMENT_TYPES.add(ScriptTask_3016); KNOWN_ELEMENT_TYPES.add(SequenceFlow_4001); KNOWN_ELEMENT_TYPES.add(Association_4002); } @@ -542,6 +562,8 @@ return TextAnnotation_2015; case SubProcessEditPart.VISUAL_ID: return SubProcess_2016; + case ScriptTaskEditPart.VISUAL_ID: + return ScriptTask_2017; case SubProcess2EditPart.VISUAL_ID: return SubProcess_3001; case UserTask2EditPart.VISUAL_ID: @@ -572,6 +594,8 @@ return DataObject_3014; case TextAnnotation2EditPart.VISUAL_ID: return TextAnnotation_3015; + case ScriptTask2EditPart.VISUAL_ID: + return ScriptTask_3016; case SequenceFlowEditPart.VISUAL_ID: return SequenceFlow_4001; case AssociationEditPart.VISUAL_ID: Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ModelingAssistantProvider.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ModelingAssistantProvider.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ModelingAssistantProvider.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -40,6 +40,8 @@ import org.jboss.tools.bpmn2.process.diagram.edit.parts.ParallelGateway2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ParallelGatewayEditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ProcessEditPart; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTask2EditPart; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTaskEditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ServiceTask2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ServiceTaskEditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.StartEvent2EditPart; @@ -67,7 +69,7 @@ IGraphicalEditPart editPart = (IGraphicalEditPart) host .getAdapter(IGraphicalEditPart.class); if (editPart instanceof ProcessEditPart) { - ArrayList<IElementType> types = new ArrayList<IElementType>(16); + ArrayList<IElementType> types = new ArrayList<IElementType>(17); types.add(Bpmn2ElementTypes.UserTask_2001); types.add(Bpmn2ElementTypes.ServiceTask_2002); types.add(Bpmn2ElementTypes.StartEvent_2003); @@ -84,10 +86,11 @@ types.add(Bpmn2ElementTypes.DataObject_2014); types.add(Bpmn2ElementTypes.TextAnnotation_2015); types.add(Bpmn2ElementTypes.SubProcess_2016); + types.add(Bpmn2ElementTypes.ScriptTask_2017); return types; } if (editPart instanceof SubProcessEditPart) { - ArrayList<IElementType> types = new ArrayList<IElementType>(15); + ArrayList<IElementType> types = new ArrayList<IElementType>(16); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -103,10 +106,11 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); return types; } if (editPart instanceof SubProcess2EditPart) { - ArrayList<IElementType> types = new ArrayList<IElementType>(15); + ArrayList<IElementType> types = new ArrayList<IElementType>(16); types.add(Bpmn2ElementTypes.SubProcess_3001); types.add(Bpmn2ElementTypes.UserTask_3002); types.add(Bpmn2ElementTypes.ServiceTask_3004); @@ -122,6 +126,7 @@ types.add(Bpmn2ElementTypes.IntermediateCatchEvent_3013); types.add(Bpmn2ElementTypes.DataObject_3014); types.add(Bpmn2ElementTypes.TextAnnotation_3015); + types.add(Bpmn2ElementTypes.ScriptTask_3016); return types; } return Collections.EMPTY_LIST; @@ -193,6 +198,10 @@ return ((SubProcessEditPart) sourceEditPart) .getMARelTypesOnSource(); } + if (sourceEditPart instanceof ScriptTaskEditPart) { + return ((ScriptTaskEditPart) sourceEditPart) + .getMARelTypesOnSource(); + } if (sourceEditPart instanceof SubProcess2EditPart) { return ((SubProcess2EditPart) sourceEditPart) .getMARelTypesOnSource(); @@ -249,6 +258,10 @@ return ((TextAnnotation2EditPart) sourceEditPart) .getMARelTypesOnSource(); } + if (sourceEditPart instanceof ScriptTask2EditPart) { + return ((ScriptTask2EditPart) sourceEditPart) + .getMARelTypesOnSource(); + } return Collections.EMPTY_LIST; } @@ -318,6 +331,10 @@ return ((SubProcessEditPart) targetEditPart) .getMARelTypesOnTarget(); } + if (targetEditPart instanceof ScriptTaskEditPart) { + return ((ScriptTaskEditPart) targetEditPart) + .getMARelTypesOnTarget(); + } if (targetEditPart instanceof SubProcess2EditPart) { return ((SubProcess2EditPart) targetEditPart) .getMARelTypesOnTarget(); @@ -374,6 +391,10 @@ return ((TextAnnotation2EditPart) targetEditPart) .getMARelTypesOnTarget(); } + if (targetEditPart instanceof ScriptTask2EditPart) { + return ((ScriptTask2EditPart) targetEditPart) + .getMARelTypesOnTarget(); + } return Collections.EMPTY_LIST; } @@ -450,6 +471,10 @@ return ((SubProcessEditPart) sourceEditPart) .getMARelTypesOnSourceAndTarget(targetEditPart); } + if (sourceEditPart instanceof ScriptTaskEditPart) { + return ((ScriptTaskEditPart) sourceEditPart) + .getMARelTypesOnSourceAndTarget(targetEditPart); + } if (sourceEditPart instanceof SubProcess2EditPart) { return ((SubProcess2EditPart) sourceEditPart) .getMARelTypesOnSourceAndTarget(targetEditPart); @@ -510,6 +535,10 @@ return ((TextAnnotation2EditPart) sourceEditPart) .getMARelTypesOnSourceAndTarget(targetEditPart); } + if (sourceEditPart instanceof ScriptTask2EditPart) { + return ((ScriptTask2EditPart) sourceEditPart) + .getMARelTypesOnSourceAndTarget(targetEditPart); + } return Collections.EMPTY_LIST; } @@ -584,6 +613,10 @@ return ((SubProcessEditPart) targetEditPart) .getMATypesForSource(relationshipType); } + if (targetEditPart instanceof ScriptTaskEditPart) { + return ((ScriptTaskEditPart) targetEditPart) + .getMATypesForSource(relationshipType); + } if (targetEditPart instanceof SubProcess2EditPart) { return ((SubProcess2EditPart) targetEditPart) .getMATypesForSource(relationshipType); @@ -644,6 +677,10 @@ return ((TextAnnotation2EditPart) targetEditPart) .getMATypesForSource(relationshipType); } + if (targetEditPart instanceof ScriptTask2EditPart) { + return ((ScriptTask2EditPart) targetEditPart) + .getMATypesForSource(relationshipType); + } return Collections.EMPTY_LIST; } @@ -718,6 +755,10 @@ return ((SubProcessEditPart) sourceEditPart) .getMATypesForTarget(relationshipType); } + if (sourceEditPart instanceof ScriptTaskEditPart) { + return ((ScriptTaskEditPart) sourceEditPart) + .getMATypesForTarget(relationshipType); + } if (sourceEditPart instanceof SubProcess2EditPart) { return ((SubProcess2EditPart) sourceEditPart) .getMATypesForTarget(relationshipType); @@ -778,6 +819,10 @@ return ((TextAnnotation2EditPart) sourceEditPart) .getMATypesForTarget(relationshipType); } + if (sourceEditPart instanceof ScriptTask2EditPart) { + return ((ScriptTask2EditPart) sourceEditPart) + .getMATypesForTarget(relationshipType); + } return Collections.EMPTY_LIST; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ParserProvider.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ParserProvider.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ParserProvider.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -15,6 +15,8 @@ import org.eclipse.gmf.runtime.notation.View; import org.jboss.tools.bpmn2.process.diagram.edit.parts.DataObjectName2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.DataObjectNameEditPart; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTaskName2EditPart; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTaskNameEditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ServiceTaskName2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ServiceTaskNameEditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.TextAnnotationText2EditPart; @@ -105,6 +107,24 @@ /** * @generated */ + private IParser scriptTaskName_5009Parser; + + /** + * @generated + */ + private IParser getScriptTaskName_5009Parser() { + if (scriptTaskName_5009Parser == null) { + EAttribute[] features = new EAttribute[] { Bpmn2Package.eINSTANCE + .getFlowElement_Name() }; + MessageFormatParser parser = new MessageFormatParser(features); + scriptTaskName_5009Parser = parser; + } + return scriptTaskName_5009Parser; + } + + /** + * @generated + */ private IParser userTaskName_5005Parser; /** @@ -177,6 +197,24 @@ /** * @generated */ + private IParser scriptTaskName_5010Parser; + + /** + * @generated + */ + private IParser getScriptTaskName_5010Parser() { + if (scriptTaskName_5010Parser == null) { + EAttribute[] features = new EAttribute[] { Bpmn2Package.eINSTANCE + .getFlowElement_Name() }; + MessageFormatParser parser = new MessageFormatParser(features); + scriptTaskName_5010Parser = parser; + } + return scriptTaskName_5010Parser; + } + + /** + * @generated + */ protected IParser getParser(int visualID) { switch (visualID) { case UserTaskNameEditPart.VISUAL_ID: @@ -187,6 +225,8 @@ return getDataObjectName_5003Parser(); case TextAnnotationTextEditPart.VISUAL_ID: return getTextAnnotationText_5004Parser(); + case ScriptTaskNameEditPart.VISUAL_ID: + return getScriptTaskName_5009Parser(); case UserTaskName2EditPart.VISUAL_ID: return getUserTaskName_5005Parser(); case ServiceTaskName2EditPart.VISUAL_ID: @@ -195,6 +235,8 @@ return getDataObjectName_5007Parser(); case TextAnnotationText2EditPart.VISUAL_ID: return getTextAnnotationText_5008Parser(); + case ScriptTaskName2EditPart.VISUAL_ID: + return getScriptTaskName_5010Parser(); } return null; } Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ViewProvider.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ViewProvider.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/Bpmn2ViewProvider.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -64,6 +64,10 @@ import org.jboss.tools.bpmn2.process.diagram.edit.parts.ParallelGateway2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ParallelGatewayEditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ProcessEditPart; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTask2EditPart; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTaskEditPart; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTaskName2EditPart; +import org.jboss.tools.bpmn2.process.diagram.edit.parts.ScriptTaskNameEditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.SequenceFlowEditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ServiceTask2EditPart; import org.jboss.tools.bpmn2.process.diagram.edit.parts.ServiceTaskEditPart; @@ -186,11 +190,13 @@ case DataObjectEditPart.VISUAL_ID: case TextAnnotationEditPart.VISUAL_ID: case SubProcessEditPart.VISUAL_ID: + case ScriptTask2EditPart.VISUAL_ID: case StartEvent2EditPart.VISUAL_ID: case EndEvent2EditPart.VISUAL_ID: case EndEvent3EditPart.VISUAL_ID: case IntermediateCatchEvent2EditPart.VISUAL_ID: case IntermediateCatchEvent3EditPart.VISUAL_ID: + case ScriptTaskEditPart.VISUAL_ID: case SubProcess2EditPart.VISUAL_ID: case UserTask2EditPart.VISUAL_ID: case ServiceTask2EditPart.VISUAL_ID: @@ -234,6 +240,7 @@ || DataObjectEditPart.VISUAL_ID == visualID || TextAnnotationEditPart.VISUAL_ID == visualID || SubProcessEditPart.VISUAL_ID == visualID + || ScriptTaskEditPart.VISUAL_ID == visualID || SubProcess2EditPart.VISUAL_ID == visualID || UserTask2EditPart.VISUAL_ID == visualID || ServiceTask2EditPart.VISUAL_ID == visualID @@ -248,7 +255,8 @@ || IntermediateThrowEvent2EditPart.VISUAL_ID == visualID || IntermediateCatchEvent5EditPart.VISUAL_ID == visualID || DataObject2EditPart.VISUAL_ID == visualID - || TextAnnotation2EditPart.VISUAL_ID == visualID; + || TextAnnotation2EditPart.VISUAL_ID == visualID + || ScriptTask2EditPart.VISUAL_ID == visualID; } /** @@ -353,6 +361,9 @@ case SubProcessEditPart.VISUAL_ID: return createSubProcess_2016(domainElement, containerView, index, persisted, preferencesHint); + case ScriptTaskEditPart.VISUAL_ID: + return createScriptTask_2017(domainElement, containerView, index, + persisted, preferencesHint); case SubProcess2EditPart.VISUAL_ID: return createSubProcess_3001(domainElement, containerView, index, persisted, preferencesHint); @@ -398,6 +409,9 @@ case TextAnnotation2EditPart.VISUAL_ID: return createTextAnnotation_3015(domainElement, containerView, index, persisted, preferencesHint); + case ScriptTask2EditPart.VISUAL_ID: + return createScriptTask_3016(domainElement, containerView, index, + persisted, preferencesHint); } // can't happen, provided #provides(CreateNodeViewOperation) is correct return null; @@ -1137,6 +1151,52 @@ /** * @generated */ + public Node createScriptTask_2017(EObject domainElement, + View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { + Shape node = NotationFactory.eINSTANCE.createShape(); + node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); + node.setType(Bpmn2VisualIDRegistry + .getType(ScriptTaskEditPart.VISUAL_ID)); + ViewUtil.insertChildView(containerView, node, index, persisted); + node.setElement(domainElement); + stampShortcut(containerView, node); + // initializeFromPreferences + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint + .getPreferenceStore(); + + org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor( + prefStore, IPreferenceConstants.PREF_LINE_COLOR); + ViewUtil.setStructuralFeatureValue(node, + NotationPackage.eINSTANCE.getLineStyle_LineColor(), + FigureUtilities.RGBToInteger(lineRGB)); + FontStyle nodeFontStyle = (FontStyle) node + .getStyle(NotationPackage.Literals.FONT_STYLE); + if (nodeFontStyle != null) { + FontData fontData = PreferenceConverter.getFontData(prefStore, + IPreferenceConstants.PREF_DEFAULT_FONT); + nodeFontStyle.setFontName(fontData.getName()); + nodeFontStyle.setFontHeight(fontData.getHeight()); + nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0); + nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0); + org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter + .getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR); + nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB) + .intValue()); + } + org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor( + prefStore, IPreferenceConstants.PREF_FILL_COLOR); + ViewUtil.setStructuralFeatureValue(node, + NotationPackage.eINSTANCE.getFillStyle_FillColor(), + FigureUtilities.RGBToInteger(fillRGB)); + Node label5009 = createLabel(node, + Bpmn2VisualIDRegistry.getType(ScriptTaskNameEditPart.VISUAL_ID)); + return node; + } + + /** + * @generated + */ public Node createSubProcess_3001(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { @@ -1790,6 +1850,52 @@ /** * @generated */ + public Node createScriptTask_3016(EObject domainElement, + View containerView, int index, boolean persisted, + PreferencesHint preferencesHint) { + Shape node = NotationFactory.eINSTANCE.createShape(); + node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); + node.setType(Bpmn2VisualIDRegistry + .getType(ScriptTask2EditPart.VISUAL_ID)); + ViewUtil.insertChildView(containerView, node, index, persisted); + node.setElement(domainElement); + // initializeFromPreferences + final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint + .getPreferenceStore(); + + org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor( + prefStore, IPreferenceConstants.PREF_LINE_COLOR); + ViewUtil.setStructuralFeatureValue(node, + NotationPackage.eINSTANCE.getLineStyle_LineColor(), + FigureUtilities.RGBToInteger(lineRGB)); + FontStyle nodeFontStyle = (FontStyle) node + .getStyle(NotationPackage.Literals.FONT_STYLE); + if (nodeFontStyle != null) { + FontData fontData = PreferenceConverter.getFontData(prefStore, + IPreferenceConstants.PREF_DEFAULT_FONT); + nodeFontStyle.setFontName(fontData.getName()); + nodeFontStyle.setFontHeight(fontData.getHeight()); + nodeFontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0); + nodeFontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0); + org.eclipse.swt.graphics.RGB fontRGB = PreferenceConverter + .getColor(prefStore, IPreferenceConstants.PREF_FONT_COLOR); + nodeFontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB) + .intValue()); + } + org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor( + prefStore, IPreferenceConstants.PREF_FILL_COLOR); + ViewUtil.setStructuralFeatureValue(node, + NotationPackage.eINSTANCE.getFillStyle_FillColor(), + FigureUtilities.RGBToInteger(fillRGB)); + Node label5010 = createLabel(node, + Bpmn2VisualIDRegistry + .getType(ScriptTaskName2EditPart.VISUAL_ID)); + return node; + } + + /** + * @generated + */ public Edge createSequenceFlow_4001(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) { Modified: trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/ElementInitializers.java =================================================================== --- trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/ElementInitializers.java 2010-09-27 17:03:05 UTC (rev 25239) +++ trunk/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/src/org/jboss/tools/bpmn2/process/diagram/providers/ElementInitializers.java 2010-09-27 17:04:43 UTC (rev 25240) @@ -13,6 +13,7 @@ import org.eclipse.bpmn2.IntermediateCatchEvent; import org.eclipse.bpmn2.IntermediateThrowEvent; import org.eclipse.bpmn2.ParallelGateway; +import org.eclipse.bpmn2.ScriptTask; import org.eclipse.bpmn2.SequenceFlow; import org.eclipse.bpmn2.ServiceTask; import org.eclipse.bpmn2.StartEvent; @@ -291,6 +292,19 @@ /** * @generated */ + public void init_ScriptTask_2017(ScriptTask instance) { + try { + Object value_0 = id_ScriptTask_2017(instance); + instance.setId((String) value_0); + } catch (RuntimeException e) { + Bpmn2DiagramEditorPlugin.getInstance().logError( + "Element initialization failed", e); //$NON-NLS-1$ + } + } + + /** + * @generated + */ public void init_SubProcess_3001(SubProcess instance) { try { Object value_0 = id_SubProcess_3001(instance); @@ -528,6 +542,19 @@ /** * @generated */ + public void init_ScriptTask_3016(ScriptTask instance) { + try { + Object value_0 = id_ScriptTask_3016(instance); + instance.setId((String) value_0); + } catch (RuntimeException e) { + Bpmn2DiagramEditorPlugin.getInstance().logError( + "Element initialization failed", e); //$NON-NLS-1$ + } + } + + /** + * @generated + */ public void init_SequenceFlow_4001(SequenceFlow instance) { try { Object value_0 = id_SequenceFlow_4001(instance); @@ -755,6 +782,13 @@ /** * @generated not */ + private String id_ScriptTask_2017(ScriptTask self) { + return EcoreUtil.generateUUID(); + } + + /** + * @generated not + */ private String id_SubProcess_3001(SubProcess self) { return EcoreUtil.generateUUID(); } @@ -936,6 +970,13 @@ /** * @generated not */ + private String id_ScriptTask_3016(ScriptTask self) { + return EcoreUtil.generateUUID(); + } + + /** + * @generated not + */ private String id_SequenceFlow_4001(SequenceFlow self) { return EcoreUtil.generateUUID();