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 2011/02/16 08:03:25 UTC
svn commit: r1071163 - in /myfaces/extensions/cdi/trunk:
core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/config/
jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/
Author: gpetracek
Date: Wed Feb 16 07:03:25 2011
New Revision: 1071163
URL: http://svn.apache.org/viewvc?rev=1071163&view=rev
Log:
EXTCDI-137 first draft of eager window-id detection
Modified:
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/config/WindowContextConfig.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/WindowContextManagerObserver.java
Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/config/WindowContextConfig.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/config/WindowContextConfig.java?rev=1071163&r1=1071162&r2=1071163&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/config/WindowContextConfig.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/config/WindowContextConfig.java Wed Feb 16 07:03:25 2011
@@ -105,13 +105,12 @@ public class WindowContextConfig extends
/**
* Allows to restore the window-context before the component tree gets built.
- * Per default it's only supported if {#isUrlParameterSupported} is true as well.
*
* @return true for activating it, false otherwise
*/
public boolean isEagerWindowContextDetectionEnabled()
{
- return isUrlParameterSupported();
+ return true;
}
/*
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/WindowContextManagerObserver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/WindowContextManagerObserver.java?rev=1071163&r1=1071162&r2=1071163&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/WindowContextManagerObserver.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/WindowContextManagerObserver.java Wed Feb 16 07:03:25 2011
@@ -65,8 +65,7 @@ final class WindowContextManagerObserver
WindowHandler windowHandler,
WindowContextConfig windowContextConfig)
{
- boolean requestParameterSupported = windowContextConfig.isUrlParameterSupported();
- if(!(requestParameterSupported && windowContextConfig.isEagerWindowContextDetectionEnabled()) ||
+ if(!windowContextConfig.isEagerWindowContextDetectionEnabled() ||
RequestCache.getCurrentWindowContext() != null /*skip the process if there is a custom mechanism*/)
{
return;
@@ -75,7 +74,7 @@ final class WindowContextManagerObserver
//don't use: windowContextManager.getCurrentWindowContext(); it would create a new window-id immediately and
//it would break other features.
String windowId = resolveWindowContextId(windowHandler,
- requestParameterSupported,
+ windowContextConfig.isUrlParameterSupported(),
windowContextConfig.isUnknownWindowIdsAllowed());
if(windowId != null)