[jbosstools-commits] JBoss Tools SVN: r15157 - in trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4: src/org/jboss/tools/flow/jpdl4/editor and 1 other directories.

Author: koen.aers(a)jboss.com Date: 2009-05-11 11:33:05 -0400 (Mon, 11 May 2009) New Revision: 15157 Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/MailTask.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: enable mail, remove subprocess from palette Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-05-11 15:22:07 UTC (rev 15156) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-05-11 15:33:05 UTC (rev 15157) @@ -133,6 +133,16 @@ </node> </element> <element + class="org.jboss.tools.flow.jpdl4.model.MailTask" + figure="icons/16/task_empty.png" + id="org.jboss.tools.flow.jpdl4.mailTask" + label="mail" + 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.JavaTask" figure="icons/16/task_java.png" id="org.jboss.tools.flow.jpdl4.javaTask" 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 2009-05-11 15:22:07 UTC (rev 15156) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java 2009-05-11 15:33:05 UTC (rev 15157) @@ -419,6 +419,7 @@ else if ("java".equals(nodeName)) return "org.jboss.tools.flow.jpdl4.javaTask"; else if ("script".equals(nodeName)) return "org.jboss.tools.flow.jpdl4.scriptTask"; else if ("esb".equals(nodeName)) return "org.jboss.tools.flow.jpdl4.serviceTask"; + else if ("mail".equals(nodeName)) return "org.jboss.tools.flow.jpdl4.mailTask"; else if ("task".equals(nodeName)) return "org.jboss.tools.flow.jpdl4.humanTask"; else if ("sub-process".equals(nodeName)) return "org.jboss.tools.flow.jpdl4.subprocessTask"; else if ("decision".equals(nodeName)) return "org.jboss.tools.flow.jpdl4.exclusiveGateway"; 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-11 15:22:07 UTC (rev 15156) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java 2009-05-11 15:33:05 UTC (rev 15157) @@ -169,15 +169,15 @@ ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/task_empty.png")) ); entries.add(combined); - combined = new CombinedTemplateCreationEntry( - "sub-process", - "Create a new Subprocess", - "org.jboss.tools.flow.jpdl4.subprocess", - ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.subprocessTask"), - 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( +// "sub-process", +// "Create a new Subprocess", +// "org.jboss.tools.flow.jpdl4.subprocess", +// ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.subprocessTask"), +// 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-11 15:22:07 UTC (rev 15156) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java 2009-05-11 15:33:05 UTC (rev 15157) @@ -40,6 +40,7 @@ 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.MailTask; import org.jboss.tools.flow.jpdl4.model.Process; import org.jboss.tools.flow.jpdl4.model.ProcessNode; import org.jboss.tools.flow.jpdl4.model.ScriptTask; @@ -187,6 +188,7 @@ else if ("org.jboss.tools.flow.jpdl4.sqlTask".equals(elementId)) return "sql"; else if ("org.jboss.tools.flow.jpdl4.javaTask".equals(elementId)) return "java"; else if ("org.jboss.tools.flow.jpdl4.scriptTask".equals(elementId)) return "script"; + else if ("org.jboss.tools.flow.jpdl4.mailTask".equals(elementId)) return "mail"; 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"; @@ -503,8 +505,10 @@ new ProcessNodeWrapperSerializer().appendOpening(buffer, wrapper, level); } else if (element instanceof JavaTask) { new ProcessNodeWrapperSerializer().appendOpening(buffer, wrapper, level); - } else if (element instanceof ScriptTask) { + } else if (element instanceof ScriptTask) { new ProcessNodeWrapperSerializer().appendOpening(buffer, wrapper, level); + } else if (element instanceof MailTask) { + new ProcessNodeWrapperSerializer().appendOpening(buffer, wrapper, level); } else if (element instanceof ServiceTask) { new ProcessNodeWrapperSerializer().appendOpening(buffer, wrapper, level); } else if (element instanceof HumanTask) { @@ -621,6 +625,8 @@ buffer.append("</java>"); } else if (element instanceof ScriptTask) { buffer.append("</script>"); + } else if (element instanceof MailTask) { + buffer.append("</mail>"); } else if (element instanceof ServiceTask) { buffer.append("</esb>"); } else if (element instanceof HumanTask) { Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/MailTask.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/MailTask.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/MailTask.java 2009-05-11 15:33:05 UTC (rev 15157) @@ -0,0 +1,10 @@ +package org.jboss.tools.flow.jpdl4.model; + + +public class MailTask 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/MailTask.java ___________________________________________________________________ Name: svn:mime-type + text/plain