Author: koen.aers(a)jboss.com Date: 2009-05-30 17:59:40 -0400 (Sat, 30 May 2009) New Revision: 15618 Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/CustomTask.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/JpdlPaletteFactory.java 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/properties/JavaTaskArgumentsSection.java Log: - allow config of jbpm 4 runtimes (GPD-346) - support custom node (GPD-349) - remove esb node temporarily (GPD-350) Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-05-30 21:57:32 UTC (rev 15617) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-05-30 21:59:40 UTC (rev 15618) @@ -162,7 +162,7 @@ <figure class="org.jboss.tools.flow.jpdl4.figure.TaskFigure"></figure> </node> </element> - <element +<!-- <element class="org.jboss.tools.flow.jpdl4.model.ServiceTask" figure="icons/16/task_empty.png" id="org.jboss.tools.flow.jpdl4.serviceTask" @@ -171,7 +171,7 @@ <node> <figure class="org.jboss.tools.flow.jpdl4.figure.TaskFigure"></figure> </node> - </element> + </element> --> <element class="org.jboss.tools.flow.jpdl4.model.HumanTask" figure="icons/16/task_empty.png" @@ -191,7 +191,17 @@ <node> <figure class="org.jboss.tools.flow.jpdl4.figure.TaskFigure"></figure> </node> + <element + class="org.jboss.tools.flow.jpdl4.model.CustomTask" + figure="icons/16/task_empty.png" + id="org.jboss.tools.flow.jpdl4.customTask" + label="custom" + language="org.jboss.tools.flow.jpdl4"> + <node> + <figure class="org.jboss.tools.flow.jpdl4.figure.TaskFigure"></figure> + </node> </element> + </element> <element class="org.jboss.tools.flow.jpdl4.model.ExclusiveGateway" figure="icons/16/gateway_exclusive.png" Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java 2009-05-30 21:57:32 UTC (rev 15617) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java 2009-05-30 21:59:40 UTC (rev 15618) @@ -151,16 +151,16 @@ ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/task_empty.png")) ); entries.add(combined); +// combined = new CombinedTemplateCreationEntry( +// "esb", +// "Create a new Service Task", +// "org.jboss.tools.flow.jpdl4.serviceTask", +// ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.serviceTask"), +// ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/task_empty.png")), +// ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/task_empty.png")) +// ); +// entries.add(combined); combined = new CombinedTemplateCreationEntry( - "esb", - "Create a new Service Task", - "org.jboss.tools.flow.jpdl4.serviceTask", - ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.serviceTask"), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/task_empty.png")), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/task_empty.png")) - ); - entries.add(combined); - combined = new CombinedTemplateCreationEntry( "task", "Create a new Human Task", "org.jboss.tools.flow.jpdl4.humanTask", @@ -178,6 +178,15 @@ ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/task_empty.png")) ); entries.add(combined); + combined = new CombinedTemplateCreationEntry( + "custom", + "Create a new Custom Node", + "org.jboss.tools.flow.jpdl4.customTask", + ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.customTask"), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/task_empty.png")), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/task_empty.png")) + ); + entries.add(combined); return entries; } 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 2009-05-30 21:57:32 UTC (rev 15617) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java 2009-05-30 21:59:40 UTC (rev 15618) @@ -31,6 +31,7 @@ import org.jboss.tools.flow.jpdl4.Logger; import org.jboss.tools.flow.jpdl4.model.Assignment; import org.jboss.tools.flow.jpdl4.model.CancelEndEvent; +import org.jboss.tools.flow.jpdl4.model.CustomTask; import org.jboss.tools.flow.jpdl4.model.ErrorEndEvent; import org.jboss.tools.flow.jpdl4.model.EventListener; import org.jboss.tools.flow.jpdl4.model.EventListenerContainer; @@ -197,6 +198,7 @@ else if ("org.jboss.tools.flow.jpdl4.serviceTask".equals(elementId)) return "esb"; else if ("org.jboss.tools.flow.jpdl4.humanTask".equals(elementId)) return "task"; else if ("org.jboss.tools.flow.jpdl4.subprocessTask".equals(elementId)) return "sub-process"; + else if ("org.jboss.tools.flow.jpdl4.customTask".equals(elementId)) return "node"; else if ("org.jboss.tools.flow.jpdl4.exclusiveGateway".equals(elementId)) return "decision"; else if ("org.jboss.tools.flow.jpdl4.parallelJoinGateway".equals(elementId)) return "join"; else if ("org.jboss.tools.flow.jpdl4.parallelForkGateway".equals(elementId)) return "fork"; @@ -747,6 +749,8 @@ new HumanTaskWrapperSerializer().appendOpening(buffer, wrapper, level); } else if (element instanceof SubprocessTask) { new SubprocessTaskWrapperSerializer().appendOpening(buffer, wrapper, level); + } else if (element instanceof CustomTask) { + new ProcessNodeWrapperSerializer().appendOpening(buffer, wrapper, level); } else if (element instanceof ExclusiveGateway) { new ExclusiveGatewayWrapperSerializer().appendOpening(buffer, wrapper, level); } else if (element instanceof ForkParallelGateway) { @@ -802,6 +806,8 @@ new HumanTaskWrapperSerializer().appendBody(buffer, wrapper, level); } else if (element instanceof SubprocessTask) { new SubprocessTaskWrapperSerializer().appendBody(buffer, wrapper, level); + } else if (element instanceof CustomTask) { + new ProcessNodeWrapperSerializer().appendBody(buffer, wrapper, level); } else if (element instanceof ExclusiveGateway) { new ExclusiveGatewayWrapperSerializer().appendBody(buffer, wrapper, level); } else if (element instanceof ForkParallelGateway) { @@ -867,6 +873,8 @@ buffer.append("</task>"); } else if (element instanceof SubprocessTask) { buffer.append("</sub-process>"); + } else if (element instanceof CustomTask) { + buffer.append("</node>"); } else if (element instanceof ExclusiveGateway) { buffer.append("</decision>"); } else if (element instanceof ForkParallelGateway) { Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/CustomTask.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/CustomTask.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/CustomTask.java 2009-05-30 21:59:40 UTC (rev 15618) @@ -0,0 +1,10 @@ +package org.jboss.tools.flow.jpdl4.model; + + +public class CustomTask extends Task { + + protected boolean isPropagationExclusive() { + return true; + } + +} Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/CustomTask.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/JavaTaskArgumentsSection.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/JavaTaskArgumentsSection.java 2009-05-30 21:57:32 UTC (rev 15617) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/JavaTaskArgumentsSection.java 2009-05-30 21:59:40 UTC (rev 15618) @@ -4,14 +4,13 @@ import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Text; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage; import org.jboss.tools.flow.common.properties.IPropertyId; public class JavaTaskArgumentsSection extends JpdlPropertySection implements IPropertyId { - private final static String NO_FIELDS = "The configured class has no fields that can be configured."; - private final static String CONFIGURE_FIELDS = "Configure the value of the supported fields as needed."; + private final static String NO_ARGUMENTS = "The configured method has no arguments that can be configured."; + private final static String CONFIGURE_ARGUMENTS = "Configure the value of the supported arguments as needed."; private CLabel infoLabel; @@ -51,7 +50,7 @@ private void createInfoLabel(Composite parent) { - infoLabel = getWidgetFactory().createCLabel(parent, NO_FIELDS); + infoLabel = getWidgetFactory().createCLabel(parent, NO_ARGUMENTS); FormData data = new FormData(); data.left = new FormAttachment(0, 0); data.top = new FormAttachment(0, 5);