Author: koen.aers(a)jboss.com Date: 2009-12-18 21:38:14 -0500 (Fri, 18 Dec 2009) New Revision: 19483 Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/JmsTaskDeserializer.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/JmsTaskSerializer.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/RuleTaskDeserializer.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/RuleTaskSerializer.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/RulesDecisionDeserializer.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/RulesDecisionSerializer.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/JmsTask.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/RuleTask.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/RulesDecision.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/io/ProcessDeserializer.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/Registry.java Log: add - rules decision node - rules node - jms node Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-12-19 01:47:05 UTC (rev 19482) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-12-19 02:38:14 UTC (rev 19483) @@ -162,6 +162,26 @@ <figure class="org.jboss.tools.flow.jpdl4.figure.TaskFigure"></figure> </node> </element> + <element + class="org.jboss.tools.flow.jpdl4.model.JmsTask" + figure="icons/16/task_empty.png" + id="org.jboss.tools.flow.jpdl4.jmsTask" + label="jms" + 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.RuleTask" + figure="icons/16/task_empty.png" + id="org.jboss.tools.flow.jpdl4.ruleTask" + label="rule" + 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" figure="icons/16/task_empty.png" @@ -213,6 +233,16 @@ </node> </element> <element + class="org.jboss.tools.flow.jpdl4.model.RulesDecision" + figure="icons/16/gateway_exclusive.png" + id="org.jboss.tools.flow.jpdl4.rulesDecision" + label="rule" + language="org.jboss.tools.flow.jpdl4"> + <node> + <figure class="org.jboss.tools.flow.jpdl4.figure.ExclusiveGatewayFigure"></figure> + </node> + </element> + <element class="org.jboss.tools.flow.jpdl4.model.ForkParallelGateway" figure="icons/16/gateway_parallel.png" id="org.jboss.tools.flow.jpdl4.parallelForkGateway" 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-12-19 01:47:05 UTC (rev 19482) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java 2009-12-19 02:38:14 UTC (rev 19483) @@ -134,6 +134,24 @@ ); entries.add(combined); combined = new CombinedTemplateCreationEntry( + "jms", + "Create a new JMS Node", + "org.jboss.tools.flow.jpdl4.jmsTask", + ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.jmsTask"), + 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( + "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); + combined = new CombinedTemplateCreationEntry( "java", "Create a new Java Task", "org.jboss.tools.flow.jpdl4.javaTask", @@ -151,6 +169,15 @@ ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/task_empty.png")) ); entries.add(combined); + combined = new CombinedTemplateCreationEntry( + "rule", + "Create a new Rule Task", + "org.jboss.tools.flow.jpdl4.ruleTask", + ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.ruleTask"), + 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", @@ -178,15 +205,6 @@ 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; } @@ -202,6 +220,15 @@ ); entries.add(combined); combined = new CombinedTemplateCreationEntry( + "rule", + "Create a new Rules Decision", + "org.jboss.tools.flow.jpdl4.rulesDecision", + ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.exclusiveGateway"), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/gateway_exclusive.png")), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/gateway_exclusive.png")) + ); + entries.add(combined); + combined = new CombinedTemplateCreationEntry( "fork", "Create a new Fork", "org.jboss.tools.flow.jpdl4.parallelForkGateway", Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/JmsTaskDeserializer.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/JmsTaskDeserializer.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/JmsTaskDeserializer.java 2009-12-19 02:38:14 UTC (rev 19483) @@ -0,0 +1,9 @@ +/** + * + */ +package org.jboss.tools.flow.jpdl4.io; + + +class JmsTaskDeserializer extends NodeDeserializer { + +} \ No newline at end of file Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/JmsTaskDeserializer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/JmsTaskSerializer.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/JmsTaskSerializer.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/JmsTaskSerializer.java 2009-12-19 02:38:14 UTC (rev 19483) @@ -0,0 +1,9 @@ +/** + * + */ +package org.jboss.tools.flow.jpdl4.io; + + +class JmsTaskSerializer extends ProcessNodeSerializer { + +} \ No newline at end of file Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/JmsTaskSerializer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/ProcessDeserializer.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/ProcessDeserializer.java 2009-12-19 01:47:05 UTC (rev 19482) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/ProcessDeserializer.java 2009-12-19 02:38:14 UTC (rev 19483) @@ -31,6 +31,10 @@ FlowWrapper flowWrapper = (FlowWrapper)parent; if (node instanceof Element) { result = Registry.createWrapper((Element)node); + if (result == null) { + return null; +// result = tryToCreateUnknownNodeWrapper((Element)node); + } if (result == null) return null; if (result instanceof NodeWrapper) { flowWrapper.addElement((NodeWrapper)result); @@ -45,4 +49,6 @@ return result; } + + } \ No newline at end of file Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/Registry.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/Registry.java 2009-12-19 01:47:05 UTC (rev 19482) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/Registry.java 2009-12-19 02:38:14 UTC (rev 19483) @@ -18,12 +18,15 @@ import org.jboss.tools.flow.jpdl4.model.ForkParallelGateway; import org.jboss.tools.flow.jpdl4.model.HumanTask; import org.jboss.tools.flow.jpdl4.model.JavaTask; +import org.jboss.tools.flow.jpdl4.model.JmsTask; import org.jboss.tools.flow.jpdl4.model.JoinParallelGateway; import org.jboss.tools.flow.jpdl4.model.MailTask; import org.jboss.tools.flow.jpdl4.model.Parameter; import org.jboss.tools.flow.jpdl4.model.PrimitiveObject; import org.jboss.tools.flow.jpdl4.model.Process; import org.jboss.tools.flow.jpdl4.model.QueryTask; +import org.jboss.tools.flow.jpdl4.model.RuleTask; +import org.jboss.tools.flow.jpdl4.model.RulesDecision; import org.jboss.tools.flow.jpdl4.model.ScriptTask; import org.jboss.tools.flow.jpdl4.model.SequenceFlow; import org.jboss.tools.flow.jpdl4.model.ServiceTask; @@ -50,12 +53,15 @@ else if ("sql".equals(nodeName)) return "org.jboss.tools.flow.jpdl4.sqlTask"; 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 ("jms".equals(nodeName)) return "org.jboss.tools.flow.jpdl4.jmsTask"; + else if ("rules".equals(nodeName)) return "org.jboss.tools.flow.jpdl4.ruleTask"; 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 ("custom".equals(nodeName)) return "org.jboss.tools.flow.jpdl4.customTask"; 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"; + else if ("rules-decision".equals(nodeName)) return "org.jboss.tools.flow.jpdl4.rulesDecision"; else if ("join".equals(nodeName)) return "org.jboss.tools.flow.jpdl4.parallelJoinGateway"; else if ("fork".equals(nodeName)) return "org.jboss.tools.flow.jpdl4.parallelForkGateway"; else if ("transition".equals(nodeName)) return "org.jboss.tools.flow.jpdl4.sequenceFlow"; @@ -142,12 +148,18 @@ return new SubprocessTaskDeserializer(); } else if (element instanceof ExclusiveGateway) { return new ExclusiveGatewayDeserializer(); + } else if (element instanceof RulesDecision) { + return new RulesDecisionDeserializer(); } else if (element instanceof TerminateEndEvent) { return new TerminateEndEventDeserializer(); } else if (element instanceof JavaTask) { return new JavaTaskDeserializer(); } else if (element instanceof ScriptTask) { return new ScriptTaskDeserializer(); + } else if (element instanceof JmsTask) { + return new JmsTaskDeserializer(); + } else if (element instanceof RuleTask) { + return new RuleTaskDeserializer(); } else if (element instanceof QueryTask) { return new QueryTaskDeserializer(); } else { @@ -195,6 +207,10 @@ return new JavaTaskSerializer(); } else if (element instanceof ScriptTask) { return new ScriptTaskSerializer(); + } else if (element instanceof JmsTask) { + return new JmsTaskSerializer(); + } else if (element instanceof RuleTask) { + return new RuleTaskSerializer(); } else if (element instanceof MailTask) { return new ProcessNodeSerializer(); } else if (element instanceof ServiceTask) { @@ -207,6 +223,8 @@ return new ProcessNodeSerializer(); } else if (element instanceof ExclusiveGateway) { return new ExclusiveGatewaySerializer(); + } else if (element instanceof RulesDecision) { + return new RulesDecisionSerializer(); } else if (element instanceof ForkParallelGateway) { return new ProcessNodeSerializer(); } else if (element instanceof JoinParallelGateway) { @@ -244,12 +262,15 @@ 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.jmsTask".equals(elementId)) return "jms"; + else if ("org.jboss.tools.flow.jpdl4.ruleTask".equals(elementId)) return "rules"; 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"; else if ("org.jboss.tools.flow.jpdl4.customTask".equals(elementId)) return "custom"; else if ("org.jboss.tools.flow.jpdl4.exclusiveGateway".equals(elementId)) return "decision"; + else if ("org.jboss.tools.flow.jpdl4.rulesDecision".equals(elementId)) return "rules-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"; else if ("org.jboss.tools.flow.jpdl4.sequenceFlow".equals(elementId)) return "transition"; Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/RuleTaskDeserializer.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/RuleTaskDeserializer.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/RuleTaskDeserializer.java 2009-12-19 02:38:14 UTC (rev 19483) @@ -0,0 +1,9 @@ +/** + * + */ +package org.jboss.tools.flow.jpdl4.io; + + +class RuleTaskDeserializer extends NodeDeserializer { + +} \ No newline at end of file Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/RuleTaskDeserializer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/RuleTaskSerializer.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/RuleTaskSerializer.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/RuleTaskSerializer.java 2009-12-19 02:38:14 UTC (rev 19483) @@ -0,0 +1,9 @@ +/** + * + */ +package org.jboss.tools.flow.jpdl4.io; + + +class RuleTaskSerializer extends ProcessNodeSerializer { + +} \ No newline at end of file Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/RuleTaskSerializer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/RulesDecisionDeserializer.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/RulesDecisionDeserializer.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/RulesDecisionDeserializer.java 2009-12-19 02:38:14 UTC (rev 19483) @@ -0,0 +1,9 @@ +/** + * + */ +package org.jboss.tools.flow.jpdl4.io; + + +class RulesDecisionDeserializer extends NodeDeserializer { + +} \ No newline at end of file Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/RulesDecisionDeserializer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/RulesDecisionSerializer.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/RulesDecisionSerializer.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/RulesDecisionSerializer.java 2009-12-19 02:38:14 UTC (rev 19483) @@ -0,0 +1,9 @@ +/** + * + */ +package org.jboss.tools.flow.jpdl4.io; + + +class RulesDecisionSerializer extends ProcessNodeSerializer { + +} \ No newline at end of file Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/RulesDecisionSerializer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/JmsTask.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/JmsTask.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/JmsTask.java 2009-12-19 02:38:14 UTC (rev 19483) @@ -0,0 +1,7 @@ +package org.jboss.tools.flow.jpdl4.model; + + + +public class JmsTask extends Task { + +} Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/JmsTask.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/RuleTask.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/RuleTask.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/RuleTask.java 2009-12-19 02:38:14 UTC (rev 19483) @@ -0,0 +1,12 @@ +package org.jboss.tools.flow.jpdl4.model; + + + +public class RuleTask 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/RuleTask.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/RulesDecision.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/RulesDecision.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/RulesDecision.java 2009-12-19 02:38:14 UTC (rev 19483) @@ -0,0 +1,7 @@ +package org.jboss.tools.flow.jpdl4.model; + + + +public class RulesDecision extends Gateway { + +} Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/RulesDecision.java ___________________________________________________________________ Name: svn:mime-type + text/plain