[Springframework-cvs] spring-projects/spring-webflow/src/java/org/springframework/webflow/builder FlowArtifactFactory.java,1.33,1.34 AbstractFlowBuilder.java,1.45,1.46

[Keith D. <kd...@us...>]

Update of /cvsroot/springframework/spring-projects/spring-webflow/src/java/org/springframework/webflow/builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5009/src/java/org/springframework/webflow/builder

Modified Files:
	FlowArtifactFactory.java AbstractFlowBuilder.java 
Log Message:


Index: FlowArtifactFactory.java
===================================================================
RCS file: /cvsroot/springframework/spring-projects/spring-webflow/src/java/org/springframework/webflow/builder/FlowArtifactFactory.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** FlowArtifactFactory.java	25 Apr 2006 00:51:43 -0000	1.33
--- FlowArtifactFactory.java	30 Apr 2006 14:00:32 -0000	1.34
***************
*** 36,49 ****
  
  /**
!  * A factory for core web flow elements such as {@link Flow flows}, {@link State states}, 
!  * and {@link Transition transitions}.
   * <p>
!  * This factory encapsulates the construct of each Flow implementation 
!  * as well as each core state type.
!  *  
   * @author Keith Donald
   */
  public class FlowArtifactFactory {
! 	
  	/**
  	 * Factory method that creates a new {@link Flow} definition object.
--- 36,50 ----
  
  /**
!  * A factory for core web flow elements such as {@link Flow flows},
!  * {@link State states}, and {@link Transition transitions}.
   * <p>
!  * This factory encapsulates the construct of each Flow implementation as well
!  * as each core state type. Subclasses may customize how the core elements are
!  * created, useful for plugging in custom implementations.
!  * 
   * @author Keith Donald
   */
  public class FlowArtifactFactory {
! 
  	/**
  	 * Factory method that creates a new {@link Flow} definition object.
***************
*** 61,65 ****
  	 * @throws FlowArtifactException an exception occured creating the Flow
  	 * instance
! 	 */	
  	public Flow createFlow(String id, AttributeCollection attributes) throws FlowArtifactException {
  		Flow flow = new Flow(id);
--- 62,66 ----
  	 * @throws FlowArtifactException an exception occured creating the Flow
  	 * instance
! 	 */
  	public Flow createFlow(String id, AttributeCollection attributes) throws FlowArtifactException {
  		Flow flow = new Flow(id);
***************
*** 243,247 ****
  		return transition;
  	}
! 	
  	private void configureCommonProperties(TransitionableState state, Action[] entryActions, Transition[] transitions,
  			StateExceptionHandler[] exceptionHandlers, Action[] exitActions, AttributeCollection attributes) {
--- 244,248 ----
  		return transition;
  	}
! 
  	private void configureCommonProperties(TransitionableState state, Action[] entryActions, Transition[] transitions,
  			StateExceptionHandler[] exceptionHandlers, Action[] exitActions, AttributeCollection attributes) {

Index: AbstractFlowBuilder.java
===================================================================
RCS file: /cvsroot/springframework/spring-projects/spring-webflow/src/java/org/springframework/webflow/builder/AbstractFlowBuilder.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** AbstractFlowBuilder.java	30 Apr 2006 02:44:41 -0000	1.45
--- AbstractFlowBuilder.java	30 Apr 2006 14:00:33 -0000	1.46
***************
*** 218,222 ****
  	 * @param stateId the state identifier
  	 * @param viewName the string-encoded view selector
! 	 * @param transition the transitions (path) out of this state
  	 * @return the fully constructed view state instance
  	 */
--- 218,222 ----
  	 * @param stateId the state identifier
  	 * @param viewName the string-encoded view selector
! 	 * @param transitions the transitions (path) out of this state
  	 * @return the fully constructed view state instance
  	 */
***************
*** 232,236 ****
  	 * @param viewSelector the view selector that will make the view selection
  	 * when the state is entered
! 	 * @param transition the transitions (path) out of this state
  	 * @param exceptionHandlers any exception handlers to attach to the state
  	 * @param exitActions the actions to execute when the state exits
--- 232,236 ----
  	 * @param viewSelector the view selector that will make the view selection
  	 * when the state is entered
! 	 * @param transitions the transitions (path) out of this state
  	 * @param exceptionHandlers any exception handlers to attach to the state
  	 * @param exitActions the actions to execute when the state exits
***************
*** 289,293 ****
  	 * @param stateId the state identifier
  	 * @param entryActions any generic entry actions to add to the state
! 	 * @param action the actions to execute in a chain when the state is entered
  	 * @param transitions the transitions (paths) out of this state
  	 * @param exceptionHandlers the exception handlers to handle exceptions
--- 289,293 ----
  	 * @param stateId the state identifier
  	 * @param entryActions any generic entry actions to add to the state
! 	 * @param actions the actions to execute in a chain when the state is entered
  	 * @param transitions the transitions (paths) out of this state
  	 * @param exceptionHandlers the exception handlers to handle exceptions
***************
*** 357,361 ****
  	 * @param attributeMapper the mapper to map subflow input and output
  	 * attributes
! 	 * @param transitions the single transition (path) out of the state
  	 * @return the fully constructed subflow state instance
  	 */
--- 357,361 ----
  	 * @param attributeMapper the mapper to map subflow input and output
  	 * attributes
! 	 * @param transition the single transition (path) out of the state
  	 * @return the fully constructed subflow state instance
  	 */
***************
*** 499,503 ****
  	 * @param id the action id identifying a arbitrary
  	 * <code>java.lang.Object</code> to be used as an action
! 	 * @param method the signature of the method to invoke on the POJO
  	 * @return the adapted bean invoking action
  	 * @throws FlowArtifactException the action could not be resolved
--- 499,503 ----
  	 * @param id the action id identifying a arbitrary
  	 * <code>java.lang.Object</code> to be used as an action
! 	 * @param methodSignature the signature of the method to invoke on the POJO
  	 * @return the adapted bean invoking action
  	 * @throws FlowArtifactException the action could not be resolved
***************
*** 513,517 ****
  	 * @param id the action id identifying a arbitrary
  	 * <code>java.lang.Object</code> to be used as an action
! 	 * @param method the signature of the method to invoke on the POJO
  	 * @return the adapted bean invoking action
  	 * @throws FlowArtifactException the action could not be resolved
--- 513,517 ----
  	 * @param id the action id identifying a arbitrary
  	 * <code>java.lang.Object</code> to be used as an action
! 	 * @param methodSignature the signature of the method to invoke on the POJO
  	 * @return the adapted bean invoking action
  	 * @throws FlowArtifactException the action could not be resolved
***************
*** 618,623 ****
  	/**
  	 * Creates a new transition.
! 	 * @param matchingCriteria
! 	 * @param targetStateResolver
  	 * @return the transition
  	 */
--- 618,623 ----
  	/**
  	 * Creates a new transition.
! 	 * @param matchingCriteria the criteria that determines when the transition matches
! 	 * @param targetStateResolver the resolver that calculates the target state of the transition
  	 * @return the transition
  	 */
***************
*** 628,635 ****
  	/**
  	 * Creates a new transition.
! 	 * @param matchingCriteria
! 	 * @param targetStateResolver
! 	 * @param executionCriteria
! 	 * @return
  	 */
  	protected Transition transition(TransitionCriteria matchingCriteria, TargetStateResolver targetStateResolver,
--- 628,635 ----
  	/**
  	 * Creates a new transition.
! 	 * @param matchingCriteria the criteria that determines when the transition matches
! 	 * @param targetStateResolver the resolver that calculates the target state of the transition
! 	 * @param executionCriteria the criteria that determines if a matched transition is allowed to execute
! 	 * @return the transition
  	 */
  	protected Transition transition(TransitionCriteria matchingCriteria, TargetStateResolver targetStateResolver,