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

[Gavin King]

  User: gavin   
  Date: 07/06/20 18:11:31

  Modified:    src/main/org/jboss/seam/faces   FacesPage.java Switcher.java
  Log:
  move the Session API
  
  Revision  Changes    Path
  1.6       +3 -3      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.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- FacesPage.java	20 Jun 2007 17:45:55 -0000	1.5
  +++ FacesPage.java	20 Jun 2007 22:11:31 -0000	1.6
  @@ -13,8 +13,8 @@
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.core.Init;
   import org.jboss.seam.core.Manager;
  -import org.jboss.seam.core.ServletSession;
   import org.jboss.seam.pageflow.Pageflow;
  +import org.jboss.seam.web.Session;
   
   /**
    * Book-keeping component that persists information
  @@ -119,8 +119,8 @@
         //we only need to execute this code when we are in the 
         //RENDER_RESPONSE phase, ie. not before redirects
      
  -      ServletSession servletSession = ServletSession.getInstance();
  -      boolean sessionInvalid = servletSession!=null && servletSession.isInvalid();
  +      Session session = Session.getInstance();
  +      boolean sessionInvalid = session!=null && session.isInvalid();
         if ( !sessionInvalid && manager.isLongRunningConversation() )
         {
            storeConversation( manager.getCurrentConversationId() );
  
  
  
  1.4       +2 -2      jboss-seam/src/main/org/jboss/seam/faces/Switcher.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Switcher.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/faces/Switcher.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- Switcher.java	20 Jun 2007 17:45:55 -0000	1.3
  +++ Switcher.java	20 Jun 2007 22:11:31 -0000	1.4
  @@ -20,7 +20,7 @@
   import org.jboss.seam.core.ConversationEntries;
   import org.jboss.seam.core.ConversationEntry;
   import org.jboss.seam.core.Manager;
  -import org.jboss.seam.core.ServletSession;
  +import org.jboss.seam.web.Session;
   
   /**
    * Support for the conversation switcher drop-down menu.
  @@ -54,7 +54,7 @@
            selectItems = new ArrayList<SelectItem>( conversationEntries.size() );
            for ( ConversationEntry entry: orderedEntries )
            {
  -            if ( entry.isDisplayable() && !ServletSession.instance().isInvalid() )
  +            if ( entry.isDisplayable() && !Session.instance().isInvalid() )
               {
                  selectItems.add( new SelectItem( entry.getId(), entry.getDescription() ) );
               }