Author: koen.aers(a)jboss.com Date: 2009-08-25 19:54:20 -0400 (Tue, 25 Aug 2009) New Revision: 17256 Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/JavaTaskExpressionSection.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/io/JavaTaskDeserializer.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/JavaTaskSerializer.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/properties/JavaTaskClassSection.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/JavaTaskMethodSection.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/JavaTaskVariableSection.java Log: GPD-369 : Java Task Problems Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-08-25 22:41:09 UTC (rev 17255) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-08-25 23:54:20 UTC (rev 17256) @@ -507,6 +507,13 @@ </propertySection> <propertySection afterSection="org.jboss.tools.jpdl4.javaTask.class" + class="org.jboss.tools.flow.jpdl4.properties.JavaTaskExpressionSection" + id="org.jboss.tools.jpdl4.javaTask.expression" + tab="org.jboss.tools.jpdl4.general"> + <input type="org.jboss.tools.flow.jpdl4.model.JavaTask"/> + </propertySection> + <propertySection + afterSection="org.jboss.tools.jpdl4.javaTask.expression" class="org.jboss.tools.flow.jpdl4.properties.JavaTaskMethodSection" id="org.jboss.tools.jpdl4.javaTask.method" tab="org.jboss.tools.jpdl4.general"> Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/JavaTaskDeserializer.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/JavaTaskDeserializer.java 2009-08-25 22:41:09 UTC (rev 17255) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/JavaTaskDeserializer.java 2009-08-25 23:54:20 UTC (rev 17256) @@ -16,6 +16,7 @@ wrapper.setPropertyValue(JavaTask.CLASS, element.getAttribute("class")); wrapper.setPropertyValue(JavaTask.METHOD, element.getAttribute("method")); wrapper.setPropertyValue(JavaTask.VAR, element.getAttribute("var")); + wrapper.setPropertyValue(JavaTask.EXPR, element.getAttribute("expr")); } public Wrapper deserializeChildNode(Wrapper parent, Node node) { Wrapper result = super.deserializeChildNode(parent, node); Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/JavaTaskSerializer.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/JavaTaskSerializer.java 2009-08-25 22:41:09 UTC (rev 17255) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/JavaTaskSerializer.java 2009-08-25 23:54:20 UTC (rev 17256) @@ -15,6 +15,7 @@ result.add("class"); result.add("method"); result.add("var"); + result.add("expr"); return result; } protected String getPropertyName(String attributeName) { @@ -24,6 +25,8 @@ return JavaTask.METHOD; } else if ("var".equals(attributeName)) { return JavaTask.VAR; + } else if ("expr".equals(attributeName)) { + return JavaTask.EXPR; } return super.getPropertyName(attributeName); } Modified: 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 2009-08-25 22:41:09 UTC (rev 17255) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/JavaTask.java 2009-08-25 23:54:20 UTC (rev 17256) @@ -12,12 +12,14 @@ public static final String CLASS = "org.jboss.tools.flow.jpdl4.model.javaTask.class"; public static final String METHOD = "org.jboss.tools.flow.jpdl4.model.javaTask.method"; public static final String VAR = "org.jboss.tools.flow.jpdl4.model.javaTask.var"; + public static final String EXPR = "org.jboss.tools.flow.jpdl4.model.javaTask.expression"; public static final String FIELDS = "org.jboss.tools.flow.jpdl4.model.javaTask.fields"; public static final String ARGS = "org.jboss.tools.flow.jpdl4.model.javaTask.args"; private String className; private String methodName; private String variableName; + private String expression; private List<Argument> arguments = new ArrayList<Argument>(); private List<Field> fields = new ArrayList<Field>(); @@ -49,6 +51,14 @@ this.variableName = variableName; } + public String getExpression() { + return expression; + } + + public void setExpression(String expression) { + this.expression = expression; + } + protected boolean isPropagationExclusive() { return true; } @@ -70,6 +80,8 @@ return getMethodName(); } else if (VAR.equals(id)) { return getVariableName(); + } else if (EXPR.equals(id)) { + return getExpression(); } else if (FIELDS.equals(id)) { return fields; } else if (ARGS.equals(id)) { @@ -85,6 +97,8 @@ return getMethodName() != null; } else if (VAR.equals(id)) { return getVariableName() != null; + } else if (EXPR.equals(id)) { + return getExpression() != null; } else if (FIELDS.equals(id)) { return true; } else if (ARGS.equals(id)) { @@ -103,6 +117,8 @@ setMethodName((String)value); } else if (VAR.equals(id)) { setVariableName((String)value); + } else if (EXPR.equals(id)) { + setExpression((String)value); } } Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/JavaTaskClassSection.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/JavaTaskClassSection.java 2009-08-25 22:41:09 UTC (rev 17255) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/JavaTaskClassSection.java 2009-08-25 23:54:20 UTC (rev 17256) @@ -5,7 +5,7 @@ public class JavaTaskClassSection extends TextFieldPropertySection { public JavaTaskClassSection() { - super(JavaTask.CLASS, "Class Name"); + super(JavaTask.CLASS, "Class"); } } Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/JavaTaskExpressionSection.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/JavaTaskExpressionSection.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/JavaTaskExpressionSection.java 2009-08-25 23:54:20 UTC (rev 17256) @@ -0,0 +1,11 @@ +package org.jboss.tools.flow.jpdl4.properties; + +import org.jboss.tools.flow.jpdl4.model.JavaTask; + +public class JavaTaskExpressionSection extends TextFieldPropertySection { + + public JavaTaskExpressionSection() { + super(JavaTask.EXPR, "Expression"); + } + +} Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/JavaTaskExpressionSection.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/JavaTaskMethodSection.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/JavaTaskMethodSection.java 2009-08-25 22:41:09 UTC (rev 17255) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/JavaTaskMethodSection.java 2009-08-25 23:54:20 UTC (rev 17256) @@ -5,7 +5,7 @@ public class JavaTaskMethodSection extends TextFieldPropertySection { public JavaTaskMethodSection() { - super(JavaTask.METHOD, "Method Name"); + super(JavaTask.METHOD, "Method"); } } Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/JavaTaskVariableSection.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/JavaTaskVariableSection.java 2009-08-25 22:41:09 UTC (rev 17255) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/JavaTaskVariableSection.java 2009-08-25 23:54:20 UTC (rev 17256) @@ -5,7 +5,7 @@ public class JavaTaskVariableSection extends TextFieldPropertySection { public JavaTaskVariableSection() { - super(JavaTask.VAR, "Variable Name"); + super(JavaTask.VAR, "Return Variable"); } }