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/11/26 19:49:49 UTC
svn commit: r1039509 -
/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultWindowHandler.java
Author: gpetracek
Date: Fri Nov 26 18:49:49 2010
New Revision: 1039509
URL: http://svn.apache.org/viewvc?rev=1039509&view=rev
Log:
reverted #1039231
Modified:
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/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=1039509&r1=1039508&r2=1039509&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 18:49:49 2010
@@ -52,8 +52,6 @@ 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()
{
@@ -63,12 +61,11 @@ public class DefaultWindowHandler implem
protected DefaultWindowHandler(WindowContextConfig config)
{
this.useWindowAwareUrlEncoding = config.isUrlParameterSupported();
- this.encodeActionURLs = config.isAddWindowIdToActionUrlsEnabled();
}
public String encodeURL(String url)
{
- if(this.encodeActionURLs)
+ if(this.useWindowAwareUrlEncoding)
{
return encodeActionURL(url, getCurrentWindowId());
}