You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2023/01/16 09:59:36 UTC
[myfaces] branch main updated: removed duplicated param
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/main by this push:
new 3034b7e02 removed duplicated param
3034b7e02 is described below
commit 3034b7e02745446f10367e200727570e4258c5b4
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Mon Jan 16 10:59:28 2023 +0100
removed duplicated param
---
.../java/org/apache/myfaces/config/FacesConfigurator.java | 6 +++---
.../lifecycle/clientwindow/ClientWindowFactoryImpl.java | 11 +----------
2 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java b/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
index 07e3ac506..2fc7ba44b 100755
--- a/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
+++ b/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
@@ -1463,12 +1463,12 @@ public class FacesConfigurator
//No window mode set, force window mode to url
String defaultWindowMode = WebConfigParamUtils.getStringInitParameter(
facesContext.getExternalContext(),
- ClientWindowFactoryImpl.INIT_PARAM_DEFAULT_WINDOW_MODE,
+ ClientWindow.CLIENT_WINDOW_MODE_PARAM_NAME,
ClientWindowFactoryImpl.WINDOW_MODE_URL);
-
+
log.info("The current configuration requires client window enabled, setting it to '"+
defaultWindowMode+ '\'');
-
+
facesContext.getExternalContext().getApplicationMap().put(
ENABLE_DEFAULT_WINDOW_MODE, Boolean.TRUE);
}
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/ClientWindowFactoryImpl.java b/impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/ClientWindowFactoryImpl.java
index 03a203d38..8dcce3aba 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/ClientWindowFactoryImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/ClientWindowFactoryImpl.java
@@ -22,7 +22,6 @@ import org.apache.myfaces.util.token.TokenGenerator;
import jakarta.faces.context.FacesContext;
import jakarta.faces.lifecycle.ClientWindow;
import jakarta.faces.lifecycle.ClientWindowFactory;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
import org.apache.myfaces.config.FacesConfigurator;
import org.apache.myfaces.util.WebConfigParamUtils;
@@ -33,10 +32,6 @@ import org.apache.myfaces.util.WebConfigParamUtils;
*/
public class ClientWindowFactoryImpl extends ClientWindowFactory
{
- @JSFWebConfigParam(since="2.2",defaultValue="url")
- public static final String INIT_PARAM_DEFAULT_WINDOW_MODE =
- "org.apache.myfaces.DEFAULT_WINDOW_MODE";
-
public static final String WINDOW_MODE_NONE = "none";
public static final String WINDOW_MODE_URL = "url";
public static final String WINDOW_MODE_URL_REDIRECT = "url-redirect";
@@ -87,14 +82,10 @@ public class ClientWindowFactoryImpl extends ClientWindowFactory
{
if (FacesConfigurator.isEnableDefaultWindowMode(context))
{
- String defaultWindowMode = WebConfigParamUtils.getStringInitParameter(
- context.getExternalContext(),
- INIT_PARAM_DEFAULT_WINDOW_MODE,
- WINDOW_MODE_URL);
windowMode = WebConfigParamUtils.getStringInitParameter(
context.getExternalContext(),
ClientWindow.CLIENT_WINDOW_MODE_PARAM_NAME,
- defaultWindowMode);
+ WINDOW_MODE_URL);
}
else
{