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

[Gavin King]

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

  Modified:    src/main/org/jboss/seam/core     ConversationList.java
                        ConversationStack.java Manager.java
  Removed:     src/main/org/jboss/seam/core     ServletSession.java
  Log:
  move the Session API
  
  Revision  Changes    Path
  1.17      +2 -1      jboss-seam/src/main/org/jboss/seam/core/ConversationList.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ConversationList.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ConversationList.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- ConversationList.java	20 Jun 2007 17:45:55 -0000	1.16
  +++ ConversationList.java	20 Jun 2007 22:11:30 -0000	1.17
  @@ -16,6 +16,7 @@
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Unwrap;
   import org.jboss.seam.annotations.intercept.BypassInterceptors;
  +import org.jboss.seam.web.Session;
   
   /**
    * @author Gavin King
  @@ -45,7 +46,7 @@
            conversationEntryList = new ArrayList<ConversationEntry>( conversationEntries.size() );
            for ( ConversationEntry entry: orderedEntries )
            {
  -            if ( entry.isDisplayable() && !ServletSession.instance().isInvalid() )
  +            if ( entry.isDisplayable() && !Session.instance().isInvalid() )
               {
                  conversationEntryList.add(entry);
               }
  
  
  
  1.15      +2 -1      jboss-seam/src/main/org/jboss/seam/core/ConversationStack.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ConversationStack.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ConversationStack.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- ConversationStack.java	20 Jun 2007 17:45:55 -0000	1.14
  +++ ConversationStack.java	20 Jun 2007 22:11:30 -0000	1.15
  @@ -15,6 +15,7 @@
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Unwrap;
   import org.jboss.seam.annotations.intercept.BypassInterceptors;
  +import org.jboss.seam.web.Session;
   
   /**
    * Support for "breadcrumbs".
  @@ -49,7 +50,7 @@
               while ( ids.hasPrevious() )
               {
                  ConversationEntry entry = conversationEntries.getConversationEntry( ids.previous() );
  -               if ( entry.isDisplayable() && !ServletSession.instance().isInvalid() ) 
  +               if ( entry.isDisplayable() && !Session.instance().isInvalid() ) 
                  {
                     conversationEntryStack.add(entry);
                  }
  
  
  
  1.178     +3 -2      jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.177
  retrieving revision 1.178
  diff -u -b -r1.177 -r1.178
  --- Manager.java	20 Jun 2007 17:45:55 -0000	1.177
  +++ Manager.java	20 Jun 2007 22:11:30 -0000	1.178
  @@ -29,6 +29,7 @@
   import org.jboss.seam.navigation.Pages;
   import org.jboss.seam.pageflow.Pageflow;
   import org.jboss.seam.util.Id;
  +import org.jboss.seam.web.Session;
   
   /**
    * The Seam conversation manager.
  @@ -213,7 +214,7 @@
      {
         return isLongRunningConversation() && 
               !getCurrentConversationEntry().isRemoveAfterRedirect() &&
  -            !ServletSession.instance().isInvalid();
  +            !Session.instance().isInvalid();
      }
      
      public boolean isNestedConversation()
  @@ -694,7 +695,7 @@
      private String encodeConversationIdParameter(String url, String paramName, String paramValue)
      {
            
  -      if ( ServletSession.instance().isInvalid() || containsParameter(url, paramName) )
  +      if ( Session.instance().isInvalid() || containsParameter(url, paramName) )
         {
            return url;
         }