Updated Branches: refs/heads/master 407f20d9f -> 895c6f00e
DELTASPIKE-454 merge URL with LAZY Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/895c6f00 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/895c6f00 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/895c6f00 Branch: refs/heads/master Commit: 895c6f00ef3fedbef3955f05117b2615d3846e4a Parents: 407f20d Author: tandraschko <[email protected]> Authored: Fri Jan 17 18:16:30 2014 +0100 Committer: tandraschko <[email protected]> Committed: Fri Jan 17 18:16:30 2014 +0100 ---------------------------------------------------------------------- .../jsf/spi/scope/window/ClientWindowConfig.java | 2 -- .../jsf/impl/scope/window/DefaultClientWindow.java | 10 +++++----- 2 files changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/895c6f00/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/spi/scope/window/ClientWindowConfig.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/spi/scope/window/ClientWindowConfig.java b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/spi/scope/window/ClientWindowConfig.java index d9aa688..2828bd4 100644 --- a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/spi/scope/window/ClientWindowConfig.java +++ b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/spi/scope/window/ClientWindowConfig.java @@ -53,8 +53,6 @@ public interface ClientWindowConfig */ DELEGATED, - URL, - /** * If you set this mode, you also need to provide an own {@link ClientWindow} implementation. */ http://git-wip-us.apache.org/repos/asf/deltaspike/blob/895c6f00/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/scope/window/DefaultClientWindow.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/scope/window/DefaultClientWindow.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/scope/window/DefaultClientWindow.java index 92378f9..3b5fc47 100644 --- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/scope/window/DefaultClientWindow.java +++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/scope/window/DefaultClientWindow.java @@ -111,7 +111,7 @@ public class DefaultClientWindow implements ClientWindow return ClientWindowAdapter.getWindowIdFromJsf(facesContext); } - if (ClientWindowRenderMode.URL.equals(clientWindowRenderMode)) + if (ClientWindowRenderMode.LAZY.equals(clientWindowRenderMode)) { ExternalContext externalContext = facesContext.getExternalContext(); @@ -306,7 +306,7 @@ public class DefaultClientWindow implements ClientWindow { facesContext.getExternalContext().getClientWindow().disableClientWindowRenderMode(facesContext); } - else if (ClientWindowRenderMode.URL.equals(clientWindowRenderMode)) + else if (ClientWindowRenderMode.LAZY.equals(clientWindowRenderMode)) { Map<Object, Object> attrMap = facesContext.getAttributes(); attrMap.put(PER_USE_CLIENT_WINDOW_URL_QUERY_PARAMETER_DISABLED_KEY, Boolean.TRUE); @@ -322,7 +322,7 @@ public class DefaultClientWindow implements ClientWindow { facesContext.getExternalContext().getClientWindow().enableClientWindowRenderMode(facesContext); } - else if (ClientWindowRenderMode.URL.equals(clientWindowRenderMode)) + else if (ClientWindowRenderMode.LAZY.equals(clientWindowRenderMode)) { Map<Object, Object> attrMap = facesContext.getAttributes(); attrMap.remove(PER_USE_CLIENT_WINDOW_URL_QUERY_PARAMETER_DISABLED_KEY); @@ -334,7 +334,7 @@ public class DefaultClientWindow implements ClientWindow { ClientWindowRenderMode clientWindowRenderMode = clientWindowConfig.getClientWindowRenderMode(facesContext); - if (ClientWindowRenderMode.URL.equals(clientWindowRenderMode)) + if (ClientWindowRenderMode.LAZY.equals(clientWindowRenderMode)) { Map<Object, Object> attrMap = facesContext.getAttributes(); return !attrMap.containsKey(PER_USE_CLIENT_WINDOW_URL_QUERY_PARAMETER_DISABLED_KEY); @@ -348,7 +348,7 @@ public class DefaultClientWindow implements ClientWindow { ClientWindowRenderMode clientWindowRenderMode = clientWindowConfig.getClientWindowRenderMode(facesContext); - if (ClientWindowRenderMode.URL.equals(clientWindowRenderMode)) + if (ClientWindowRenderMode.LAZY.equals(clientWindowRenderMode)) { String windowId = getWindowId(facesContext); if (windowId != null)
