[jbpm-commits] JBoss JBPM SVN: r5972 - in jbpm4/trunk/modules: pvm/src/main/java/org/jbpm/pvm/internal/wire/binding and 1 other directory.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Dec 16 11:30:02 EST 2009
Author: koen.aers at jboss.com
Date: 2009-12-16 11:30:02 -0500 (Wed, 16 Dec 2009)
New Revision: 5972
Modified:
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsBinding.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MapBinding.java
Log:
JMS Activity and Binding: JMS MapMessage
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsBinding.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsBinding.java 2009-12-16 15:56:39 UTC (rev 5971)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JmsBinding.java 2009-12-16 16:30:02 UTC (rev 5972)
@@ -23,7 +23,9 @@
import org.jbpm.jpdl.internal.xml.JpdlParser;
import org.jbpm.pvm.internal.util.XmlUtil;
+import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.descriptor.MapDescriptor;
+import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
import org.jbpm.pvm.internal.xml.Binding;
import org.jbpm.pvm.internal.xml.Parse;
import org.w3c.dom.Element;
@@ -71,16 +73,11 @@
Element mapElement = XmlUtil.element(element, "map", false, parse);
if (mapElement != null) {
- Binding binding = parser.getBinding(mapElement);
- if (binding != null) {
- System.out.println("Goddam f*ck!!!");
- }
- jmsActivity.setType("map");
- Object object = binding.parse(mapElement, parse, parser);
- if (object instanceof MapDescriptor) {
- jmsActivity.setMapDescriptor((MapDescriptor)object);
+ Descriptor descriptor = parser.parseObjectDescriptor(mapElement, parse);
+ if (descriptor instanceof MapDescriptor) {
+ jmsActivity.setMapDescriptor((MapDescriptor)descriptor);
} else {
- parse.addProblem("parsed object is not instanceof MapDescriptor", mapElement);
+ System.out.println("descriptor is not of class MadDescriptor");
}
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MapBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MapBinding.java 2009-12-16 15:56:39 UTC (rev 5971)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MapBinding.java 2009-12-16 16:30:02 UTC (rev 5972)
@@ -65,32 +65,12 @@
if ("entry".equals(XmlUtil.getTagLocalName(entryElement))) {
// key
Element keyElement = XmlUtil.element(entryElement, "key");
- if (keyElement != null) {
- System.out.println("found keyElement");
- }
Element keyDescriptorElement = (keyElement!=null ? XmlUtil.element(keyElement) : null);
- if (keyDescriptorElement != null) {
- System.out.println("found keyDescriptorElement");
- System.out.println(" element: " + keyDescriptorElement.getNodeName());
- }
Descriptor keyDescriptor = (Descriptor) parser.parseElement(keyDescriptorElement, parse, WireParser.CATEGORY_DESCRIPTOR);
- if (keyDescriptor != null) {
- System.out.println("found keyDescriptor");
- }
// value
Element valueElement = XmlUtil.element(entryElement, "value");
- if (valueElement != null) {
- System.out.println("found valueElement");
- }
Element valueDescriptorElement = (valueElement!=null ? XmlUtil.element(valueElement) : null);
- if (valueDescriptorElement != null) {
- System.out.println("found valueDescriptorElement");
- System.out.println(" element: " + valueDescriptorElement.getNodeName());
- }
Descriptor valueDescriptor = (Descriptor) parser.parseElement(valueDescriptorElement, parse, WireParser.CATEGORY_DESCRIPTOR);
- if (valueDescriptor != null) {
- System.out.println("found valueDescriptor");
- }
if ( (keyDescriptor!=null)
&& (valueDescriptor!=null)
More information about the jbpm-commits
mailing list