[jboss-cvs] jboss-seam/src/main/org/jboss/seam/core ...

[Gavin King]

  User: gavin   
  Date: 06/08/04 10:50:19

  Modified:    src/main/org/jboss/seam/core  Pageflow.java
  Log:
  make this a user-visible component
  
  Revision  Changes    Path
  1.28      +14 -4     jboss-seam/src/main/org/jboss/seam/core/Pageflow.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Pageflow.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Pageflow.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -b -r1.27 -r1.28
  --- Pageflow.java	1 Jul 2006 11:29:21 -0000	1.27
  +++ Pageflow.java	4 Aug 2006 14:50:18 -0000	1.28
  @@ -31,7 +31,7 @@
    * @author Gavin King
    */
   @Scope(ScopeType.CONVERSATION)
  - at Name("org.jboss.seam.core.pageflow")
  + at Name("pageflow")
   @Intercept(NEVER)
   @Mutable
   public class Pageflow implements Serializable
  @@ -129,7 +129,18 @@
      
      public void reposition(String nodeName)
      {
  +      if (processInstance==null)
  +      {
  +         throw new IllegalStateException("no pageflow in progress");
  +      }
         Node node = processInstance.getProcessDefinition().getNode(nodeName);
  +      if (node==null)
  +      {
  +         throw new IllegalArgumentException(
  +               "no node named: " + nodeName + 
  +               " for pageflow: " + processInstance.getProcessDefinition().getName()
  +            );
  +      }
         processInstance.getRootToken().setNode(node);
      }
      
  @@ -201,9 +212,8 @@
            log.debug("beginning pageflow: " + pageflowDefinitionName);
         }
         
  -      ProcessDefinition pd = getPageflowProcessDefinition(pageflowDefinitionName);
  -      ProcessInstance pi = PageflowHelper.newPageflowInstance(pd);
  -      setProcessInstance(pi);
  +      processInstance = PageflowHelper.newPageflowInstance( getPageflowProcessDefinition(pageflowDefinitionName) );
  +      
         //if ( Lifecycle.getPhaseId().equals(PhaseId.RENDER_RESPONSE) ) 
         //{
       	  //if a pageflow starts during the render response phase