You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by st...@apache.org on 2010/11/26 01:08:00 UTC
svn commit: r1039231 - in /myfaces/extensions/cdi/trunk:
core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/
jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/
Author: struberg
Date: Fri Nov 26 00:08:00 2010
New Revision: 1039231
URL: http://svn.apache.org/viewvc?rev=1039231&view=rev
Log:
EXTCDI-79 re-enable isAddWindowIdToActionUrlsEnabled
useWindowAwareUrlEncoding did also control how the windowId got passed through
to the WindowManager. This feature must remain but i must be able to disable
the &windowId=xxx in the created links and action URLs
Modified:
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/WindowContextConfig.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultWindowHandler.java
Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/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/WindowContextConfig.java?rev=1039231&r1=1039230&r2=1039231&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/WindowContextConfig.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/WindowContextConfig.java Fri Nov 26 00:08:00 2010
@@ -41,7 +41,10 @@ public interface WindowContextConfig ext
*/
boolean isUnknownWindowIdsAllowed();
- @Deprecated
+ /**
+ * if set to <code>true</code> CODI will add a windowId=xxx parameter
+ * while encoding each action URL.
+ */
boolean isAddWindowIdToActionUrlsEnabled();
/**
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultWindowHandler.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/DefaultWindowHandler.java?rev=1039231&r1=1039230&r2=1039231&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultWindowHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultWindowHandler.java Fri Nov 26 00:08:00 2010
@@ -52,6 +52,8 @@ public class DefaultWindowHandler implem
private static final String WINDOW_ID_PARAMETER_KEY = WINDOW_CONTEXT_ID_PARAMETER_KEY + "=";
protected boolean useWindowAwareUrlEncoding;
+ protected boolean encodeActionURLs;
+
protected DefaultWindowHandler()
{
@@ -61,11 +63,12 @@ public class DefaultWindowHandler implem
protected DefaultWindowHandler(WindowContextConfig config)
{
this.useWindowAwareUrlEncoding = config.isUrlParameterSupported();
+ this.encodeActionURLs = config.isAddWindowIdToActionUrlsEnabled();
}
public String encodeURL(String url)
{
- if(this.useWindowAwareUrlEncoding)
+ if(this.encodeActionURLs)
{
return encodeActionURL(url, getCurrentWindowId());
}