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

[Gavin King]

  User: gavin   
  Date: 07/06/20 01:34:32

  Modified:    src/main/org/jboss/seam/faces   FacesManager.java
                        FacesPage.java
  Log:
  reorg pageflow stuff
  make some things package-private
  
  Revision  Changes    Path
  1.2       +7 -7      jboss-seam/src/main/org/jboss/seam/faces/FacesManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FacesManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/faces/FacesManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- FacesManager.java	19 Jun 2007 20:08:12 -0000	1.1
  +++ FacesManager.java	20 Jun 2007 05:34:32 -0000	1.2
  @@ -31,8 +31,8 @@
   import org.jboss.seam.log.LogProvider;
   import org.jboss.seam.log.Logging;
   import org.jboss.seam.navigation.ConversationIdParameter;
  -import org.jboss.seam.navigation.Pageflow;
   import org.jboss.seam.navigation.Pages;
  +import org.jboss.seam.pageflow.Pageflow;
   import org.jboss.seam.util.JSF;
   
   /**
  @@ -237,13 +237,13 @@
         Conversation conversation = Conversation.instance();
   
         //stuff from jPDL takes precedence
  -      org.jboss.seam.pageflow.Page pageflowPage = 
  +      org.jboss.seam.pageflow.Page page = 
               Manager.instance().isLongRunningConversation() &&
               Init.instance().isJbpmInstalled() && 
               Pageflow.instance().isInProcess() ?
                     Pageflow.instance().getPage() : null;
         
  -      if (pageflowPage==null)
  +      if (page==null)
         {
            //handle stuff defined in pages.xml
            Pages pages = Pages.instance();
  @@ -265,15 +265,15 @@
         else
         {
            //use stuff from the pageflow definition
  -         if ( pageflowPage.isSwitchEnabled() )
  +         if ( page.isSwitchEnabled() )
            {
               conversation.setViewId( Pageflow.instance().getPageViewId() );
            }
  -         if ( pageflowPage.hasDescription() )
  +         if ( page.hasDescription() )
            {
  -            conversation.setDescription( pageflowPage.getDescription() );
  +            conversation.setDescription( page.getDescription() );
            }
  -         conversation.setTimeout( pageflowPage.getTimeout() );
  +         conversation.setTimeout( page.getTimeout() );
         }
         
         flushConversationMetadata();
  
  
  
  1.3       +1 -1      jboss-seam/src/main/org/jboss/seam/faces/FacesPage.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FacesPage.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/faces/FacesPage.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- FacesPage.java	19 Jun 2007 20:08:12 -0000	1.2
  +++ FacesPage.java	20 Jun 2007 05:34:32 -0000	1.3
  @@ -15,7 +15,7 @@
   import org.jboss.seam.core.Init;
   import org.jboss.seam.core.Manager;
   import org.jboss.seam.core.ServletSession;
  -import org.jboss.seam.navigation.Pageflow;
  +import org.jboss.seam.pageflow.Pageflow;
   
   /**
    * Book-keeping component that persists information