[jbpm-commits] JBoss JBPM SVN: r1861 - in jbpm4/pvm/trunk/modules/core/src/main: java/org/jbpm/pvm/internal/wire/binding and 2 other directories.

Author: tom.baeyens(a)jboss.com Date: 2008-08-11 05:59:19 -0400 (Mon, 11 Aug 2008) New Revision: 1861 Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/model/TransitionImpl.java jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/binding/ObjectBinding.java jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/model/Condition.java jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/model/ProcessFactory.java jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/model/Transition.java jbpm4/pvm/trunk/modules/core/src/main/resources/org/jbpm/pvm/hibernate.definition.hbm.xml Log: renamed transition.guardCondition to transition.condition: JBPM-1461 Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/model/TransitionImpl.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/model/TransitionImpl.java 2008-08-11 09:03:59 UTC (rev 1860) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/model/TransitionImpl.java 2008-08-11 09:59:19 UTC (rev 1861) @@ -23,6 +23,8 @@ import java.util.List; +import org.jbpm.pvm.internal.wire.Descriptor; +import org.jbpm.pvm.internal.wire.WireContext; import org.jbpm.pvm.model.Condition; import org.jbpm.pvm.model.Event; import org.jbpm.pvm.model.Transition; @@ -37,8 +39,8 @@ protected NodeImpl source; protected NodeImpl destination; - protected ObjectReference<Condition> guardConditionReference; - protected ObjectReference<Condition> waitConditionReference; + protected Descriptor conditionDescriptor; + protected Descriptor waitConditionDescriptor; protected boolean isTakeAsync; /* Use one of the NodeImpl.createOutgoingTransition methods instead. */ @@ -118,12 +120,18 @@ } } - public Condition getGuardCondition() { - return ( guardConditionReference!=null ? guardConditionReference.get() : null ); + public Condition getCondition() { + if (conditionDescriptor==null) { + return null; + } + return (Condition) WireContext.create(conditionDescriptor); } public Condition getWaitCondition() { - return ( waitConditionReference!=null ? waitConditionReference.get() : null ); + if (waitConditionDescriptor==null) { + return null; + } + return (Condition) WireContext.create(waitConditionDescriptor); } public EventImpl getEvent() { @@ -141,21 +149,21 @@ public void setDestination(NodeImpl destination) { this.destination = destination; } - /** see <a href="#guardconditions">Guard conditions</a> */ - public ObjectReference<Condition> getGuardConditionReference() { - return guardConditionReference; + /** see <a href="#conditions">Conditions</a> */ + public Descriptor getConditionDescriptor() { + return conditionDescriptor; } - /** see <a href="#guardconditions">Guard conditions</a> */ - public void setGuardConditionReference(ObjectReference<Condition> guardConditionReference) { - this.guardConditionReference = guardConditionReference; + /** see <a href="#conditions">Conditions</a> */ + public void setConditionDescriptor(Descriptor conditionDescriptor) { + this.conditionDescriptor = conditionDescriptor; } /** see <a href="#waitconditions">Wait conditions</a> */ - public ObjectReference<Condition> getWaitConditionReference() { - return waitConditionReference; + public Descriptor getWaitConditionDescriptor() { + return waitConditionDescriptor; } /** see <a href="#waitconditions">Wait conditions</a> */ - public void setWaitConditionReferenceConditionReference(ObjectReference<Condition> waitConditionReference) { - this.waitConditionReference = waitConditionReference; + public void setWaitConditionDescriptor(Descriptor waitConditionDescriptor) { + this.waitConditionDescriptor = waitConditionDescriptor; } public boolean isTakeAsync() { return isTakeAsync; @@ -163,7 +171,4 @@ public void setTakeAsync(boolean isTakeAsync) { this.isTakeAsync = isTakeAsync; } - public void setWaitConditionReference(ObjectReference<Condition> waitConditionReference) { - this.waitConditionReference = waitConditionReference; - } } Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/binding/ObjectBinding.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/binding/ObjectBinding.java 2008-08-11 09:03:59 UTC (rev 1860) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/binding/ObjectBinding.java 2008-08-11 09:59:19 UTC (rev 1861) @@ -47,6 +47,20 @@ super("object"); } + + public static boolean isObjectDescriptor(Element element) { + if (XmlUtil.attribute(element, "class")!=null) { + return true; + } + if (XmlUtil.attribute(element, "factory")!=null) { + return true; + } + if (XmlUtil.element(element, "factory")!=null) { + return true; + } + return false; + } + public Object parse(Element element, Parse parse, Parser parser) { ObjectDescriptor descriptor = new ObjectDescriptor(); Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/model/Condition.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/model/Condition.java 2008-08-11 09:03:59 UTC (rev 1860) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/model/Condition.java 2008-08-11 09:59:19 UTC (rev 1861) @@ -26,7 +26,7 @@ import org.jbpm.pvm.listener.EventListenerExecution; /** user code that reflects a runtime calculation of a boolean value. - * Used for {@link Transition#getGuardCondition() transition guard conditions} and + * Used for {@link Transition#getCondition() transition guard conditions} and * {@link Transition#getWaitCondition() transition wait states}. * * @see Transition Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/model/ProcessFactory.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/model/ProcessFactory.java 2008-08-11 09:03:59 UTC (rev 1860) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/model/ProcessFactory.java 2008-08-11 09:59:19 UTC (rev 1861) @@ -43,6 +43,7 @@ import org.jbpm.pvm.internal.model.VariableDefinitionImpl; import org.jbpm.pvm.internal.wire.Descriptor; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; +import org.jbpm.pvm.internal.wire.descriptor.ProvidedObjectDescriptor; import org.jbpm.pvm.internal.wire.descriptor.StringDescriptor; import org.jbpm.pvm.listener.EventListener; @@ -457,8 +458,8 @@ if (transition==null) { throw new PvmException("no current transition"); } - ObjectReference<Condition> waitConditionReference = new ObjectReference<Condition>(condition); - transition.setWaitConditionReference(waitConditionReference); + Descriptor conditionDescriptor= new ProvidedObjectDescriptor(condition); + transition.setWaitConditionDescriptor(conditionDescriptor); return this; } @@ -471,8 +472,8 @@ if (transition==null) { throw new PvmException("no current transition"); } - ObjectReference<Condition> guardConditionReference = new ObjectReference<Condition>(condition); - transition.setGuardConditionReference(guardConditionReference); + Descriptor conditionDescriptor= new ProvidedObjectDescriptor(condition); + transition.setConditionDescriptor(conditionDescriptor); return this; } Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/model/Transition.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/model/Transition.java 2008-08-11 09:03:59 UTC (rev 1860) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/model/Transition.java 2008-08-11 09:59:19 UTC (rev 1861) @@ -62,6 +62,7 @@ /** the node in which this transition arrives. */ Node getDestination(); - /** the guard condition */ - Condition getGuardCondition(); + /** the general purpose condition that can be used in various ways by the + * activities. */ + Condition getCondition(); } \ No newline at end of file Modified: jbpm4/pvm/trunk/modules/core/src/main/resources/org/jbpm/pvm/hibernate.definition.hbm.xml =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/resources/org/jbpm/pvm/hibernate.definition.hbm.xml 2008-08-11 09:03:59 UTC (rev 1860) +++ jbpm4/pvm/trunk/modules/core/src/main/resources/org/jbpm/pvm/hibernate.definition.hbm.xml 2008-08-11 09:59:19 UTC (rev 1861) @@ -232,32 +232,22 @@ foreign-key="FK_TRANS_DST" index="IDX_TRANS_DST" /> - <component name="guardConditionReference"> - <many-to-one name="descriptor" - column="GUARD_DESCR_" - class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" - cascade="all" - foreign-key="FK_TRANS_GUARD" - index="IDX_TRANS_GUARD" /> - <any name="object" id-type="long" cascade="all"> - <!-- TODO: Specify names for classes --> - <column name="GUARD_CLASS_" /> - <column name="GUARD_ID_" /> - </any> - </component> - <component name="waitConditionReference"> - <many-to-one name="descriptor" - column="WAIT_DESCR_" - class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" - cascade="all" - foreign-key="FK_TRANS_WAIT_DESCR" - index="IDX_TRANS_WAIT_DESCR" /> - <any name="object" id-type="long" cascade="all"> - <!-- TODO: Specify names for classes --> - <column name="WAIT_CLASS_" /> - <column name="WAIT_ID_" /> - </any> - </component> + <many-to-one name="conditionDescriptor" + column="COND_DESCR_" + class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" + cascade="all" + foreign-key="FK_TRANS_COND" + index="IDX_TRANS_COND" /> + + <!-- + <many-to-one name="waitConditionDescriptor" + column="WAIT_DESCR_" + class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" + cascade="all" + foreign-key="FK_TRANS_WAIT_DESCR" + index="IDX_TRANS_WAIT_DESCR" /> + --> + <property name="isTakeAsync" column="TAKEASYNC_" /> </class>