Author: koen.aers(a)jboss.com Date: 2008-12-13 11:24:13 -0500 (Sat, 13 Dec 2008) New Revision: 12584 Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/large/gateway_parallel.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ParallelGatewayFigure.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ParallelForkGateway.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ParallelJoinGateway.java Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java Log: added support for join and fork (parallel gateway) Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/large/gateway_parallel.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/large/gateway_parallel.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2008-12-13 01:33:21 UTC (rev 12583) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2008-12-13 16:24:13 UTC (rev 12584) @@ -93,6 +93,22 @@ </node> </element> <element + class="org.jboss.tools.flow.jpdl4.model.ParallelForkGateway" + id="org.jboss.tools.flow.jpdl4.parallelForkGateway" + language="org.jboss.tools.flow.jpdl4"> + <node> + <figure class="org.jboss.tools.flow.jpdl4.figure.ParallelGatewayFigure"></figure> + </node> + </element> + <element + class="org.jboss.tools.flow.jpdl4.model.ParallelJoinGateway" + id="org.jboss.tools.flow.jpdl4.parallelJoinGateway" + language="org.jboss.tools.flow.jpdl4"> + <node> + <figure class="org.jboss.tools.flow.jpdl4.figure.ParallelGatewayFigure"></figure> + </node> + </element> + <element class="org.jboss.tools.flow.jpdl4.model.SequenceFlow" figure="icons/sequence.gif" id="org.jboss.tools.flow.jpdl4.sequenceFlow" Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java 2008-12-13 01:33:21 UTC (rev 12583) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java 2008-12-13 16:24:13 UTC (rev 12584) @@ -118,6 +118,10 @@ result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.endEvent"); } else if ("exclusive".equals(child.getNodeName())) { result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.exclusiveGateway"); + } else if ("join".equals(child.getNodeName())) { + result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.parallelJoinGateway"); + } else if ("fork".equals(child.getNodeName())) { + result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.parallelForkGateway"); } if (result != null) { wrapper.addElement(result); Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java 2008-12-13 01:33:21 UTC (rev 12583) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java 2008-12-13 16:24:13 UTC (rev 12584) @@ -15,6 +15,8 @@ import org.jboss.tools.flow.common.wrapper.Wrapper; import org.jboss.tools.flow.jpdl4.model.EndEvent; import org.jboss.tools.flow.jpdl4.model.ExclusiveGateway; +import org.jboss.tools.flow.jpdl4.model.ParallelForkGateway; +import org.jboss.tools.flow.jpdl4.model.ParallelJoinGateway; import org.jboss.tools.flow.jpdl4.model.Process; import org.jboss.tools.flow.jpdl4.model.StartEvent; import org.jboss.tools.flow.jpdl4.model.StateTask; @@ -114,6 +116,30 @@ } appendNodeGraphics(buffer, (NodeWrapper)wrapper); buffer.append(">"); + } else if (element instanceof ParallelForkGateway) { + ParallelForkGateway parallelForkGateway = (ParallelForkGateway)element; + buffer.append("\n"); + appendPadding(buffer, level); + buffer.append("<fork"); + if (parallelForkGateway.getName() != null) { + buffer.append(" "); + String value = parallelForkGateway.getName(); + buffer.append("name=\"" + value + "\""); + } + appendNodeGraphics(buffer, (NodeWrapper)wrapper); + buffer.append(">"); + } else if (element instanceof ParallelJoinGateway) { + ParallelJoinGateway parallelJoinGateway = (ParallelJoinGateway)element; + buffer.append("\n"); + appendPadding(buffer, level); + buffer.append("<join"); + if (parallelJoinGateway.getName() != null) { + buffer.append(" "); + String value = parallelJoinGateway.getName(); + buffer.append("name=\"" + value + "\""); + } + appendNodeGraphics(buffer, (NodeWrapper)wrapper); + buffer.append(">"); } else if (element instanceof Process) { Process process = (Process)element; buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\n"); @@ -167,6 +193,14 @@ buffer.append("\n"); appendPadding(buffer, level); buffer.append("</exclusive>"); + } else if (element instanceof ParallelForkGateway) { + buffer.append("\n"); + appendPadding(buffer, level); + buffer.append("</fork>"); + } else if (element instanceof ParallelJoinGateway) { + buffer.append("\n"); + appendPadding(buffer, level); + buffer.append("</join>"); } else if (element instanceof Process) { buffer.append("\n"); appendPadding(buffer, level); Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ParallelGatewayFigure.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ParallelGatewayFigure.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ParallelGatewayFigure.java 2008-12-13 16:24:13 UTC (rev 12584) @@ -0,0 +1,30 @@ +package org.jboss.tools.flow.jpdl4.figure; + +import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.swt.graphics.Image; +import org.jboss.tools.flow.common.figure.AbstractElementFigure; +import org.jboss.tools.flow.jpdl4.Activator; + +public class ParallelGatewayFigure extends AbstractElementFigure { //DiamondElementFigure { + + private static final Image ICON = ImageDescriptor.createFromURL( + Activator.getDefault().getBundle().getEntry( + "icons/large/gateway_parallel.png")).createImage(); + + public ParallelGatewayFigure() { + setSize(32, 32); + } + + public void setText(String text) { + } + + public void setBounds(Rectangle r) { + r.setSize(32, 32); + super.setBounds(r); + } + + protected void customizeFigure() { + setIcon(ICON); + } +} Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ParallelForkGateway.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ParallelForkGateway.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ParallelForkGateway.java 2008-12-13 16:24:13 UTC (rev 12584) @@ -0,0 +1,7 @@ +package org.jboss.tools.flow.jpdl4.model; + +import org.jboss.tools.flow.common.model.DefaultNode; + +public class ParallelForkGateway extends DefaultNode { + +} Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ParallelJoinGateway.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ParallelJoinGateway.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ParallelJoinGateway.java 2008-12-13 16:24:13 UTC (rev 12584) @@ -0,0 +1,7 @@ +package org.jboss.tools.flow.jpdl4.model; + +import org.jboss.tools.flow.common.model.DefaultNode; + +public class ParallelJoinGateway extends DefaultNode { + +}