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

[Gavin King]

  User: gavin   
  Date: 06/10/10 17:00:52

  Modified:    src/main/org/jboss/seam/contexts   Lifecycle.java
                        ServerConversationContext.java
  Log:
  long overdue refactoring
  
  Revision  Changes    Path
  1.59      +3 -2      jboss-seam/src/main/org/jboss/seam/contexts/Lifecycle.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Lifecycle.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/Lifecycle.java,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -b -r1.58 -r1.59
  --- Lifecycle.java	10 Oct 2006 19:37:37 -0000	1.58
  +++ Lifecycle.java	10 Oct 2006 21:00:52 -0000	1.59
  @@ -19,6 +19,7 @@
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.Seam;
   import org.jboss.seam.core.BusinessProcess;
  +import org.jboss.seam.core.ConversationEntries;
   import org.jboss.seam.core.Events;
   import org.jboss.seam.core.Init;
   import org.jboss.seam.core.Manager;
  @@ -27,7 +28,7 @@
   /**
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.58 $
  + * @version $Revision: 1.59 $
    */
   public class Lifecycle
   {
  @@ -208,7 +209,7 @@
         Context tempSessionContext = new WebSessionContext( session );
         Contexts.sessionContext.set(tempSessionContext);
   
  -      Set<String> conversationIds = Manager.instance().getSessionConversationIds();
  +      Set<String> conversationIds = ConversationEntries.instance().getConversationIds();
         log.debug("destroying conversation contexts: " + conversationIds);
         for (String conversationId: conversationIds)
         {
  
  
  
  1.11      +5 -4      jboss-seam/src/main/org/jboss/seam/contexts/ServerConversationContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServerConversationContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/ServerConversationContext.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- ServerConversationContext.java	10 Oct 2006 19:37:37 -0000	1.10
  +++ ServerConversationContext.java	10 Oct 2006 21:00:52 -0000	1.11
  @@ -10,6 +10,7 @@
   import java.util.HashMap;
   import java.util.HashSet;
   import java.util.LinkedList;
  +import java.util.List;
   import java.util.Map;
   import java.util.Set;
   
  @@ -25,7 +26,7 @@
    * 
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.10 $
  + * @version $Revision: 1.11 $
    */
   public class ServerConversationContext implements Context {
   
  @@ -33,9 +34,9 @@
      private final Map<String, Object> additions = new HashMap<String, Object>();
      private final Set<String> removals = new HashSet<String>();
      private final String id;
  -   private final LinkedList<String> idStack;
  +   private final List<String> idStack;
      
  -   private LinkedList<String> getIdStack()
  +   private List<String> getIdStack()
      {
         return idStack==null ? Manager.instance().getCurrentConversationIdStack() : idStack;
      }
  @@ -85,7 +86,7 @@
         Object result = additions.get(name);
         if (result!=null) return result;
         if ( removals.contains(name) ) return null;
  -      LinkedList<String> stack = getIdStack();
  +      List<String> stack = getIdStack();
         if (stack==null)
         {
            return session.getAttribute( getKey(name) );