Author: thomas.diesler(a)jboss.com Date: 2008-07-14 14:14:10 -0400 (Mon, 14 Jul 2008) New Revision: 1632 Modified: api/trunk/docs/VioletUML/APIClient.class.violet api/trunk/docs/VioletUML/APIClient.png api/trunk/docs/VioletUML/APIModel.png api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java api/trunk/modules/api/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Activity.java api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Signal.java api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Task.java api/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/SignalListener.java api/trunk/modules/api/src/test/java/org/jboss/bpm/pattern/parallelsplit/ParallelSplitTest.java Log: javadoc Modified: api/trunk/docs/VioletUML/APIClient.class.violet =================================================================== --- api/trunk/docs/VioletUML/APIClient.class.violet 2008-07-14 16:31:59 UTC (rev 1631) +++ api/trunk/docs/VioletUML/APIClient.class.violet 2008-07-14 18:14:10 UTC (rev 1632) @@ -98,7 +98,7 @@ <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> <double>253.0</double> - <double>226.0</double> + <double>260.0</double> </void> </object> </void> @@ -117,8 +117,8 @@ </object> <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> - <double>245.0</double> - <double>380.0</double> + <double>248.0</double> + <double>404.0</double> </void> </object> </void> @@ -126,7 +126,7 @@ <object id="ClassNode6" class="com.horstmann.violet.ClassNode"> <void property="attributes"> <void property="text"> - <string>process + <string>flowObject message type </string> @@ -141,10 +141,31 @@ <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> <double>404.0</double> - <double>230.0</double> + <double>264.0</double> </void> </object> </void> + <void method="addNode"> + <object id="ClassNode7" class="com.horstmann.violet.ClassNode"> + <void property="methods"> + <void property="text"> + <string>startProcess +</string> + </void> + </void> + <void property="name"> + <void property="text"> + <string>ExecutionManager</string> + </void> + </void> + </object> + <object class="java.awt.geom.Point2D$Double"> + <void method="setLocation"> + <double>247.0</double> + <double>169.0</double> + </void> + </object> + </void> <void method="connect"> <object class="com.horstmann.violet.ClassRelationshipEdge"> <void property="bentStyle"> @@ -229,5 +250,17 @@ <object idref="ClassNode4"/> <object idref="ClassNode6"/> </void> + <void method="connect"> + <object class="com.horstmann.violet.ClassRelationshipEdge"> + <void property="bentStyle"> + <object class="com.horstmann.violet.BentStyle" field="HVH"/> + </void> + <void property="startArrowHead"> + <object class="com.horstmann.violet.ArrowHead" field="DIAMOND"/> + </void> + </object> + <object idref="ClassNode1"/> + <object idref="ClassNode7"/> + </void> </object> </java> Modified: api/trunk/docs/VioletUML/APIClient.png =================================================================== (Binary files differ) Modified: api/trunk/docs/VioletUML/APIModel.png =================================================================== (Binary files differ) Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java =================================================================== --- api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java 2008-07-14 16:31:59 UTC (rev 1631) +++ api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ExecutionManager.java 2008-07-14 18:14:10 UTC (rev 1632) @@ -29,10 +29,10 @@ import org.jboss.bpm.model.ExecutionHandler; import org.jboss.bpm.model.FlowHandler; import org.jboss.bpm.model.FlowObject; +import org.jboss.bpm.model.Process; import org.jboss.bpm.model.Result; import org.jboss.bpm.model.Signal; import org.jboss.bpm.model.SignalHandler; -import org.jboss.bpm.model.internal.ProcessImpl; import org.jboss.bpm.runtime.Attachments; /** @@ -57,7 +57,7 @@ * @param att The Attachments in the ExecutionContext * @return The Future from which to obtain the process result */ - public abstract Future<Result> startProcess(ProcessImpl proc, Attachments att); + public abstract Future<Result> startProcess(Process proc, Attachments att); /** * Locate the signal manager Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java =================================================================== --- api/trunk/modules/api/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java 2008-07-14 16:31:59 UTC (rev 1631) +++ api/trunk/modules/api/src/main/java/org/jboss/bpm/client/internal/ExecutionManagerImpl.java 2008-07-14 18:14:10 UTC (rev 1632) @@ -43,10 +43,7 @@ import org.jboss.bpm.model.Signal; import org.jboss.bpm.model.SignalHandler; import org.jboss.bpm.model.StartEvent; -import org.jboss.bpm.model.internal.ExecutionHandlerImpl; -import org.jboss.bpm.model.internal.ProcessImpl; import org.jboss.bpm.model.internal.SequenceFlowImpl; -import org.jboss.bpm.model.internal.StartEventImpl; import org.jboss.bpm.model.internal.jaxb.JAXBSequenceFlow; import org.jboss.bpm.runtime.Attachments; import org.jboss.bpm.runtime.Token; @@ -68,13 +65,13 @@ } @Override - public Future<Result> startProcess(ProcessImpl proc, Attachments att) + public Future<Result> startProcess(Process proc, Attachments att) { throwSignal(new Signal(proc, Signal.Type.ENTER_PROCESS)); try { Token token = new Token(proc, att); - StartEventImpl start = proc.getStartEvent(); + StartEvent start = proc.getStartEvent(); token.addTailFlow(new InitialFlow(start)); while (token.peekHeadFlow() != null) Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Activity.java =================================================================== --- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Activity.java 2008-07-14 16:31:59 UTC (rev 1631) +++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Activity.java 2008-07-14 18:14:10 UTC (rev 1632) @@ -26,7 +26,7 @@ /** * An activity is a generic term for work that a company or organization performs via business processes. * An activity can be atomic or non-atomic (compound). - * The types of activities that are a part of a Process Model are: Process, Sub-Process, and Task. + * The types of activities that are a part of a Process Model are: {@link Process}, {@link SubProcess}, and {@link Task}. * * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Signal.java =================================================================== --- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Signal.java 2008-07-14 16:31:59 UTC (rev 1631) +++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Signal.java 2008-07-14 18:14:10 UTC (rev 1632) @@ -79,7 +79,7 @@ return type; } - public String getSource() + public String getFlowObject() { return flowObject.toString(); } Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Task.java =================================================================== --- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Task.java 2008-07-14 16:31:59 UTC (rev 1631) +++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Task.java 2008-07-14 18:14:10 UTC (rev 1632) @@ -1,5 +1,37 @@ +/* + * 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.jboss.bpm.model; +//$Id$ + +/** + * A Task is an Atomic Activity that is included within a Process. + * + * A Task is used when the work in the Process is not broken down to a finer level of Process Model detail. Generally, an end-user and/or an application are used to + * perform the Task when it is executed. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ public interface Task extends Activity, Executable, SingleInFlowSupport, SingleOutFlowSupport { } \ No newline at end of file Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/SignalListener.java =================================================================== --- api/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/SignalListener.java 2008-07-14 16:31:59 UTC (rev 1631) +++ api/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/SignalListener.java 2008-07-14 18:14:10 UTC (rev 1632) @@ -34,6 +34,8 @@ */ public interface SignalListener { - /** Catch a signal from the process that this listener is registered with */ + /** + * Catch a signal from the process that this listener is registered with + */ void catchSignal(Signal signal); } \ No newline at end of file Modified: api/trunk/modules/api/src/test/java/org/jboss/bpm/pattern/parallelsplit/ParallelSplitTest.java =================================================================== --- api/trunk/modules/api/src/test/java/org/jboss/bpm/pattern/parallelsplit/ParallelSplitTest.java 2008-07-14 16:31:59 UTC (rev 1631) +++ api/trunk/modules/api/src/test/java/org/jboss/bpm/pattern/parallelsplit/ParallelSplitTest.java 2008-07-14 18:14:10 UTC (rev 1632) @@ -80,10 +80,10 @@ assertEquals(Signal.Type.ENTER_GATEWAY, signals.get(3).getType()); assertEquals(Signal.Type.EXIT_GATEWAY, signals.get(4).getType()); assertEquals(Signal.Type.ENTER_END_EVENT, signals.get(5).getType()); - assertEquals("EndEvent[endA]", signals.get(5).getSource()); + assertEquals("EndEvent[endA]", signals.get(5).getFlowObject()); assertEquals(Signal.Type.EXIT_END_EVENT, signals.get(6).getType()); assertEquals(Signal.Type.ENTER_END_EVENT, signals.get(7).getType()); - assertEquals("EndEvent[endB]", signals.get(7).getSource()); + assertEquals("EndEvent[endB]", signals.get(7).getFlowObject()); assertEquals(Signal.Type.EXIT_END_EVENT, signals.get(8).getType()); assertEquals(Signal.Type.EXIT_PROCESS, signals.get(9).getType()); }