You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/01/16 11:53:06 UTC
[01/10] git commit: WICKET-5466 watch out for null component;
break early from method
Updated Branches:
refs/heads/sandbox/preserve-page-parameters-and-execute-listener-interface-after-expiration 4299d74c9 -> 79ba33817
WICKET-5466 watch out for null component; break early from method
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c1c1f794
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c1c1f794
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c1c1f794
Branch: refs/heads/sandbox/preserve-page-parameters-and-execute-listener-interface-after-expiration
Commit: c1c1f79408052235339c8696a8c3564caac8a111
Parents: 5de39f4
Author: svenmeier <sv...@meiers.net>
Authored: Tue Jan 14 16:59:42 2014 +0100
Committer: svenmeier <sv...@meiers.net>
Committed: Tue Jan 14 16:59:42 2014 +0100
----------------------------------------------------------------------
.../ListenerInterfaceRequestHandler.java | 91 ++++++++++----------
.../ListenerInterfaceRequestHandlerTest.java | 31 ++++++-
2 files changed, 74 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/c1c1f794/wicket-core/src/main/java/org/apache/wicket/core/request/handler/ListenerInterfaceRequestHandler.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/ListenerInterfaceRequestHandler.java b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/ListenerInterfaceRequestHandler.java
index 84592d7..1e24206 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/ListenerInterfaceRequestHandler.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/ListenerInterfaceRequestHandler.java
@@ -172,65 +172,62 @@ public class ListenerInterfaceRequestHandler
component = null;
}
- if ((component == null && freshPage) ||
- (component != null && getComponent().getPage() == page))
+ if ((component == null && !freshPage) || (component != null && component.getPage() != page))
{
- if (page instanceof Page)
- {
- // initialize the page to be able to check whether it is stateless
- ((Page)page).internalInitialize();
- }
- final boolean isStateless = page.isPageStateless();
+ throw new WicketRuntimeException("Component '" + getComponentPath()
+ + "' has been removed from page.");
+ }
- RedirectPolicy policy = isStateless ? RedirectPolicy.NEVER_REDIRECT
- : RedirectPolicy.AUTO_REDIRECT;
- final IPageProvider pageProvider = new PageProvider(page);
+ if (page instanceof Page)
+ {
+ // initialize the page to be able to check whether it is stateless
+ ((Page)page).internalInitialize();
+ }
+ final boolean isStateless = page.isPageStateless();
+
+ RedirectPolicy policy = isStateless
+ ? RedirectPolicy.NEVER_REDIRECT
+ : RedirectPolicy.AUTO_REDIRECT;
+ final IPageProvider pageProvider = new PageProvider(page);
- if (freshPage && (isStateless == false || component == null))
+ if (freshPage && (isStateless == false || component == null))
+ {
+ // A listener interface is invoked on an expired page.
+
+ // If the page is stateful then we cannot assume that the listener interface is
+ // invoked on its initial state (right after page initialization) and that its
+ // component and/or behavior will be available. That's why the listener interface
+ // should be ignored and the best we can do is to re-paint the newly constructed
+ // page.
+
+ if (LOG.isDebugEnabled())
{
- // A listener interface is invoked on an expired page.
-
- // If the page is stateful then we cannot assume that the listener interface is
- // invoked on its initial state (right after page initialization) and that its
- // component and/or behavior will be available. That's why the listener interface
- // should be ignored and the best we can do is to re-paint the newly constructed
- // page.
-
- if (LOG.isDebugEnabled())
- {
- LOG.debug(
- "A ListenerInterface '{}' assigned to '{}' is executed on an expired stateful page. "
- + "Scheduling re-create of the page and ignoring the listener interface...",
- listenerInterface, getComponentPath());
- }
-
- if (isAjax)
- {
- policy = RedirectPolicy.ALWAYS_REDIRECT;
- }
-
- requestCycle.scheduleRequestHandlerAfterCurrent(new RenderPageRequestHandler(
- pageProvider, policy));
- return;
+ LOG.debug(
+ "A ListenerInterface '{}' assigned to '{}' is executed on an expired stateful page. "
+ + "Scheduling re-create of the page and ignoring the listener interface...",
+ listenerInterface, getComponentPath());
}
- if (isAjax == false && listenerInterface.isRenderPageAfterInvocation())
+ if (isAjax)
{
- // schedule page render after current request handler is done. this can be
- // overridden during invocation of listener
- // method (i.e. by calling RequestCycle#setResponsePage)
- requestCycle.scheduleRequestHandlerAfterCurrent(new RenderPageRequestHandler(
- pageProvider, policy));
+ policy = RedirectPolicy.ALWAYS_REDIRECT;
}
- invokeListener();
-
+ requestCycle.scheduleRequestHandlerAfterCurrent(new RenderPageRequestHandler(
+ pageProvider, policy));
+ return;
}
- else
+
+ if (isAjax == false && listenerInterface.isRenderPageAfterInvocation())
{
- throw new WicketRuntimeException("Component " + getComponent() +
- " has been removed from page.");
+ // schedule page render after current request handler is done. this can be
+ // overridden during invocation of listener
+ // method (i.e. by calling RequestCycle#setResponsePage)
+ requestCycle.scheduleRequestHandlerAfterCurrent(new RenderPageRequestHandler(
+ pageProvider, policy));
}
+
+ invokeListener();
}
private void invokeListener()
http://git-wip-us.apache.org/repos/asf/wicket/blob/c1c1f794/wicket-core/src/test/java/org/apache/wicket/core/request/handler/ListenerInterfaceRequestHandlerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/handler/ListenerInterfaceRequestHandlerTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/handler/ListenerInterfaceRequestHandlerTest.java
index 9cd6905..cc03296 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/handler/ListenerInterfaceRequestHandlerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/handler/ListenerInterfaceRequestHandlerTest.java
@@ -23,13 +23,16 @@ import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
import org.apache.wicket.RequestListenerInterface;
import org.apache.wicket.Session;
+import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.form.IOnChangeListener;
import org.apache.wicket.markup.html.link.ILinkListener;
import org.apache.wicket.request.Url;
+import org.apache.wicket.resource.DummyPage;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
import org.apache.wicket.util.resource.StringResourceStream;
@@ -42,8 +45,34 @@ public class ListenerInterfaceRequestHandlerTest extends WicketTestCase
{
/**
+ * WICKET-5466
+ */
+ @Test
+ public void removedComponent()
+ {
+ // non-existing component on fresh page is ignored
+ PageAndComponentProvider freshPage = new PageAndComponentProvider(DummyPage.class, null,
+ "foo");
+ new ListenerInterfaceRequestHandler(freshPage, IOnChangeListener.INTERFACE).respond(tester
+ .getRequestCycle());
+
+ // non-existing component on old page fails
+ PageAndComponentProvider oldPage = new PageAndComponentProvider(new DummyPage(), "foo");
+ try
+ {
+ new ListenerInterfaceRequestHandler(oldPage, IOnChangeListener.INTERFACE)
+ .respond(tester.getRequestCycle());
+ fail();
+ }
+ catch (WicketRuntimeException ex)
+ {
+ assertEquals("Component 'foo' has been removed from page.", ex.getMessage());
+ }
+ }
+
+ /**
* https://issues.apache.org/jira/browse/WICKET-4116
- *
+ *
* @throws Exception
*/
@Test
[08/10] git commit: WICKET-5468 UrlRenderer#renderRelativeUrl
potentially appends "/" after query parameters
Posted by mg...@apache.org.
WICKET-5468 UrlRenderer#renderRelativeUrl potentially appends "/" after query parameters
(cherry picked from commit d9f50272e37b62a78f6a67c9b9f3f32f024d0ab8)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/4f9aa2d9
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4f9aa2d9
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4f9aa2d9
Branch: refs/heads/sandbox/preserve-page-parameters-and-execute-listener-interface-after-expiration
Commit: 4f9aa2d95ff064d81c49229b3c94d9c6a959cd36
Parents: 79c7cb2
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Jan 15 12:02:00 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Jan 15 12:02:36 2014 +0200
----------------------------------------------------------------------
.../org/apache/wicket/request/cycle/UrlRendererTest.java | 11 +++++++++++
.../main/java/org/apache/wicket/request/UrlRenderer.java | 4 ++--
2 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/4f9aa2d9/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java b/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
index dc257be..3fecf79 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
@@ -214,6 +214,17 @@ public class UrlRendererTest extends Assert
}
/**
+ * https://issues.apache.org/jira/browse/WICKET-5468
+ */
+ @Test
+ public void renderUrlWithTrailingDotsInQueryString()
+ {
+ UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("some/path")));
+
+ assertEquals("./path?a=b..", r1.renderUrl(Url.parse("some/path?a=b..")));
+ }
+
+ /**
* Verify that absolute urls are rendered as is, ignoring the current client url and base url
* completely.
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/4f9aa2d9/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java b/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
index a09542d..0c83d82 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
@@ -290,8 +290,8 @@ public class UrlRenderer
renderedUrl = "./" + renderedUrl;
}
- // sanitize end
- if (renderedUrl.endsWith(".."))
+ // add trailing slash if the url has no query string and ends with ..
+ if (renderedUrl.indexOf('?') == -1 && renderedUrl.endsWith(".."))
{
// WICKET-4401
renderedUrl = renderedUrl + '/';
[04/10] git commit: WICKET-5472
PackageResource#internalGetResourceStream() should return
ProcessingResourceStream only when the resource is existing
Posted by mg...@apache.org.
WICKET-5472 PackageResource#internalGetResourceStream() should return ProcessingResourceStream only when the resource is existing
(cherry picked from commit 1cc56f56aedbb9f0da0c6e1df35a441106568e72)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c2b49a6c
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c2b49a6c
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c2b49a6c
Branch: refs/heads/sandbox/preserve-page-parameters-and-execute-listener-interface-after-expiration
Commit: c2b49a6cb0748664119c2279e5556d3874ced59b
Parents: e96dab0
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Jan 14 23:22:05 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Jan 14 23:22:28 2014 +0200
----------------------------------------------------------------------
.../org/apache/wicket/request/resource/PackageResource.java | 6 +++++-
.../org/apache/wicket/util/resource/ResourceStreamWrapper.java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/c2b49a6c/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
index ad03e22..dd23147 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
@@ -461,7 +461,11 @@ public class PackageResource extends AbstractResource implements IStaticCacheabl
". See IPackageResourceGuard");
}
- return new ProcessingResourceStream(resourceStream);
+ if (resourceStream != null)
+ {
+ resourceStream = new ProcessingResourceStream(resourceStream);
+ }
+ return resourceStream;
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/c2b49a6c/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceStreamWrapper.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceStreamWrapper.java b/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceStreamWrapper.java
index 8b78be3..11b6253 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceStreamWrapper.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceStreamWrapper.java
@@ -36,7 +36,7 @@ public class ResourceStreamWrapper implements IResourceStream
this.delegate = Args.notNull(delegate, "delegate");
}
- protected IResourceStream getDelegate()
+ public IResourceStream getDelegate()
{
return delegate;
}
[07/10] git commit: WICKET-5469 ModalWindow unload warning always
displayed (even if window is closed)
Posted by mg...@apache.org.
WICKET-5469 ModalWindow unload warning always displayed (even if window is closed)
Use event listeners instead of property based event handler for onbeforeunload.
We don't do the same for 'onunload' because event listeners can be skipped with event.stopImmediatePropagation() and this may lead to memory leaks in IE.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/79c7cb29
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/79c7cb29
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/79c7cb29
Branch: refs/heads/sandbox/preserve-page-parameters-and-execute-listener-interface-after-expiration
Commit: 79c7cb297687a0f214a8531818ce947ccabc0074
Parents: ca4bfba
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Jan 15 11:40:42 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Jan 15 11:40:42 2014 +0200
----------------------------------------------------------------------
.../wicket/ajax/res/js/wicket-event-jquery.js | 26 +++++++++++++++++---
wicket-core/src/test/js/event.js | 20 +++++++++++++++
.../ajax/markup/html/modal/res/modal.js | 16 +++++-------
3 files changed, 49 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/79c7cb29/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js
index 9529761..8827cde 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js
@@ -137,9 +137,18 @@
jQuery(element).trigger(event);
},
- // adds an event of specified type to the element
- // also supports the domready event on window
- // domready is event fired when the DOM is complete, but before loading external resources (images, ...)
+ /**
+ * Binds an event listener for an element
+ *
+ * Also supports the special 'domready' event on window.
+ * 'domready' is event fired when the DOM is complete, but
+ * before loading external resources (images, scripts, ...)
+ *
+ * @param element {HTMLElement} The host HTML element
+ * @param type {String} The type of the DOM event
+ * @param fn {Function} The event handler to unbind
+ * @param data {Object} Extra data for the event
+ */
add: function (element, type, fn, data) {
if (type === 'domready') {
jQuery(fn);
@@ -163,6 +172,17 @@
},
/**
+ * Unbinds an event listener for an element
+ *
+ * @param element {HTMLElement} The host HTML element
+ * @param type {String} The type of the DOM event
+ * @param fn {Function} The event handler to unbind
+ */
+ remove: function (element, type, fn) {
+ jQuery(element).off(type, fn);
+ },
+
+ /**
* Adds a subscriber for the passed topic.
*
* @param topic {String} - the channel name for which this subscriber will be notified
http://git-wip-us.apache.org/repos/asf/wicket/blob/79c7cb29/wicket-core/src/test/js/event.js
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/js/event.js b/wicket-core/src/test/js/event.js
index e180b4f..9ccba5e 100644
--- a/wicket-core/src/test/js/event.js
+++ b/wicket-core/src/test/js/event.js
@@ -133,6 +133,26 @@ jQuery(document).ready(function() {
$el.remove();
});
+ test('remove - any event', function () {
+
+ expect(1);
+
+ var $el = jQuery('<div id="addTestId">element body</div>');
+ $el.appendTo(jQuery('#qunit-fixture'));
+
+ var handler = function() {
+ ok(true, 'This event must be fired!');
+ };
+
+ var el = $el[0];
+ Wicket.Event.add(el, 'click', handler);
+
+ Wicket.Event.fire(el, 'click');
+
+ Wicket.Event.remove(el, 'click', handler);
+
+ Wicket.Event.fire(el, 'click');
+ });
test('add - mousewheel', function () {
http://git-wip-us.apache.org/repos/asf/wicket/blob/79c7cb29/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
index 7a66c92..159b4b5 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
@@ -732,19 +732,17 @@
}, this);
if (this.settings.unloadConfirmation) {
- // preserve old beforeunload handler
- this.old_onbeforeunload = window.onbeforeunload;
-
- // new beforeunload handler - ask user before reloading window
- window.onbeforeunload = function() {
- return "Reloading this page will cause the modal window to disappear.";
- };
+ Wicket.Event.add(window, 'beforeunload',this.onbeforeunload);
}
// create the mask that covers the background
this.createMask();
},
+ onbeforeunload: function() {
+ return "Reloading this page will cause the modal window to disappear.";
+ },
+
adjustOpenWindowZIndexesOnShow: function() {
// if there is a previous window
if (this.oldWindow) {
@@ -828,9 +826,7 @@
window.onunload = this.old_onunload;
this.old_onunload = null;
- // restore old beforeunload handler
- window.onbeforeunload = this.old_onbeforeunload;
- this.old_onbeforeunload = null;
+ Wicket.Event.remove(window, 'beforeunload',this.onbeforeunload);
// hids and cleanup the mask
this.destroyMask();
[02/10] git commit: Methods in interface are public implicitly
Posted by mg...@apache.org.
Methods in interface are public implicitly
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/9969c9ed
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9969c9ed
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9969c9ed
Branch: refs/heads/sandbox/preserve-page-parameters-and-execute-listener-interface-after-expiration
Commit: 9969c9ed1219e86787f9bfa2218e6ea23bcdc434
Parents: c1c1f79
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Jan 13 15:29:56 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Jan 14 23:14:24 2014 +0200
----------------------------------------------------------------------
.../request/component/IRequestableComponent.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/9969c9ed/wicket-core/src/main/java/org/apache/wicket/request/component/IRequestableComponent.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/component/IRequestableComponent.java b/wicket-core/src/main/java/org/apache/wicket/request/component/IRequestableComponent.java
index 2566dcc..adc0c9f 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/component/IRequestableComponent.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/component/IRequestableComponent.java
@@ -34,21 +34,21 @@ public interface IRequestableComponent
*
* @return Colon separated path to this component in the component hierarchy
*/
- public String getPageRelativePath();
+ String getPageRelativePath();
/**
* Gets the id of this component.
*
* @return The id of this component
*/
- public String getId();
+ String getId();
/**
* Returns page this component belongs to.
*
* @return page instance or <code>null</code>
*/
- public IRequestablePage getPage();
+ IRequestablePage getPage();
/**
* Gets the component at the given path.
@@ -57,7 +57,7 @@ public interface IRequestableComponent
* Path to component
* @return The component at the path
*/
- public IRequestableComponent get(String path);
+ IRequestableComponent get(String path);
/**
* Gets a stable id for the specified behavior. The id remains stable from the point this method
@@ -66,7 +66,7 @@ public interface IRequestableComponent
* @param behavior
* @return a stable id for the specified behavior
*/
- public int getBehaviorId(Behavior behavior);
+ int getBehaviorId(Behavior behavior);
/**
* Gets the behavior for the specified id
@@ -76,7 +76,7 @@ public interface IRequestableComponent
* @throws InvalidBehaviorIdException
* when behavior with this id cannot be found
*/
- public Behavior getBehaviorById(int id);
+ Behavior getBehaviorById(int id);
/**
* Detaches the component.
@@ -104,5 +104,5 @@ public interface IRequestableComponent
*
* </p>
*/
- public void detach();
+ void detach();
}
[03/10] git commit: WICKET-5471 Store the page if it is known that it
will be used in a following request
Posted by mg...@apache.org.
WICKET-5471 Store the page if it is known that it will be used in a following request
(cherry picked from commit 23172242b84704d8c95bbe168198c99d8b0f5ec4)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e96dab08
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e96dab08
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e96dab08
Branch: refs/heads/sandbox/preserve-page-parameters-and-execute-listener-interface-after-expiration
Commit: e96dab0801ab21e96472206dacd8052d385a966e
Parents: 9969c9e
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Jan 14 23:13:37 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Jan 14 23:14:36 2014 +0200
----------------------------------------------------------------------
wicket-core/src/main/java/org/apache/wicket/Page.java | 2 ++
.../main/java/org/apache/wicket/request/cycle/RequestCycle.java | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/e96dab08/wicket-core/src/main/java/org/apache/wicket/Page.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Page.java b/wicket-core/src/main/java/org/apache/wicket/Page.java
index 1a3e9aa..a58ad9a 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Page.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Page.java
@@ -965,6 +965,8 @@ public abstract class Page extends MarkupContainer implements IRedirectListener,
{
setStatelessHint(false);
+ internalInitialize();
+
return new PageReference(numericId);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/e96dab08/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java b/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
index 0a84739..3eaed6a 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
@@ -660,7 +660,9 @@ public class RequestCycle implements IRequestCycle, IEventSink
{
if (page instanceof Page)
{
- ((Page)page).setStatelessHint(false);
+ Page _page = (Page) page;
+ _page.setStatelessHint(false);
+ _page.internalInitialize();
}
scheduleRequestHandlerAfterCurrent(new RenderPageRequestHandler(new PageProvider(page),
RenderPageRequestHandler.RedirectPolicy.AUTO_REDIRECT));
[09/10] git commit: WICKET-5467 NumberTextField should support "any"
as valid step attribute value
Posted by mg...@apache.org.
WICKET-5467 NumberTextField should support "any" as valid step attribute value
(cherry picked from commit 2c3aa01aba8666f8dc358e5ae25f36e38523924d)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/60d3009e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/60d3009e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/60d3009e
Branch: refs/heads/sandbox/preserve-page-parameters-and-execute-listener-interface-after-expiration
Commit: 60d3009e9f3dc65d3d7cfeb401aaae3e617ef4a0
Parents: 4f9aa2d
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Jan 15 12:13:27 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Jan 15 12:14:04 2014 +0200
----------------------------------------------------------------------
.../markup/html/form/NumberTextField.java | 16 ++++++++-
.../markup/html/form/NumberTextFieldTest.java | 34 +++++++++++++++++++-
2 files changed, 48 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/60d3009e/wicket-core/src/main/java/org/apache/wicket/markup/html/form/NumberTextField.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/NumberTextField.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/NumberTextField.java
index 925ad21..ca1a2fc 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/NumberTextField.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/NumberTextField.java
@@ -42,6 +42,13 @@ public class NumberTextField<N extends Number & Comparable<N>> extends TextField
{
private static final long serialVersionUID = 1L;
+ /**
+ * Use this as a marker of step attribute value "any"
+ * Because the w3c spec requires step to be a non-negative digit
+ * greater than zero we use zero as delegate for "any" keyword.
+ */
+ public static final Double ANY = Double.valueOf(0d);
+
private RangeValidator<N> validator;
private N minimum;
@@ -187,7 +194,14 @@ public class NumberTextField<N extends Number & Comparable<N>> extends TextField
if (step != null)
{
- attributes.put("step", Objects.stringValue(step));
+ if (step.doubleValue() == ANY)
+ {
+ attributes.put("step", "any");
+ }
+ else
+ {
+ attributes.put("step", Objects.stringValue(step));
+ }
}
else
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/60d3009e/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NumberTextFieldTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NumberTextFieldTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NumberTextFieldTest.java
index 44c0fa8..bb951d5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NumberTextFieldTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NumberTextFieldTest.java
@@ -104,6 +104,38 @@ public class NumberTextFieldTest extends WicketTestCase
}
/**
+ * WICKET-5467
+ */
+ @Test
+ public void respectStepAny()
+ {
+ TestPage<Double> testPage = new TestPage<Double>();
+ testPage.textField.setType(Double.class);
+ testPage.textField.setStep(NumberTextField.ANY);
+ testPage.textField.setModelObject(new Double("1000.0"));
+ tester.startPage(testPage);
+
+ String response = tester.getLastResponseAsString();
+ assertTrue(response.contains("<input wicket:id=\"number\" step=\"any\" type=\"number\" value=\"1000.0\" name=\"number\"/>"));
+ }
+
+ /**
+ * WICKET-5467
+ */
+ @Test
+ public void respectStepWithNumberValue()
+ {
+ TestPage<Double> testPage = new TestPage<Double>();
+ testPage.textField.setType(Double.class);
+ testPage.textField.setStep(Double.valueOf(0.3d));
+ testPage.textField.setModelObject(new Double("1000.0"));
+ tester.startPage(testPage);
+
+ String response = tester.getLastResponseAsString();
+ assertTrue(response.contains("<input wicket:id=\"number\" step=\"0.3\" type=\"number\" value=\"1000.0\" name=\"number\"/>"));
+ }
+
+ /**
* @param <N>
* type parameter
*/
@@ -138,7 +170,7 @@ public class NumberTextFieldTest extends WicketTestCase
{
return new StringResourceStream(
"<html><body>"
- + "<form wicket:id=\"form\"><input wicket:id=\"number\" type=\"number\" /></form></body></html>");
+ + "<form wicket:id=\"form\"><input wicket:id=\"number\" step=\"any\" type=\"number\" /></form></body></html>");
}
}
}
[10/10] git commit: Merge branch 'master' into
sandbox/preserve-page-parameters-and-execute-listener-interface-after-expiration
Posted by mg...@apache.org.
Merge branch 'master' into sandbox/preserve-page-parameters-and-execute-listener-interface-after-expiration
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/79ba3381
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/79ba3381
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/79ba3381
Branch: refs/heads/sandbox/preserve-page-parameters-and-execute-listener-interface-after-expiration
Commit: 79ba33817899b5921a1864da9fc39e5f5a97395b
Parents: 4299d74 60d3009
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Jan 16 12:51:18 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Jan 16 12:51:18 2014 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/Page.java | 3 +
.../wicket/ajax/res/js/wicket-event-jquery.js | 26 +++++-
.../ListenerInterfaceRequestHandler.java | 98 ++++++++++----------
.../markup/html/form/NumberTextField.java | 16 +++-
.../wicket/request/cycle/RequestCycle.java | 6 +-
.../request/resource/PackageResource.java | 6 +-
.../apache/wicket/settings/PageSettings.java | 2 +-
.../ListenerInterfaceRequestHandlerTest.java | 31 ++++++-
.../markup/html/form/NumberTextFieldTest.java | 34 ++++++-
.../wicket/request/cycle/UrlRendererTest.java | 11 +++
wicket-core/src/test/js/event.js | 20 ++++
.../ajax/markup/html/modal/res/modal.js | 18 ++--
.../org/apache/wicket/request/UrlRenderer.java | 4 +-
.../util/resource/ResourceStreamWrapper.java | 2 +-
14 files changed, 203 insertions(+), 74 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/79ba3381/wicket-core/src/main/java/org/apache/wicket/core/request/handler/ListenerInterfaceRequestHandler.java
----------------------------------------------------------------------
diff --cc wicket-core/src/main/java/org/apache/wicket/core/request/handler/ListenerInterfaceRequestHandler.java
index 76fa264,1e24206..0ddb30b
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/ListenerInterfaceRequestHandler.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/ListenerInterfaceRequestHandler.java
@@@ -172,68 -172,62 +172,66 @@@ public class ListenerInterfaceRequestHa
component = null;
}
- if ((component == null && freshPage) ||
- (component != null && getComponent().getPage() == page))
+ if ((component == null && !freshPage) || (component != null && component.getPage() != page))
{
- if (page instanceof Page)
- {
- // initialize the page to be able to check whether it is stateless
- ((Page)page).internalInitialize();
- }
- final boolean isStateless = page.isPageStateless();
+ throw new WicketRuntimeException("Component '" + getComponentPath()
+ + "' has been removed from page.");
+ }
+
+ if (page instanceof Page)
+ {
+ // initialize the page to be able to check whether it is stateless
+ ((Page)page).internalInitialize();
+ }
+ final boolean isStateless = page.isPageStateless();
+
+ RedirectPolicy policy = isStateless
+ ? RedirectPolicy.NEVER_REDIRECT
+ : RedirectPolicy.AUTO_REDIRECT;
+ final IPageProvider pageProvider = new PageProvider(page);
- RedirectPolicy policy = isStateless ? RedirectPolicy.NEVER_REDIRECT
- : RedirectPolicy.AUTO_REDIRECT;
- final IPageProvider pageProvider = new PageProvider(page);
- if (freshPage && (isStateless == false || component == null))
++ final boolean canCallListenerInterfaceAfterExpiry = component != null
++ ? component.canCallListenerInterfaceAfterExpiry()
++ : false;
+
- final boolean canCallListenerInterfaceAfterExpiry = component != null
- ? component.canCallListenerInterfaceAfterExpiry()
- : false;
- if (!canCallListenerInterfaceAfterExpiry && freshPage && (isStateless == false || component == null))
++ if (!canCallListenerInterfaceAfterExpiry && freshPage && (isStateless == false || component == null))
+ {
+ // A listener interface is invoked on an expired page.
+
+ // If the page is stateful then we cannot assume that the listener interface is
+ // invoked on its initial state (right after page initialization) and that its
+ // component and/or behavior will be available. That's why the listener interface
+ // should be ignored and the best we can do is to re-paint the newly constructed
+ // page.
+
+ if (LOG.isDebugEnabled())
{
- // A listener interface is invoked on an expired page.
-
- // If the page is stateful then we cannot assume that the listener interface is
- // invoked on its initial state (right after page initialization) and that its
- // component and/or behavior will be available. That's why the listener interface
- // should be ignored and the best we can do is to re-paint the newly constructed
- // page.
-
- if (LOG.isDebugEnabled())
- {
- LOG.debug(
- "A ListenerInterface '{}' assigned to '{}' is executed on an expired stateful page. "
- + "Scheduling re-create of the page and ignoring the listener interface...",
- listenerInterface, getComponentPath());
- }
-
- if (isAjax)
- {
- policy = RedirectPolicy.ALWAYS_REDIRECT;
- }
-
- requestCycle.scheduleRequestHandlerAfterCurrent(new RenderPageRequestHandler(
- pageProvider, policy));
- return;
+ LOG.debug(
+ "A ListenerInterface '{}' assigned to '{}' is executed on an expired stateful page. "
+ + "Scheduling re-create of the page and ignoring the listener interface...",
+ listenerInterface, getComponentPath());
}
- if (isAjax == false && listenerInterface.isRenderPageAfterInvocation())
+ if (isAjax)
{
- // schedule page render after current request handler is done. this can be
- // overridden during invocation of listener
- // method (i.e. by calling RequestCycle#setResponsePage)
- requestCycle.scheduleRequestHandlerAfterCurrent(new RenderPageRequestHandler(
- pageProvider, policy));
+ policy = RedirectPolicy.ALWAYS_REDIRECT;
}
- invokeListener();
-
+ requestCycle.scheduleRequestHandlerAfterCurrent(new RenderPageRequestHandler(
+ pageProvider, policy));
+ return;
}
- else
+
+ if (isAjax == false && listenerInterface.isRenderPageAfterInvocation())
{
- throw new WicketRuntimeException("Component " + getComponent() +
- " has been removed from page.");
+ // schedule page render after current request handler is done. this can be
+ // overridden during invocation of listener
+ // method (i.e. by calling RequestCycle#setResponsePage)
+ requestCycle.scheduleRequestHandlerAfterCurrent(new RenderPageRequestHandler(
+ pageProvider, policy));
}
+
+ invokeListener();
}
private void invokeListener()
http://git-wip-us.apache.org/repos/asf/wicket/blob/79ba3381/wicket-core/src/main/java/org/apache/wicket/settings/PageSettings.java
----------------------------------------------------------------------
diff --cc wicket-core/src/main/java/org/apache/wicket/settings/PageSettings.java
index 8070359,19ddaa0..aa8a351
--- a/wicket-core/src/main/java/org/apache/wicket/settings/PageSettings.java
+++ b/wicket-core/src/main/java/org/apache/wicket/settings/PageSettings.java
@@@ -121,29 -115,4 +121,29 @@@ public class PageSetting
{
this.recreateMountedPagesAfterExpiry = recreateMountedPagesAfterExpiry;
}
+
+ /**
+ * @return {@code true} if Wicket should execute the listener interface of a component
+ * which owner page is freshly created after expiration of the old one
+ * @see #getRecreateMountedPagesAfterExpiry()
+ * @see org.apache.wicket.request.component.IRequestableComponent#canCallListenerInterfaceAfterExpiry()
+ */
+ public boolean getCallListenerInterfaceAfterExpiry()
+ {
+ return recreateMountedPagesAfterExpiry && callListenerInterfaceAfterExpiry;
+ }
+
+ /**
+ * Sets a setting that determines whether Wicket should execute the listener interface of a component
+ * which owner page is freshly created after expiration of the old one
+ *
+ * @param callListenerInterfaceAfterExpiry
+ * {@code true} if Wicket should execute the listener interface
- * @see #setRecreateMountedPagesAfterExpiry(boolean)
++ * @see #setRecreateMountedPagesAfterExpiry(boolean)
+ * @see org.apache.wicket.request.component.IRequestableComponent#canCallListenerInterfaceAfterExpiry()
+ */
+ public void setCallListenerInterfaceAfterExpiry(boolean callListenerInterfaceAfterExpiry)
+ {
+ this.callListenerInterfaceAfterExpiry = callListenerInterfaceAfterExpiry;
+ }
}
[06/10] git commit: WICKET-5469 ModalWindow unload warning always
displayed (even if window is closed)
Posted by mg...@apache.org.
WICKET-5469 ModalWindow unload warning always displayed (even if window is closed)
Always reset window.onbeforeunload on close
(cherry picked from commit 0f0be95c81c97d224de5a1b9ec7abc44dc7f149f)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ca4bfbad
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ca4bfbad
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ca4bfbad
Branch: refs/heads/sandbox/preserve-page-parameters-and-execute-listener-interface-after-expiration
Commit: ca4bfbadf0de7f5dd605ac0d78592dea744b4806
Parents: a391ff3
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Jan 15 11:15:17 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Jan 15 11:16:04 2014 +0200
----------------------------------------------------------------------
.../wicket/extensions/ajax/markup/html/modal/res/modal.js | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ca4bfbad/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
index 51c4d3c..7a66c92 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
@@ -828,11 +828,9 @@
window.onunload = this.old_onunload;
this.old_onunload = null;
- if (this.old_onbeforeunload) {
- // restore old beforeunload handler
- window.onbeforeunload = this.old_onbeforeunload;
- this.old_onbeforeunload = null;
- }
+ // restore old beforeunload handler
+ window.onbeforeunload = this.old_onbeforeunload;
+ this.old_onbeforeunload = null;
// hids and cleanup the mask
this.destroyMask();
[05/10] git commit: WICKET-5471 Store the page if it is known that it
will be used in a following request
Posted by mg...@apache.org.
WICKET-5471 Store the page if it is known that it will be used in a following request
Better fix.
The page will be touched (i.e. stored). But it won't be initialized unless really used because setStatelessHint(false) is called as well.
(cherry picked from commit 3fca3415b46af58591463c7a1c8843c0e9f894ac)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a391ff3f
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a391ff3f
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a391ff3f
Branch: refs/heads/sandbox/preserve-page-parameters-and-execute-listener-interface-after-expiration
Commit: a391ff3fe2cf3bbd9aa9afa7b2810df2b0b47d28
Parents: c2b49a6
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Jan 15 10:10:27 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Jan 15 10:12:01 2014 +0200
----------------------------------------------------------------------
wicket-core/src/main/java/org/apache/wicket/Page.java | 3 ++-
.../java/org/apache/wicket/request/cycle/RequestCycle.java | 8 +++++---
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/a391ff3f/wicket-core/src/main/java/org/apache/wicket/Page.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Page.java b/wicket-core/src/main/java/org/apache/wicket/Page.java
index a58ad9a..6d1dd44 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Page.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Page.java
@@ -965,7 +965,8 @@ public abstract class Page extends MarkupContainer implements IRedirectListener,
{
setStatelessHint(false);
- internalInitialize();
+ // make sure the page will be available on following request
+ getSession().getPageManager().touchPage(this);
return new PageReference(numericId);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/a391ff3f/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java b/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
index 3eaed6a..87bdafe 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
@@ -660,10 +660,12 @@ public class RequestCycle implements IRequestCycle, IEventSink
{
if (page instanceof Page)
{
- Page _page = (Page) page;
- _page.setStatelessHint(false);
- _page.internalInitialize();
+ ((Page) page).setStatelessHint(false);
}
+
+ // make sure the page will be available on following request
+ Session.get().getPageManager().touchPage(page);
+
scheduleRequestHandlerAfterCurrent(new RenderPageRequestHandler(new PageProvider(page),
RenderPageRequestHandler.RedirectPolicy.AUTO_REDIRECT));
}