Author: koen.aers(a)jboss.com
Date: 2008-12-22 22:32:08 -0500 (Mon, 22 Dec 2008)
New Revision: 12811
Added:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HumanTask.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ScriptTask.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ServiceTask.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/JpdlPaletteFactory.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java
Log:
addition of script task, esb task and human task support
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2008-12-23 03:28:50 UTC (rev
12810)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2008-12-23 03:32:08 UTC (rev
12811)
@@ -127,6 +127,30 @@
</node>
</element>
<element
+ class="org.jboss.tools.flow.jpdl4.model.ScriptTask"
+ id="org.jboss.tools.flow.jpdl4.scriptTask"
+ language="org.jboss.tools.flow.jpdl4">
+ <node>
+ <figure
class="org.jboss.tools.flow.jpdl4.figure.TaskFigure"></figure>
+ </node>
+ </element>
+ <element
+ class="org.jboss.tools.flow.jpdl4.model.ServiceTask"
+ id="org.jboss.tools.flow.jpdl4.serviceTask"
+ language="org.jboss.tools.flow.jpdl4">
+ <node>
+ <figure
class="org.jboss.tools.flow.jpdl4.figure.TaskFigure"></figure>
+ </node>
+ </element>
+ <element
+ class="org.jboss.tools.flow.jpdl4.model.HumanTask"
+ id="org.jboss.tools.flow.jpdl4.humanTask"
+ language="org.jboss.tools.flow.jpdl4">
+ <node>
+ <figure
class="org.jboss.tools.flow.jpdl4.figure.TaskFigure"></figure>
+ </node>
+ </element>
+ <element
class="org.jboss.tools.flow.jpdl4.model.ExclusiveGateway"
id="org.jboss.tools.flow.jpdl4.exclusiveGateway"
language="org.jboss.tools.flow.jpdl4">
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-23
03:28:50 UTC (rev 12810)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java 2008-12-23
03:32:08 UTC (rev 12811)
@@ -126,6 +126,12 @@
result =
(NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.sqlTask");
} else if ("java".equals(child.getNodeName())) {
result =
(NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.javaTask");
+ } else if ("script".equals(child.getNodeName())) {
+ result =
(NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.scriptTask");
+ } else if ("esb".equals(child.getNodeName())) {
+ result =
(NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.serviceTask");
+ } else if ("task".equals(child.getNodeName())) {
+ result =
(NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.humanTask");
} else if ("exclusive".equals(child.getNodeName())) {
result =
(NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.exclusiveGateway");
} else if ("join".equals(child.getNodeName())) {
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 2008-12-23
03:28:50 UTC (rev 12810)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java 2008-12-23
03:32:08 UTC (rev 12811)
@@ -66,7 +66,7 @@
protected List<PaletteEntry> createEventEntries() {
List<PaletteEntry> entries = new ArrayList<PaletteEntry>();
CombinedTemplateCreationEntry combined = new CombinedTemplateCreationEntry(
- "Start Event",
+ "Start",
"Create a new Start Event",
"org.jboss.tools.flow.jpdl4.startEvent",
ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.startEvent"),
@@ -75,7 +75,7 @@
);
entries.add(combined);
combined = new CombinedTemplateCreationEntry(
- "Terminate End Event",
+ "Terminate",
"Create a new terminating end event",
"org.jboss.tools.flow.jpdl4.terminateEndEvent",
ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.terminateEndEvent"),
@@ -84,7 +84,7 @@
);
entries.add(combined);
combined = new CombinedTemplateCreationEntry(
- "Cancel End Event",
+ "Cancel",
"Create a new cancel end event",
"org.jboss.tools.flow.jpdl4.cancelEndEvent",
ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.cancelEndEvent"),
@@ -93,7 +93,7 @@
);
entries.add(combined);
combined = new CombinedTemplateCreationEntry(
- "Error End Event",
+ "Error",
"Create a new error end event",
"org.jboss.tools.flow.jpdl4.errorEndEvent",
ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.errorEndEvent"),
@@ -107,7 +107,7 @@
protected List<PaletteEntry> createTaskEntries() {
List<PaletteEntry> entries = new ArrayList<PaletteEntry>();
CombinedTemplateCreationEntry combined = new CombinedTemplateCreationEntry(
- "Wait State Task",
+ "Wait",
"Create a new Wait State Task",
"org.jboss.tools.flow.jpdl4.waitTask",
ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.waitTask"),
@@ -116,7 +116,7 @@
);
entries.add(combined);
combined = new CombinedTemplateCreationEntry(
- "HQL Task",
+ "HQL",
"Create a new HQL Task",
"org.jboss.tools.flow.jpdl4.hqlTask",
ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.hqlTask"),
@@ -125,7 +125,7 @@
);
entries.add(combined);
combined = new CombinedTemplateCreationEntry(
- "SQL Task",
+ "SQL",
"Create a new SQL Task",
"org.jboss.tools.flow.jpdl4.sqlTask",
ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.sqlTask"),
@@ -134,7 +134,7 @@
);
entries.add(combined);
combined = new CombinedTemplateCreationEntry(
- "Java Task",
+ "Java",
"Create a new Java Task",
"org.jboss.tools.flow.jpdl4.javaTask",
ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.javaTask"),
@@ -142,6 +142,33 @@
ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/task_java.png"))
);
entries.add(combined);
+ combined = new CombinedTemplateCreationEntry(
+ "Script",
+ "Create a new Script Task",
+ "org.jboss.tools.flow.jpdl4.scriptTask",
+
ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.scriptTask"),
+
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",
+
ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.humanTask"),
+
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 2008-12-23
03:28:50 UTC (rev 12810)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java 2008-12-23
03:32:08 UTC (rev 12811)
@@ -18,10 +18,13 @@
import org.jboss.tools.flow.jpdl4.model.ExclusiveGateway;
import org.jboss.tools.flow.jpdl4.model.ForkParallelGateway;
import org.jboss.tools.flow.jpdl4.model.HqlTask;
+import org.jboss.tools.flow.jpdl4.model.HumanTask;
import org.jboss.tools.flow.jpdl4.model.JavaTask;
import org.jboss.tools.flow.jpdl4.model.JoinParallelGateway;
import org.jboss.tools.flow.jpdl4.model.Process;
+import org.jboss.tools.flow.jpdl4.model.ScriptTask;
import org.jboss.tools.flow.jpdl4.model.SequenceFlow;
+import org.jboss.tools.flow.jpdl4.model.ServiceTask;
import org.jboss.tools.flow.jpdl4.model.SqlTask;
import org.jboss.tools.flow.jpdl4.model.StartEvent;
import org.jboss.tools.flow.jpdl4.model.SuperState;
@@ -166,6 +169,39 @@
buffer.append("name=\"" + value + "\"");
}
appendNodeGraphics(buffer, (NodeWrapper)wrapper);
+ } else if (element instanceof ScriptTask) {
+ ScriptTask scriptTask = (ScriptTask)element;
+ buffer.append("\n");
+ appendPadding(buffer, level);
+ buffer.append("<script");
+ if (!isEmpty(scriptTask.getName())) {
+ buffer.append(" ");
+ String value = scriptTask.getName();
+ buffer.append("name=\"" + value + "\"");
+ }
+ appendNodeGraphics(buffer, (NodeWrapper)wrapper);
+ } else if (element instanceof ServiceTask) {
+ ServiceTask serviceTask = (ServiceTask)element;
+ buffer.append("\n");
+ appendPadding(buffer, level);
+ buffer.append("<esb");
+ if (!isEmpty(serviceTask.getName())) {
+ buffer.append(" ");
+ String value = serviceTask.getName();
+ buffer.append("name=\"" + value + "\"");
+ }
+ appendNodeGraphics(buffer, (NodeWrapper)wrapper);
+ } else if (element instanceof HumanTask) {
+ HumanTask humanTask = (HumanTask)element;
+ buffer.append("\n");
+ appendPadding(buffer, level);
+ buffer.append("<task");
+ if (!isEmpty(humanTask.getName())) {
+ buffer.append(" ");
+ String value = humanTask.getName();
+ buffer.append("name=\"" + value + "\"");
+ }
+ appendNodeGraphics(buffer, (NodeWrapper)wrapper);
} else if (element instanceof ExclusiveGateway) {
ExclusiveGateway exclusiveGateway = (ExclusiveGateway)element;
buffer.append("\n");
@@ -271,6 +307,18 @@
buffer.append("\n");
appendPadding(buffer, level);
buffer.append("</java>");
+ } else if (element instanceof ScriptTask) {
+ buffer.append("\n");
+ appendPadding(buffer, level);
+ buffer.append("</script>");
+ } else if (element instanceof ServiceTask) {
+ buffer.append("\n");
+ appendPadding(buffer, level);
+ buffer.append("</esb>");
+ } else if (element instanceof HumanTask) {
+ buffer.append("\n");
+ appendPadding(buffer, level);
+ buffer.append("</task>");
} else if (element instanceof ExclusiveGateway) {
buffer.append("\n");
appendPadding(buffer, level);
Added:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HumanTask.java
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HumanTask.java
(rev 0)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HumanTask.java 2008-12-23
03:32:08 UTC (rev 12811)
@@ -0,0 +1,6 @@
+package org.jboss.tools.flow.jpdl4.model;
+
+
+public class HumanTask extends Task {
+
+}
Added:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ScriptTask.java
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ScriptTask.java
(rev 0)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ScriptTask.java 2008-12-23
03:32:08 UTC (rev 12811)
@@ -0,0 +1,6 @@
+package org.jboss.tools.flow.jpdl4.model;
+
+
+public class ScriptTask extends Task {
+
+}
Added:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ServiceTask.java
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ServiceTask.java
(rev 0)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ServiceTask.java 2008-12-23
03:32:08 UTC (rev 12811)
@@ -0,0 +1,6 @@
+package org.jboss.tools.flow.jpdl4.model;
+
+
+public class ServiceTask extends Task {
+
+}