You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/07/25 00:00:31 UTC
svn commit: r978941 - in /myfaces/extensions/cdi/trunk:
core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/
jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversati...
Author: gpetracek
Date: Sat Jul 24 22:00:31 2010
New Revision: 978941
URL: http://svn.apache.org/viewvc?rev=978941&view=rev
Log:
unified approach to resolve the current WindowContextManager
Modified:
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/AbstractConversationContextAdapter.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/GroupedConversationContextAdapter.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/ConversationUtils.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/RequestCache.java
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/AbstractConversationContextAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/AbstractConversationContextAdapter.java?rev=978941&r1=978940&r2=978941&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/AbstractConversationContextAdapter.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/AbstractConversationContextAdapter.java Sat Jul 24 22:00:31 2010
@@ -21,7 +21,6 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationScoped;
import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi.BeanEntry;
import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi.WindowContextManager;
-import org.apache.myfaces.extensions.cdi.core.impl.utils.CodiUtils;
import javax.enterprise.context.spi.Context;
import javax.enterprise.context.spi.Contextual;
@@ -127,18 +126,7 @@ public abstract class AbstractConversati
* @return an instance of a custom (the default)
* {@link org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi.WindowContextManager}
*/
- private WindowContextManager resolveWindowContextManager()
- {
- Bean<WindowContextManager> windowContextManagerBean = resolveWindowContextManagerBean();
- return CodiUtils.getOrCreateScopedInstanceOfBean(windowContextManagerBean);
-
- //TODO cleanup:
- //return (WindowContextManager)this.beanManager.getReference(
- //windowContextManagerBean, ConversationManager.class,
- //getConversationManagerCreationalContextFor(windowContextManagerBean));
- }
-
- protected abstract Bean<WindowContextManager> resolveWindowContextManagerBean();
+ protected abstract WindowContextManager resolveWindowContextManager();
/**
* @param conversationManager the current
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/GroupedConversationContextAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/GroupedConversationContextAdapter.java?rev=978941&r1=978940&r2=978941&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/GroupedConversationContextAdapter.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/GroupedConversationContextAdapter.java Sat Jul 24 22:00:31 2010
@@ -55,15 +55,9 @@ class GroupedConversationContextAdapter
return FacesContext.getCurrentInstance().getExternalContext().getSession(false) != null;
}
- /**
- * @return the descriptor of a custom
- * {@link org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi.WindowContextManager}
- * with the qualifier {@link org.apache.myfaces.extensions.cdi.javaee.jsf.api.qualifier.Jsf} or
- * the descriptor of the default implementation provided by this module
- */
- protected Bean<WindowContextManager> resolveWindowContextManagerBean()
+ protected WindowContextManager resolveWindowContextManager()
{
- return RequestCache.resolveWindowContextManagerBean();
+ return RequestCache.getWindowContextManager();
}
/**
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/ConversationUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/ConversationUtils.java?rev=978941&r1=978940&r2=978941&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/ConversationUtils.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/ConversationUtils.java Sat Jul 24 22:00:31 2010
@@ -356,7 +356,6 @@ public class ConversationUtils
public static WindowContextManager getWindowContextManager()
{
- return CodiUtils.getOrCreateScopedInstanceOfBeanByName(
- WindowContextManager.WINDOW_CONTEXT_MANAGER_BEAN_NAME, WindowContextManager.class);
+ return RequestCache.getWindowContextManager();
}
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/RequestCache.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/RequestCache.java?rev=978941&r1=978940&r2=978941&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/RequestCache.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/RequestCache.java Sat Jul 24 22:00:31 2010
@@ -56,7 +56,29 @@ public class RequestCache
conversationCache.remove();
}
- public static WindowContextManager resolveWindowContextManager(Bean<WindowContextManager> windowContextManagerBean)
+ public static WindowContextManager getWindowContextManager()
+ {
+ WindowContextManager windowContextManager = windowContextManagerCache.get();
+
+ if(windowContextManager == null)
+ {
+ return resolveWindowContextManager(resolveWindowContextManagerBean());
+ }
+
+ /* TODO remove it after tests
+ if(windowContextManager == null)
+ {
+ windowContextManager = CodiUtils.getOrCreateScopedInstanceOfBeanByName(
+ WindowContextManager.WINDOW_CONTEXT_MANAGER_BEAN_NAME, WindowContextManager.class);
+
+ windowContextManagerCache.set(windowContextManager);
+ }
+ */
+
+ return windowContextManager;
+ }
+
+ private static WindowContextManager resolveWindowContextManager(Bean<WindowContextManager> windowContextManagerBean)
{
WindowContextManager windowContextManager = windowContextManagerCache.get();
@@ -69,7 +91,7 @@ public class RequestCache
return windowContextManager;
}
- public static Bean<WindowContextManager> resolveWindowContextManagerBean()
+ private static Bean<WindowContextManager> resolveWindowContextManagerBean()
{
Bean<WindowContextManager> windowContextManagerBean = windowContextManagerBeanCache.get();