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

Author: koen.aers(a)jboss.com Date: 2009-06-03 13:54:47 -0400 (Wed, 03 Jun 2009) New Revision: 15689 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/JpdlSerializer.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/wizard/NewJpdl4FileWizardPage.java Log: - custom task fix - namespace fix 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-06-03 17:51:45 UTC (rev 15688) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java 2009-06-03 17:54:47 UTC (rev 15689) @@ -686,6 +686,7 @@ 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 ("join".equals(nodeName)) return "org.jboss.tools.flow.jpdl4.parallelJoinGateway"; 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-06-03 17:51:45 UTC (rev 15688) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java 2009-06-03 17:54:47 UTC (rev 15689) @@ -200,7 +200,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.customTask".equals(elementId)) return "custom"; 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"; @@ -942,7 +942,7 @@ } else if (element instanceof SubprocessTask) { buffer.append("</sub-process>"); } else if (element instanceof CustomTask) { - buffer.append("</node>"); + buffer.append("</custom>"); } else if (element instanceof ExclusiveGateway) { buffer.append("</decision>"); } else if (element instanceof ForkParallelGateway) { Modified: 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 2009-06-03 17:51:45 UTC (rev 15688) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HqlTask.java 2009-06-03 17:54:47 UTC (rev 15689) @@ -1,8 +1,21 @@ package org.jboss.tools.flow.jpdl4.model; +import java.util.ArrayList; +import java.util.List; + public class HqlTask extends Task { + public static final String VAR = "org.jboss.tools.flow.jpdl4.model.hqlTask.var"; + public static final String UNIQUE = "org.jboss.tools.flow.jpdl4.model.hqlTask.unique"; + public static final String QUERY = "org.jboss.tools.flow.jpdl4.model.hqlTask.query"; + public static final String ARGS = "org.jboss.tools.flow.jpdl4.model.hqlTask.args"; + + private String variableName; + private String unique; + private String query; + private List<Field> fields = new ArrayList<Field>(); + protected boolean isPropagationExclusive() { return true; } Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/NewJpdl4FileWizardPage.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/NewJpdl4FileWizardPage.java 2009-06-03 17:51:45 UTC (rev 15688) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/wizard/NewJpdl4FileWizardPage.java 2009-06-03 17:54:47 UTC (rev 15689) @@ -23,7 +23,7 @@ private String getInitialContentsAsString() { StringBuffer buffer = new StringBuffer(); buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\n"); - buffer.append("<process xmlns=\"http://jbpm.org/4/jpdl\" name=\""); + buffer.append("<process xmlns=\"http://jbpm.org/4.0/jpdl\" name=\""); buffer.append(getFileName().substring(0, getFileName().lastIndexOf(getFileExtension()) - 1)); buffer.append("\">\n</process>"); return buffer.toString();