Author: koen.aers(a)jboss.com Date: 2009-07-01 16:30:00 -0400 (Wed, 01 Jul 2009) New Revision: 16326 Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/ArgumentDeserializer.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/FieldDeserializer.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/FieldSerializer.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Argument.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Field.java Log: Field for Java Task is working properly now Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/ArgumentDeserializer.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/ArgumentDeserializer.java 2009-07-01 20:10:02 UTC (rev 16325) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/ArgumentDeserializer.java 2009-07-01 20:30:00 UTC (rev 16326) @@ -23,6 +23,11 @@ } public void deserializeChildNodes(Wrapper wrapper, Element element) { + wrapper.setPropertyValue(Argument.VALUE, streamChildNodes(element)); + + } + + protected String streamChildNodes(Element element) { NodeList nodeList = element.getChildNodes(); StringBuffer buffer = new StringBuffer(); DOMSource domSource = new DOMSource(); @@ -37,8 +42,7 @@ } buffer.append(writer.getBuffer()); } - wrapper.setPropertyValue(Argument.VALUE, buffer.toString()); - + return buffer.toString(); } Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/FieldDeserializer.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/FieldDeserializer.java 2009-07-01 20:10:02 UTC (rev 16325) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/FieldDeserializer.java 2009-07-01 20:30:00 UTC (rev 16326) @@ -38,4 +38,10 @@ } } } + + + public void deserializeChildNodes(Wrapper wrapper, Element element) { + wrapper.setPropertyValue(Field.VALUE, streamChildNodes(element)); + + } } \ No newline at end of file Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/FieldSerializer.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/FieldSerializer.java 2009-07-01 20:10:02 UTC (rev 16325) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/FieldSerializer.java 2009-07-01 20:30:00 UTC (rev 16326) @@ -10,24 +10,30 @@ import org.jboss.tools.flow.jpdl4.model.Field; class FieldSerializer extends AbstractElementSerializer { + protected List<String> getAttributesToSave() { ArrayList<String> result = new ArrayList<String>(); result.add("name"); return result; } + protected String getPropertyName(String attributeName) { if ("name".equals(attributeName)) { return Field.NAME; } return super.getPropertyName(attributeName); } + public void appendBody(StringBuffer buffer, Wrapper wrapper, int level) { String value = (String)wrapper.getPropertyValue(Field.VALUE); if (value != null && !("".equals(value))) { - buffer.append("\n"); - appendPadding(buffer, level + 1); - buffer.append("<string value=\"" + value + "\"/>"); + buffer.append(value); } super.appendBody(buffer, wrapper, level); } + + protected void appendTrailingNodes(StringBuffer buffer, Wrapper wrapper, int level) { + // There are no trailing nodes in an argument serialization + } + } \ No newline at end of file Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Argument.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Argument.java 2009-07-01 20:10:02 UTC (rev 16325) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Argument.java 2009-07-01 20:30:00 UTC (rev 16326) @@ -1,5 +1,51 @@ package org.jboss.tools.flow.jpdl4.model; -public class Argument extends PrimitiveObject { +import org.eclipse.ui.views.properties.IPropertyDescriptor; +import org.eclipse.ui.views.properties.IPropertySource; +import org.jboss.tools.flow.common.model.DefaultElement; + +public class Argument extends DefaultElement { + public static final String VALUE = "org.jboss.tools.flow.jpdl4.model.argument.value"; + + private String value = "<string value=\"aValue\"/>"; + + public Argument() { + setMetaData("propertySource", new PropertySource()); + } + + private class PropertySource implements IPropertySource { + + public Object getEditableValue() { + return null; + } + + public IPropertyDescriptor[] getPropertyDescriptors() { + return new IPropertyDescriptor[0]; + } + + public Object getPropertyValue(Object id) { + if (VALUE.equals(id)) { + return value; + } + return null; + } + + public boolean isPropertySet(Object id) { + if (VALUE.equals(id)) { + return value != null; + } + return false; + } + + public void resetPropertyValue(Object id) { + } + + public void setPropertyValue(Object id, Object val) { + if (VALUE.equals(id)) { + value = (String)val; + } + } + + } } Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Field.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Field.java 2009-07-01 20:10:02 UTC (rev 16325) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Field.java 2009-07-01 20:30:00 UTC (rev 16326) @@ -9,7 +9,7 @@ public static final String NAME = "org.jboss.tools.flow.jpdl4.model.field.name"; public static final String VALUE = "org.jboss.tools.flow.jpdl4.model.field.value"; - private String value; + private String value = "<string value=\"aValue\"/>"; private String name; public Field() {