svn commit: r671183 - /myfaces/orchestra/branches/prepare_core12/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationManager.java

[sk...@apache.org]

Author: skitching
Date: Tue Jun 24 07:20:40 2008
New Revision: 671183

URL: http://svn.apache.org/viewvc?rev=671183&view=rev
Log:
Remove some experimental methods from the 1.2 release (note: they still exist in trunk).

Modified:
    myfaces/orchestra/branches/prepare_core12/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationManager.java

Modified: myfaces/orchestra/branches/prepare_core12/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationManager.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/branches/prepare_core12/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationManager.java?rev=671183&r1=671182&r2=671183&view=diff
==============================================================================
--- myfaces/orchestra/branches/prepare_core12/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationManager.java (original)
+++ myfaces/orchestra/branches/prepare_core12/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationManager.java Tue Jun 24 07:20:40 2008
@@ -53,8 +53,6 @@
     private final static String CONVERSATION_MANAGER_KEY = "org.apache.myfaces.ConversationManager";
     private final static String CONVERSATION_CONTEXT_REQ = "org.apache.myfaces.ConversationManager.conversationContext";
 
-    private final static ConversationContext[] EMPTY_CONTEXTS = new ConversationContext[0];
-
     private static final Iterator EMPTY_ITERATOR = Collections.EMPTY_LIST.iterator();
 
     private final Log log = LogFactory.getLog(ConversationManager.class);
@@ -222,48 +220,6 @@
     }
 
     /**
-     * Return a snapshot array of all conversation contexts associated with the
-     * current topmost conversation context.
-     * 
-     * @since 1.2
-    protected ConversationContext[] getConversationContexts()
-    {
-        synchronized (this)
-        {
-            List ret = new ArrayList();
-
-            ConversationContext topmost = getTopmostConversationContext();
-            if (topmost == null)
-            {
-                return EMPTY_CONTEXTS;
-            }
-
-            Iterator iterConversationContexts = conversationContexts.values().iterator();
-            while (iterConversationContexts.hasNext())
-            {
-                ConversationContext conversationContext = (ConversationContext) iterConversationContexts.next();
-                if (conversationContext.getParent() == null)
-                {
-                    // this is a topmost conversation context already
-                    continue;
-                }
-
-                if (topmost != conversationContext.getTopmostConversationContext())
-                {
-                    continue;
-                }
-
-                ret.add(conversationContext);
-            }
-
-            ConversationContext[] contexts = new ConversationContext[ret.size()];
-            ret.toArray(contexts);
-            return contexts;
-        }
-    }
-     */
-
-    /**
      * Get the conversation context for the given id.
      * <p>
      * Null is returned if there is no ConversationContext with the specified id.
@@ -306,38 +262,6 @@
     }
 
     /**
-     * This will start a new conversation context using the current conversation context as the parent.
-     * If there is no parent a topmost conversation context will be created.
-     * The returned conversation context is then a child of this automatically created conversation context.
-     * <br />
-     * Notice: The created conversation context is not activated after this method call. You have to call
-     * {@link #activateConversationContext(ConversationContext)} on the newly create context too.
-     * 
-     * @since 1.2
-    protected ConversationContext startNewConversationContext()
-    {
-        synchronized (this)
-        {
-            ConversationContext parent = getCurrentConversationContext();
-            if (parent == null)
-            {
-                parent = getOrCreateTopmostConversationContext();
-            }
-
-            Long conversationContextId = createNextConversationContextId();
-
-            ConversationContext conversationContext = (ConversationContext) conversationContexts.get(conversationContextId);
-            if (conversationContext == null)
-            {
-                conversationContext = new ConversationContext(parent, conversationContextId);
-                conversationContexts.put(conversationContextId, conversationContext);
-            }
-
-            return conversationContext;
-        }
-    }
-*/
-    /**
      * Make the specific context the current context for the current HTTP session.
      * <p>
      * Methods like getCurrentConversationContext will then return the specified