[jbpm-commits] JBoss JBPM SVN: r1858 - in jbpm4/pvm/trunk/modules/core/src: main/java/org/jbpm/pvm/internal/model/op and 3 other directories.

Author: tom.baeyens(a)jboss.com Date: 2008-08-09 10:09:16 -0400 (Sat, 09 Aug 2008) New Revision: 1858 Added: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/model/Condition.java Removed: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/listener/Condition.java 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/op/TakeTransition.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/test/java/org/jbpm/pvm/api/basicfeatures/TransitionAsWaitStateTest.java Log: updates needed for jpdl decision impl 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-09 14:08:19 UTC (rev 1857) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/model/TransitionImpl.java 2008-08-09 14:09:16 UTC (rev 1858) @@ -23,7 +23,7 @@ import java.util.List; -import org.jbpm.pvm.listener.Condition; +import org.jbpm.pvm.model.Condition; import org.jbpm.pvm.model.Event; import org.jbpm.pvm.model.Transition; Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransition.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransition.java 2008-08-09 14:08:19 UTC (rev 1857) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/model/op/TakeTransition.java 2008-08-09 14:09:16 UTC (rev 1858) @@ -30,7 +30,7 @@ import org.jbpm.pvm.internal.model.NodeImpl; import org.jbpm.pvm.internal.model.ObservableElementImpl; import org.jbpm.pvm.internal.model.TransitionImpl; -import org.jbpm.pvm.listener.Condition; +import org.jbpm.pvm.model.Condition; import org.jbpm.pvm.model.Event; public class TakeTransition implements AtomicOperation { Deleted: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/listener/Condition.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/listener/Condition.java 2008-08-09 14:08:19 UTC (rev 1857) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/listener/Condition.java 2008-08-09 14:09:16 UTC (rev 1858) @@ -1,40 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.pvm.listener; - -import java.io.Serializable; - -import org.jbpm.pvm.model.Transition; - -/** user code that reflects a runtime calculation of a boolean value. - * Used for {@link Transition#getGuardCondition() transition guard conditions} and - * {@link Transition#getWaitCondition() transition wait states}. - * - * @see Transition - * - * @author Tom Baeyens - */ -public interface Condition extends Serializable { - - /** evaluates this condition in the context of the given execution. */ - boolean evaluate(EventListenerExecution execution); -} Copied: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/model/Condition.java (from rev 1850, jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/listener/Condition.java) =================================================================== --- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/model/Condition.java (rev 0) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/model/Condition.java 2008-08-09 14:09:16 UTC (rev 1858) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.model; + +import java.io.Serializable; + +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 + * {@link Transition#getWaitCondition() transition wait states}. + * + * @see Transition + * + * @author Tom Baeyens + */ +public interface Condition extends Serializable { + + /** evaluates this condition in the context of the given execution. */ + boolean evaluate(EventListenerExecution execution); +} Property changes on: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/model/Condition.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF 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-09 14:08:19 UTC (rev 1857) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/model/ProcessFactory.java 2008-08-09 14:09:16 UTC (rev 1858) @@ -44,7 +44,6 @@ import org.jbpm.pvm.internal.wire.Descriptor; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; import org.jbpm.pvm.internal.wire.descriptor.StringDescriptor; -import org.jbpm.pvm.listener.Condition; import org.jbpm.pvm.listener.EventListener; /** factory for process definitions. 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-09 14:08:19 UTC (rev 1857) +++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/model/Transition.java 2008-08-09 14:09:16 UTC (rev 1858) @@ -23,6 +23,7 @@ import java.util.Set; + /** * a transition in a {@link ProcessDefinition} graph. * @@ -60,4 +61,7 @@ /** the node in which this transition arrives. */ Node getDestination(); + + /** the guard condition */ + Condition getGuardCondition(); } \ No newline at end of file Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionAsWaitStateTest.java =================================================================== --- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionAsWaitStateTest.java 2008-08-09 14:08:19 UTC (rev 1857) +++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionAsWaitStateTest.java 2008-08-09 14:09:16 UTC (rev 1858) @@ -29,8 +29,8 @@ import org.jbpm.pvm.activity.ExternalActivity; import org.jbpm.pvm.client.ClientProcessDefinition; import org.jbpm.pvm.client.ClientProcessInstance; -import org.jbpm.pvm.listener.Condition; import org.jbpm.pvm.listener.EventListenerExecution; +import org.jbpm.pvm.model.Condition; import org.jbpm.pvm.model.ProcessFactory; /** this test shows how to implement a transition that behaves as a