Author: koen.aers(a)jboss.com Date: 2008-12-17 20:38:57 -0500 (Wed, 17 Dec 2008) New Revision: 12668 Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/task_hql.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/task_java.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/task_sql.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/task_wait.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/task_hql.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/task_java.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/task_sql.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/task_wait.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/task_hql.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/task_java.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/task_sql.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/task_wait.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/CancelEndEventFigure.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ErrorEndEventFigure.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/TaskFigure.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/TerminateEndEventFigure.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/CancelEndEvent.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ErrorEndEvent.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ForkParallelGateway.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Gateway.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HqlTask.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/JavaTask.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/JoinParallelGateway.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ParallelGateway.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/SqlTask.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Task.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/TerminateEndEvent.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/WaitTask.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/EndEventAcceptsOutgoingConnectionStrategy.java Removed: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/StateTaskFigure.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 trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/StateTask.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/EndStateAcceptsOutgoingConnectionStrategy.java Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/flow_sequence.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/flow_sequence.png trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/flow_sequence.png 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 trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/EndEventFigure.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ExclusiveGateway.java Log: addition of - hql node - sql node - java node - end-error event - end-cancel event Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/flow_sequence.png =================================================================== (Binary files differ) Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/task_hql.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/task_hql.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/task_java.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/task_java.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/task_sql.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/task_sql.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/task_wait.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/task_wait.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/flow_sequence.png =================================================================== (Binary files differ) Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/task_hql.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/task_hql.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/task_java.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/task_java.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/task_sql.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/task_sql.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/task_wait.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/task_wait.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/flow_sequence.png =================================================================== (Binary files differ) Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/task_hql.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/task_hql.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/task_java.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/task_java.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/task_sql.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/task_sql.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/task_wait.png =================================================================== (Binary files differ) Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/task_wait.png ___________________________________________________________________ Name: svn:executable + * 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-18 00:42:31 UTC (rev 12667) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2008-12-18 01:38:57 UTC (rev 12668) @@ -68,23 +68,65 @@ </node> </element> <element - class="org.jboss.tools.flow.jpdl4.model.EndEvent" - id="org.jboss.tools.flow.jpdl4.endEvent" + class="org.jboss.tools.flow.jpdl4.model.TerminateEndEvent" + id="org.jboss.tools.flow.jpdl4.terminateEndEvent" language="org.jboss.tools.flow.jpdl4"> <node - acceptsOutgoingConnectionStrategy="org.jboss.tools.flow.jpdl4.strategy.EndStateAcceptsOutgoingConnectionStrategy"> - <figure class="org.jboss.tools.flow.jpdl4.figure.EndEventFigure"></figure> + acceptsOutgoingConnectionStrategy="org.jboss.tools.flow.jpdl4.strategy.EndEventAcceptsOutgoingConnectionStrategy"> + <figure class="org.jboss.tools.flow.jpdl4.figure.TerminateEndEventFigure"></figure> </node> </element> <element - class="org.jboss.tools.flow.jpdl4.model.StateTask" - id="org.jboss.tools.flow.jpdl4.stateTask" + class="org.jboss.tools.flow.jpdl4.model.CancelEndEvent" + id="org.jboss.tools.flow.jpdl4.cancelEndEvent" language="org.jboss.tools.flow.jpdl4"> + <node + acceptsOutgoingConnectionStrategy="org.jboss.tools.flow.jpdl4.strategy.EndEventAcceptsOutgoingConnectionStrategy"> + <figure class="org.jboss.tools.flow.jpdl4.figure.CancelEndEventFigure"></figure> + </node> + </element> + <element + class="org.jboss.tools.flow.jpdl4.model.ErrorEndEvent" + id="org.jboss.tools.flow.jpdl4.errorEndEvent" + language="org.jboss.tools.flow.jpdl4"> + <node + acceptsOutgoingConnectionStrategy="org.jboss.tools.flow.jpdl4.strategy.EndEventAcceptsOutgoingConnectionStrategy"> + <figure class="org.jboss.tools.flow.jpdl4.figure.ErrorEndEventFigure"></figure> + </node> + </element> + <element + class="org.jboss.tools.flow.jpdl4.model.WaitTask" + id="org.jboss.tools.flow.jpdl4.waitTask" + language="org.jboss.tools.flow.jpdl4"> <node> - <figure class="org.jboss.tools.flow.jpdl4.figure.StateTaskFigure"></figure> + <figure class="org.jboss.tools.flow.jpdl4.figure.TaskFigure"></figure> </node> </element> <element + class="org.jboss.tools.flow.jpdl4.model.HqlTask" + id="org.jboss.tools.flow.jpdl4.hqlTask" + 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.SqlTask" + id="org.jboss.tools.flow.jpdl4.sqlTask" + 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" + id="org.jboss.tools.flow.jpdl4.javaTask" + 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"> @@ -93,7 +135,7 @@ </node> </element> <element - class="org.jboss.tools.flow.jpdl4.model.ParallelForkGateway" + class="org.jboss.tools.flow.jpdl4.model.ForkParallelGateway" id="org.jboss.tools.flow.jpdl4.parallelForkGateway" language="org.jboss.tools.flow.jpdl4"> <node> @@ -101,7 +143,7 @@ </node> </element> <element - class="org.jboss.tools.flow.jpdl4.model.ParallelJoinGateway" + class="org.jboss.tools.flow.jpdl4.model.JoinParallelGateway" id="org.jboss.tools.flow.jpdl4.parallelJoinGateway" language="org.jboss.tools.flow.jpdl4"> <node> 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-18 00:42:31 UTC (rev 12667) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java 2008-12-18 01:38:57 UTC (rev 12668) @@ -112,10 +112,20 @@ NodeWrapper result = null; if ("start".equals(child.getNodeName())) { result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.startEvent"); + } else if ("end".equals(child.getNodeName())) { + result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.terminateEndEvent"); + } else if ("end-error".equals(child.getNodeName())) { + result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.errorEndEvent"); + } else if ("end-cancel".equals(child.getNodeName())) { + result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.cancelEndEvent"); } else if ("state".equals(child.getNodeName())) { - result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.stateTask"); - } else if ("end".equals(child.getNodeName())) { - result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.endEvent"); + result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.waitTask"); + } else if ("hql".equals(child.getNodeName())) { + result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.hqlTask"); + } else if ("sql".equals(child.getNodeName())) { + 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 ("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-18 00:42:31 UTC (rev 12667) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java 2008-12-18 01:38:57 UTC (rev 12668) @@ -66,7 +66,7 @@ protected List<PaletteEntry> createEventEntries() { List<PaletteEntry> entries = new ArrayList<PaletteEntry>(); CombinedTemplateCreationEntry combined = new CombinedTemplateCreationEntry( - "Start", + "Start Event", "Create a new Start Event", "org.jboss.tools.flow.jpdl4.startEvent", ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.startEvent"), @@ -75,35 +75,80 @@ ); entries.add(combined); combined = new CombinedTemplateCreationEntry( - "End", - "Create a new End Event", - "org.jboss.tools.flow.jpdl4.endEvent", - ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.endEvent"), + "Terminate End Event", + "Create a new terminating end event", + "org.jboss.tools.flow.jpdl4.terminateEndEvent", + ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.terminateEndEvent"), ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/end_event_terminate.png")), ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/end_event_terminate.png")) ); entries.add(combined); + combined = new CombinedTemplateCreationEntry( + "Cancel End Event", + "Create a new cancel end event", + "org.jboss.tools.flow.jpdl4.cancelEndEvent", + ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.cancelEndEvent"), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/end_event_cancel.png")), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/end_event_cancel.png")) + ); + entries.add(combined); + combined = new CombinedTemplateCreationEntry( + "Error End Event", + "Create a new error end event", + "org.jboss.tools.flow.jpdl4.errorEndEvent", + ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.errorEndEvent"), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/end_event_error.png")), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/end_event_error.png")) + ); + entries.add(combined); return entries; } protected List<PaletteEntry> createTaskEntries() { List<PaletteEntry> entries = new ArrayList<PaletteEntry>(); CombinedTemplateCreationEntry combined = new CombinedTemplateCreationEntry( - "Wait State", + "Wait State Task", "Create a new Wait State Task", - "org.jboss.tools.flow.jpdl4.stateTask", - ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.stateTask"), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/task_empty.png")), - ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/task_empty.png")) + "org.jboss.tools.flow.jpdl4.waitTask", + ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.waitTask"), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/task_wait.png")), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/task_wait.png")) ); entries.add(combined); + combined = new CombinedTemplateCreationEntry( + "HQL Task", + "Create a new HQL Task", + "org.jboss.tools.flow.jpdl4.hqlTask", + ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.hqlTask"), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/task_hql.png")), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/task_hql.png")) + ); + entries.add(combined); + combined = new CombinedTemplateCreationEntry( + "SQL Task", + "Create a new SQL Task", + "org.jboss.tools.flow.jpdl4.sqlTask", + ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.sqlTask"), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/task_sql.png")), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/task_sql.png")) + ); + entries.add(combined); + combined = new CombinedTemplateCreationEntry( + "Java Task", + "Create a new Java Task", + "org.jboss.tools.flow.jpdl4.javaTask", + ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.javaTask"), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/task_java.png")), + ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/task_java.png")) + ); + entries.add(combined); return entries; } protected List<PaletteEntry> createGatewayEntries() { List<PaletteEntry> entries = new ArrayList<PaletteEntry>(); CombinedTemplateCreationEntry combined = new CombinedTemplateCreationEntry( - "Exclusive", + "Exclusive Gateway", "Create a new Exclusive Gateway", "org.jboss.tools.flow.jpdl4.exclusiveGateway", ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.exclusiveGateway"), @@ -112,7 +157,7 @@ ); entries.add(combined); combined = new CombinedTemplateCreationEntry( - "Parallel Fork", + "Fork Parallel Gateway", "Create a new Parallel Fork Gateway", "org.jboss.tools.flow.jpdl4.parallelForkGateway", ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.parallelForkGateway"), @@ -121,7 +166,7 @@ ); entries.add(combined); combined = new CombinedTemplateCreationEntry( - "Parallel Join", + "Join Parallel Gateway", "Create a new Parallel Join Gateway", "org.jboss.tools.flow.jpdl4.parallelJoinGateway", ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.parallelJoinGateway"), @@ -135,7 +180,7 @@ protected List<PaletteEntry> createFlowEntries() { List<PaletteEntry> entries = new ArrayList<PaletteEntry>(); ToolEntry tool = new ConnectionCreationToolEntry( - "Sequence", + "Sequence Flow", "Creating a new Sequence Flow", ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.sequenceFlow"), ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/flow_sequence.png")), 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-18 00:42:31 UTC (rev 12667) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java 2008-12-18 01:38:57 UTC (rev 12668) @@ -13,15 +13,20 @@ import org.jboss.tools.flow.common.wrapper.ContainerWrapper; import org.jboss.tools.flow.common.wrapper.NodeWrapper; import org.jboss.tools.flow.common.wrapper.Wrapper; -import org.jboss.tools.flow.jpdl4.model.EndEvent; +import org.jboss.tools.flow.jpdl4.model.CancelEndEvent; +import org.jboss.tools.flow.jpdl4.model.ErrorEndEvent; 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.ForkParallelGateway; +import org.jboss.tools.flow.jpdl4.model.HqlTask; +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.SequenceFlow; +import org.jboss.tools.flow.jpdl4.model.SqlTask; import org.jboss.tools.flow.jpdl4.model.StartEvent; -import org.jboss.tools.flow.jpdl4.model.StateTask; import org.jboss.tools.flow.jpdl4.model.SuperState; +import org.jboss.tools.flow.jpdl4.model.TerminateEndEvent; +import org.jboss.tools.flow.jpdl4.model.WaitTask; public class JpdlSerializer { @@ -63,25 +68,47 @@ buffer.append("to=\"" + value + "\""); } appendConnectionGraphics(buffer, (ConnectionWrapper)wrapper); - } else if (element instanceof EndEvent) { - EndEvent endState = (EndEvent)element; + } else if (element instanceof TerminateEndEvent) { + TerminateEndEvent terminateEndEvent = (TerminateEndEvent)element; buffer.append("\n"); appendPadding(buffer, level); buffer.append("<end"); - if (!isEmpty(endState.getName())) { + if (!isEmpty(terminateEndEvent.getName())) { buffer.append(" "); - String value = endState.getName(); + String value = terminateEndEvent.getName(); buffer.append("name=\"" + value + "\""); } appendNodeGraphics(buffer, (NodeWrapper)wrapper); + } else if (element instanceof ErrorEndEvent) { + ErrorEndEvent errorEndEvent = (ErrorEndEvent)element; + buffer.append("\n"); + appendPadding(buffer, level); + buffer.append("<end-error"); + if (!isEmpty(errorEndEvent.getName())) { + buffer.append(" "); + String value = errorEndEvent.getName(); + buffer.append("name=\"" + value + "\""); + } + appendNodeGraphics(buffer, (NodeWrapper)wrapper); + } else if (element instanceof CancelEndEvent) { + CancelEndEvent cancelEndEvent = (CancelEndEvent)element; + buffer.append("\n"); + appendPadding(buffer, level); + buffer.append("<end-cancel"); + if (!isEmpty(cancelEndEvent.getName())) { + buffer.append(" "); + String value = cancelEndEvent.getName(); + buffer.append("name=\"" + value + "\""); + } + appendNodeGraphics(buffer, (NodeWrapper)wrapper); } else if (element instanceof StartEvent) { - StartEvent startState = (StartEvent)element; + StartEvent startEvent = (StartEvent)element; buffer.append("\n"); appendPadding(buffer, level); buffer.append("<start"); - if (!isEmpty(startState.getName())) { + if (!isEmpty(startEvent.getName())) { buffer.append(" "); - String value = startState.getName(); + String value = startEvent.getName(); buffer.append("name=\"" + value + "\""); } appendNodeGraphics(buffer, (NodeWrapper)wrapper); @@ -95,17 +122,50 @@ String value = superState.getName(); buffer.append("name=\"" + value + "\""); } - } else if (element instanceof StateTask) { - StateTask state = (StateTask)element; + } else if (element instanceof WaitTask) { + WaitTask waitTask = (WaitTask)element; buffer.append("\n"); appendPadding(buffer, level); buffer.append("<state"); - if (!isEmpty(state.getName())) { + if (!isEmpty(waitTask.getName())) { buffer.append(" "); - String value = state.getName(); + String value = waitTask.getName(); buffer.append("name=\"" + value + "\""); } appendNodeGraphics(buffer, (NodeWrapper)wrapper); + } else if (element instanceof HqlTask) { + HqlTask hqlTask = (HqlTask)element; + buffer.append("\n"); + appendPadding(buffer, level); + buffer.append("<hql"); + if (!isEmpty(hqlTask.getName())) { + buffer.append(" "); + String value = hqlTask.getName(); + buffer.append("name=\"" + value + "\""); + } + appendNodeGraphics(buffer, (NodeWrapper)wrapper); + } else if (element instanceof SqlTask) { + SqlTask sqlTask = (SqlTask)element; + buffer.append("\n"); + appendPadding(buffer, level); + buffer.append("<sql"); + if (!isEmpty(sqlTask.getName())) { + buffer.append(" "); + String value = sqlTask.getName(); + buffer.append("name=\"" + value + "\""); + } + appendNodeGraphics(buffer, (NodeWrapper)wrapper); + } else if (element instanceof JavaTask) { + JavaTask javaTask = (JavaTask)element; + buffer.append("\n"); + appendPadding(buffer, level); + buffer.append("<java"); + if (!isEmpty(javaTask.getName())) { + buffer.append(" "); + String value = javaTask.getName(); + buffer.append("name=\"" + value + "\""); + } + appendNodeGraphics(buffer, (NodeWrapper)wrapper); } else if (element instanceof ExclusiveGateway) { ExclusiveGateway exclusiveGateway = (ExclusiveGateway)element; buffer.append("\n"); @@ -117,8 +177,8 @@ buffer.append("name=\"" + value + "\""); } appendNodeGraphics(buffer, (NodeWrapper)wrapper); - } else if (element instanceof ParallelForkGateway) { - ParallelForkGateway parallelForkGateway = (ParallelForkGateway)element; + } else if (element instanceof ForkParallelGateway) { + ForkParallelGateway parallelForkGateway = (ForkParallelGateway)element; buffer.append("\n"); appendPadding(buffer, level); buffer.append("<fork"); @@ -128,8 +188,8 @@ buffer.append("name=\"" + value + "\""); } appendNodeGraphics(buffer, (NodeWrapper)wrapper); - } else if (element instanceof ParallelJoinGateway) { - ParallelJoinGateway parallelJoinGateway = (ParallelJoinGateway)element; + } else if (element instanceof JoinParallelGateway) { + JoinParallelGateway parallelJoinGateway = (JoinParallelGateway)element; buffer.append("\n"); appendPadding(buffer, level); buffer.append("<join"); @@ -175,10 +235,18 @@ buffer.append("\n"); appendPadding(buffer, level); buffer.append("</flow>"); - } else if (element instanceof EndEvent) { + } else if (element instanceof TerminateEndEvent) { buffer.append("\n"); appendPadding(buffer, level); buffer.append("</end>"); + } else if (element instanceof ErrorEndEvent) { + buffer.append("\n"); + appendPadding(buffer, level); + buffer.append("</end-error>"); + } else if (element instanceof CancelEndEvent) { + buffer.append("\n"); + appendPadding(buffer, level); + buffer.append("</end-cancel>"); } else if (element instanceof StartEvent) { buffer.append("\n"); appendPadding(buffer, level); @@ -187,19 +255,31 @@ buffer.append("\n"); appendPadding(buffer, level); buffer.append("</super-state>"); - } else if (element instanceof StateTask) { + } else if (element instanceof WaitTask) { buffer.append("\n"); appendPadding(buffer, level); buffer.append("</state>"); + } else if (element instanceof HqlTask) { + buffer.append("\n"); + appendPadding(buffer, level); + buffer.append("</hql>"); + } else if (element instanceof SqlTask) { + buffer.append("\n"); + appendPadding(buffer, level); + buffer.append("</sql>"); + } else if (element instanceof JavaTask) { + buffer.append("\n"); + appendPadding(buffer, level); + buffer.append("</java>"); } else if (element instanceof ExclusiveGateway) { buffer.append("\n"); appendPadding(buffer, level); buffer.append("</exclusive>"); - } else if (element instanceof ParallelForkGateway) { + } else if (element instanceof ForkParallelGateway) { buffer.append("\n"); appendPadding(buffer, level); buffer.append("</fork>"); - } else if (element instanceof ParallelJoinGateway) { + } else if (element instanceof JoinParallelGateway) { buffer.append("\n"); appendPadding(buffer, level); buffer.append("</join>"); Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/CancelEndEventFigure.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/CancelEndEventFigure.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/CancelEndEventFigure.java 2008-12-18 01:38:57 UTC (rev 12668) @@ -0,0 +1,17 @@ +package org.jboss.tools.flow.jpdl4.figure; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.swt.graphics.Image; +import org.jboss.tools.flow.jpdl4.Activator; + +public class CancelEndEventFigure extends EndEventFigure { + + private static final Image icon = ImageDescriptor.createFromURL( + Activator.getDefault().getBundle().getEntry( + "icons/48/end_event_cancel.png")).createImage(); + + protected void customizeFigure() { + setIcon(icon); + } + +} Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/EndEventFigure.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/EndEventFigure.java 2008-12-18 00:42:31 UTC (rev 12667) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/EndEventFigure.java 2008-12-18 01:38:57 UTC (rev 12668) @@ -1,17 +1,6 @@ package org.jboss.tools.flow.jpdl4.figure; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.swt.graphics.Image; -import org.jboss.tools.flow.jpdl4.Activator; -public class EndEventFigure extends EventFigure { //EventFigure { +public abstract class EndEventFigure extends EventFigure { //EventFigure { - private static final Image icon = ImageDescriptor.createFromURL( - Activator.getDefault().getBundle().getEntry( - "icons/48/end_event_terminate.png")).createImage(); - - protected void customizeFigure() { - setIcon(icon); - } - } Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ErrorEndEventFigure.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ErrorEndEventFigure.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ErrorEndEventFigure.java 2008-12-18 01:38:57 UTC (rev 12668) @@ -0,0 +1,17 @@ +package org.jboss.tools.flow.jpdl4.figure; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.swt.graphics.Image; +import org.jboss.tools.flow.jpdl4.Activator; + +public class ErrorEndEventFigure extends EndEventFigure { + + private static final Image icon = ImageDescriptor.createFromURL( + Activator.getDefault().getBundle().getEntry( + "icons/48/end_event_error.png")).createImage(); + + protected void customizeFigure() { + setIcon(icon); + } + +} Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/StateTaskFigure.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/StateTaskFigure.java 2008-12-18 00:42:31 UTC (rev 12667) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/StateTaskFigure.java 2008-12-18 01:38:57 UTC (rev 12668) @@ -1,29 +0,0 @@ -package org.jboss.tools.flow.jpdl4.figure; - -import org.eclipse.draw2d.ColorConstants; -import org.eclipse.draw2d.Graphics; -import org.eclipse.swt.graphics.Color; -import org.jboss.tools.flow.common.figure.RoundedRectangleElementFigure; - -public class StateTaskFigure extends RoundedRectangleElementFigure { - - private static final Color veryLightBlue = new Color(null, 246, 247, 255); - private static final Color lightBlue = new Color(null, 3, 104, 154); - - protected void paintChildren(Graphics graphics) { - Color foregroundColor = graphics.getForegroundColor(); - Color backgroundColor = graphics.getBackgroundColor(); - graphics.setBackgroundColor(veryLightBlue); - graphics.setForegroundColor(lightBlue); - super.paintChildren(graphics); - graphics.setBackgroundColor(backgroundColor); - graphics.setForegroundColor(foregroundColor); - } - - protected void customizeFigure() { - super.customizeFigure(); - getLabel().setForegroundColor(ColorConstants.darkGray); - rectangle.setLineWidth(2); - } - -} Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/TaskFigure.java (from rev 12631, trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/StateTaskFigure.java) =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/TaskFigure.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/TaskFigure.java 2008-12-18 01:38:57 UTC (rev 12668) @@ -0,0 +1,29 @@ +package org.jboss.tools.flow.jpdl4.figure; + +import org.eclipse.draw2d.ColorConstants; +import org.eclipse.draw2d.Graphics; +import org.eclipse.swt.graphics.Color; +import org.jboss.tools.flow.common.figure.RoundedRectangleElementFigure; + +public class TaskFigure extends RoundedRectangleElementFigure { + + private static final Color veryLightBlue = new Color(null, 246, 247, 255); + private static final Color lightBlue = new Color(null, 3, 104, 154); + + protected void paintChildren(Graphics graphics) { + Color foregroundColor = graphics.getForegroundColor(); + Color backgroundColor = graphics.getBackgroundColor(); + graphics.setBackgroundColor(veryLightBlue); + graphics.setForegroundColor(lightBlue); + super.paintChildren(graphics); + graphics.setBackgroundColor(backgroundColor); + graphics.setForegroundColor(foregroundColor); + } + + protected void customizeFigure() { + super.customizeFigure(); + getLabel().setForegroundColor(ColorConstants.darkGray); + rectangle.setLineWidth(2); + } + +} Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/TaskFigure.java ___________________________________________________________________ Name: svn:mergeinfo + Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/TerminateEndEventFigure.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/TerminateEndEventFigure.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/TerminateEndEventFigure.java 2008-12-18 01:38:57 UTC (rev 12668) @@ -0,0 +1,17 @@ +package org.jboss.tools.flow.jpdl4.figure; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.swt.graphics.Image; +import org.jboss.tools.flow.jpdl4.Activator; + +public class TerminateEndEventFigure extends EndEventFigure { + + private static final Image icon = ImageDescriptor.createFromURL( + Activator.getDefault().getBundle().getEntry( + "icons/48/end_event_terminate.png")).createImage(); + + protected void customizeFigure() { + setIcon(icon); + } + +} Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/CancelEndEvent.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/CancelEndEvent.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/CancelEndEvent.java 2008-12-18 01:38:57 UTC (rev 12668) @@ -0,0 +1,6 @@ +package org.jboss.tools.flow.jpdl4.model; + + +public class CancelEndEvent extends EndEvent { + +} Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ErrorEndEvent.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ErrorEndEvent.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ErrorEndEvent.java 2008-12-18 01:38:57 UTC (rev 12668) @@ -0,0 +1,6 @@ +package org.jboss.tools.flow.jpdl4.model; + + +public class ErrorEndEvent extends EndEvent { + +} Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ExclusiveGateway.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ExclusiveGateway.java 2008-12-18 00:42:31 UTC (rev 12667) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ExclusiveGateway.java 2008-12-18 01:38:57 UTC (rev 12668) @@ -1,7 +1,6 @@ package org.jboss.tools.flow.jpdl4.model; -import org.jboss.tools.flow.common.model.DefaultNode; -public class ExclusiveGateway extends DefaultNode { +public class ExclusiveGateway extends Gateway { } Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ForkParallelGateway.java (from rev 12584, 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/ForkParallelGateway.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ForkParallelGateway.java 2008-12-18 01:38:57 UTC (rev 12668) @@ -0,0 +1,6 @@ +package org.jboss.tools.flow.jpdl4.model; + + +public class ForkParallelGateway extends ParallelGateway { + +} Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ForkParallelGateway.java ___________________________________________________________________ Name: svn:mergeinfo + Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Gateway.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Gateway.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Gateway.java 2008-12-18 01:38:57 UTC (rev 12668) @@ -0,0 +1,7 @@ +package org.jboss.tools.flow.jpdl4.model; + +import org.jboss.tools.flow.common.model.DefaultNode; + +public class Gateway extends DefaultNode { + +} Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HqlTask.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HqlTask.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HqlTask.java 2008-12-18 01:38:57 UTC (rev 12668) @@ -0,0 +1,6 @@ +package org.jboss.tools.flow.jpdl4.model; + + +public class HqlTask extends Task { + +} Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/JavaTask.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/JavaTask.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/JavaTask.java 2008-12-18 01:38:57 UTC (rev 12668) @@ -0,0 +1,6 @@ +package org.jboss.tools.flow.jpdl4.model; + + +public class JavaTask extends Task { + +} Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/JoinParallelGateway.java (from rev 12584, 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/JoinParallelGateway.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/JoinParallelGateway.java 2008-12-18 01:38:57 UTC (rev 12668) @@ -0,0 +1,6 @@ +package org.jboss.tools.flow.jpdl4.model; + + +public class JoinParallelGateway extends Gateway { + +} Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/JoinParallelGateway.java ___________________________________________________________________ Name: svn:mergeinfo + Deleted: 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 2008-12-18 00:42:31 UTC (rev 12667) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ParallelForkGateway.java 2008-12-18 01:38:57 UTC (rev 12668) @@ -1,7 +0,0 @@ -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/ParallelGateway.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ParallelGateway.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ParallelGateway.java 2008-12-18 01:38:57 UTC (rev 12668) @@ -0,0 +1,6 @@ +package org.jboss.tools.flow.jpdl4.model; + + +public class ParallelGateway extends Gateway { + +} Deleted: 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 2008-12-18 00:42:31 UTC (rev 12667) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ParallelJoinGateway.java 2008-12-18 01:38:57 UTC (rev 12668) @@ -1,7 +0,0 @@ -package org.jboss.tools.flow.jpdl4.model; - -import org.jboss.tools.flow.common.model.DefaultNode; - -public class ParallelJoinGateway extends DefaultNode { - -} Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/SqlTask.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/SqlTask.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/SqlTask.java 2008-12-18 01:38:57 UTC (rev 12668) @@ -0,0 +1,6 @@ +package org.jboss.tools.flow.jpdl4.model; + + +public class SqlTask extends Task { + +} Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/StateTask.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/StateTask.java 2008-12-18 00:42:31 UTC (rev 12667) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/StateTask.java 2008-12-18 01:38:57 UTC (rev 12668) @@ -1,7 +0,0 @@ -package org.jboss.tools.flow.jpdl4.model; - -import org.jboss.tools.flow.common.model.DefaultNode; - -public class StateTask extends DefaultNode { - -} Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Task.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Task.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Task.java 2008-12-18 01:38:57 UTC (rev 12668) @@ -0,0 +1,7 @@ +package org.jboss.tools.flow.jpdl4.model; + +import org.jboss.tools.flow.common.model.DefaultNode; + +public class Task extends DefaultNode { + +} Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/TerminateEndEvent.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/TerminateEndEvent.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/TerminateEndEvent.java 2008-12-18 01:38:57 UTC (rev 12668) @@ -0,0 +1,6 @@ +package org.jboss.tools.flow.jpdl4.model; + + +public class TerminateEndEvent extends EndEvent { + +} Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/WaitTask.java (from rev 12088, trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/StateTask.java) =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/WaitTask.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/WaitTask.java 2008-12-18 01:38:57 UTC (rev 12668) @@ -0,0 +1,6 @@ +package org.jboss.tools.flow.jpdl4.model; + + +public class WaitTask extends Task { + +} Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/EndEventAcceptsOutgoingConnectionStrategy.java (from rev 12088, trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/EndStateAcceptsOutgoingConnectionStrategy.java) =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/EndEventAcceptsOutgoingConnectionStrategy.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/EndEventAcceptsOutgoingConnectionStrategy.java 2008-12-18 01:38:57 UTC (rev 12668) @@ -0,0 +1,16 @@ +package org.jboss.tools.flow.jpdl4.strategy; + +import org.jboss.tools.flow.common.model.Connection; +import org.jboss.tools.flow.common.model.Node; +import org.jboss.tools.flow.common.strategy.AcceptsOutgoingConnectionStrategy; + +public class EndEventAcceptsOutgoingConnectionStrategy implements AcceptsOutgoingConnectionStrategy { + + public boolean acceptsOutgoingConnection(Connection connection, Node source) { + return false; + } + + public void setNode(Node node) { + } + +} Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/EndEventAcceptsOutgoingConnectionStrategy.java ___________________________________________________________________ Name: svn:mergeinfo + Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/EndStateAcceptsOutgoingConnectionStrategy.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/EndStateAcceptsOutgoingConnectionStrategy.java 2008-12-18 00:42:31 UTC (rev 12667) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/EndStateAcceptsOutgoingConnectionStrategy.java 2008-12-18 01:38:57 UTC (rev 12668) @@ -1,16 +0,0 @@ -package org.jboss.tools.flow.jpdl4.strategy; - -import org.jboss.tools.flow.common.model.Connection; -import org.jboss.tools.flow.common.model.Node; -import org.jboss.tools.flow.common.strategy.AcceptsOutgoingConnectionStrategy; - -public class EndStateAcceptsOutgoingConnectionStrategy implements AcceptsOutgoingConnectionStrategy { - - public boolean acceptsOutgoingConnection(Connection connection, Node source) { - return false; - } - - public void setNode(Node node) { - } - -}