Author: koen.aers(a)jboss.com
Date: 2009-07-05 11:40:27 -0400 (Sun, 05 Jul 2009)
New Revision: 16383
Added:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/PrimitiveObjectTreeEditPart.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskDeserializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskSerializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/PrimitiveObjectSerializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/PrimitiveObjectValueSection.java
Removed:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/WireObjectTreeEditPart.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/WireObject.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/WireObjectContainer.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/editpart/JpdlTreeEditPartFactory.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/AbstractElementDeserializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/AbstractElementSerializer.java
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/SwimlaneSerializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HqlTask.java
Log:
Hql node: query and parameters are supported
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-07-04 00:43:15 UTC (rev
16382)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-07-05 15:40:27 UTC (rev
16383)
@@ -306,17 +306,15 @@
</extension>
<extension
point="org.eclipse.ui.newWizards">
- <category
- id="org.jboss.tools.flow.jpdl4"
- name="jBPM 4"
- parentCategory="org.jboss.tools.jbpm">
- </category>
<wizard
- category="org.jboss.tools.flow.jpdl4"
+ category="org.jboss.tools.jbpm"
class="org.jboss.tools.flow.jpdl4.wizard.NewJpdl4FileWizard"
icon="icons/process.gif"
id="org.jboss.tools.flow.jpdl4.file"
- name="Process Definition">
+ name="jBPM 4 Process Definition">
+ <description>
+ A wizard that creates a new jBPM 4 process definition
+ </description>
</wizard>
</extension>
@@ -643,15 +641,22 @@
tab="org.jboss.tools.jpdl4.general">
<input type="org.jboss.tools.flow.jpdl4.model.HqlTask"/>
</propertySection>
+ <propertySection
+
class="org.jboss.tools.flow.jpdl4.properties.PrimitiveObjectValueSection"
+ id="org.jboss.tools.jpdl4.primitiveObject.value"
+ tab="org.jboss.tools.jpdl4.general">
+ <input
type="org.jboss.tools.flow.jpdl4.model.PrimitiveObject"/>
+ </propertySection>
</propertySections>
</extension>
<extension
point="org.eclipse.ui.views">
<view
+ category="org.jboss.tools.jbpm"
class="org.jboss.tools.flow.jpdl4.view.DetailsView"
icon="icons/process.gif"
id="org.jboss.tools.flow.jpdl4.details"
- name="Details"
+ name="Details (jBPM 4)"
restorable="true">
</view>
</extension>
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java 2009-07-04
00:43:15 UTC (rev 16382)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java 2009-07-05
15:40:27 UTC (rev 16383)
@@ -14,10 +14,10 @@
import org.jboss.tools.flow.jpdl4.model.HqlTask;
import org.jboss.tools.flow.jpdl4.model.JavaTask;
import org.jboss.tools.flow.jpdl4.model.Parameter;
+import org.jboss.tools.flow.jpdl4.model.PrimitiveObject;
import org.jboss.tools.flow.jpdl4.model.SubprocessTask;
import org.jboss.tools.flow.jpdl4.model.Swimlane;
import org.jboss.tools.flow.jpdl4.model.Timer;
-import org.jboss.tools.flow.jpdl4.model.WireObject;
public class JpdlTreeEditPartFactory implements EditPartFactory {
@@ -40,7 +40,7 @@
if (element instanceof EventListenerContainer) return new
EventListenerListTreeEditPart((Wrapper)model);
if (element instanceof EventListener) return new
EventListenerTreeEditPart((Wrapper)model);
if (element instanceof Timer) return new TimerTreeEditPart((Wrapper)model);
- if (element instanceof WireObject) return new WireObjectTreeEditPart((Wrapper)model);
+ if (element instanceof PrimitiveObject) return new
PrimitiveObjectTreeEditPart((Wrapper)model);
return new NoDetailsTreeRootEditPart();
}
if (model instanceof SwimlaneListTreeEditPart) return (EditPart)model;
Copied:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/PrimitiveObjectTreeEditPart.java
(from rev 16344,
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/WireObjectTreeEditPart.java)
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/PrimitiveObjectTreeEditPart.java
(rev 0)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/PrimitiveObjectTreeEditPart.java 2009-07-05
15:40:27 UTC (rev 16383)
@@ -0,0 +1,44 @@
+package org.jboss.tools.flow.jpdl4.editpart;
+
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.graphics.Image;
+import org.jboss.tools.flow.common.wrapper.ModelEvent;
+import org.jboss.tools.flow.common.wrapper.Wrapper;
+import org.jboss.tools.flow.jpdl4.model.PrimitiveObject;
+import org.jboss.tools.flow.jpdl4.util.SharedImages;
+
+public class PrimitiveObjectTreeEditPart extends JpdlTreeEditPart implements
ElementTreeEditPart {
+
+ public PrimitiveObjectTreeEditPart(Wrapper wrapper) {
+ super(wrapper);
+ }
+
+ protected Image getImage() {
+ String iconPath = "icons/16/argument.gif";
+ ImageDescriptor descriptor = ImageDescriptor.createFromURL(
+ Platform.getBundle("org.jboss.tools.flow.jpdl4").getEntry(iconPath));
+ return SharedImages.INSTANCE.getImage(descriptor);
+ }
+
+ protected String getText() {
+ String value = (String)((Wrapper)getModel()).getPropertyValue(PrimitiveObject.VALUE);
+ return (value != null && !("".equals(value))) ? value.trim() :
"object";
+ }
+
+ public void modelChanged(ModelEvent event) {
+ if (event.getChangeType() == Wrapper.CHANGE_PROPERTY) {
+ refreshVisuals();
+ }
+ }
+
+ public void activate() {
+ super.activate();
+ ((Wrapper)getModel()).addListener(this);
+ }
+
+ public void deactivate() {
+ ((Wrapper)getModel()).removeListener(this);
+ super.deactivate();
+ }
+}
Property changes on:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/PrimitiveObjectTreeEditPart.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/WireObjectTreeEditPart.java
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/WireObjectTreeEditPart.java 2009-07-04
00:43:15 UTC (rev 16382)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/WireObjectTreeEditPart.java 2009-07-05
15:40:27 UTC (rev 16383)
@@ -1,42 +0,0 @@
-package org.jboss.tools.flow.jpdl4.editpart;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.jboss.tools.flow.common.wrapper.ModelEvent;
-import org.jboss.tools.flow.common.wrapper.Wrapper;
-import org.jboss.tools.flow.jpdl4.util.SharedImages;
-
-public class WireObjectTreeEditPart extends JpdlTreeEditPart implements
ElementTreeEditPart {
-
- public WireObjectTreeEditPart(Wrapper wrapper) {
- super(wrapper);
- }
-
- protected Image getImage() {
- String iconPath = "icons/16/argument.gif";
- ImageDescriptor descriptor = ImageDescriptor.createFromURL(
- Platform.getBundle("org.jboss.tools.flow.jpdl4").getEntry(iconPath));
- return SharedImages.INSTANCE.getImage(descriptor);
- }
-
- protected String getText() {
- return "WireObject";
- }
-
- public void modelChanged(ModelEvent event) {
- if (event.getChangeType() == Wrapper.CHANGE_PROPERTY) {
- refreshVisuals();
- }
- }
-
- public void activate() {
- super.activate();
- ((Wrapper)getModel()).addListener(this);
- }
-
- public void deactivate() {
- ((Wrapper)getModel()).removeListener(this);
- super.deactivate();
- }
-}
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/AbstractElementDeserializer.java
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/AbstractElementDeserializer.java 2009-07-04
00:43:15 UTC (rev 16382)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/AbstractElementDeserializer.java 2009-07-05
15:40:27 UTC (rev 16383)
@@ -1,6 +1,7 @@
package org.jboss.tools.flow.jpdl4.io;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import org.jboss.tools.flow.common.wrapper.Wrapper;
@@ -21,17 +22,22 @@
NodeList nodeList = element.getChildNodes();
ArrayList<Node> unknownNodeList = new ArrayList<Node>();
for (int i = 0; i < nodeList.getLength(); i++) {
- Wrapper childWrapper = deserializeChildNode(wrapper, nodeList.item(i));
- if (childWrapper != null) {
- childWrapper.getElement().setMetaData("leadingNodes", unknownNodeList);
- unknownNodeList = new ArrayList<Node>();
- } else {
- unknownNodeList.add(nodeList.item(i));
- }
+ deserializeChildNode(wrapper, nodeList.item(i), unknownNodeList);
}
wrapper.getElement().setMetaData("trailingNodes", unknownNodeList);
}
+ protected void deserializeChildNode(Wrapper parent, Node node, List<Node>
unknownNodeList) {
+ Wrapper childWrapper = deserializeChildNode(parent, node);
+ if (childWrapper != null) {
+ childWrapper.getElement().setMetaData("leadingNodes", new
ArrayList<Node>(unknownNodeList));
+ unknownNodeList.clear();
+ } else {
+ unknownNodeList.add(node);
+ }
+
+ }
+
protected List<String> getAttributesToRead() {
return new ArrayList<String>();
}
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/AbstractElementSerializer.java
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/AbstractElementSerializer.java 2009-07-04
00:43:15 UTC (rev 16382)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/AbstractElementSerializer.java 2009-07-05
15:40:27 UTC (rev 16383)
@@ -68,8 +68,8 @@
}
@SuppressWarnings("unchecked")
- protected void appendLeadingNodes(StringBuffer buffer, Wrapper wrapper, int level) {
- ArrayList<Node> leadingNodeList =
(ArrayList<Node>)wrapper.getElement().getMetaData("leadingNodes");
+ protected void appendUnknownNodes(String type, StringBuffer buffer, Wrapper wrapper, int
level) {
+ ArrayList<Node> leadingNodeList =
(ArrayList<Node>)wrapper.getElement().getMetaData(type);
boolean appendLeadingNodes = leadingNodeList != null &&
!leadingNodeList.isEmpty();
if (appendLeadingNodes) {
appendNodeList(buffer, leadingNodeList);
@@ -136,7 +136,7 @@
}
protected void appendOpening(StringBuffer buffer, Wrapper wrapper, int level) {
- appendLeadingNodes(buffer, wrapper, level);
+ appendUnknownNodes("leadingNodes", buffer, wrapper, level);
buffer.append("<" + Registry.getXmlNodeName(wrapper.getElement()));
appendAttributes(buffer, wrapper, level);
}
Added:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskDeserializer.java
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskDeserializer.java
(rev 0)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskDeserializer.java 2009-07-05
15:40:27 UTC (rev 16383)
@@ -0,0 +1,67 @@
+/**
+ *
+ */
+package org.jboss.tools.flow.jpdl4.io;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.tools.flow.common.wrapper.Wrapper;
+import org.jboss.tools.flow.jpdl4.model.HqlTask;
+import org.jboss.tools.flow.jpdl4.model.PrimitiveObject;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+class HqlTaskDeserializer extends NodeDeserializer {
+
+ public void deserializeAttributes(Wrapper wrapper, Element element) {
+ super.deserializeAttributes(wrapper, element);
+ wrapper.setPropertyValue(HqlTask.VAR, element.getAttribute("var"));
+ wrapper.setPropertyValue(HqlTask.UNIQUE, element.getAttribute("unique"));
+ }
+
+ public void deserializeChildNodes(Wrapper wrapper,
+ Element element) {
+ if (wrapper == null) return;
+ NodeList nodeList = element.getChildNodes();
+ ArrayList<Node> unknownNodeList = new ArrayList<Node>();
+ for (int i = 0; i < nodeList.getLength(); i++) {
+ Node node = nodeList.item(i);
+ if ("query".equals(node.getNodeName())) {
+ deserializeQuery(wrapper, node, unknownNodeList);
+ } else if ("parameters".equals(node.getNodeName())) {
+ deserializeParameters(wrapper, node, unknownNodeList);
+ } else {
+ deserializeChildNode(wrapper, node, unknownNodeList);
+ }
+ }
+ wrapper.getElement().setMetaData("trailingNodes", unknownNodeList);
+ }
+
+ private void deserializeQuery(Wrapper parent, Node node, List<Node>
unknownNodeList) {
+ parent.setMetaData("beforeQueryNodes", new
ArrayList<Node>(unknownNodeList));
+ unknownNodeList.clear();
+ // the query has only one child node
+ Node content = node.getChildNodes().item(0);
+ parent.setPropertyValue(HqlTask.QUERY, content.getNodeValue());
+ }
+
+ private void deserializeParameters(Wrapper parent, Node node, List<Node>
unknownNodeList) {
+ parent.setMetaData("beforeParametersNodes", new
ArrayList<Node>(unknownNodeList));
+ unknownNodeList.clear();
+ // the actual parameters are the children of the <parameters> element
+ NodeList nodeList = node.getChildNodes();
+ for (int i = 0; i < nodeList.getLength(); i++) {
+ Wrapper childWrapper = deserializeChildNode(parent, nodeList.item(i));
+ if (childWrapper != null && childWrapper.getElement() instanceof
PrimitiveObject) {
+ parent.addChild(HqlTask.PARAMETERS, childWrapper);
+ childWrapper.getElement().setMetaData("leadingNodes", new
ArrayList<Node>(unknownNodeList));
+ unknownNodeList.clear();
+ } else {
+ unknownNodeList.add(node);
+ }
+ }
+ }
+
+}
\ No newline at end of file
Property changes on:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskDeserializer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskSerializer.java
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskSerializer.java
(rev 0)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskSerializer.java 2009-07-05
15:40:27 UTC (rev 16383)
@@ -0,0 +1,55 @@
+/**
+ *
+ */
+package org.jboss.tools.flow.jpdl4.io;
+
+import java.util.List;
+
+import org.jboss.tools.flow.common.model.Element;
+import org.jboss.tools.flow.common.wrapper.Wrapper;
+import org.jboss.tools.flow.jpdl4.model.HqlTask;
+
+class HqlTaskSerializer extends ProcessNodeSerializer {
+
+ protected List<String> getAttributesToSave() {
+ List<String> result = super.getAttributesToSave();
+ result.add("var");
+ result.add("unique");
+ return result;
+ }
+
+ protected String getPropertyName(String attributeName) {
+ if ("var".equals(attributeName)) {
+ return HqlTask.VAR;
+ } else if ("unique".equals(attributeName)) {
+ return HqlTask.UNIQUE;
+ }
+ return super.getPropertyName(attributeName);
+ }
+
+ public void appendBody(StringBuffer buffer, Wrapper wrapper, int level) {
+ String query = (String)wrapper.getPropertyValue(HqlTask.QUERY);
+ if (query != null && !"".equals(query)) {
+ appendQuery(buffer, wrapper, query, level+1);
+ }
+ List<Element> parameters =wrapper.getChildren(HqlTask.PARAMETERS);
+ if (parameters != null) {
+ appendParameters(buffer, wrapper, parameters, level+1);
+ }
+ super.appendBody(buffer, wrapper, level);
+ }
+
+ private void appendQuery(StringBuffer buffer, Wrapper wrapper, String query, int level)
{
+ appendUnknownNodes("beforeQueryNodes", buffer, wrapper, level);
+ buffer.append("<query>").append(query).append("</query>");
+ }
+
+ private void appendParameters(StringBuffer buffer, Wrapper wrapper, List<Element>
parameters, int level) {
+ appendUnknownNodes("beforeParametersNodes", buffer, wrapper, level);
+ for (Element parameter : parameters) {
+ if (parameter instanceof Wrapper) {
+ JpdlSerializer.serialize((Wrapper)parameter, buffer, level+1);
+ }
+ }
+ }
+}
\ No newline at end of file
Property changes on:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskSerializer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/PrimitiveObjectSerializer.java
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/PrimitiveObjectSerializer.java
(rev 0)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/PrimitiveObjectSerializer.java 2009-07-05
15:40:27 UTC (rev 16383)
@@ -0,0 +1,19 @@
+/**
+ *
+ */
+package org.jboss.tools.flow.jpdl4.io;
+
+import org.jboss.tools.flow.common.wrapper.Wrapper;
+import org.jboss.tools.flow.jpdl4.model.Argument;
+
+class PrimitiveObjectSerializer extends AbstractElementSerializer {
+
+ public void appendToBuffer(StringBuffer buffer, Wrapper wrapper, int level) {
+ appendUnknownNodes("leadingNodes", buffer, wrapper, level);
+ String value = (String)wrapper.getPropertyValue(Argument.VALUE);
+ if (value != null && !("".equals(value))) {
+ buffer.append(value);
+ }
+ }
+
+}
\ No newline at end of file
Property changes on:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/PrimitiveObjectSerializer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
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-07-04
00:43:15 UTC (rev 16382)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/Registry.java 2009-07-05
15:40:27 UTC (rev 16383)
@@ -148,6 +148,8 @@
return new JavaTaskDeserializer();
} else if (element instanceof ScriptTask) {
return new ScriptTaskDeserializer();
+ } else if (element instanceof HqlTask) {
+ return new HqlTaskDeserializer();
} else {
return new NodeDeserializer();
}
@@ -186,7 +188,7 @@
} else if (element instanceof WaitTask) {
return new ProcessNodeSerializer();
} else if (element instanceof HqlTask) {
- return new ProcessNodeSerializer();
+ return new HqlTaskSerializer();
} else if (element instanceof SqlTask) {
return new ProcessNodeSerializer();
} else if (element instanceof JavaTask) {
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/SwimlaneSerializer.java
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/SwimlaneSerializer.java 2009-07-04
00:43:15 UTC (rev 16382)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/SwimlaneSerializer.java 2009-07-05
15:40:27 UTC (rev 16383)
@@ -50,7 +50,7 @@
}
}
public void appendOpening(StringBuffer buffer, Wrapper wrapper, int level) {
- appendLeadingNodes(buffer, wrapper, level);
+ appendUnknownNodes("leadingNodes", buffer, wrapper, level);
buffer.append("<swimlane");
appendAttributes(buffer, wrapper, level);
}
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-07-04
00:43:15 UTC (rev 16382)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HqlTask.java 2009-07-05
15:40:27 UTC (rev 16383)
@@ -17,7 +17,7 @@
private String variableName;
private String unique;
private String query;
- private List<WireObject> parameters = new ArrayList<WireObject>();
+ private List<PrimitiveObject> parameters = new
ArrayList<PrimitiveObject>();
public HqlTask() {
setMetaData("propertySource", new PropertySource());
Deleted:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/WireObject.java
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/WireObject.java 2009-07-04
00:43:15 UTC (rev 16382)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/WireObject.java 2009-07-05
15:40:27 UTC (rev 16383)
@@ -1,7 +0,0 @@
-package org.jboss.tools.flow.jpdl4.model;
-
-import org.jboss.tools.flow.common.model.DefaultElement;
-
-public class WireObject extends DefaultElement {
-
-}
Deleted:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/WireObjectContainer.java
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/WireObjectContainer.java 2009-07-04
00:43:15 UTC (rev 16382)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/WireObjectContainer.java 2009-07-05
15:40:27 UTC (rev 16383)
@@ -1,7 +0,0 @@
-package org.jboss.tools.flow.jpdl4.model;
-
-import org.jboss.tools.flow.common.model.DefaultElement;
-
-public class WireObjectContainer extends DefaultElement {
-
-}
Added:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/PrimitiveObjectValueSection.java
===================================================================
---
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/PrimitiveObjectValueSection.java
(rev 0)
+++
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/PrimitiveObjectValueSection.java 2009-07-05
15:40:27 UTC (rev 16383)
@@ -0,0 +1,11 @@
+package org.jboss.tools.flow.jpdl4.properties;
+
+import org.jboss.tools.flow.jpdl4.model.PrimitiveObject;
+
+public class PrimitiveObjectValueSection extends TextFieldPropertySection {
+
+ public PrimitiveObjectValueSection() {
+ super(PrimitiveObject.VALUE, "Value");
+ }
+
+}
Property changes on:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/PrimitiveObjectValueSection.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain