You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2016/04/25 11:48:45 UTC
[07/17] wicket git commit: WICKET-6137 renamed to
IRequstListener#rendersPage() with default; javadoc;
InlineFrame needs not to be dependent on rendering
WICKET-6137 renamed to IRequstListener#rendersPage() with default; javadoc; InlineFrame needs not to be dependent on rendering
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0b798d99
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0b798d99
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0b798d99
Branch: refs/heads/master
Commit: 0b798d999727d9642dd34c5db166b5a4cd4e7cd3
Parents: 657e449
Author: Sven Meier <sv...@apache.org>
Authored: Mon Mar 28 19:38:23 2016 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Mon Apr 25 11:44:48 2016 +0200
----------------------------------------------------------------------
.../org/apache/wicket/IRequestListener.java | 21 ++++++++++----------
.../wicket/behavior/AbstractAjaxBehavior.java | 6 ------
...markableListenerInterfaceRequestHandler.java | 4 ++--
.../ListenerInterfaceRequestHandler.java | 6 +++---
.../wicket/markup/html/form/CheckBox.java | 6 ------
.../wicket/markup/html/form/CheckGroup.java | 6 ------
.../wicket/markup/html/form/DropDownChoice.java | 6 ------
.../apache/wicket/markup/html/form/Form.java | 6 ------
.../wicket/markup/html/form/ImageButton.java | 2 +-
.../wicket/markup/html/form/RadioChoice.java | 6 ------
.../wicket/markup/html/form/RadioGroup.java | 6 ------
.../apache/wicket/markup/html/image/Image.java | 2 +-
.../wicket/markup/html/link/InlineFrame.java | 4 ++--
.../apache/wicket/markup/html/link/Link.java | 6 ------
.../wicket/markup/html/link/ResourceLink.java | 2 +-
.../wicket/markup/html/link/StatelessLink.java | 2 +-
.../org/apache/wicket/BehaviorRequestTest.java | 6 ------
.../java/org/apache/wicket/BehaviorUrlTest.java | 6 ------
.../ComponentWithLazyModelCreationTest.java | 6 ------
.../behavior/ImmutableBehaviorIdsTest.java | 6 ------
20 files changed, 22 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b798d99/wicket-core/src/main/java/org/apache/wicket/IRequestListener.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/IRequestListener.java b/wicket-core/src/main/java/org/apache/wicket/IRequestListener.java
index d94416d..a00958e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/IRequestListener.java
+++ b/wicket-core/src/main/java/org/apache/wicket/IRequestListener.java
@@ -17,27 +17,28 @@
package org.apache.wicket;
+import org.apache.wicket.core.request.handler.RenderPageRequestHandler;
import org.apache.wicket.util.io.IClusterable;
/**
- * Base interface for all interfaces that listen for requests from the client browser. All
- * sub-interfaces of this interface must have a single method which takes no arguments.
- * <p>
- * New listener interfaces must be registered with Wicket by constructing a
- * {@link RequestListenerInterface} object for the given interface class. The best way to do this is
- * to create a public static final constant field in your request listener interface. Doing this
- * will cause the interface to automatically register whenever it is used. For example, see
- * {@link org.apache.wicket.IResourceListener#INTERFACE}.
+ * Interface to be implemented by {@link Component}s or {@link Behaviors} that listen for requests from the client browser.
*
* @author Jonathan Locke
*/
public interface IRequestListener extends IClusterable
{
- boolean includeRenderCount();
+ /**
+ * Does invocation of this listener render the page.
+ *
+ * @return default {@code true}, i.e. a {@link RenderPageRequestHandler} is schedules after invocation
+ */
+ default boolean rendersPage() {
+ return true;
+ }
/**
- * Called when a request to a behavior is received.
+ * Called when a request is received.
*/
void onRequest();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b798d99/wicket-core/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java b/wicket-core/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java
index 04072c8..c563f41 100644
--- a/wicket-core/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java
@@ -68,12 +68,6 @@ public abstract class AbstractAjaxBehavior extends Behavior implements IRequestL
onBind();
}
- @Override
- public boolean includeRenderCount()
- {
- return true;
- }
-
/**
* Gets the url that references this handler.
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b798d99/wicket-core/src/main/java/org/apache/wicket/core/request/handler/BookmarkableListenerInterfaceRequestHandler.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/BookmarkableListenerInterfaceRequestHandler.java b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/BookmarkableListenerInterfaceRequestHandler.java
index 01eecfe..f2a20ec 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/BookmarkableListenerInterfaceRequestHandler.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/BookmarkableListenerInterfaceRequestHandler.java
@@ -68,9 +68,9 @@ public class BookmarkableListenerInterfaceRequestHandler
public boolean includeRenderCount() {
if (behaviorIndex == null) {
- return ((IRequestListener)getComponent()).includeRenderCount();
+ return ((IRequestListener)getComponent()).rendersPage();
} else {
- return ((IRequestListener)getComponent().getBehaviorById(getBehaviorIndex())).includeRenderCount();
+ return ((IRequestListener)getComponent().getBehaviorById(getBehaviorIndex())).rendersPage();
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b798d99/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 71696ce..1438d9c 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
@@ -81,9 +81,9 @@ public class ListenerInterfaceRequestHandler
public boolean includeRenderCount() {
if (behaviorId == null) {
- return ((IRequestListener)getComponent()).includeRenderCount();
+ return ((IRequestListener)getComponent()).rendersPage();
} else {
- return ((IRequestListener)getComponent().getBehaviorById(getBehaviorIndex())).includeRenderCount();
+ return ((IRequestListener)getComponent().getBehaviorById(getBehaviorIndex())).rendersPage();
}
}
@@ -302,7 +302,7 @@ public class ListenerInterfaceRequestHandler
IRequestListener requestListener = (IRequestListener)target;
- if (requestListener.includeRenderCount() && !ajax)
+ if (requestListener.rendersPage() && !ajax)
{
// schedule page render after current request handler is done. this can be
// overridden during invocation of listener
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b798d99/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java
index 2d39d4f..fdbf5b8 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java
@@ -75,12 +75,6 @@ public class CheckBox extends FormComponent<Boolean> implements IRequestListener
setType(Boolean.class);
}
- @Override
- public boolean includeRenderCount()
- {
- return true;
- }
-
/**
* @see org.apache.wicket.markup.html.form.IOnChangeListener#onSelectionChanged()
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b798d99/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java
index 5c62da5..8795ec4 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckGroup.java
@@ -201,12 +201,6 @@ public class CheckGroup<T> extends FormComponent<Collection<T>> implements IRequ
tag.remove("name");
}
- @Override
- public boolean includeRenderCount()
- {
- return true;
- }
-
/**
* Called when a selection changes.
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b798d99/wicket-core/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java
index b7aa1ec..954ada6 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java
@@ -203,12 +203,6 @@ public class DropDownChoice<T> extends AbstractSingleSelectChoice<T> implements
super(id, model, choices, renderer);
}
- @Override
- public boolean includeRenderCount()
- {
- return true;
- }
-
/**
* Called when a selection changes.
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b798d99/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
index f7a9e70..701576a 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
@@ -675,12 +675,6 @@ public class Form<T> extends WebMarkupContainer
return getFlag(FLAG_SUBMITTED);
}
- @Override
- public boolean includeRenderCount()
- {
- return true;
- }
-
/**
* THIS METHOD IS NOT PART OF THE WICKET API. DO NOT ATTEMPT TO OVERRIDE OR CALL IT.
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b798d99/wicket-core/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java
index 702daad..389cd76 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java
@@ -127,7 +127,7 @@ public class ImageButton extends Button implements IRequestListener
}
@Override
- public boolean includeRenderCount()
+ public boolean rendersPage()
{
return false;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b798d99/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java
index 4198070..bedd3ab 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java
@@ -245,12 +245,6 @@ public class RadioChoice<T> extends AbstractSingleSelectChoice<T> implements IRe
tag.remove("name");
}
- @Override
- public boolean includeRenderCount()
- {
- return true;
- }
-
/**
* @see org.apache.wicket.markup.html.form.IOnChangeListener#onSelectionChanged()
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b798d99/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java
index 795132d..1a54bad 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java
@@ -164,12 +164,6 @@ public class RadioGroup<T> extends FormComponent<T> implements IRequestListener
tag.remove("name");
}
- @Override
- public boolean includeRenderCount()
- {
- return true;
- }
-
/**
* Called when a selection changes.
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b798d99/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java
index bbe5bc1..ddbc84c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java
@@ -210,7 +210,7 @@ public class Image extends WebComponent implements IRequestListener
}
@Override
- public boolean includeRenderCount()
+ public boolean rendersPage()
{
return false;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b798d99/wicket-core/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java
index 12013b8..a7fb228 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java
@@ -148,9 +148,9 @@ public class InlineFrame extends WebMarkupContainer implements IRequestListener
}
@Override
- public boolean includeRenderCount()
+ public boolean rendersPage()
{
- return true;
+ return false;
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b798d99/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java
index 9d4fb3b..f4d842d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java
@@ -178,12 +178,6 @@ public abstract class Link<T> extends AbstractLink implements IRequestListener,
*/
public abstract void onClick();
- @Override
- public boolean includeRenderCount()
- {
- return true;
- }
-
/**
* THIS METHOD IS NOT PART OF THE WICKET API. DO NOT ATTEMPT TO OVERRIDE OR CALL IT.
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b798d99/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java
index 3ec597d..2e1f0c4 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java
@@ -104,7 +104,7 @@ public class ResourceLink<T> extends Link<T> implements IRequestListener
}
@Override
- public boolean includeRenderCount()
+ public boolean rendersPage()
{
return false;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b798d99/wicket-core/src/main/java/org/apache/wicket/markup/html/link/StatelessLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/StatelessLink.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/StatelessLink.java
index be0d022..cdaba22 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/StatelessLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/StatelessLink.java
@@ -50,7 +50,7 @@ public abstract class StatelessLink<T> extends Link<T>
}
@Override
- public boolean includeRenderCount()
+ public boolean rendersPage()
{
return false;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b798d99/wicket-core/src/test/java/org/apache/wicket/BehaviorRequestTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/BehaviorRequestTest.java b/wicket-core/src/test/java/org/apache/wicket/BehaviorRequestTest.java
index c7326b4..909ee23 100644
--- a/wicket-core/src/test/java/org/apache/wicket/BehaviorRequestTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/BehaviorRequestTest.java
@@ -138,12 +138,6 @@ public class BehaviorRequestTest extends WicketTestCase
}
@Override
- public boolean includeRenderCount()
- {
- return true;
- }
-
- @Override
public void onRequest()
{
called = true;
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b798d99/wicket-core/src/test/java/org/apache/wicket/BehaviorUrlTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/BehaviorUrlTest.java b/wicket-core/src/test/java/org/apache/wicket/BehaviorUrlTest.java
index 3bbff98..0e57f3c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/BehaviorUrlTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/BehaviorUrlTest.java
@@ -137,12 +137,6 @@ public class BehaviorUrlTest extends WicketTestCase
}
@Override
- public boolean includeRenderCount()
- {
- return true;
- }
-
- @Override
public void onRequest()
{
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b798d99/wicket-core/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.java b/wicket-core/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.java
index c4465bd..59cd19e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.java
@@ -126,12 +126,6 @@ public class ComponentWithLazyModelCreationTest extends WicketTestCase
}
@Override
- public boolean includeRenderCount()
- {
- return true;
- }
-
- @Override
public void onRequest()
{
requested = true;
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b798d99/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java b/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java
index 19bc3d6..bc0aaba 100644
--- a/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java
@@ -170,12 +170,6 @@ public class ImmutableBehaviorIdsTest extends WicketTestCase
}
@Override
- public boolean includeRenderCount()
- {
- return true;
- }
-
- @Override
public void onRequest()
{
}