Author: koen.aers(a)jboss.com Date: 2009-07-05 12:37:05 -0400 (Sun, 05 Jul 2009) New Revision: 16386 Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/QueryTaskTreeRootEditPart.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/QueryTaskDeserializer.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/QueryTaskSerializer.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/QueryTask.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/QueryTaskQuerySection.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/QueryTaskUniqueSection.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/QueryTaskVariableNameSection.java Removed: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/HqlTaskTreeRootEditPart.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/properties/HqlTaskQuerySection.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/HqlTaskUniqueSection.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/HqlTaskVariableNameSection.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/handler/AddParameterHandler.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/model/HqlTask.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/view/DetailsPage.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsView.java Log: SqlTask configuration is now supported Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-07-05 16:02:25 UTC (rev 16385) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-07-05 16:37:05 UTC (rev 16386) @@ -622,24 +622,24 @@ </propertySection> <propertySection afterSection="org.jboss.tools.jpdl4.name" - class="org.jboss.tools.flow.jpdl4.properties.HqlTaskVariableNameSection" + class="org.jboss.tools.flow.jpdl4.properties.QueryTaskVariableNameSection" id="org.jboss.tools.jpdl4.hqlTask.variableName" tab="org.jboss.tools.jpdl4.general"> - <input type="org.jboss.tools.flow.jpdl4.model.HqlTask"/> + <input type="org.jboss.tools.flow.jpdl4.model.QueryTask"/> </propertySection> <propertySection afterSection="org.jboss.tools.jpdl4.hqlTask.variableName" - class="org.jboss.tools.flow.jpdl4.properties.HqlTaskUniqueSection" + class="org.jboss.tools.flow.jpdl4.properties.QueryTaskUniqueSection" id="org.jboss.tools.jpdl4.hqlTask.unique" tab="org.jboss.tools.jpdl4.general"> - <input type="org.jboss.tools.flow.jpdl4.model.HqlTask"/> + <input type="org.jboss.tools.flow.jpdl4.model.QueryTask"/> </propertySection> <propertySection afterSection="org.jboss.tools.jpdl4.hqlTask.unique" - class="org.jboss.tools.flow.jpdl4.properties.HqlTaskQuerySection" + class="org.jboss.tools.flow.jpdl4.properties.QueryTaskQuerySection" id="org.jboss.tools.jpdl4.hqlTask.query" tab="org.jboss.tools.jpdl4.general"> - <input type="org.jboss.tools.flow.jpdl4.model.HqlTask"/> + <input type="org.jboss.tools.flow.jpdl4.model.QueryTask"/> </propertySection> <propertySection class="org.jboss.tools.flow.jpdl4.properties.PrimitiveObjectValueSection" @@ -856,7 +856,7 @@ <iterate> <or> <instanceof - value="org.jboss.tools.flow.jpdl4.editpart.HqlTaskTreeRootEditPart"> + value="org.jboss.tools.flow.jpdl4.editpart.QueryTaskTreeRootEditPart"> </instanceof> <instanceof value="org.jboss.tools.flow.jpdl4.editpart.ParameterListTreeEditPart"> Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/HqlTaskTreeRootEditPart.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/HqlTaskTreeRootEditPart.java 2009-07-05 16:02:25 UTC (rev 16385) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/HqlTaskTreeRootEditPart.java 2009-07-05 16:37:05 UTC (rev 16386) @@ -1,30 +0,0 @@ -package org.jboss.tools.flow.jpdl4.editpart; - -import java.util.ArrayList; -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; - -public class HqlTaskTreeRootEditPart extends TaskTreeRootEditPart { - - public HqlTaskTreeRootEditPart(Wrapper wrapper) { - super(wrapper); - } - - protected List<Object> getModelChildren() { - List<Object> result = new ArrayList<Object>(); - addParameters(result, (Wrapper)getModel()); - result.addAll(super.getModelChildren()); - return result; - } - - private void addParameters(List<Object> list, Wrapper wrapper) { - List<Element> parameters = wrapper.getChildren(HqlTask.PARAMETERS); - if (parameters != null && !parameters.isEmpty()) { - list.add(new ParameterListTreeEditPart(parameters)); - } - } - -} 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-05 16:02:25 UTC (rev 16385) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java 2009-07-05 16:37:05 UTC (rev 16386) @@ -11,10 +11,10 @@ import org.jboss.tools.flow.jpdl4.model.EventListener; import org.jboss.tools.flow.jpdl4.model.EventListenerContainer; import org.jboss.tools.flow.jpdl4.model.Field; -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.QueryTask; import org.jboss.tools.flow.jpdl4.model.SubprocessTask; import org.jboss.tools.flow.jpdl4.model.Swimlane; import org.jboss.tools.flow.jpdl4.model.Timer; @@ -27,7 +27,7 @@ Element element = ((NodeWrapper)model).getElement(); if (element instanceof SubprocessTask) return new SubprocessTaskTreeRootEditPart((Wrapper)model); if (element instanceof JavaTask) return new JavaTaskTreeRootEditPart((Wrapper)model); - if (element instanceof HqlTask) return new HqlTaskTreeRootEditPart((Wrapper)model); + if (element instanceof QueryTask) return new QueryTaskTreeRootEditPart((Wrapper)model); return new TaskTreeRootEditPart((NodeWrapper)model); } if (model instanceof ConnectionWrapper && context == null) return new SequenceFlowTreeRootEditPart((ConnectionWrapper)model); Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/QueryTaskTreeRootEditPart.java (from rev 16344, trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/HqlTaskTreeRootEditPart.java) =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/QueryTaskTreeRootEditPart.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/QueryTaskTreeRootEditPart.java 2009-07-05 16:37:05 UTC (rev 16386) @@ -0,0 +1,30 @@ +package org.jboss.tools.flow.jpdl4.editpart; + +import java.util.ArrayList; +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.QueryTask; + +public class QueryTaskTreeRootEditPart extends TaskTreeRootEditPart { + + public QueryTaskTreeRootEditPart(Wrapper wrapper) { + super(wrapper); + } + + protected List<Object> getModelChildren() { + List<Object> result = new ArrayList<Object>(); + addParameters(result, (Wrapper)getModel()); + result.addAll(super.getModelChildren()); + return result; + } + + private void addParameters(List<Object> list, Wrapper wrapper) { + List<Element> parameters = wrapper.getChildren(QueryTask.PARAMETERS); + if (parameters != null && !parameters.isEmpty()) { + list.add(new ParameterListTreeEditPart(parameters)); + } + } + +} Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/QueryTaskTreeRootEditPart.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddParameterHandler.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddParameterHandler.java 2009-07-05 16:02:25 UTC (rev 16385) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddParameterHandler.java 2009-07-05 16:37:05 UTC (rev 16386) @@ -1,6 +1,6 @@ package org.jboss.tools.flow.jpdl4.handler; -import org.jboss.tools.flow.jpdl4.model.HqlTask; +import org.jboss.tools.flow.jpdl4.model.QueryTask; public class AddParameterHandler extends AddChildHandler { @@ -11,7 +11,7 @@ @Override protected String getChildType() { - return HqlTask.PARAMETERS; + return QueryTask.PARAMETERS; } } Deleted: 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 2009-07-05 16:02:25 UTC (rev 16385) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskDeserializer.java 2009-07-05 16:37:05 UTC (rev 16386) @@ -1,67 +0,0 @@ -/** - * - */ -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 Deleted: 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 2009-07-05 16:02:25 UTC (rev 16385) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/HqlTaskSerializer.java 2009-07-05 16:37:05 UTC (rev 16386) @@ -1,55 +0,0 @@ -/** - * - */ -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 Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/QueryTaskDeserializer.java (from rev 16383, 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/QueryTaskDeserializer.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/QueryTaskDeserializer.java 2009-07-05 16:37:05 UTC (rev 16386) @@ -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.PrimitiveObject; +import org.jboss.tools.flow.jpdl4.model.QueryTask; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +class QueryTaskDeserializer extends NodeDeserializer { + + public void deserializeAttributes(Wrapper wrapper, Element element) { + super.deserializeAttributes(wrapper, element); + wrapper.setPropertyValue(QueryTask.VAR, element.getAttribute("var")); + wrapper.setPropertyValue(QueryTask.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(QueryTask.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(QueryTask.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/QueryTaskDeserializer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/QueryTaskSerializer.java (from rev 16383, 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/QueryTaskSerializer.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/QueryTaskSerializer.java 2009-07-05 16:37:05 UTC (rev 16386) @@ -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.QueryTask; + +class QueryTaskSerializer 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 QueryTask.VAR; + } else if ("unique".equals(attributeName)) { + return QueryTask.UNIQUE; + } + return super.getPropertyName(attributeName); + } + + public void appendBody(StringBuffer buffer, Wrapper wrapper, int level) { + String query = (String)wrapper.getPropertyValue(QueryTask.QUERY); + if (query != null && !"".equals(query)) { + appendQuery(buffer, wrapper, query, level+1); + } + List<Element> parameters =wrapper.getChildren(QueryTask.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/QueryTaskSerializer.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-05 16:02:25 UTC (rev 16385) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/io/Registry.java 2009-07-05 16:37:05 UTC (rev 16386) @@ -16,7 +16,6 @@ import org.jboss.tools.flow.jpdl4.model.ExclusiveGateway; import org.jboss.tools.flow.jpdl4.model.Field; import org.jboss.tools.flow.jpdl4.model.ForkParallelGateway; -import org.jboss.tools.flow.jpdl4.model.HqlTask; import org.jboss.tools.flow.jpdl4.model.HumanTask; import org.jboss.tools.flow.jpdl4.model.JavaTask; import org.jboss.tools.flow.jpdl4.model.JoinParallelGateway; @@ -24,6 +23,7 @@ import org.jboss.tools.flow.jpdl4.model.Parameter; import org.jboss.tools.flow.jpdl4.model.PrimitiveObject; import org.jboss.tools.flow.jpdl4.model.Process; +import org.jboss.tools.flow.jpdl4.model.QueryTask; import org.jboss.tools.flow.jpdl4.model.ScriptTask; import org.jboss.tools.flow.jpdl4.model.SequenceFlow; import org.jboss.tools.flow.jpdl4.model.ServiceTask; @@ -148,8 +148,8 @@ return new JavaTaskDeserializer(); } else if (element instanceof ScriptTask) { return new ScriptTaskDeserializer(); - } else if (element instanceof HqlTask) { - return new HqlTaskDeserializer(); + } else if (element instanceof QueryTask) { + return new QueryTaskDeserializer(); } else { return new NodeDeserializer(); } @@ -187,8 +187,8 @@ return new ProcessNodeSerializer(); } else if (element instanceof WaitTask) { return new ProcessNodeSerializer(); - } else if (element instanceof HqlTask) { - return new HqlTaskSerializer(); + } else if (element instanceof QueryTask) { + return new QueryTaskSerializer(); } 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/model/HqlTask.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HqlTask.java 2009-07-05 16:02:25 UTC (rev 16385) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HqlTask.java 2009-07-05 16:37:05 UTC (rev 16386) @@ -1,80 +1,7 @@ package org.jboss.tools.flow.jpdl4.model; -import java.util.ArrayList; -import java.util.List; -import org.eclipse.ui.views.properties.IPropertyDescriptor; -import org.eclipse.ui.views.properties.IPropertySource; - -public class HqlTask extends Task { +public class HqlTask extends QueryTask { - 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 PARAMETERS = "org.jboss.tools.flow.jpdl4.model.hqlTask.parameters"; - - private String variableName; - private String unique; - private String query; - private List<PrimitiveObject> parameters = new ArrayList<PrimitiveObject>(); - - public HqlTask() { - setMetaData("propertySource", new PropertySource()); - } - - protected boolean isPropagationExclusive() { - return true; - } - - private class PropertySource implements IPropertySource { - - public Object getEditableValue() { - return null; - } - - public IPropertyDescriptor[] getPropertyDescriptors() { - return new IPropertyDescriptor[0]; - } - - public Object getPropertyValue(Object id) { - if (VAR.equals(id)) { - return variableName; - } else if (UNIQUE.equals(id)) { - return unique; - } else if (QUERY.equals(id)) { - return query; - } else if (PARAMETERS.equals(id)) { - return parameters; - } - return null; - } - - public boolean isPropertySet(Object id) { - if (VAR.equals(id)) { - return variableName != null; - } else if (UNIQUE.equals(id)) { - return unique != null; - } else if (QUERY.equals(id)) { - return query != null; - } else if (PARAMETERS.equals(id)) { - return true; - } - return false; - } - - public void resetPropertyValue(Object id) { - } - - public void setPropertyValue(Object id, Object value) { - if (VAR.equals(id)) { - variableName = (String)value; - } else if (UNIQUE.equals(id)) { - unique = (String)value; - } else if (QUERY.equals(id)) { - query = (String)value; - } - } - - } } Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/QueryTask.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/QueryTask.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/QueryTask.java 2009-07-05 16:37:05 UTC (rev 16386) @@ -0,0 +1,80 @@ +package org.jboss.tools.flow.jpdl4.model; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.ui.views.properties.IPropertyDescriptor; +import org.eclipse.ui.views.properties.IPropertySource; + + +public class QueryTask extends Task { + + public static final String VAR = "org.jboss.tools.flow.jpdl4.model.queryTask.var"; + public static final String UNIQUE = "org.jboss.tools.flow.jpdl4.model.queryTask.unique"; + public static final String QUERY = "org.jboss.tools.flow.jpdl4.model.queryTask.query"; + public static final String PARAMETERS = "org.jboss.tools.flow.jpdl4.model.queryTask.parameters"; + + private String variableName; + private String unique; + private String query; + private List<PrimitiveObject> parameters = new ArrayList<PrimitiveObject>(); + + public QueryTask() { + setMetaData("propertySource", new PropertySource()); + } + + protected boolean isPropagationExclusive() { + return true; + } + + private class PropertySource implements IPropertySource { + + public Object getEditableValue() { + return null; + } + + public IPropertyDescriptor[] getPropertyDescriptors() { + return new IPropertyDescriptor[0]; + } + + public Object getPropertyValue(Object id) { + if (VAR.equals(id)) { + return variableName; + } else if (UNIQUE.equals(id)) { + return unique; + } else if (QUERY.equals(id)) { + return query; + } else if (PARAMETERS.equals(id)) { + return parameters; + } + return null; + } + + public boolean isPropertySet(Object id) { + if (VAR.equals(id)) { + return variableName != null; + } else if (UNIQUE.equals(id)) { + return unique != null; + } else if (QUERY.equals(id)) { + return query != null; + } else if (PARAMETERS.equals(id)) { + return true; + } + return false; + } + + public void resetPropertyValue(Object id) { + } + + public void setPropertyValue(Object id, Object value) { + if (VAR.equals(id)) { + variableName = (String)value; + } else if (UNIQUE.equals(id)) { + unique = (String)value; + } else if (QUERY.equals(id)) { + query = (String)value; + } + } + + } +} Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/QueryTask.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: 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 2009-07-05 16:02:25 UTC (rev 16385) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/SqlTask.java 2009-07-05 16:37:05 UTC (rev 16386) @@ -1,10 +1,6 @@ package org.jboss.tools.flow.jpdl4.model; -public class SqlTask extends Task { +public class SqlTask extends QueryTask { - protected boolean isPropagationExclusive() { - return true; - } - } Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/HqlTaskQuerySection.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/HqlTaskQuerySection.java 2009-07-05 16:02:25 UTC (rev 16385) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/HqlTaskQuerySection.java 2009-07-05 16:37:05 UTC (rev 16386) @@ -1,11 +0,0 @@ -package org.jboss.tools.flow.jpdl4.properties; - -import org.jboss.tools.flow.jpdl4.model.HqlTask; - -public class HqlTaskQuerySection extends TextFieldPropertySection { - - public HqlTaskQuerySection() { - super(HqlTask.QUERY, "Query"); - } - -} Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/HqlTaskUniqueSection.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/HqlTaskUniqueSection.java 2009-07-05 16:02:25 UTC (rev 16385) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/HqlTaskUniqueSection.java 2009-07-05 16:37:05 UTC (rev 16386) @@ -1,11 +0,0 @@ -package org.jboss.tools.flow.jpdl4.properties; - -import org.jboss.tools.flow.jpdl4.model.HqlTask; - -public class HqlTaskUniqueSection extends TextFieldPropertySection { - - public HqlTaskUniqueSection() { - super(HqlTask.UNIQUE, "Unique"); - } - -} Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/HqlTaskVariableNameSection.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/HqlTaskVariableNameSection.java 2009-07-05 16:02:25 UTC (rev 16385) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/HqlTaskVariableNameSection.java 2009-07-05 16:37:05 UTC (rev 16386) @@ -1,11 +0,0 @@ -package org.jboss.tools.flow.jpdl4.properties; - -import org.jboss.tools.flow.jpdl4.model.HqlTask; - -public class HqlTaskVariableNameSection extends TextFieldPropertySection { - - public HqlTaskVariableNameSection() { - super(HqlTask.VAR, "Variable Name"); - } - -} Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/QueryTaskQuerySection.java (from rev 16344, trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/HqlTaskQuerySection.java) =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/QueryTaskQuerySection.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/QueryTaskQuerySection.java 2009-07-05 16:37:05 UTC (rev 16386) @@ -0,0 +1,11 @@ +package org.jboss.tools.flow.jpdl4.properties; + +import org.jboss.tools.flow.jpdl4.model.QueryTask; + +public class QueryTaskQuerySection extends TextFieldPropertySection { + + public QueryTaskQuerySection() { + super(QueryTask.QUERY, "Query"); + } + +} Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/QueryTaskQuerySection.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/QueryTaskUniqueSection.java (from rev 16344, trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/HqlTaskUniqueSection.java) =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/QueryTaskUniqueSection.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/QueryTaskUniqueSection.java 2009-07-05 16:37:05 UTC (rev 16386) @@ -0,0 +1,11 @@ +package org.jboss.tools.flow.jpdl4.properties; + +import org.jboss.tools.flow.jpdl4.model.QueryTask; + +public class QueryTaskUniqueSection extends TextFieldPropertySection { + + public QueryTaskUniqueSection() { + super(QueryTask.UNIQUE, "Unique"); + } + +} Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/QueryTaskUniqueSection.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/QueryTaskVariableNameSection.java (from rev 16344, trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/HqlTaskVariableNameSection.java) =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/QueryTaskVariableNameSection.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/QueryTaskVariableNameSection.java 2009-07-05 16:37:05 UTC (rev 16386) @@ -0,0 +1,11 @@ +package org.jboss.tools.flow.jpdl4.properties; + +import org.jboss.tools.flow.jpdl4.model.QueryTask; + +public class QueryTaskVariableNameSection extends TextFieldPropertySection { + + public QueryTaskVariableNameSection() { + super(QueryTask.VAR, "Variable Name"); + } + +} Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/QueryTaskVariableNameSection.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsPage.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsPage.java 2009-07-05 16:02:25 UTC (rev 16385) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsPage.java 2009-07-05 16:37:05 UTC (rev 16386) @@ -18,10 +18,12 @@ private EditPartViewer viewer; private Control control; + private JpdlEditor jpdlEditor; public DetailsPage(JpdlEditor jpdlEditor) { viewer = new TreeViewer(); viewer.setEditPartFactory(new JpdlTreeEditPartFactory()); + this.jpdlEditor = jpdlEditor; jpdlEditor.getEditDomain().addViewer(viewer); } @@ -33,6 +35,10 @@ return viewer; } + public JpdlEditor getContributingEditor() { + return jpdlEditor; + } + public void addSelectionChangedListener(ISelectionChangedListener listener) { getViewer().addSelectionChangedListener(listener); } @@ -76,4 +82,6 @@ } } } + + } Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsView.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsView.java 2009-07-05 16:02:25 UTC (rev 16385) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsView.java 2009-07-05 16:37:05 UTC (rev 16386) @@ -116,8 +116,8 @@ @SuppressWarnings("unchecked") public Object getAdapter(Class adapter) { - if (adapter == IPropertySheetPage.class && getCurrentContributingPart() != null) - return getCurrentContributingPart().getAdapter(adapter); + if (adapter == IPropertySheetPage.class && getCurrentPage() != null && getCurrentPage() instanceof DetailsPage) + return ((DetailsPage)getCurrentPage()).getContributingEditor().getAdapter(adapter); return super.getAdapter(adapter); }