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:39 UTC
[01/17] wicket git commit: WICKET-6137 always just call #onRequest()
instead of individual interface methods
Repository: wicket
Updated Branches:
refs/heads/master f82fd1c39 -> 3e6c0a819
WICKET-6137 always just call #onRequest() instead of individual interface methods
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7dcdae5d
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7dcdae5d
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7dcdae5d
Branch: refs/heads/master
Commit: 7dcdae5dd95684b7554b24a0e19c1d400a729c84
Parents: f82fd1c
Author: Sven Meier <sv...@apache.org>
Authored: Sat Mar 19 09:47:35 2016 +0100
Committer: Sven Meier <sv...@apache.org>
Committed: Mon Apr 25 11:44:16 2016 +0200
----------------------------------------------------------------------
.../org/apache/wicket/IRequestListener.java | 5 ++
.../org/apache/wicket/IResourceListener.java | 5 --
.../apache/wicket/RequestListenerInterface.java | 74 ++------------------
.../wicket/behavior/IBehaviorListener.java | 4 --
.../logger/ListenerInterfaceLogData.java | 12 ----
.../wicket/markup/html/form/CheckBox.java | 2 +-
.../wicket/markup/html/form/CheckGroup.java | 2 +-
.../wicket/markup/html/form/DropDownChoice.java | 2 +-
.../apache/wicket/markup/html/form/Form.java | 2 +-
.../markup/html/form/IFormSubmitListener.java | 4 --
.../markup/html/form/IOnChangeListener.java | 5 --
.../wicket/markup/html/form/ImageButton.java | 2 +-
.../wicket/markup/html/form/RadioChoice.java | 2 +-
.../wicket/markup/html/form/RadioGroup.java | 2 +-
.../apache/wicket/markup/html/image/Image.java | 2 +-
.../wicket/markup/html/link/ILinkListener.java | 5 --
.../wicket/markup/html/link/InlineFrame.java | 2 +-
.../apache/wicket/markup/html/link/Link.java | 2 +-
.../wicket/markup/html/link/ResourceLink.java | 5 +-
.../test/java/org/apache/wicket/RemoveTest.java | 2 +-
.../html/form/upload/FileUploadErrorTest.java | 3 +-
21 files changed, 25 insertions(+), 119 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/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 84a5d12..350717f 100644
--- a/wicket-core/src/main/java/org/apache/wicket/IRequestListener.java
+++ b/wicket-core/src/main/java/org/apache/wicket/IRequestListener.java
@@ -33,4 +33,9 @@ import org.apache.wicket.util.io.IClusterable;
*/
public interface IRequestListener extends IClusterable
{
+
+ /**
+ * Called when a request to a behavior is received.
+ */
+ void onRequest();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/wicket-core/src/main/java/org/apache/wicket/IResourceListener.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/IResourceListener.java b/wicket-core/src/main/java/org/apache/wicket/IResourceListener.java
index 1ecb543..983594c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/IResourceListener.java
+++ b/wicket-core/src/main/java/org/apache/wicket/IResourceListener.java
@@ -36,9 +36,4 @@ public interface IResourceListener extends IRequestListener
/** Resource listener interface object */
RequestListenerInterface INTERFACE = new RequestListenerInterface(
IResourceListener.class).setIncludeRenderCount(false).setRenderPageAfterInvocation(false);
-
- /**
- * Called when a resource is requested.
- */
- void onResourceRequested();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java b/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java
index abe6dbe..64c26f0 100644
--- a/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java
+++ b/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java
@@ -59,9 +59,6 @@ public class RequestListenerInterface
return interfaces.get(interfaceName);
}
- /** The listener interface method */
- private Method method;
-
/** The name of this listener interface */
private final String name;
@@ -97,29 +94,6 @@ public class RequestListenerInterface
" must extend IRequestListener");
}
- // Get interface methods
- final Method[] methods = listenerInterfaceClass.getMethods();
-
- // If there is only one method
- if (methods.length == 1)
- {
- // and that method takes no parameters
- if (methods[0].getParameterTypes().length == 0)
- {
- method = methods[0];
- }
- else
- {
- throw new IllegalArgumentException("Method " + methods[0] + " in interface " +
- listenerInterfaceClass + " cannot take any arguments");
- }
- }
- else
- {
- throw new IllegalArgumentException("Interface " + listenerInterfaceClass +
- " can have only one method");
- }
-
// Save short class name
name = Classes.simpleName(listenerInterfaceClass);
@@ -175,14 +149,6 @@ public class RequestListenerInterface
}
/**
- * @return The method for this request listener interface
- */
- public final Method getMethod()
- {
- return method;
- }
-
- /**
* @return The name of this request listener interface
*/
public final String getName()
@@ -204,7 +170,7 @@ public class RequestListenerInterface
// we are in Wicket core land
final Component component = (Component)rcomponent;
- if (!component.canCallListenerInterface(method))
+ if (!component.canCallListenerInterface(null))
{
// just return so that we have a silent fail and just re-render the
// page
@@ -230,7 +196,7 @@ public class RequestListenerInterface
// we are in Wicket core land
final Component component = (Component)rcomponent;
- if (!behavior.canCallListenerInterface(component, method))
+ if (!behavior.canCallListenerInterface(component, null))
{
log.warn("behavior not enabled; ignore call. Behavior {} at component {}", behavior,
component);
@@ -253,28 +219,7 @@ public class RequestListenerInterface
page.internalInitialize();
}
- try
- {
- method.invoke(target);
- }
- catch (InvocationTargetException e)
- {
- if (e.getTargetException() instanceof ReplaceHandlerException ||
- e.getTargetException() instanceof AuthorizationException ||
- e.getTargetException() instanceof WicketRuntimeException)
- {
- throw (RuntimeException)e.getTargetException();
- }
- throw new WicketRuntimeException("Method " + method.getName() + " of " +
- method.getDeclaringClass() + " targeted at " + target + " on component " +
- component + " threw an exception", e);
- }
- catch (Exception e)
- {
- throw new WicketRuntimeException("Method " + method.getName() + " of " +
- method.getDeclaringClass() + " targeted at " + target + " on component " +
- component + " threw an exception", e);
- }
+ ((IRequestListener)target).onRequest();
}
/**
@@ -292,7 +237,7 @@ public class RequestListenerInterface
@Override
public String toString()
{
- return "[RequestListenerInterface name=" + name + ", method=" + method + "]";
+ return "[RequestListenerInterface name=" + name + "]";
}
@@ -313,16 +258,7 @@ public class RequestListenerInterface
// Check that a different interface method with the same name has not
// already been registered
final RequestListenerInterface existingInterface = RequestListenerInterface.forName(requestListenerInterface.getName());
- if (existingInterface != null)
- {
- if (existingInterface.getMethod().equals(requestListenerInterface.getMethod()) == false)
- {
- throw new IllegalStateException("Cannot register listener interface " +
- requestListenerInterface +
- " because it conflicts with the already registered interface " + existingInterface);
- }
- }
- else
+ if (existingInterface == null)
{
// Save this interface method by the non-qualified class name
interfaces.put(requestListenerInterface.getName(), requestListenerInterface);
http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/wicket-core/src/main/java/org/apache/wicket/behavior/IBehaviorListener.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/behavior/IBehaviorListener.java b/wicket-core/src/main/java/org/apache/wicket/behavior/IBehaviorListener.java
index 3375e81..8b029d0 100644
--- a/wicket-core/src/main/java/org/apache/wicket/behavior/IBehaviorListener.java
+++ b/wicket-core/src/main/java/org/apache/wicket/behavior/IBehaviorListener.java
@@ -33,8 +33,4 @@ public interface IBehaviorListener extends IRequestListener
RequestListenerInterface INTERFACE = new RequestListenerInterface(
IBehaviorListener.class);
- /**
- * Called when a request to a behavior is received.
- */
- void onRequest();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/wicket-core/src/main/java/org/apache/wicket/core/request/handler/logger/ListenerInterfaceLogData.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/logger/ListenerInterfaceLogData.java b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/logger/ListenerInterfaceLogData.java
index 8e73163..4a5ad40 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/logger/ListenerInterfaceLogData.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/logger/ListenerInterfaceLogData.java
@@ -39,7 +39,6 @@ public class ListenerInterfaceLogData extends PageLogData
private final Integer behaviorIndex;
private Class<? extends Behavior> behaviorClass;
private final String interfaceName;
- private final String interfaceMethod;
private Class<? extends IRequestableComponent> submittingComponentClass;
private String submittingComponentPath;
@@ -75,7 +74,6 @@ public class ListenerInterfaceLogData extends PageLogData
behaviorClass = null;
}
interfaceName = listenerInterface.getName();
- interfaceMethod = listenerInterface.getMethod().getName();
if (listenerInterface.getListenerInterfaceClass().equals(IFormSubmitListener.class))
{
final Component formSubmitter = tryToGetFormSubmittingComponent(pageAndComponentProvider);
@@ -176,14 +174,6 @@ public class ListenerInterfaceLogData extends PageLogData
}
/**
- * @return interfaceMethod
- */
- public final String getInterfaceMethod()
- {
- return interfaceMethod;
- }
-
- /**
* @return submittingComponentClass
*/
public Class<? extends IRequestableComponent> getSubmittingComponentClass()
@@ -225,8 +215,6 @@ public class ListenerInterfaceLogData extends PageLogData
}
sb.append(",interfaceName=");
sb.append(getInterfaceName());
- sb.append(",interfaceMethod=");
- sb.append(getInterfaceMethod());
if (getSubmittingComponentClass() != null)
{
sb.append(",submittingComponentClass=");
http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/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 64d298f..180f191 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
@@ -78,7 +78,7 @@ public class CheckBox extends FormComponent<Boolean> implements IOnChangeListene
* @see org.apache.wicket.markup.html.form.IOnChangeListener#onSelectionChanged()
*/
@Override
- public void onSelectionChanged()
+ public void onRequest()
{
convertInput();
updateModel();
http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/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 d7b6bf5..1e6d804 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
@@ -204,7 +204,7 @@ public class CheckGroup<T> extends FormComponent<Collection<T>> implements IOnCh
* Called when a selection changes.
*/
@Override
- public final void onSelectionChanged()
+ public final void onRequest()
{
convertInput();
updateModel();
http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/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 bab85c5..ca03dfd 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
@@ -206,7 +206,7 @@ public class DropDownChoice<T> extends AbstractSingleSelectChoice<T> implements
* Called when a selection changes.
*/
@Override
- public final void onSelectionChanged()
+ public final void onRequest()
{
convertInput();
updateModel();
http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/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 fd9279d..efa7137 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
@@ -682,7 +682,7 @@ public class Form<T> extends WebMarkupContainer
* @see #onFormSubmitted(IFormSubmitter)
*/
@Override
- public final void onFormSubmitted()
+ public final void onRequest()
{
// check methods match
if (getRequest().getContainerRequest() instanceof HttpServletRequest)
http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IFormSubmitListener.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IFormSubmitListener.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IFormSubmitListener.java
index 0564760..3dfff96 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IFormSubmitListener.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IFormSubmitListener.java
@@ -30,8 +30,4 @@ public interface IFormSubmitListener extends IRequestListener
RequestListenerInterface INTERFACE = new RequestListenerInterface(
IFormSubmitListener.class);
- /**
- * Called when a form is submitted
- */
- void onFormSubmitted();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IOnChangeListener.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IOnChangeListener.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IOnChangeListener.java
index ef9673f..964c531 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IOnChangeListener.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IOnChangeListener.java
@@ -32,9 +32,4 @@ public interface IOnChangeListener extends IRequestListener
/** Listener interface */
RequestListenerInterface INTERFACE = new RequestListenerInterface(
IOnChangeListener.class);
-
- /**
- * Called when a new option is selected.
- */
- void onSelectionChanged();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/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 707f667..978d138 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
@@ -131,7 +131,7 @@ public class ImageButton extends Button implements IResourceListener
* @see org.apache.wicket.IResourceListener#onResourceRequested()
*/
@Override
- public void onResourceRequested()
+ public void onRequest()
{
localizedImageResource.onResourceRequested(null);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/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 a2d3551..e8af55e 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
@@ -248,7 +248,7 @@ public class RadioChoice<T> extends AbstractSingleSelectChoice<T> implements IOn
* @see org.apache.wicket.markup.html.form.IOnChangeListener#onSelectionChanged()
*/
@Override
- public void onSelectionChanged()
+ public void onRequest()
{
convertInput();
updateModel();
http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/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 38361e2..e4f142e 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
@@ -167,7 +167,7 @@ public class RadioGroup<T> extends FormComponent<T> implements IOnChangeListener
* Called when a selection changes.
*/
@Override
- public final void onSelectionChanged()
+ public final void onRequest()
{
convertInput();
updateModel();
http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/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 19f4f7a..1b9622c 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
@@ -214,7 +214,7 @@ public class Image extends WebComponent implements IResourceListener
* @see org.apache.wicket.IResourceListener#onResourceRequested()
*/
@Override
- public void onResourceRequested()
+ public void onRequest()
{
localizedImageResource.onResourceRequested(null);
for (LocalizedImageResource localizedImageResource : localizedImageResources)
http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ILinkListener.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ILinkListener.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ILinkListener.java
index 0d2f7a4..c2d37f1 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ILinkListener.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ILinkListener.java
@@ -29,9 +29,4 @@ public interface ILinkListener extends IRequestListener
/** Listener interface */
RequestListenerInterface INTERFACE = new RequestListenerInterface(
ILinkListener.class);
-
- /**
- * Called when a link is clicked.
- */
- void onLinkClicked();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/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 a2e58c7..566bdae 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
@@ -150,7 +150,7 @@ public class InlineFrame extends WebMarkupContainer implements ILinkListener
* @see org.apache.wicket.markup.html.link.ILinkListener#onLinkClicked()
*/
@Override
- public final void onLinkClicked()
+ public final void onRequest()
{
setResponsePage(pageProvider.getPageInstance());
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/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 89eff11..413698c 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
@@ -186,7 +186,7 @@ public abstract class Link<T> extends AbstractLink implements ILinkListener, IGe
* @see ILinkListener
*/
@Override
- public final void onLinkClicked()
+ public void onRequest()
{
// Invoke subclass handler
onClick();
http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/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 220bc05..b8bbff4 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
@@ -107,13 +107,14 @@ public class ResourceLink<T> extends Link<T> implements IResourceListener
* @see org.apache.wicket.IResourceListener#onResourceRequested()
*/
@Override
- public final void onResourceRequested()
+ public final void onRequest()
{
Attributes a = new Attributes(RequestCycle.get().getRequest(), RequestCycle.get()
.getResponse(), null);
resource.respond(a);
- onLinkClicked();
+
+ super.onRequest();
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/wicket-core/src/test/java/org/apache/wicket/RemoveTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/RemoveTest.java b/wicket-core/src/test/java/org/apache/wicket/RemoveTest.java
index 7dda0a2..6ab6364 100644
--- a/wicket-core/src/test/java/org/apache/wicket/RemoveTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/RemoveTest.java
@@ -61,7 +61,7 @@ public class RemoveTest extends WicketTestCase
tester.clickLink(PATH);
fail("Missing Exception");
}
- catch (WicketRuntimeException wre)
+ catch (IllegalStateException wre)
{
// do nothing.
// This exception was expected.
http://git-wip-us.apache.org/repos/asf/wicket/blob/7dcdae5d/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadErrorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadErrorTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadErrorTest.java
index 61f9f33..a3d47c7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadErrorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadErrorTest.java
@@ -125,9 +125,8 @@ public class FileUploadErrorTest extends WicketTestCase
formTester.submit();
fail("Value not succesfully submitted.");
}
- catch (WicketRuntimeException rex)
+ catch (RuntimeException ex)
{
- Throwable ex = rex.getCause().getCause();
assertEquals("Special value: " + FileUploadError.THIS_VALUE_SHOULD_THROW_EXCEPTION,
ex.getMessage());
}
[12/17] wicket git commit: WICKET-6137 removed strange url mangling
in test: rendering count increases with each render
Posted by sv...@apache.org.
WICKET-6137 removed strange url mangling in test: rendering count increases with each render
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/18ab9bec
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/18ab9bec
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/18ab9bec
Branch: refs/heads/master
Commit: 18ab9bec6a7e492990043351a4f4e6cbadc95f4f
Parents: c353fc8
Author: Sven Meier <sv...@apache.org>
Authored: Mon Mar 28 23:39:32 2016 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Mon Apr 25 11:44:55 2016 +0200
----------------------------------------------------------------------
.../markup/html/internal/EnclosurePageExpectedResult_9-1-1.html | 2 +-
.../markup/html/internal/EnclosurePageExpectedResult_9-1.html | 2 +-
.../markup/html/internal/EnclosurePageExpectedResult_9-2-1.html | 2 +-
.../markup/html/internal/EnclosurePageExpectedResult_9-2.html | 2 +-
.../markup/html/internal/EnclosurePageExpectedResult_9-3-1.html | 2 +-
.../markup/html/internal/EnclosurePageExpectedResult_9-3-2.html | 2 +-
.../markup/html/internal/EnclosurePageExpectedResult_9-3.html | 2 +-
.../markup/html/internal/EnclosurePageExpectedResult_9-4.html | 2 +-
.../java/org/apache/wicket/markup/html/internal/EnclosureTest.java | 1 -
9 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/18ab9bec/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1-1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1-1.html
index ec477f4..0f555fc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1-1.html
@@ -1,6 +1,6 @@
<html xmlns:wicket>
<body>
- <form wicket:id="form" id="form1" method="post" action="./page?2-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?2-3.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
<wicket:enclosure child="label">
<input wicket:id="input" type="checkbox" name="input"/>
http://git-wip-us.apache.org/repos/asf/wicket/blob/18ab9bec/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html
index 96a4816..260cccf 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html
@@ -1,6 +1,6 @@
<html xmlns:wicket>
<body>
- <form wicket:id="form" id="form1" method="post" action="./page?1-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?1-2.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
</form>
http://git-wip-us.apache.org/repos/asf/wicket/blob/18ab9bec/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2-1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2-1.html
index 36e99d4..870e4db 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2-1.html
@@ -1,6 +1,6 @@
<html xmlns:wicket>
<body>
- <form wicket:id="form" id="form1" method="post" action="./page?2-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?2-3.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
</form>
http://git-wip-us.apache.org/repos/asf/wicket/blob/18ab9bec/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2.html
index ab64beb..f9831a7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2.html
@@ -1,6 +1,6 @@
<html xmlns:wicket>
<body>
- <form wicket:id="form" id="form1" method="post" action="./page?4-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?4-5.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
</form>
http://git-wip-us.apache.org/repos/asf/wicket/blob/18ab9bec/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-1.html
index 78db5e1..2dbd5c6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-1.html
@@ -1,6 +1,6 @@
<html xmlns:wicket>
<body>
- <form wicket:id="form" id="form1" method="post" action="./page?5-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?5-6.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
<wicket:enclosure child="label">
http://git-wip-us.apache.org/repos/asf/wicket/blob/18ab9bec/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-2.html
index a662144..6f8a775 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-2.html
@@ -1,6 +1,6 @@
<html xmlns:wicket>
<body>
- <form wicket:id="form" id="form1" method="post" action="./page?6-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?6-7.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
<wicket:enclosure child="label">
<input wicket:id="input" type="checkbox" name="input"/>
http://git-wip-us.apache.org/repos/asf/wicket/blob/18ab9bec/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3.html
index 3776723..f88c265 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3.html
@@ -1,6 +1,6 @@
<html xmlns:wicket>
<body>
- <form wicket:id="form" id="form1" method="post" action="./page?3-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?3-4.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
<wicket:enclosure child="label">
http://git-wip-us.apache.org/repos/asf/wicket/blob/18ab9bec/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-4.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-4.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-4.html
index c2642aa..b359886 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-4.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-4.html
@@ -1,6 +1,6 @@
<html xmlns:wicket>
<body>
- <form wicket:id="form" id="form1" method="post" action="./page?1-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?1-2.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
<wicket:enclosure child="label">
<input wicket:id="input" type="checkbox" checked="checked" name="input"/>
http://git-wip-us.apache.org/repos/asf/wicket/blob/18ab9bec/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java
index b661ef9..a34ea5c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java
@@ -175,7 +175,6 @@ public class EnclosureTest extends WicketTestCase
private void assertResultPage(final String file) throws IOException
{
String document = tester.getLastResponse().getDocument();
- document = document.replaceAll("[1-9]+[.]IFormSubmitListener", "1.IFormSubmitListener");
DiffUtil.validatePage(document, getClass(), file, true);
}
[16/17] wicket git commit: WICKET-6137 don't render dot separator
when no renderCount and no behaviorId
Posted by sv...@apache.org.
WICKET-6137 don't render dot separator when no renderCount and no behaviorId
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/69f48627
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/69f48627
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/69f48627
Branch: refs/heads/master
Commit: 69f4862756477ce78208cc1f09420884f262c6a1
Parents: 19e01b2
Author: Sven Meier <sv...@apache.org>
Authored: Tue Apr 5 10:45:21 2016 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Mon Apr 25 11:45:04 2016 +0200
----------------------------------------------------------------------
.../core/request/mapper/BookmarkableMapperTest.java | 4 ++--
.../wicket/core/request/mapper/MountedMapperTest.java | 4 ++--
.../wicket/core/request/mapper/PackageMapperTest.java | 4 ++--
.../core/request/mapper/PageInstanceMapperTest.java | 4 ++--
.../wicket/request/mapper/info/ComponentInfoTest.java | 10 +++++-----
.../wicket/request/mapper/info/PageComponentInfoTest.java | 2 +-
.../apache/wicket/stateless/StatelessDynmicLinksTest.java | 6 +++---
.../apache/wicket/request/mapper/info/ComponentInfo.java | 10 ++++++++--
8 files changed, 25 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/69f48627/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
index 5ee7dd2..f4fc1aa 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
@@ -174,7 +174,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
@Test
public void decode5()
{
- Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + "?15-.-foo-bar");
+ Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + "?15--foo-bar");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
@@ -195,7 +195,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
public void decode6()
{
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME
- + "/i1/i2?15-.-foo-bar&a=b&b=c");
+ + "/i1/i2?15--foo-bar&a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
http://git-wip-us.apache.org/repos/asf/wicket/blob/69f48627/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java
index 37823ac..d92cc83 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java
@@ -207,7 +207,7 @@ public class MountedMapperTest extends AbstractMapperTest
@Test
public void decode5()
{
- Url url = Url.parse("some/mount/path?15-.-foo-bar");
+ Url url = Url.parse("some/mount/path?15--foo-bar");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
@@ -227,7 +227,7 @@ public class MountedMapperTest extends AbstractMapperTest
@Test
public void decode6()
{
- Url url = Url.parse("some/mount/path/i1/i2?15-.-foo-bar&a=b&b=c");
+ Url url = Url.parse("some/mount/path/i1/i2?15--foo-bar&a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
http://git-wip-us.apache.org/repos/asf/wicket/blob/69f48627/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
index e1e3cca..6a620ad 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
@@ -240,7 +240,7 @@ public class PackageMapperTest extends AbstractMapperTest
@Test
public void decode5()
{
- Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "?15-.-foo-bar");
+ Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "?15--foo-bar");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
@@ -260,7 +260,7 @@ public class PackageMapperTest extends AbstractMapperTest
@Test
public void decode6()
{
- Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/i1/i2?15-.-foo-bar&a=b&b=c");
+ Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/i1/i2?15--foo-bar&a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
http://git-wip-us.apache.org/repos/asf/wicket/blob/69f48627/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
index 97ebd52..9a2eaf0 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
@@ -87,7 +87,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest
@Test
public void decode3()
{
- Url url = Url.parse("wicket/page?4-.-a-b-c");
+ Url url = Url.parse("wicket/page?4--a-b-c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
@@ -104,7 +104,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest
@Test
public void decode4()
{
- Url url = Url.parse("wickett/pagee?4-.-a:b-c");
+ Url url = Url.parse("wickett/pagee?4--a:b-c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertNull(handler);
http://git-wip-us.apache.org/repos/asf/wicket/blob/69f48627/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java
index 431ed3a..c543f87 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java
@@ -31,7 +31,7 @@ public class ComponentInfoTest extends Assert
@Test
public void test1()
{
- String s = ".-component-path";
+ String s = "-component-path";
ComponentInfo info = ComponentInfo.parse(s);
assertEquals("component:path", info.getComponentPath());
assertNull(info.getBehaviorId());
@@ -45,7 +45,7 @@ public class ComponentInfoTest extends Assert
@Test
public void test2()
{
- String s = "-component-path";
+ String s = "component-path";
ComponentInfo info = ComponentInfo.parse(s);
assertEquals(null, info);
}
@@ -70,7 +70,7 @@ public class ComponentInfoTest extends Assert
{
String s = "-";
ComponentInfo info = ComponentInfo.parse(s);
- assertEquals(null, info);
+ assertEquals(s, info.toString());
}
/**
@@ -89,7 +89,7 @@ public class ComponentInfoTest extends Assert
@Test
public void test6()
{
- String s = ".-compo~~nent-path";
+ String s = "-compo~~nent-path";
ComponentInfo info = ComponentInfo.parse(s);
assertEquals("compo--nent:path", info.getComponentPath());
assertNull(info.getBehaviorId());
@@ -103,7 +103,7 @@ public class ComponentInfoTest extends Assert
@Test
public void test7()
{
- String s = ".-co~mpo~~nent-path";
+ String s = "-co~mpo~~nent-path";
ComponentInfo info = ComponentInfo.parse(s);
assertEquals("co-mpo--nent:path", info.getComponentPath());
assertNull(info.getBehaviorId());
http://git-wip-us.apache.org/repos/asf/wicket/blob/69f48627/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
index 823f834..9fe3a4f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
@@ -51,7 +51,7 @@ public class PageComponentInfoTest extends TestCase
@Test
public void test1()
{
- String s = "2-.-foo-bar-baz";
+ String s = "2--foo-bar-baz";
PageComponentInfo info = PageComponentInfo.parse(s);
testPageComponentInfo(info, 2, "foo:bar:baz");
assertEquals(s, info.toString());
http://git-wip-us.apache.org/repos/asf/wicket/blob/69f48627/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessDynmicLinksTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessDynmicLinksTest.java b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessDynmicLinksTest.java
index 4968d96..f5f5284 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessDynmicLinksTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessDynmicLinksTest.java
@@ -36,15 +36,15 @@ public class StatelessDynmicLinksTest extends WicketTestCase
tester.startPage(StatelessPageWithDynamicLinks.class);
assertTrue(tester.getLastResponseAsString().contains("LINK-1"));
- tester.getRequest().setUrl(Url.parse("stateless?-.-links:1"));
+ tester.getRequest().setUrl(Url.parse("stateless?--links:1"));
tester.processRequest();
assertTrue(tester.getLastResponseAsString().contains("LINK-2"));
- tester.getRequest().setUrl(Url.parse("stateless?-.-links:2"));
+ tester.getRequest().setUrl(Url.parse("stateless?--links:2"));
tester.processRequest();
assertTrue(tester.getLastResponseAsString().contains("LINK-3"));
- tester.getRequest().setUrl(Url.parse("stateless?-.-links:3"));
+ tester.getRequest().setUrl(Url.parse("stateless?--links:3"));
tester.processRequest();
assertTrue(tester.getLastResponseAsString().contains("LINK-4"));
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/69f48627/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java b/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java
index 1263c66..ca11e48 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java
@@ -167,7 +167,9 @@ public class ComponentInfo
result.append(renderCount);
}
- result.append(BEHAVIOR_INDEX_SEPARATOR);
+ if (renderCount != null || behaviorId != null) {
+ result.append(BEHAVIOR_INDEX_SEPARATOR);
+ }
if (behaviorId != null)
{
@@ -227,7 +229,11 @@ public class ComponentInfo
Integer renderCount = null;
String listenerParts[] = Strings.split(listenerInterface, BEHAVIOR_INDEX_SEPARATOR);
- if (listenerParts.length == 2)
+ if (listenerParts.length == 0)
+ {
+ return new ComponentInfo(renderCount, componentPath, behaviorIndex);
+ }
+ else if (listenerParts.length == 2)
{
if (isNumber(listenerParts[0]))
{
[15/17] wicket git commit: WICKET-6137 test fixes: request listener
has to exist
Posted by sv...@apache.org.
WICKET-6137 test fixes: request listener has to exist
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/19e01b2a
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/19e01b2a
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/19e01b2a
Branch: refs/heads/master
Commit: 19e01b2a8891604249a3ac16439d6ba0d704688c
Parents: 538ca83
Author: Sven Meier <sv...@apache.org>
Authored: Sun Apr 3 21:50:30 2016 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Mon Apr 25 11:45:02 2016 +0200
----------------------------------------------------------------------
.../core/request/mapper/CryptoMapperTest.java | 55 +++++++++++++++++---
1 file changed, 49 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/19e01b2a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/CryptoMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/CryptoMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/CryptoMapperTest.java
index 5a9b950..98696fd 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/CryptoMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/CryptoMapperTest.java
@@ -30,6 +30,7 @@ import org.apache.wicket.core.request.handler.RequestSettingRequestHandler;
import org.apache.wicket.markup.IMarkupFragment;
import org.apache.wicket.markup.Markup;
import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.protocol.http.PageExpiredException;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.IRequestHandler;
@@ -77,7 +78,7 @@ public class CryptoMapperTest extends AbstractMapperTest
@Before
public void before() throws Exception
{
- tester = new WicketTester();
+ tester = new WicketTester(HomePage.class);
WebApplication application = tester.getApplication();
application.mountPage(MOUNTED_URL, Page1.class);
@@ -161,7 +162,7 @@ public class CryptoMapperTest extends AbstractMapperTest
@Test
public void homePageForceEncryptionOfRequestListener()
{
- PageAndComponentProvider provider = new PageAndComponentProvider(tester.getApplication().getHomePage(), "some:link");
+ PageAndComponentProvider provider = new PageAndComponentProvider(tester.getApplication().getHomePage(), "link");
IRequestHandler requestHandler = new BookmarkableListenerInterfaceRequestHandler(provider);
Url plainUrl = mapper.getDelegateMapper().mapHandler(requestHandler);
assertTrue("Plain URL for home page has segments: " + plainUrl.toString(), plainUrl.getSegments().isEmpty());
@@ -263,7 +264,7 @@ public class CryptoMapperTest extends AbstractMapperTest
@Test
public void bookmarkablePageForceEncryptionOfRequestListener()
{
- PageAndComponentProvider provider = new PageAndComponentProvider(Page2.class, "some:link");
+ PageAndComponentProvider provider = new PageAndComponentProvider(Page2.class, "link");
IRequestHandler requestHandler = new BookmarkableListenerInterfaceRequestHandler(provider);
Url plainUrl = mapper.getDelegateMapper().mapHandler(requestHandler);
assertTrue("Plain text request listener URL for bookmarkable page does not start with: "
@@ -354,7 +355,7 @@ public class CryptoMapperTest extends AbstractMapperTest
@Test
public void mountedPageRequestListenerParameter()
{
- final String componentPath = "some:path:to:link";
+ final String componentPath = "link";
PageAndComponentProvider provider = new PageAndComponentProvider(Page1.class, componentPath);
IRequestHandler requestHandler = new ListenerInterfaceRequestHandler(provider);
@@ -657,14 +658,46 @@ public class CryptoMapperTest extends AbstractMapperTest
}
/**
+ * Home page
+ */
+ public static class HomePage extends WebPage
+ {
+ public HomePage()
+ {
+ add(new Link<Void>("link") {
+ @Override
+ public void onClick()
+ {
+ }
+ });
+ }
+
+ @Override
+ public IMarkupFragment getMarkup()
+ {
+ return Markup.of("<html><body wicket:id=\"link\"></body></html>");
+ }
+ }
+
+ /**
* Page that is mounted
*/
public static class Page1 extends WebPage
{
+ public Page1()
+ {
+ add(new Link<Void>("link") {
+ @Override
+ public void onClick()
+ {
+ }
+ });
+ }
+
@Override
public IMarkupFragment getMarkup()
{
- return Markup.of("<html><body></body></html>");
+ return Markup.of("<html><body wicket:id=\"link\"></body></html>");
}
}
@@ -673,10 +706,20 @@ public class CryptoMapperTest extends AbstractMapperTest
*/
public static class Page2 extends WebPage
{
+ public Page2()
+ {
+ add(new Link<Void>("link") {
+ @Override
+ public void onClick()
+ {
+ }
+ });
+ }
+
@Override
public IMarkupFragment getMarkup()
{
- return Markup.of("<html><body></body></html>");
+ return Markup.of("<html><body wicket:id=\"link\"></body></html>");
}
}
}
[05/17] wicket git commit: WICKET-6137 renamed #urlFor() to
#urlForListener() for component and behavior listener
Posted by sv...@apache.org.
WICKET-6137 renamed #urlFor() to #urlForListener() for component and behavior listener
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/034a14d0
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/034a14d0
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/034a14d0
Branch: refs/heads/master
Commit: 034a14d079a060a24add55467f30a0b4ef3a8fff
Parents: c5194b4
Author: Sven Meier <sv...@apache.org>
Authored: Sun Mar 27 23:46:44 2016 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Mon Apr 25 11:44:40 2016 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/Component.java | 10 +++++-----
.../org/apache/wicket/behavior/AbstractAjaxBehavior.java | 2 +-
.../java/org/apache/wicket/markup/html/form/Check.java | 2 +-
.../java/org/apache/wicket/markup/html/form/CheckBox.java | 2 +-
.../apache/wicket/markup/html/form/DropDownChoice.java | 2 +-
.../java/org/apache/wicket/markup/html/form/Form.java | 2 +-
.../java/org/apache/wicket/markup/html/form/Radio.java | 2 +-
.../org/apache/wicket/markup/html/form/RadioChoice.java | 2 +-
.../org/apache/wicket/markup/html/form/StatelessForm.java | 2 +-
.../html/image/resource/LocalizedImageResource.java | 2 +-
.../org/apache/wicket/markup/html/link/InlineFrame.java | 2 +-
.../java/org/apache/wicket/markup/html/link/Link.java | 2 +-
.../org/apache/wicket/markup/html/link/ResourceLink.java | 2 +-
.../org/apache/wicket/markup/html/link/StatelessLink.java | 2 +-
.../org/apache/wicket/util/tester/BaseWicketTester.java | 4 ++--
.../test/java/org/apache/wicket/BehaviorRequestTest.java | 2 +-
.../src/test/java/org/apache/wicket/BehaviorUrlTest.java | 2 +-
.../apache/wicket/behavior/ImmutableBehaviorIdsTest.java | 2 +-
.../extensions/captcha/kittens/KittenCaptchaPanel.java | 2 +-
19 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/034a14d0/wicket-core/src/main/java/org/apache/wicket/Component.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java
index 2c8150d..b1e56f0 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -3326,7 +3326,7 @@ public abstract class Component
}
/**
- * Gets a URL for the listener interface on a behavior (e.g. IBehaviorListener on
+ * Gets a URL for the listener interface on a behavior (e.g. IRequestBehaviorListener on
* AjaxPagingNavigationBehavior).
*
* @param behaviour
@@ -3337,7 +3337,7 @@ public abstract class Component
* The parameters that should be rendered into the urls
* @return The URL
*/
- public final CharSequence urlFor(final Behavior behaviour, final PageParameters parameters)
+ public final CharSequence urlForListener(final Behavior behaviour, final PageParameters parameters)
{
int id = getBehaviorId(behaviour);
IRequestHandler handler = createRequestHandler(parameters, id);
@@ -3381,15 +3381,15 @@ public abstract class Component
}
/**
- * Gets a URL for the listener interface (e.g. ILinkListener).
+ * Gets a URL for this {@link IRequestListener}.
*
* @see RequestCycle#urlFor(IRequestHandler)
*
* @param parameters
- * The parameters that should be rendered into the urls
+ * The parameters that should be rendered into the URL
* @return The URL
*/
- public final CharSequence urlFor(final PageParameters parameters)
+ public final CharSequence urlForListener(final PageParameters parameters)
{
IRequestHandler handler = createRequestHandler(parameters, null);
return getRequestCycle().urlFor(handler);
http://git-wip-us.apache.org/repos/asf/wicket/blob/034a14d0/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 d4c9877..04072c8 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
@@ -87,7 +87,7 @@ public abstract class AbstractAjaxBehavior extends Behavior implements IRequestL
"Behavior must be bound to a component to create the URL");
}
- return getComponent().urlFor(this, new PageParameters());
+ return getComponent().urlForListener(this, new PageParameters());
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/034a14d0/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Check.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Check.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Check.java
index 91aff59..ed50c80 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Check.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Check.java
@@ -198,7 +198,7 @@ public class Check<T> extends LabeledWebMarkupContainer implements IGenericCompo
if (group.wantOnSelectionChangedNotifications())
{
// url that points to this components IOnChangeListener method
- CharSequence url = group.urlFor(new PageParameters());
+ CharSequence url = group.urlForListener(new PageParameters());
Form<?> form = group.findParent(Form.class);
if (form != null)
http://git-wip-us.apache.org/repos/asf/wicket/blob/034a14d0/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 655533a..2d39d4f 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
@@ -170,7 +170,7 @@ public class CheckBox extends FormComponent<Boolean> implements IRequestListener
// checkbox is clicked?
if (wantOnSelectionChangedNotifications())
{
- CharSequence url = urlFor(new PageParameters());
+ CharSequence url = urlForListener(new PageParameters());
Form<?> form = findParent(Form.class);
if (form != null)
http://git-wip-us.apache.org/repos/asf/wicket/blob/034a14d0/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 60f97fa..b7aa1ec 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
@@ -238,7 +238,7 @@ public class DropDownChoice<T> extends AbstractSingleSelectChoice<T> implements
{
// we do not want relative URL here, because it will be used by
// Form#dispatchEvent
- CharSequence url = urlFor(new PageParameters());
+ CharSequence url = urlForListener(new PageParameters());
Form<?> form = findParent(Form.class);
if (form != null)
http://git-wip-us.apache.org/repos/asf/wicket/blob/034a14d0/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 fbdc568..f7a9e70 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
@@ -1653,7 +1653,7 @@ public class Form<T> extends WebMarkupContainer
*/
protected CharSequence getActionUrl()
{
- return urlFor(new PageParameters());
+ return urlForListener(new PageParameters());
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/034a14d0/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Radio.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Radio.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Radio.java
index 8db42ed..6a5a46f 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Radio.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Radio.java
@@ -183,7 +183,7 @@ public class Radio<T> extends LabeledWebMarkupContainer implements IGenericCompo
if (group.wantOnSelectionChangedNotifications())
{
// url that points to this components IOnChangeListener method
- CharSequence url = group.urlFor(new PageParameters());
+ CharSequence url = group.urlForListener(new PageParameters());
Form<?> form = group.findParent(Form.class);
if (form != null)
http://git-wip-us.apache.org/repos/asf/wicket/blob/034a14d0/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 1d336ea..4198070 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
@@ -534,7 +534,7 @@ public class RadioChoice<T> extends AbstractSingleSelectChoice<T> implements IRe
// when the option is clicked?
if (wantOnSelectionChangedNotifications())
{
- CharSequence url = urlFor(new PageParameters());
+ CharSequence url = urlForListener(new PageParameters());
Form<?> form = findParent(Form.class);
if (form != null)
http://git-wip-us.apache.org/repos/asf/wicket/blob/034a14d0/wicket-core/src/main/java/org/apache/wicket/markup/html/form/StatelessForm.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/StatelessForm.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/StatelessForm.java
index f258556..ae6b5e8 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/StatelessForm.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/StatelessForm.java
@@ -82,7 +82,7 @@ public class StatelessForm<T> extends Form<T>
@Override
protected CharSequence getActionUrl()
{
- return urlFor(getPage().getPageParameters());
+ return urlForListener(getPage().getPageParameters());
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/034a14d0/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
index 93a2e39..a76a22e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
@@ -332,7 +332,7 @@ public final class LocalizedImageResource implements IClusterable
else
{
// Create URL to component
- url = component.urlFor(resourceParameters);
+ url = component.urlForListener(resourceParameters);
}
// Set the SRC attribute to point to the component or shared resource
http://git-wip-us.apache.org/repos/asf/wicket/blob/034a14d0/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 0663620..12013b8 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
@@ -123,7 +123,7 @@ public class InlineFrame extends WebMarkupContainer implements IRequestListener
*/
protected CharSequence getURL()
{
- return urlFor(new PageParameters());
+ return urlForListener(new PageParameters());
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/034a14d0/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 cfc23ec..9d4fb3b 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
@@ -333,7 +333,7 @@ public abstract class Link<T> extends AbstractLink implements IRequestListener,
*/
protected CharSequence getURL()
{
- return urlFor(new PageParameters());
+ return urlForListener(new PageParameters());
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/034a14d0/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 6e8e73d..3ec597d 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
@@ -148,6 +148,6 @@ public class ResourceLink<T> extends Link<T> implements IRequestListener
return getRequestCycle().urlFor(
new ResourceReferenceRequestHandler(resourceReference, resourceParameters));
}
- return urlFor(resourceParameters);
+ return urlForListener(resourceParameters);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/034a14d0/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 62e0581..be0d022 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
@@ -58,6 +58,6 @@ public abstract class StatelessLink<T> extends Link<T>
@Override
protected CharSequence getURL()
{
- return urlFor(getPage().getPageParameters());
+ return urlForListener(getPage().getPageParameters());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/034a14d0/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
index 8544339..531c89a 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
@@ -1067,7 +1067,7 @@ public class BaseWicketTester
{
Args.notNull(link, "link");
- Url url = Url.parse(link.urlFor(new PageParameters()).toString());
+ Url url = Url.parse(link.urlForListener(new PageParameters()).toString());
return transform(url).toString();
}
@@ -2006,7 +2006,7 @@ public class BaseWicketTester
Form<?> form = (Form<?>)getComponentFromLastRenderedPage(path);
Url url = Url.parse(
form.getRootForm()
- .urlFor(new PageParameters())
+ .urlForListener(new PageParameters())
.toString(), Charset.forName(request.getCharacterEncoding()));
// make url absolute
http://git-wip-us.apache.org/repos/asf/wicket/blob/034a14d0/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 7497351..c7326b4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/BehaviorRequestTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/BehaviorRequestTest.java
@@ -134,7 +134,7 @@ public class BehaviorRequestTest extends WicketTestCase
public void onComponentTag(Component component, ComponentTag tag)
{
super.onComponentTag(component, tag);
- tag.put("href", component.urlFor(this, new PageParameters()));
+ tag.put("href", component.urlForListener(this, new PageParameters()));
}
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/034a14d0/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 fdcff04..3bbff98 100644
--- a/wicket-core/src/test/java/org/apache/wicket/BehaviorUrlTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/BehaviorUrlTest.java
@@ -133,7 +133,7 @@ public class BehaviorUrlTest extends WicketTestCase
{
super.onComponentTag(component, tag);
tag.put("href",
- component.urlFor(this, new PageParameters()));
+ component.urlForListener(this, new PageParameters()));
}
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/034a14d0/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 1bb7f24..19bc3d6 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
@@ -166,7 +166,7 @@ public class ImmutableBehaviorIdsTest extends WicketTestCase
public void onComponentTag(Component component, ComponentTag tag)
{
super.onComponentTag(component, tag);
- tag.put(attr, component.urlFor(this, new PageParameters()));
+ tag.put(attr, component.urlForListener(this, new PageParameters()));
}
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/034a14d0/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java
index 68fb424..efe7d82 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java
@@ -212,7 +212,7 @@ public class KittenCaptchaPanel extends Panel
javascript.append("Wicket.$('")
.append(image.getMarkupId())
.append("').src = '");
- CharSequence url = image.urlFor(new PageParameters());
+ CharSequence url = image.urlForListener(new PageParameters());
javascript.append(url);
javascript.append(url.toString().indexOf('?') > -1 ? "&" : "?")
.append("rand=")
[10/17] wicket git commit: WICKET-6137 fixing tests: listener
interface no longer in url;
stateless components don't need render count in url
Posted by sv...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1.html
index 236b19b..7919591 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1.html
@@ -3,6 +3,6 @@
<title>Paged Table Page</title>
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">one</span></li><li wicket:id="table"><span wicket:id="txt">two</span></li></ul>
-<a wicket:id="prev" disabled="disabled">Prev</a><a wicket:id="nextNext" href="./org.apache.wicket.markup.html.list.IncrementalTableNavigationPage?0-1.ILinkListener-nextNext">NextNext</a>
+<a wicket:id="prev" disabled="disabled">Prev</a><a wicket:id="nextNext" href="./org.apache.wicket.markup.html.list.IncrementalTableNavigationPage?0-1.-nextNext">NextNext</a>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_1.html
index b99055a..f12d478 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_1.html
@@ -23,14 +23,14 @@
<span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" disabled="disabled" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-1.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-1.-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-1.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-1.-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-1.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-1.-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span>
- <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-1.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-1.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-1.-navigator-next" title="Go to next page">></a>
+ <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-1.-navigator-last" title="Go to last page">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_2.html
index f1358e0..7e99d6b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_2.html
@@ -18,19 +18,19 @@
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">three</span></li><li wicket:id="table"><span wicket:id="txt">four</span></li></ul>
<span wicket:id="navigator"><wicket:panel>
- <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.ILinkListener-navigator-first" title="Go to first page"><<</a>
- <a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.ILinkListener-navigator-prev" title="Go to previous page"><</a>
+ <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.-navigator-first" title="Go to first page"><<</a>
+ <a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.-navigator-prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
</span><span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" disabled="disabled" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span>
- <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.-navigator-next" title="Go to next page">></a>
+ <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.-navigator-last" title="Go to last page">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_3.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_3.html
index 76ac974..ce5ecc1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_3.html
@@ -23,14 +23,14 @@
<span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" disabled="disabled" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-3.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-3.-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-3.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-3.-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-3.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-3.-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span>
- <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-3.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-3.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-3.-navigator-next" title="Go to next page">></a>
+ <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-3.-navigator-last" title="Go to last page">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_4.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_4.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_4.html
index f5e83dd..ef21d53 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_4.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_4.html
@@ -18,14 +18,14 @@
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">seven</span></li><li wicket:id="table"><span wicket:id="txt">eight</span></li></ul>
<span wicket:id="navigator"><wicket:panel>
- <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-4.ILinkListener-navigator-first" title="Go to first page"><<</a>
- <a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-4.ILinkListener-navigator-prev" title="Go to previous page"><</a>
+ <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-4.-navigator-first" title="Go to first page"><<</a>
+ <a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-4.-navigator-prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-4.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-4.-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-4.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-4.-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-4.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-4.-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span><span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" disabled="disabled" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_5.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_5.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_5.html
index 5586082..f923671 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_5.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_5.html
@@ -23,14 +23,14 @@
<span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" disabled="disabled" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-5.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-5.-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-5.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-5.-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-5.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-5.-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span>
- <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-5.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-5.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-5.-navigator-next" title="Go to next page">></a>
+ <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-5.-navigator-last" title="Go to last page">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_6.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_6.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_6.html
index 6f710d2..4dd54c4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_6.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_6.html
@@ -18,19 +18,19 @@
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">five</span></li><li wicket:id="table"><span wicket:id="txt">six</span></li></ul>
<span wicket:id="navigator"><wicket:panel>
- <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.ILinkListener-navigator-first" title="Go to first page"><<</a>
- <a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.ILinkListener-navigator-prev" title="Go to previous page"><</a>
+ <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.-navigator-first" title="Go to first page"><<</a>
+ <a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.-navigator-prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span><span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" disabled="disabled" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span>
- <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.-navigator-next" title="Go to next page">></a>
+ <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.-navigator-last" title="Go to last page">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_7.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_7.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_7.html
index 2496b88..67c5eda 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_7.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_7.html
@@ -18,19 +18,19 @@
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">three</span></li><li wicket:id="table"><span wicket:id="txt">four</span></li></ul>
<span wicket:id="navigator"><wicket:panel>
- <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.ILinkListener-navigator-first" title="Go to first page"><<</a>
- <a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.ILinkListener-navigator-prev" title="Go to previous page"><</a>
+ <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.-navigator-first" title="Go to first page"><<</a>
+ <a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.-navigator-prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
</span><span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" disabled="disabled" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span>
- <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.-navigator-next" title="Go to next page">></a>
+ <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.-navigator-last" title="Go to last page">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_8.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_8.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_8.html
index c73cd11..16a0713 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_8.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_8.html
@@ -23,18 +23,18 @@
<span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" disabled="disabled" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">6</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">6</span></a>
</span>
- <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.-navigator-next" title="Go to next page">></a>
+ <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.-navigator-last" title="Go to last page">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_1.html
index 759e34e..ef2d624 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_1.html
@@ -23,20 +23,20 @@
<span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" disabled="disabled" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.ILinkListener-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
</span>
- <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.-navigator-next" title="Go to next page">></a>
+ <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.-navigator-last" title="Go to last page">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_2.html
index 18bc27f..fe5f497 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_2.html
@@ -18,25 +18,25 @@
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">three</span></li><li wicket:id="table"><span wicket:id="txt">four</span></li></ul>
<span wicket:id="navigator"><wicket:panel>
- <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-first" title="Go to first page"><<</a>
- <a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-prev" title="Go to previous page"><</a>
+ <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-navigator-first" title="Go to first page"><<</a>
+ <a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-navigator-prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
</span><span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" disabled="disabled" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
</span>
- <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-navigator-next" title="Go to next page">></a>
+ <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-navigator-last" title="Go to last page">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_3.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_3.html
index 54baebd..9b9e17e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_3.html
@@ -23,20 +23,20 @@
<span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" disabled="disabled" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.ILinkListener-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
</span>
- <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.-navigator-next" title="Go to next page">></a>
+ <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.-navigator-last" title="Go to last page">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_4.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_4.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_4.html
index 31c674f..c134259 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_4.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_4.html
@@ -18,20 +18,20 @@
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">thirteen</span></li><li wicket:id="table"><span wicket:id="txt">fourteen</span></li></ul>
<span wicket:id="navigator"><wicket:panel>
- <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-first" title="Go to first page"><<</a>
- <a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-prev" title="Go to previous page"><</a>
+ <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.-navigator-first" title="Go to first page"><<</a>
+ <a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.-navigator-prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
</span><span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" disabled="disabled" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
</span>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_5.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_5.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_5.html
index e3cbb22..17eb825 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_5.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_5.html
@@ -23,20 +23,20 @@
<span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" disabled="disabled" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.ILinkListener-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
</span>
- <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.-navigator-next" title="Go to next page">></a>
+ <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.-navigator-last" title="Go to last page">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_6.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_6.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_6.html
index fc206db..e34cf49 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_6.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_6.html
@@ -18,25 +18,25 @@
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">seven</span></li><li wicket:id="table"><span wicket:id="txt">eight</span></li></ul>
<span wicket:id="navigator"><wicket:panel>
- <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-first" title="Go to first page"><<</a>
- <a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-prev" title="Go to previous page"><</a>
+ <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-navigator-first" title="Go to first page"><<</a>
+ <a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-navigator-prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
</span><span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" disabled="disabled" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
</span>
- <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-navigator-next" title="Go to next page">></a>
+ <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-navigator-last" title="Go to last page">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_7.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_7.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_7.html
index bf59680..3002d40 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_7.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_7.html
@@ -18,25 +18,25 @@
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">five</span></li><li wicket:id="table"><span wicket:id="txt">six</span></li></ul>
<span wicket:id="navigator"><wicket:panel>
- <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-first" title="Go to first page"><<</a>
- <a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-prev" title="Go to previous page"><</a>
+ <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-navigator-first" title="Go to first page"><<</a>
+ <a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-navigator-prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
</span><span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" disabled="disabled" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
</span><span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
</span>
- <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-navigator-next" title="Go to next page">></a>
+ <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-navigator-last" title="Go to last page">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_8.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_8.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_8.html
index 88bdb0e..bc32e22 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_8.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_8.html
@@ -22,15 +22,15 @@
<span wicket:id="navigation">
<a wicket:id="pageLink"><span wicket:id="pageNumber">1</span></a>
</span>, <span wicket:id="navigation">
- <a href="/MockWebApplication/MockWebApplication?path=0:navigator:navigation:1:pageLink&interface=ILinkListener" wicket:id="pageLink"><span wicket:id="pageNumber">2</span></a>
+ <a href="/MockWebApplication/MockWebApplication?path=0:navigator:navigation:1:pageLink&interface=." wicket:id="pageLink"><span wicket:id="pageNumber">2</span></a>
</span>, <span wicket:id="navigation">
- <a href="/MockWebApplication/MockWebApplication?path=0:navigator:navigation:2:pageLink&interface=ILinkListener" wicket:id="pageLink"><span wicket:id="pageNumber">3</span></a>
+ <a href="/MockWebApplication/MockWebApplication?path=0:navigator:navigation:2:pageLink&interface=." wicket:id="pageLink"><span wicket:id="pageNumber">3</span></a>
</span>, <span wicket:id="navigation">
- <a href="/MockWebApplication/MockWebApplication?path=0:navigator:navigation:3:pageLink&interface=ILinkListener" wicket:id="pageLink"><span wicket:id="pageNumber">4</span></a>
+ <a href="/MockWebApplication/MockWebApplication?path=0:navigator:navigation:3:pageLink&interface=." wicket:id="pageLink"><span wicket:id="pageNumber">4</span></a>
</span>, <span wicket:id="navigation">
- <a href="/MockWebApplication/MockWebApplication?path=0:navigator:navigation:4:pageLink&interface=ILinkListener" wicket:id="pageLink"><span wicket:id="pageNumber">5</span></a>
+ <a href="/MockWebApplication/MockWebApplication?path=0:navigator:navigation:4:pageLink&interface=." wicket:id="pageLink"><span wicket:id="pageNumber">5</span></a>
</span>
- <a href="/MockWebApplication/MockWebApplication?path=0:navigator:next&interface=ILinkListener" wicket:id="next">></a> <a href="/MockWebApplication/MockWebApplication?path=0:navigator:last&interface=ILinkListener" wicket:id="last">>></a>
+ <a href="/MockWebApplication/MockWebApplication?path=0:navigator:next&interface=." wicket:id="next">></a> <a href="/MockWebApplication/MockWebApplication?path=0:navigator:last&interface=." wicket:id="last">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_1.html
index fdb42c2..0aab7be 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_1.html
@@ -23,16 +23,16 @@
<span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" disabled="disabled" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
</span>
- <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.-navigator-next" title="Go to next page">></a>
+ <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.-navigator-last" title="Go to last page">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_2.html
index ea119eb..ef8fc2b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_2.html
@@ -18,21 +18,21 @@
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">three</span></li><li wicket:id="table"><span wicket:id="txt">four</span></li></ul>
<span wicket:id="navigator"><wicket:panel>
- <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.ILinkListener-navigator-first" title="Go to first page"><<</a>
- <a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.ILinkListener-navigator-prev" title="Go to previous page"><</a>
+ <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.-navigator-first" title="Go to first page"><<</a>
+ <a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.-navigator-prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
</span>, <span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" disabled="disabled" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
</span>
- <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.-navigator-next" title="Go to next page">></a>
+ <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.-navigator-last" title="Go to last page">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_3.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_3.html
index 03da8af..be86a2d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_3.html
@@ -23,16 +23,16 @@
<span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" disabled="disabled" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
</span>
- <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.-navigator-next" title="Go to next page">></a>
+ <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.-navigator-last" title="Go to last page">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_4.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_4.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_4.html
index 4b819c2..da8b43a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_4.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_4.html
@@ -18,16 +18,16 @@
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">thirteen</span></li><li wicket:id="table"><span wicket:id="txt">fourteen</span></li></ul>
<span wicket:id="navigator"><wicket:panel>
- <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.ILinkListener-navigator-first" title="Go to first page"><<</a>
- <a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.ILinkListener-navigator-prev" title="Go to previous page"><</a>
+ <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.-navigator-first" title="Go to first page"><<</a>
+ <a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.-navigator-prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.-navigator-navigation-0-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.-navigator-navigation-1-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.-navigator-navigation-2-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 6"><span wicket:id="pageNumber">6</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.-navigator-navigation-3-pageLink" title="Go to page 6"><span wicket:id="pageNumber">6</span></a>
</span>, <span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" disabled="disabled" title="Go to page 7"><span wicket:id="pageNumber">7</span></a>
</span>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_5.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_5.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_5.html
index 7ea8567..b54a64a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_5.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_5.html
@@ -23,16 +23,16 @@
<span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" disabled="disabled" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-5.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-5.-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-5.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-5.-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-5.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-5.-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-5.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-5.-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
</span>
- <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-5.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-5.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-5.-navigator-next" title="Go to next page">></a>
+ <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-5.-navigator-last" title="Go to last page">>></a>
</wicket:panel></span>
</body>
</html>
[14/17] wicket git commit: WICKET-6137 adjusted more hard-coded urls
in test code
Posted by sv...@apache.org.
WICKET-6137 adjusted more hard-coded urls in test code
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/538ca833
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/538ca833
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/538ca833
Branch: refs/heads/master
Commit: 538ca833d513dbd7943ad22dd6e0eb2cd85dfb07
Parents: 53c5dc6
Author: Sven Meier <sv...@apache.org>
Authored: Mon Mar 28 23:54:06 2016 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Mon Apr 25 11:45:00 2016 +0200
----------------------------------------------------------------------
.../wicket/markup/html/link/StatelessLink.java | 6 -----
.../java/org/apache/wicket/MockComponent.java | 18 ++++++++++++-
.../wicket/ajax/AjaxCallbackFunctionTest.java | 28 ++++++++++----------
.../request/mapper/BookmarkableMapperTest.java | 8 +++---
.../core/request/mapper/MountedMapperTest.java | 22 +++++++--------
.../core/request/mapper/PackageMapperTest.java | 14 +++++-----
.../request/mapper/PageInstanceMapperTest.java | 10 +++----
.../markup/html/link/MountedPageLinkTest.java | 4 +--
.../mapper/info/PageComponentInfoTest.java | 7 +++--
...nentPageWithParams_indexed_mount_result.html | 2 +-
...essComponentPageWithParams_mount_result.html | 2 +-
...StatelessComponentPageWithParams_result.html | 2 +-
.../StatelessComponentPage_mount_result.html | 2 +-
.../StatelessComponentPage_result.html | 2 +-
.../stateless/StatelessComponentTest.java | 6 ++---
.../stateless/StatelessDynmicLinksTest.java | 6 ++---
16 files changed, 74 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/538ca833/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 cdaba22..c0896ba 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,12 +50,6 @@ public abstract class StatelessLink<T> extends Link<T>
}
@Override
- public boolean rendersPage()
- {
- return false;
- }
-
- @Override
protected CharSequence getURL()
{
return urlForListener(getPage().getPageParameters());
http://git-wip-us.apache.org/repos/asf/wicket/blob/538ca833/wicket-core/src/test/java/org/apache/wicket/MockComponent.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/MockComponent.java b/wicket-core/src/test/java/org/apache/wicket/MockComponent.java
index f0046f2..61106e3 100644
--- a/wicket-core/src/test/java/org/apache/wicket/MockComponent.java
+++ b/wicket-core/src/test/java/org/apache/wicket/MockComponent.java
@@ -26,7 +26,7 @@ import org.apache.wicket.util.string.Strings;
*
* @author Matej Knopp
*/
-public class MockComponent implements IRequestableComponent
+public class MockComponent implements IRequestableComponent, IRequestListener
{
private String markupId;
private String id;
@@ -173,6 +173,22 @@ public class MockComponent implements IRequestableComponent
@Override
public Behavior getBehaviorById(int id)
{
+ if (id == 4) {
+ return new MockBehavior();
+ }
return null;
}
+
+ @Override
+ public void onRequest()
+ {
+ }
+
+ private class MockBehavior extends Behavior implements IRequestListener {
+
+ @Override
+ public void onRequest()
+ {
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/538ca833/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxCallbackFunctionTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxCallbackFunctionTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxCallbackFunctionTest.java
index a4f1d79..776b484 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxCallbackFunctionTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxCallbackFunctionTest.java
@@ -33,7 +33,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase
AjaxCallbackPage page = tester.startPage(AjaxCallbackPage.class);
assertEquals(//
"function () {\n" //
- + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.0-\"};\n" //
+ + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.0-\"};\n" //
+ "var params = [];\n" //
+ "attrs.ep = params.concat(attrs.ep || []);\n" //
+ "Wicket.Ajax.ajax(attrs);\n" //
@@ -42,7 +42,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase
assertEquals(//
"function () {\n" //
- + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.1-\"," //
+ + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.1-\"," //
+ "\"ep\":[{\"name\":\"param1\",\"value\":123},{\"name\":\"param2\",\"value\":\"zh_CN\"}]};\n" //
+ "var params = [];\n" //
+ "attrs.ep = params.concat(attrs.ep || []);\n" //
@@ -57,7 +57,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase
AjaxCallbackPage page = tester.startPage(AjaxCallbackPage.class);
assertEquals(//
"function (context) {\n" //
- + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.0-\"};\n" //
+ + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.0-\"};\n" //
+ "var params = [];\n" //
+ "attrs.ep = params.concat(attrs.ep || []);\n" //
+ "Wicket.Ajax.ajax(attrs);\n" //
@@ -66,7 +66,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase
assertEquals(//
"function (context) {\n" //
- + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.1-\"," //
+ + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.1-\"," //
+ "\"ep\":[{\"name\":\"param1\",\"value\":123},{\"name\":\"param2\",\"value\":\"zh_CN\"}]};\n" //
+ "var params = [];\n" //
+ "attrs.ep = params.concat(attrs.ep || []);\n" //
@@ -81,7 +81,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase
AjaxCallbackPage page = tester.startPage(AjaxCallbackPage.class);
assertEquals(//
"function (explicit) {\n" //
- + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.0-\"};\n" //
+ + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.0-\"};\n" //
+ "var params = [{\"name\":\"explicit\",\"value\":explicit}];\n" //
+ "attrs.ep = params.concat(attrs.ep || []);\n" //
+ "Wicket.Ajax.ajax(attrs);\n" //
@@ -90,7 +90,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase
assertEquals(//
"function (explicit) {\n" //
- + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.1-\",\"ep\":[{\"name\":\"param1\",\"value\":123},{\"name\":\"param2\",\"value\":\"zh_CN\"}]};\n" //
+ + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.1-\",\"ep\":[{\"name\":\"param1\",\"value\":123},{\"name\":\"param2\",\"value\":\"zh_CN\"}]};\n" //
+ "var params = [{\"name\":\"explicit\",\"value\":explicit}];\n" //
+ "attrs.ep = params.concat(attrs.ep || []);\n" //
+ "Wicket.Ajax.ajax(attrs);\n" //
@@ -104,7 +104,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase
AjaxCallbackPage page = tester.startPage(AjaxCallbackPage.class);
assertEquals(//
"function () {\n" //
- + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.0-\"};\n" //
+ + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.0-\"};\n" //
+ "var params = [{\"name\":\"resolved\",\"value\":window.location.href}];\n" //
+ "attrs.ep = params.concat(attrs.ep || []);\n" //
+ "Wicket.Ajax.ajax(attrs);\n" //
@@ -115,7 +115,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase
assertEquals(//
"function () {\n" //
- + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.1-\"," //
+ + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.1-\"," //
+ "\"ep\":[{\"name\":\"param1\",\"value\":123},{\"name\":\"param2\",\"value\":\"zh_CN\"}]};\n" //
+ "var params = [{\"name\":\"resolved\",\"value\":window.location.href}];\n" //
+ "attrs.ep = params.concat(attrs.ep || []);\n" //
@@ -133,7 +133,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase
assertEquals(
//
"function (converted) {\n" //
- + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.0-\"};\n" //
+ + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.0-\"};\n" //
+ "var params = [{\"name\":\"converted\",\"value\":converted.substring(0, 3)}];\n" //
+ "attrs.ep = params.concat(attrs.ep || []);\n" //
+ "Wicket.Ajax.ajax(attrs);\n" //
@@ -145,7 +145,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase
assertEquals(
//
"function (converted) {\n" //
- + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.1-\"," //
+ + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.1-\"," //
+ "\"ep\":[{\"name\":\"param1\",\"value\":123},{\"name\":\"param2\",\"value\":\"zh_CN\"}]};\n" //
+ "var params = [{\"name\":\"converted\",\"value\":converted.substring(0, 3)}];\n" //
+ "attrs.ep = params.concat(attrs.ep || []);\n" //
@@ -163,7 +163,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase
assertEquals(
//
"function (context,explicit,converted) {\n" //
- + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.0-\"};\n" //
+ + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.0-\"};\n" //
+ "var params = [{\"name\":\"explicit\",\"value\":explicit},"
+ "{\"name\":\"resolved\",\"value\":window.location.href},"
+ "{\"name\":\"converted\",\"value\":converted.substring(0, 3)}];\n" //
@@ -179,7 +179,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase
assertEquals(
//
"function (context,explicit,converted) {\n" //
- + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.1-\"," //
+ + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.1-\"," //
+ "\"ep\":[{\"name\":\"param1\",\"value\":123},{\"name\":\"param2\",\"value\":\"zh_CN\"}]};\n" //
+ "var params = [{\"name\":\"explicit\",\"value\":explicit},"
+ "{\"name\":\"resolved\",\"value\":window.location.href},"
@@ -201,7 +201,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase
assertEquals(
//
"function (event,ui) {\n" //
- + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.0-\"};\n" //
+ + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.0-\"};\n" //
+ "var params = [{\"name\":\"sortIndex\",\"value\":$(this).find(':data(sortable-item)').index(ui.item)}," //
+ "{\"name\":\"sortItemId\",\"value\":$(ui.item).attr('id')}," //
+ "{\"name\":\"sortSenderId\",\"value\":$(ui.sender).attr('id')}];\n" //
@@ -218,7 +218,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase
assertEquals(
//
"function (event,ui) {\n" //
- + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.1-\"," //
+ + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.1-\"," //
+ "\"ep\":[{\"name\":\"param1\",\"value\":123},{\"name\":\"param2\",\"value\":\"zh_CN\"}]};\n" //
+ "var params = [{\"name\":\"sortIndex\",\"value\":$(this).find(':data(sortable-item)').index(ui.item)}," //
+ "{\"name\":\"sortItemId\",\"value\":$(ui.item).attr('id')}," //
http://git-wip-us.apache.org/repos/asf/wicket/blob/538ca833/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
index 3e90cb1..5ee7dd2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
@@ -174,7 +174,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
@Test
public void decode5()
{
- Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + "?15-ILinkListener-foo-bar");
+ Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + "?15-.-foo-bar");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
@@ -195,7 +195,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
public void decode6()
{
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME
- + "/i1/i2?15-ILinkListener-foo-bar&a=b&b=c");
+ + "/i1/i2?15-.-foo-bar&a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
@@ -612,7 +612,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
Url url = encoder.mapHandler(handler);
assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME
- + "/i1/i2?15-0.ILinkListener-foo-bar&a=b&b=c", url.toString());
+ + "/i1/i2?15-0.-foo-bar&a=b&b=c", url.toString());
}
/**
@@ -640,7 +640,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
Url url = encoder.mapHandler(handler);
assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME
- + "/i1/i2?15-0.ILinkListener.4-foo-bar&a=b&b=c", url.toString());
+ + "/i1/i2?15-0.4-foo-bar&a=b&b=c", url.toString());
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/538ca833/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java
index a917d67..37823ac 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java
@@ -207,7 +207,7 @@ public class MountedMapperTest extends AbstractMapperTest
@Test
public void decode5()
{
- Url url = Url.parse("some/mount/path?15-ILinkListener-foo-bar");
+ Url url = Url.parse("some/mount/path?15-.-foo-bar");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
@@ -227,7 +227,7 @@ public class MountedMapperTest extends AbstractMapperTest
@Test
public void decode6()
{
- Url url = Url.parse("some/mount/path/i1/i2?15-ILinkListener-foo-bar&a=b&b=c");
+ Url url = Url.parse("some/mount/path/i1/i2?15-.-foo-bar&a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
@@ -250,7 +250,7 @@ public class MountedMapperTest extends AbstractMapperTest
@Test
public void decode7()
{
- Url url = Url.parse("some/mount/path?param1=value1&15-ILinkListener.4-foo-bar");
+ Url url = Url.parse("some/mount/path?param1=value1&15-.4-foo-bar");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
@@ -270,7 +270,7 @@ public class MountedMapperTest extends AbstractMapperTest
@Test
public void decode8()
{
- Url url = Url.parse("some/mmount/path?15-ILinkListener.4-foo-bar");
+ Url url = Url.parse("some/mmount/path?15-.4-foo-bar");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertNull(handler);
@@ -294,7 +294,7 @@ public class MountedMapperTest extends AbstractMapperTest
@Test
public void decode10()
{
- Url url = Url.parse("some/mount/path?15-5.ILinkListener.4-foo-bar");
+ Url url = Url.parse("some/mount/path?15-5.4-foo-bar");
context.setNextPageRenderCount(5);
IRequestHandler handler = encoder.mapRequest(getRequest(url));
@@ -312,7 +312,7 @@ public class MountedMapperTest extends AbstractMapperTest
@Test(expected = StalePageException.class)
public void decode11()
{
- Url url = Url.parse("some/mount/path?15-5.ILinkListener.4-foo-bar");
+ Url url = Url.parse("some/mount/path?15-5.4-foo-bar");
context.setNextPageRenderCount(7);
IRequestHandler handler = encoder.mapRequest(getRequest(url));
@@ -326,7 +326,7 @@ public class MountedMapperTest extends AbstractMapperTest
@Test
public void decode12()
{
- Url url = Url.parse("some/mount/path/i1/i2?-1.ILinkListener-foo-bar&a=b&b=c");
+ Url url = Url.parse("some/mount/path/i1/i2?-1.-foo-bar&a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
@@ -466,7 +466,7 @@ public class MountedMapperTest extends AbstractMapperTest
Url url = encoder.mapHandler(handler);
- assertEquals("some/mount/path/i1/i2?15-4.ILinkListener-foo-bar&a=b&b=c", url.toString());
+ assertEquals("some/mount/path/i1/i2?15-4.-foo-bar&a=b&b=c", url.toString());
}
/**
@@ -501,7 +501,7 @@ public class MountedMapperTest extends AbstractMapperTest
Url url = encoder.mapHandler(handler);
- assertEquals("some/mount/path/i1/i2?15-4.ILinkListener-foo-bar&a=b&b=c", url.toString());
+ assertEquals("some/mount/path/i1/i2?15-4.-foo-bar&a=b&b=c", url.toString());
}
/**
@@ -529,7 +529,7 @@ public class MountedMapperTest extends AbstractMapperTest
Url url = encoder.mapHandler(handler);
- assertEquals("some/mount/path/i1/i2?15-5.ILinkListener.4-foo-bar&a=b&b=c", url.toString());
+ assertEquals("some/mount/path/i1/i2?15-5.4-foo-bar&a=b&b=c", url.toString());
}
/**
@@ -559,7 +559,7 @@ public class MountedMapperTest extends AbstractMapperTest
Url url = encoder.mapHandler(handler);
- assertEquals("some/mount/path/i1/i2?15-5.ILinkListener.4-foo-bar&a=b&b=c", url.toString());
+ assertEquals("some/mount/path/i1/i2?15-5.4-foo-bar&a=b&b=c", url.toString());
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/538ca833/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
index f41ec26..e1e3cca 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
@@ -240,7 +240,7 @@ public class PackageMapperTest extends AbstractMapperTest
@Test
public void decode5()
{
- Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "?15-ILinkListener-foo-bar");
+ Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "?15-.-foo-bar");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
@@ -260,7 +260,7 @@ public class PackageMapperTest extends AbstractMapperTest
@Test
public void decode6()
{
- Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/i1/i2?15-ILinkListener-foo-bar&a=b&b=c");
+ Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/i1/i2?15-.-foo-bar&a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
@@ -283,7 +283,7 @@ public class PackageMapperTest extends AbstractMapperTest
@Test
public void decode7()
{
- Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "?15-ILinkListener.4-foo-bar");
+ Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "?15-.4-foo-bar");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
@@ -303,7 +303,7 @@ public class PackageMapperTest extends AbstractMapperTest
@Test
public void decode8()
{
- Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/i1/i2?15-5.ILinkListener-foo-bar&a=b&b=c");
+ Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/i1/i2?15-5.-foo-bar&a=b&b=c");
context.setNextPageRenderCount(5);
@@ -322,7 +322,7 @@ public class PackageMapperTest extends AbstractMapperTest
@Test(expected = StalePageException.class)
public void decode9()
{
- Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/i1/i2?15-5.ILinkListener-foo-bar&a=b&b=c");
+ Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/i1/i2?15-5.-foo-bar&a=b&b=c");
context.setNextPageRenderCount(6);
@@ -509,7 +509,7 @@ public class PackageMapperTest extends AbstractMapperTest
Url url = encoder.mapHandler(handler);
- assertEquals(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/i1/i2?15-0.ILinkListener-foo-bar&a=b&b=c", url.toString());
+ assertEquals(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/i1/i2?15-0.-foo-bar&a=b&b=c", url.toString());
}
/**
@@ -536,7 +536,7 @@ public class PackageMapperTest extends AbstractMapperTest
Url url = encoder.mapHandler(handler);
- assertEquals(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/i1/i2?15-0.ILinkListener.4-foo-bar&a=b&b=c",
+ assertEquals(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/i1/i2?15-0.4-foo-bar&a=b&b=c",
url.toString());
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/538ca833/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
index 2bd8a57..97ebd52 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
@@ -87,7 +87,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest
@Test
public void decode3()
{
- Url url = Url.parse("wicket/page?4-ILinkListener-a-b-c");
+ Url url = Url.parse("wicket/page?4-.-a-b-c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
@@ -104,7 +104,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest
@Test
public void decode4()
{
- Url url = Url.parse("wickett/pagee?4-ILinkListener-a:b-c");
+ Url url = Url.parse("wickett/pagee?4-.-a:b-c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertNull(handler);
@@ -145,7 +145,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest
@Test
public void decode7()
{
- Url url = Url.parse("wicket/page?4-6.ILinkListener.5-a-b-c");
+ Url url = Url.parse("wicket/page?4-6.5-a-b-c");
context.setNextPageRenderCount(6);
@@ -162,7 +162,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest
@Test(expected = StalePageException.class)
public void decode8()
{
- Url url = Url.parse("wicket/page?4-6.ILinkListener.5-a-b-c");
+ Url url = Url.parse("wicket/page?4-6.5-a-b-c");
context.setNextPageRenderCount(8);
@@ -290,7 +290,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest
IRequestHandler handler = new ListenerInterfaceRequestHandler(provider);
Url url = encoder.mapHandler(handler);
- assertEquals("wicket/page?15-5.ILinkListener-a-b-c", url.toString());
+ assertEquals("wicket/page?15-5.-a-b-c", url.toString());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/538ca833/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java
index 0c89a9d..704b10b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java
@@ -113,7 +113,7 @@ public class MountedPageLinkTest extends WicketTestCase
new PageParameters().add("param", "value", INamedParameters.Type.MANUAL));
Link<?> link = (Link<?>)page.get("link");
String url = link.getURL().toString();
- assertEquals("./wicket/page?0-1.ILinkListener-link", url);
+ assertEquals("./wicket/page?0-1.-link", url);
tester.executeUrl(url);
}
@@ -128,7 +128,7 @@ public class MountedPageLinkTest extends WicketTestCase
new PageParameters().add("param", "value", INamedParameters.Type.MANUAL));
Link<?> link = (Link<?>)page.get("link");
String url = link.getURL().toString();
- assertEquals("./wicket/page?0-1.ILinkListener-link", url);
+ assertEquals("./wicket/page?0-1.-link", url);
// simulate a page expiry
url = url.replace("page?0", "page?3");
tester.executeUrl(url);
http://git-wip-us.apache.org/repos/asf/wicket/blob/538ca833/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
index adeb089..823f834 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
@@ -35,8 +35,7 @@ public class PageComponentInfoTest extends TestCase
assertEquals(pageId, info.getPageInfo().getPageId());
}
- private void testPageComponentInfo(PageComponentInfo info, Integer pageId, String listener,
- String componentPath)
+ private void testPageComponentInfo(PageComponentInfo info, Integer pageId, String componentPath)
{
assertNotNull(info.getComponentInfo());
assertNotNull(info.getPageInfo());
@@ -52,9 +51,9 @@ public class PageComponentInfoTest extends TestCase
@Test
public void test1()
{
- String s = "2-click-foo-bar-baz";
+ String s = "2-.-foo-bar-baz";
PageComponentInfo info = PageComponentInfo.parse(s);
- testPageComponentInfo(info, 2, "click", "foo:bar:baz");
+ testPageComponentInfo(info, 2, "foo:bar:baz");
assertEquals(s, info.toString());
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/538ca833/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
index 9ef2c2e..83e7ae6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
@@ -1,5 +1,5 @@
<html>
<body>
-<a href="./testValue2?-.-link" wicket:id="link">test</a>
+<a href="./testValue2?-1.-link" wicket:id="link">test</a>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/538ca833/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
index 01be322..7e4e9d4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
@@ -1,5 +1,5 @@
<html>
<body>
-<a href="./stateless?-.-link&testParam1=testValue1&testParam2=testValue2" wicket:id="link">test</a>
+<a href="./stateless?-1.-link&testParam1=testValue1&testParam2=testValue2" wicket:id="link">test</a>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/538ca833/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
index bd3d46c..63b427ac 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
@@ -1,5 +1,5 @@
<html>
<body>
-<a href="./org.apache.wicket.stateless.StatelessComponentPageWithParams?-.-link&testParam1=testValue1&testParam2=testValue2" wicket:id="link">test</a>
+<a href="./org.apache.wicket.stateless.StatelessComponentPageWithParams?-1.-link&testParam1=testValue1&testParam2=testValue2" wicket:id="link">test</a>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/538ca833/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
index 905d21e..ac5f821 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
@@ -1,5 +1,5 @@
<html>
<body>
-<a href="./stateless?-.-link" wicket:id="link">test</a>
+<a href="./stateless?-1.-link" wicket:id="link">test</a>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/538ca833/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
index 7c1f8f3..472458f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
@@ -1,5 +1,5 @@
<html>
<body>
-<a href="./org.apache.wicket.stateless.StatelessComponentPage?-.-link" wicket:id="link">test</a>
+<a href="./org.apache.wicket.stateless.StatelessComponentPage?-1.-link" wicket:id="link">test</a>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/538ca833/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java
index 3d55c88..91d95e8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java
@@ -61,7 +61,7 @@ public class StatelessComponentTest extends WicketTestCase
executeTest(StatelessComponentPage.class, "StatelessComponentPage_mount_result.html");
tester.getRequest()
.setUrl(
- Url.parse("stateless?0-1.ILinkListener-link&testParam1=testValue1&testParam2=testValue2"));
+ Url.parse("stateless?0-1.-link&testParam1=testValue1&testParam2=testValue2"));
try
{
tester.processRequest();
@@ -88,7 +88,7 @@ public class StatelessComponentTest extends WicketTestCase
tester.getRequest()
.setUrl(
- Url.parse("wicket/bookmarkable/org.apache.wicket.stateless.StatelessComponentPageWithParams?0-1.ILinkListener-link&testParam1=testValue1&testParam2=testValue2"));
+ Url.parse("wicket/bookmarkable/org.apache.wicket.stateless.StatelessComponentPageWithParams?0-1.-link&testParam1=testValue1&testParam2=testValue2"));
try
{
tester.processRequest();
@@ -142,7 +142,7 @@ public class StatelessComponentTest extends WicketTestCase
executeTest(StatelessComponentPageWithParams.class, params,
"StatelessComponentPageWithParams_indexed_mount_result.html");
tester.getRequest().setUrl(
- Url.parse("stateless/testValue1/testValue2?0-1.ILinkListener-link"));
+ Url.parse("stateless/testValue1/testValue2?0-1.-link"));
try
{
tester.processRequest();
http://git-wip-us.apache.org/repos/asf/wicket/blob/538ca833/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessDynmicLinksTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessDynmicLinksTest.java b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessDynmicLinksTest.java
index 6c096ab..4968d96 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessDynmicLinksTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessDynmicLinksTest.java
@@ -36,15 +36,15 @@ public class StatelessDynmicLinksTest extends WicketTestCase
tester.startPage(StatelessPageWithDynamicLinks.class);
assertTrue(tester.getLastResponseAsString().contains("LINK-1"));
- tester.getRequest().setUrl(Url.parse("stateless?-0.ILinkListener-links:1"));
+ tester.getRequest().setUrl(Url.parse("stateless?-.-links:1"));
tester.processRequest();
assertTrue(tester.getLastResponseAsString().contains("LINK-2"));
- tester.getRequest().setUrl(Url.parse("stateless?-0.ILinkListener-links:2"));
+ tester.getRequest().setUrl(Url.parse("stateless?-.-links:2"));
tester.processRequest();
assertTrue(tester.getLastResponseAsString().contains("LINK-3"));
- tester.getRequest().setUrl(Url.parse("stateless?-0.ILinkListener-links:3"));
+ tester.getRequest().setUrl(Url.parse("stateless?-.-links:3"));
tester.processRequest();
assertTrue(tester.getLastResponseAsString().contains("LINK-4"));
}
[02/17] wicket git commit: WICKET-6137 remove RequestListenerInterface
Posted by sv...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/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 7f819e1..7497351 100644
--- a/wicket-core/src/test/java/org/apache/wicket/BehaviorRequestTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/BehaviorRequestTest.java
@@ -17,16 +17,15 @@
package org.apache.wicket;
import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.behavior.IBehaviorListener;
+import org.apache.wicket.core.request.handler.IPageAndComponentProvider;
+import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler;
+import org.apache.wicket.core.request.handler.ListenerInvocationNotAllowedException;
+import org.apache.wicket.core.request.handler.PageAndComponentProvider;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.request.IRequestHandler;
-import org.apache.wicket.core.request.handler.IPageAndComponentProvider;
-import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler;
-import org.apache.wicket.core.request.handler.ListenerInvocationNotAllowedException;
-import org.apache.wicket.core.request.handler.PageAndComponentProvider;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
@@ -84,8 +83,7 @@ public class BehaviorRequestTest extends WicketTestCase
final int index = page.container.getBehaviorId(behaviorUnderTest);
final IPageAndComponentProvider provider = new PageAndComponentProvider(page,
page.container);
- final IRequestHandler handler = new ListenerInterfaceRequestHandler(provider,
- IBehaviorListener.INTERFACE, index);
+ final IRequestHandler handler = new ListenerInterfaceRequestHandler(provider, index);
return tester.urlFor(handler).toString();
}
@@ -125,7 +123,7 @@ public class BehaviorRequestTest extends WicketTestCase
/**
*/
- private static class TestCallbackBehavior extends Behavior implements IBehaviorListener
+ private static class TestCallbackBehavior extends Behavior implements IRequestListener
{
private static final long serialVersionUID = 1L;
@@ -136,11 +134,16 @@ public class BehaviorRequestTest extends WicketTestCase
public void onComponentTag(Component component, ComponentTag tag)
{
super.onComponentTag(component, tag);
- tag.put("href",
- component.urlFor(this, IBehaviorListener.INTERFACE, new PageParameters()));
+ tag.put("href", component.urlFor(this, new PageParameters()));
}
@Override
+ public boolean includeRenderCount()
+ {
+ return true;
+ }
+
+ @Override
public void onRequest()
{
called = true;
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/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 b16ff43..fdcff04 100644
--- a/wicket-core/src/test/java/org/apache/wicket/BehaviorUrlTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/BehaviorUrlTest.java
@@ -19,7 +19,6 @@ package org.apache.wicket;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.behavior.IBehaviorListener;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -125,7 +124,7 @@ public class BehaviorUrlTest extends WicketTestCase
/**
*/
- private static class TestCallbackBehavior extends Behavior implements IBehaviorListener
+ private static class TestCallbackBehavior extends Behavior implements IRequestListener
{
private static final long serialVersionUID = 1L;
@@ -134,10 +133,16 @@ public class BehaviorUrlTest extends WicketTestCase
{
super.onComponentTag(component, tag);
tag.put("href",
- component.urlFor(this, IBehaviorListener.INTERFACE, new PageParameters()));
+ component.urlFor(this, new PageParameters()));
}
@Override
+ public boolean includeRenderCount()
+ {
+ return true;
+ }
+
+ @Override
public void onRequest()
{
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/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 7a6a678..c4465bd 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.java
@@ -17,7 +17,8 @@
package org.apache.wicket;
import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.behavior.IBehaviorListener;
+import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler;
+import org.apache.wicket.core.request.handler.PageAndComponentProvider;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.html.WebPage;
@@ -25,8 +26,6 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.IRequestHandler;
-import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler;
-import org.apache.wicket.core.request.handler.PageAndComponentProvider;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
@@ -109,7 +108,7 @@ public class ComponentWithLazyModelCreationTest extends WicketTestCase
}
}
- private static class TestCallbackBehavior extends Behavior implements IBehaviorListener
+ private static class TestCallbackBehavior extends Behavior implements IRequestListener
{
private static final long serialVersionUID = 1L;
private boolean requested;
@@ -122,12 +121,17 @@ public class ComponentWithLazyModelCreationTest extends WicketTestCase
super.onComponentTag(component, tag);
int index = component.getBehaviorId(this);
IRequestHandler handler = new ListenerInterfaceRequestHandler(
- new PageAndComponentProvider(component.getPage(), component),
- IBehaviorListener.INTERFACE, index);
+ new PageAndComponentProvider(component.getPage(), component), index);
statefullUrl = component.getRequestCycle().mapUrlFor(handler).toString();
}
@Override
+ public boolean includeRenderCount()
+ {
+ return true;
+ }
+
+ @Override
public void onRequest()
{
requested = true;
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/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 2698efc..1bb7f24 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
@@ -20,6 +20,7 @@ import java.util.List;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
+import org.apache.wicket.IRequestListener;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
@@ -150,7 +151,7 @@ public class ImmutableBehaviorIdsTest extends WicketTestCase
}
- private static class LinkBehavior extends Behavior implements IBehaviorListener
+ private static class LinkBehavior extends Behavior implements IRequestListener
{
private static final long serialVersionUID = 1L;
@@ -165,10 +166,16 @@ public class ImmutableBehaviorIdsTest extends WicketTestCase
public void onComponentTag(Component component, ComponentTag tag)
{
super.onComponentTag(component, tag);
- tag.put(attr, component.urlFor(this, IBehaviorListener.INTERFACE, new PageParameters()));
+ tag.put(attr, component.urlFor(this, new PageParameters()));
}
@Override
+ public boolean includeRenderCount()
+ {
+ return true;
+ }
+
+ @Override
public void onRequest()
{
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/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 62a84ff..930bec3 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
@@ -21,15 +21,12 @@ import java.text.ParseException;
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.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;
@@ -53,14 +50,14 @@ public class ListenerInterfaceRequestHandlerTest extends WicketTestCase
// non-existing component on fresh page is ignored
PageAndComponentProvider freshPage = new PageAndComponentProvider(DummyPage.class, null,
"foo");
- new ListenerInterfaceRequestHandler(freshPage, IOnChangeListener.INTERFACE).respond(tester
+ new ListenerInterfaceRequestHandler(freshPage).respond(tester
.getRequestCycle());
// non-existing component on old page fails
PageAndComponentProvider oldPage = new PageAndComponentProvider(new DummyPage(), "foo");
try
{
- new ListenerInterfaceRequestHandler(oldPage, IOnChangeListener.INTERFACE)
+ new ListenerInterfaceRequestHandler(oldPage)
.respond(tester.getRequestCycle());
fail();
}
@@ -149,8 +146,7 @@ public class ListenerInterfaceRequestHandlerTest extends WicketTestCase
public void isPageInstanceCreatedOnClassLinks()
{
PageAndComponentProvider provider = new PageAndComponentProvider(Page.class, "link");
- ListenerInterfaceRequestHandler handler = new ListenerInterfaceRequestHandler(provider,
- RequestListenerInterface.forName(ILinkListener.class.getSimpleName()));
+ ListenerInterfaceRequestHandler handler = new ListenerInterfaceRequestHandler(provider);
assertFalse("Handler should not report a page instance is available ",
handler.isPageInstanceCreated());
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractMapperTest.java
index 8d0a4a2..d2022a8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractMapperTest.java
@@ -19,13 +19,10 @@ package org.apache.wicket.core.request.mapper;
import java.nio.charset.Charset;
import java.util.Locale;
-import org.apache.wicket.RequestListenerInterface;
-import org.apache.wicket.markup.html.link.ILinkListener;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.component.IRequestablePage;
import org.junit.Assert;
-import org.junit.Before;
/**
* @author Matej Knopp
@@ -41,16 +38,6 @@ public abstract class AbstractMapperTest extends Assert
protected TestMapperContext context = new TestMapperContext();
- /**
- * @throws Exception
- */
- @Before
- public void before() throws Exception
- {
- // inititalize the interface
- RequestListenerInterface i = ILinkListener.INTERFACE;
- }
-
protected Request getRequest(final Url url)
{
return new Request()
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractResourceReferenceMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractResourceReferenceMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractResourceReferenceMapperTest.java
index 123fbb1..da486dc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractResourceReferenceMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractResourceReferenceMapperTest.java
@@ -207,7 +207,6 @@ public abstract class AbstractResourceReferenceMapperTest extends AbstractMapper
}
};
- @Override
@Before
public void before() throws Exception
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
index bcd4ba6..3e90cb1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
@@ -16,12 +16,13 @@
*/
package org.apache.wicket.core.request.mapper;
-import java.nio.charset.Charset;
-import java.util.Locale;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.Matchers.is;
+import java.nio.charset.Charset;
+import java.util.Locale;
+
import org.apache.wicket.MockPage;
import org.apache.wicket.core.request.handler.BookmarkableListenerInterfaceRequestHandler;
import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler;
@@ -31,7 +32,6 @@ import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler;
import org.apache.wicket.core.request.handler.PageAndComponentProvider;
import org.apache.wicket.core.request.handler.PageProvider;
import org.apache.wicket.core.request.handler.RenderPageRequestHandler;
-import org.apache.wicket.markup.html.link.ILinkListener;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
@@ -184,7 +184,6 @@ public class BookmarkableMapperTest extends AbstractMapperTest
IRequestablePage page = h.getPage();
checkPage(page, 15);
- assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
assertEquals("foo:bar", h.getComponent().getPageRelativePath());
assertNull(h.getBehaviorIndex());
}
@@ -205,7 +204,6 @@ public class BookmarkableMapperTest extends AbstractMapperTest
IRequestablePage page = h.getPage();
checkPage(page, 15);
- assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
assertEquals("foo:bar", h.getComponent().getPageRelativePath());
PageParameters p = page.getPageParameters();
@@ -231,7 +229,6 @@ public class BookmarkableMapperTest extends AbstractMapperTest
IRequestablePage page = h.getPage();
checkPage(page, 15);
- assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
assertEquals("foo:bar", h.getComponent().getPageRelativePath());
assertEquals((Object)4, h.getBehaviorIndex());
}
@@ -610,8 +607,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
IRequestableComponent c = page.get("foo:bar");
PageAndComponentProvider provider = new PageAndComponentProvider(page, c);
- IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider,
- ILinkListener.INTERFACE);
+ IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider);
Url url = encoder.mapHandler(handler);
@@ -639,8 +635,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
IRequestableComponent c = page.get("foo:bar");
PageAndComponentProvider provider = new PageAndComponentProvider(page, c);
- IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider,
- ILinkListener.INTERFACE, 4);
+ IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider, 4);
Url url = encoder.mapHandler(handler);
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/CryptoMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/CryptoMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/CryptoMapperTest.java
index 7c9bf6b..5a9b950 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/CryptoMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/CryptoMapperTest.java
@@ -30,7 +30,6 @@ import org.apache.wicket.core.request.handler.RequestSettingRequestHandler;
import org.apache.wicket.markup.IMarkupFragment;
import org.apache.wicket.markup.Markup;
import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.markup.html.link.ILinkListener;
import org.apache.wicket.protocol.http.PageExpiredException;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.IRequestHandler;
@@ -75,7 +74,6 @@ public class CryptoMapperTest extends AbstractMapperTest
*
* @throws Exception
*/
- @Override
@Before
public void before() throws Exception
{
@@ -164,7 +162,7 @@ public class CryptoMapperTest extends AbstractMapperTest
public void homePageForceEncryptionOfRequestListener()
{
PageAndComponentProvider provider = new PageAndComponentProvider(tester.getApplication().getHomePage(), "some:link");
- IRequestHandler requestHandler = new BookmarkableListenerInterfaceRequestHandler(provider, ILinkListener.INTERFACE);
+ IRequestHandler requestHandler = new BookmarkableListenerInterfaceRequestHandler(provider);
Url plainUrl = mapper.getDelegateMapper().mapHandler(requestHandler);
assertTrue("Plain URL for home page has segments: " + plainUrl.toString(), plainUrl.getSegments().isEmpty());
assertNull(mapper.mapRequest(getRequest(plainUrl)));
@@ -266,7 +264,7 @@ public class CryptoMapperTest extends AbstractMapperTest
public void bookmarkablePageForceEncryptionOfRequestListener()
{
PageAndComponentProvider provider = new PageAndComponentProvider(Page2.class, "some:link");
- IRequestHandler requestHandler = new BookmarkableListenerInterfaceRequestHandler(provider, ILinkListener.INTERFACE);
+ IRequestHandler requestHandler = new BookmarkableListenerInterfaceRequestHandler(provider);
Url plainUrl = mapper.getDelegateMapper().mapHandler(requestHandler);
assertTrue("Plain text request listener URL for bookmarkable page does not start with: "
+ PLAIN_BOOKMARKABLE_URL + ": " + plainUrl.toString(),
@@ -359,7 +357,7 @@ public class CryptoMapperTest extends AbstractMapperTest
final String componentPath = "some:path:to:link";
PageAndComponentProvider provider = new PageAndComponentProvider(Page1.class, componentPath);
- IRequestHandler requestHandler = new ListenerInterfaceRequestHandler(provider, ILinkListener.INTERFACE);
+ IRequestHandler requestHandler = new ListenerInterfaceRequestHandler(provider);
Url plainUrl = mapper.getDelegateMapper().mapHandler(requestHandler);
assertTrue(plainUrl.toString().startsWith(MOUNTED_URL));
@@ -604,8 +602,7 @@ public class CryptoMapperTest extends AbstractMapperTest
MockPage page = new MockPage();
IRequestableComponent c = page.get("foo:bar");
PageAndComponentProvider provider = new PageAndComponentProvider(page, c);
- IRequestHandler handler = new ListenerInterfaceRequestHandler(provider,
- ILinkListener.INTERFACE);
+ IRequestHandler handler = new ListenerInterfaceRequestHandler(provider);
Url url = mapper.mapHandler(handler);
url.addQueryParameter("q", "foo");
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java
index 2ad6033..a917d67 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java
@@ -27,7 +27,6 @@ import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler;
import org.apache.wicket.core.request.handler.PageAndComponentProvider;
import org.apache.wicket.core.request.handler.PageProvider;
import org.apache.wicket.core.request.handler.RenderPageRequestHandler;
-import org.apache.wicket.markup.html.link.ILinkListener;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.IRequestMapper;
import org.apache.wicket.request.Request;
@@ -218,7 +217,6 @@ public class MountedMapperTest extends AbstractMapperTest
IRequestablePage page = h.getPage();
checkPage(page, 15);
- assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
assertEquals("foo:bar", h.getComponent().getPageRelativePath());
assertNull(h.getBehaviorIndex());
}
@@ -238,7 +236,6 @@ public class MountedMapperTest extends AbstractMapperTest
IRequestablePage page = h.getPage();
checkPage(page, 15);
- assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
assertEquals("foo:bar", h.getComponent().getPageRelativePath());
PageParameters p = page.getPageParameters();
@@ -263,7 +260,6 @@ public class MountedMapperTest extends AbstractMapperTest
IRequestablePage page = h.getPage();
checkPage(page, 15);
- assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
assertEquals("foo:bar", h.getComponent().getPageRelativePath());
assertEquals((Object)4, h.getBehaviorIndex());
}
@@ -339,7 +335,6 @@ public class MountedMapperTest extends AbstractMapperTest
IRequestablePage page = h.getPage();
checkPage(page, 1);
- assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
assertEquals("foo:bar", h.getComponent().getPageRelativePath());
assertNull(h.getBehaviorIndex());
@@ -467,8 +462,7 @@ public class MountedMapperTest extends AbstractMapperTest
IRequestableComponent c = page.get("foo:bar");
PageAndComponentProvider provider = new PageAndComponentProvider(page, c);
- IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider,
- ILinkListener.INTERFACE);
+ IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider);
Url url = encoder.mapHandler(handler);
@@ -503,8 +497,7 @@ public class MountedMapperTest extends AbstractMapperTest
IRequestableComponent c = page.get("foo:bar");
PageAndComponentProvider provider = new PageAndComponentProvider(page, c);
- IRequestHandler handler = new ListenerInterfaceRequestHandler(provider,
- ILinkListener.INTERFACE);
+ IRequestHandler handler = new ListenerInterfaceRequestHandler(provider);
Url url = encoder.mapHandler(handler);
@@ -532,8 +525,7 @@ public class MountedMapperTest extends AbstractMapperTest
IRequestableComponent c = page.get("foo:bar");
PageAndComponentProvider provider = new PageAndComponentProvider(page, c);
- IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider,
- ILinkListener.INTERFACE, 4);
+ IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider, 4);
Url url = encoder.mapHandler(handler);
@@ -563,8 +555,7 @@ public class MountedMapperTest extends AbstractMapperTest
IRequestableComponent c = page.get("foo:bar");
PageAndComponentProvider provider = new PageAndComponentProvider(page, c);
- IRequestHandler handler = new ListenerInterfaceRequestHandler(provider,
- ILinkListener.INTERFACE, 4);
+ IRequestHandler handler = new ListenerInterfaceRequestHandler(provider, 4);
Url url = encoder.mapHandler(handler);
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
index 3716397..f41ec26 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
@@ -17,8 +17,8 @@
package org.apache.wicket.core.request.mapper;
import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
import org.apache.wicket.MockPage;
import org.apache.wicket.core.request.handler.BookmarkableListenerInterfaceRequestHandler;
@@ -30,7 +30,6 @@ import org.apache.wicket.core.request.handler.PageAndComponentProvider;
import org.apache.wicket.core.request.handler.PageProvider;
import org.apache.wicket.core.request.handler.RenderPageRequestHandler;
import org.apache.wicket.core.request.mapper.PackageMapperTest.OuterPage.InnerPage;
-import org.apache.wicket.markup.html.link.ILinkListener;
import org.apache.wicket.mock.MockWebRequest;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Url;
@@ -251,7 +250,6 @@ public class PackageMapperTest extends AbstractMapperTest
IRequestablePage page = h.getPage();
checkPage(page, 15);
- assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
assertEquals("foo:bar", h.getComponent().getPageRelativePath());
assertNull(h.getBehaviorIndex());
}
@@ -271,7 +269,6 @@ public class PackageMapperTest extends AbstractMapperTest
IRequestablePage page = h.getPage();
checkPage(page, 15);
- assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
assertEquals("foo:bar", h.getComponent().getPageRelativePath());
PageParameters p = h.getPageParameters();
@@ -296,7 +293,6 @@ public class PackageMapperTest extends AbstractMapperTest
IRequestablePage page = h.getPage();
checkPage(page, 15);
- assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
assertEquals("foo:bar", h.getComponent().getPageRelativePath());
assertEquals((Object)4, h.getBehaviorIndex());
}
@@ -509,8 +505,7 @@ public class PackageMapperTest extends AbstractMapperTest
IRequestableComponent c = page.get("foo:bar");
PageAndComponentProvider provider = new PageAndComponentProvider(page, c);
- IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider,
- ILinkListener.INTERFACE);
+ IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider);
Url url = encoder.mapHandler(handler);
@@ -537,8 +532,7 @@ public class PackageMapperTest extends AbstractMapperTest
IRequestableComponent c = page.get("foo:bar");
PageAndComponentProvider provider = new PageAndComponentProvider(page, c);
- IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider,
- ILinkListener.INTERFACE, 4);
+ IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider, 4);
Url url = encoder.mapHandler(handler);
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
index fefd8c7..2bd8a57 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
@@ -28,7 +28,6 @@ import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler;
import org.apache.wicket.core.request.handler.PageAndComponentProvider;
import org.apache.wicket.core.request.handler.PageProvider;
import org.apache.wicket.core.request.handler.RenderPageRequestHandler;
-import org.apache.wicket.markup.html.link.ILinkListener;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
@@ -96,7 +95,6 @@ public class PageInstanceMapperTest extends AbstractMapperTest
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
checkPage(h.getPage(), 4);
assertEquals(h.getComponent().getPageRelativePath(), "a:b:c");
- assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
assertNull(h.getBehaviorIndex());
}
@@ -138,7 +136,6 @@ public class PageInstanceMapperTest extends AbstractMapperTest
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
checkPage(h.getPage(), 4);
assertEquals(h.getComponent().getPageRelativePath(), "a:b:c");
- assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
assertEquals((Object)5, h.getBehaviorIndex());
}
@@ -290,8 +287,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest
IRequestableComponent c = page.get("a:b:c");
PageAndComponentProvider provider = new PageAndComponentProvider(page, c);
- IRequestHandler handler = new ListenerInterfaceRequestHandler(provider,
- ILinkListener.INTERFACE);
+ IRequestHandler handler = new ListenerInterfaceRequestHandler(provider);
Url url = encoder.mapHandler(handler);
assertEquals("wicket/page?15-5.ILinkListener-a-b-c", url.toString());
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/TestMapperContext.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/TestMapperContext.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/TestMapperContext.java
index b3e137a..a1b960d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/TestMapperContext.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/TestMapperContext.java
@@ -17,8 +17,8 @@
package org.apache.wicket.core.request.mapper;
import org.apache.wicket.MockPage;
-import org.apache.wicket.RequestListenerInterface;
import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.core.request.handler.PageProvider;
import org.apache.wicket.markup.MarkupParser;
import org.apache.wicket.page.IPageManagerContext;
import org.apache.wicket.page.PageStoreManager;
@@ -27,7 +27,6 @@ import org.apache.wicket.pageStore.IDataStore;
import org.apache.wicket.pageStore.IPageStore;
import org.apache.wicket.pageStore.memory.DummyPageManagerContext;
import org.apache.wicket.request.component.IRequestablePage;
-import org.apache.wicket.core.request.handler.PageProvider;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.request.resource.ResourceReference.Key;
@@ -202,18 +201,6 @@ public class TestMapperContext implements IMapperContext
}
@Override
- public RequestListenerInterface requestListenerInterfaceFromString(String interfaceName)
- {
- return RequestListenerInterface.forName(interfaceName);
- }
-
- @Override
- public String requestListenerInterfaceToString(RequestListenerInterface listenerInterface)
- {
- return listenerInterface.getName();
- }
-
- @Override
public Class<? extends IRequestablePage> getHomePageClass()
{
return MockPage.class;
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java
index 7cc01ce..0a7ce91 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java
@@ -33,7 +33,6 @@ public class ComponentInfoTest extends Assert
{
String s = "listener-component-path";
ComponentInfo info = ComponentInfo.parse(s);
- assertEquals("listener", info.getListenerInterface());
assertEquals("component:path", info.getComponentPath());
assertNull(info.getBehaviorId());
@@ -60,7 +59,6 @@ public class ComponentInfoTest extends Assert
String s = "listener-";
ComponentInfo info = ComponentInfo.parse(s);
// empty component path is allowed - listener invoked on page
- assertEquals("listener", info.getListenerInterface());
assertEquals("", info.getComponentPath());
}
@@ -93,7 +91,6 @@ public class ComponentInfoTest extends Assert
{
String s = "listener-compo~~nent-path";
ComponentInfo info = ComponentInfo.parse(s);
- assertEquals("listener", info.getListenerInterface());
assertEquals("compo--nent:path", info.getComponentPath());
assertNull(info.getBehaviorId());
@@ -108,7 +105,6 @@ public class ComponentInfoTest extends Assert
{
String s = "listener-co~mpo~~nent-path";
ComponentInfo info = ComponentInfo.parse(s);
- assertEquals("listener", info.getListenerInterface());
assertEquals("co-mpo--nent:path", info.getComponentPath());
assertNull(info.getBehaviorId());
@@ -123,7 +119,6 @@ public class ComponentInfoTest extends Assert
{
String s = "listener.12-component-path";
ComponentInfo info = ComponentInfo.parse(s);
- assertEquals("listener", info.getListenerInterface());
assertEquals("component:path", info.getComponentPath());
assertEquals((Object)12, info.getBehaviorId());
@@ -138,7 +133,6 @@ public class ComponentInfoTest extends Assert
{
String s = "4.listener-a-b";
ComponentInfo info = ComponentInfo.parse(s);
- assertEquals("listener", info.getListenerInterface());
assertEquals((Integer)4, info.getRenderCount());
assertEquals(s, info.toString());
@@ -152,7 +146,6 @@ public class ComponentInfoTest extends Assert
{
String s = "4.listener.5-a-b";
ComponentInfo info = ComponentInfo.parse(s);
- assertEquals("listener", info.getListenerInterface());
assertEquals((Integer)4, info.getRenderCount());
assertEquals((Integer)5, info.getBehaviorId());
@@ -170,15 +163,13 @@ public class ComponentInfoTest extends Assert
final String componentPath = "-nav-container-:-nav:1:link";
final Integer behaviorId = null;
- ComponentInfo info = new ComponentInfo(renderCount, listenerInterface, componentPath,
- behaviorId);
+ ComponentInfo info = new ComponentInfo(renderCount, componentPath, behaviorId);
final String encoded = info.toString();
assertEquals("1.ILinkListener-~nav~container~-~nav-1-link", encoded);
ComponentInfo decoded = ComponentInfo.parse(encoded);
assertEquals(renderCount, decoded.getRenderCount());
- assertEquals(listenerInterface, decoded.getListenerInterface());
assertEquals(componentPath, decoded.getComponentPath());
assertEquals(behaviorId, decoded.getBehaviorId());
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
index 06a221f..adeb089 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.wicket.request.mapper.info;
-import junit.framework.TestCase;
-
import org.junit.Test;
+import junit.framework.TestCase;
+
/**
*
* @author Matej Knopp
@@ -43,7 +43,6 @@ public class PageComponentInfoTest extends TestCase
assertEquals(pageId, info.getPageInfo().getPageId());
- assertEquals(listener, info.getComponentInfo().getListenerInterface());
assertEquals(componentPath, info.getComponentInfo().getComponentPath());
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java
index a85429e..2795eb5 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java
@@ -16,17 +16,16 @@
*/
package org.apache.wicket.examples.ajax.prototype;
+import org.apache.wicket.core.request.handler.ComponentRenderingRequestHandler;
+import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler;
+import org.apache.wicket.core.request.handler.PageAndComponentProvider;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.ILinkListener;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.core.request.handler.ComponentRenderingRequestHandler;
-import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler;
-import org.apache.wicket.core.request.handler.PageAndComponentProvider;
import org.apache.wicket.util.string.AppendingStringBuffer;
@@ -81,7 +80,7 @@ public class Index extends WicketExamplePage
protected String getOnClickScript(CharSequence url)
{
IRequestHandler handler = new ListenerInterfaceRequestHandler(
- new PageAndComponentProvider(getPage(), this), ILinkListener.INTERFACE);
+ new PageAndComponentProvider(getPage(), this));
Url componentUrl = RequestCycle.get().mapUrlFor(handler);
componentUrl.addQueryParameter("anticache", Math.random());
return new AppendingStringBuffer("new Ajax.Updater('counter', '").append(
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-examples/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/webapp/WEB-INF/web.xml b/wicket-examples/src/main/webapp/WEB-INF/web.xml
index baf91fd..75df6e5 100644
--- a/wicket-examples/src/main/webapp/WEB-INF/web.xml
+++ b/wicket-examples/src/main/webapp/WEB-INF/web.xml
@@ -784,27 +784,6 @@
<url-pattern>/mailtemplate/*</url-pattern>
</filter-mapping>
-
- <!-- CDI EXAMPLE APPLICATION -->
- <filter>
- <filter-name>CdiApplication</filter-name>
- <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
- <init-param>
- <param-name>applicationClassName</param-name>
- <param-value>org.apache.wicket.examples.cdi.CdiApplication</param-value>
- </init-param>
- </filter>
- <filter-mapping>
- <filter-name>CdiApplication</filter-name>
- <url-pattern>/cdi/*</url-pattern>
- </filter-mapping>
-
- <listener>
- <!-- initialize Weld in servlet environment -->
- <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class>
- </listener>
- <!-- END CDI EXAMPLE APPLICATION -->
-
<!-- Bean Validation EXAMPLE APPLICATION -->
<filter>
<filter-name>BeanValidation</filter-name>
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java
index f2d424b..68fb424 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java
@@ -33,7 +33,6 @@ import javax.imageio.ImageIO;
import javax.imageio.stream.MemoryCacheImageInputStream;
import org.apache.wicket.Component;
-import org.apache.wicket.IResourceListener;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxCallListener;
@@ -213,8 +212,7 @@ public class KittenCaptchaPanel extends Panel
javascript.append("Wicket.$('")
.append(image.getMarkupId())
.append("').src = '");
- CharSequence url = image.urlFor(IResourceListener.INTERFACE,
- new PageParameters());
+ CharSequence url = image.urlFor(new PageParameters());
javascript.append(url);
javascript.append(url.toString().indexOf('?') > -1 ? "&" : "?")
.append("rand=")
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java b/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java
index 230dc6d..1263c66 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java
@@ -108,7 +108,6 @@ public class ComponentInfo
}
}
- private final String listenerInterface;
private final String componentPath;
private final Integer behaviorId;
private final Integer renderCount;
@@ -121,13 +120,10 @@ public class ComponentInfo
* @param componentPath
* @param behaviorId
*/
- public ComponentInfo(final Integer renderCount, final String listenerInterface,
- final String componentPath, final Integer behaviorId)
+ public ComponentInfo(final Integer renderCount, final String componentPath, final Integer behaviorId)
{
- Args.notEmpty(listenerInterface, "listenerInterface");
Args.notNull(componentPath, "componentPath");
- this.listenerInterface = listenerInterface;
this.componentPath = componentPath;
this.behaviorId = behaviorId;
this.renderCount = renderCount;
@@ -142,14 +138,6 @@ public class ComponentInfo
}
/**
- * @return listener interface name
- */
- public String getListenerInterface()
- {
- return listenerInterface;
- }
-
- /**
* @return behavior index
*/
public Integer getBehaviorId()
@@ -177,14 +165,12 @@ public class ComponentInfo
if (renderCount != null)
{
result.append(renderCount);
- result.append(BEHAVIOR_INDEX_SEPARATOR);
}
- result.append(listenerInterface);
-
+ result.append(BEHAVIOR_INDEX_SEPARATOR);
+
if (behaviorId != null)
{
- result.append(BEHAVIOR_INDEX_SEPARATOR);
result.append(behaviorId);
}
result.append(SEPARATOR);
@@ -237,11 +223,6 @@ public class ComponentInfo
String listenerInterface = string.substring(0, i);
String componentPath = decodeComponentPath(string.substring(i + 1));
- if (Strings.isEmpty(listenerInterface))
- {
- return null;
- }
-
Integer behaviorIndex = null;
Integer renderCount = null;
@@ -251,34 +232,18 @@ public class ComponentInfo
if (isNumber(listenerParts[0]))
{
renderCount = Integer.valueOf(listenerParts[0]);
- listenerInterface = listenerParts[1];
}
- else if (isNumber(listenerParts[1]))
+ if (isNumber(listenerParts[1]))
{
- listenerInterface = listenerParts[0];
behaviorIndex = Integer.valueOf(listenerParts[1]);
}
- else
- {
- return null;
- }
- }
- else if (listenerParts.length == 3)
- {
- if (!isNumber(listenerParts[0]) && !isNumber(listenerParts[1]))
- {
- return null;
- }
- renderCount = Integer.valueOf(listenerParts[0]);
- listenerInterface = listenerParts[1];
- behaviorIndex = Integer.valueOf(listenerParts[2]);
+
+ return new ComponentInfo(renderCount, componentPath, behaviorIndex);
}
- else if (listenerParts.length != 1)
+ else
{
return null;
}
-
- return new ComponentInfo(renderCount, listenerInterface, componentPath, behaviorIndex);
}
}
}
[11/17] wicket git commit: WICKET-6137 fixing tests: listener
interface no longer in url;
stateless components don't need render count in url
Posted by sv...@apache.org.
WICKET-6137 fixing tests: listener interface no longer in url; stateless components don't need render count in url
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c353fc84
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c353fc84
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c353fc84
Branch: refs/heads/master
Commit: c353fc8433e27fe7e2547f04713c41ce4d8a25cc
Parents: e9be1b9
Author: Sven Meier <sv...@apache.org>
Authored: Mon Mar 28 23:26:04 2016 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Mon Apr 25 11:44:53 2016 +0200
----------------------------------------------------------------------
.../apache/wicket/RequestListenerInterface.java | 4 ++--
.../wicket/DisabledComponentPage1a_result.html | 2 +-
.../apache/wicket/TestDetachPageAjaxResult.html | 4 ++--
.../wicket/TestDetachPageExpectedResult.html | 2 +-
.../ajax/AjaxBehaviorEnabled_expected.html | 2 +-
.../AjaxHeaderContributionPage2_expected.html | 4 ++--
.../AjaxHeaderContributionPage_expected.html | 4 ++--
.../ajax/DomReadyOrderPage_ajax_expected.html | 6 +++---
.../wicket/ajax/DomReadyOrderPage_expected.html | 4 ++--
.../form/AjaxFormSubmitTestPage_expected.html | 4 ++--
.../OnChangeAjaxBehaviorTestPage_expected.html | 6 +++---
.../ajaxLink/AjaxLinkPageExpectedResult.html | 2 +-
.../AjaxLinkWithBorderPageExpectedResult.html | 2 +-
.../html/ajaxLink/AjaxPage2_ExpectedResult.html | 2 +-
.../SimpleTestPageExpectedResult-1.html | 4 ++--
.../SimpleTestPageExpectedResult.html | 2 +-
.../behavior/ImmutableBehaviorIdsTest.java | 8 ++++----
.../MarkupInheritanceExpectedResult_12.html | 2 +-
.../MarkupInheritanceExpectedResult_4-1.html | 2 +-
.../MarkupInheritanceExpectedResult_4.html | 2 +-
.../MarkupInheritanceExpectedResult_5.html | 2 +-
.../MarkupInheritanceExpectedResult_7.html | 2 +-
.../html/basic/SimplePageExpectedResult_13.html | 2 +-
.../HideableBorderPage_ExpectedResult.html | 2 +-
.../CheckGroupDisabledTestPage_expected.html | 2 +-
.../html/form/CheckGroupTestPage1_expected.html | 2 +-
.../html/form/CheckGroupTestPage2_expected.html | 2 +-
.../html/form/CheckGroupTestPage3_expected.html | 2 +-
.../html/form/CheckGroupTestPage4_expected.html | 2 +-
...DropDownChoiceTestPage_A_false_expected.html | 2 +-
.../DropDownChoiceTestPage_A_true_expected.html | 2 +-
...pDownChoiceTestPage_null_false_expected.html | 2 +-
...opDownChoiceTestPage_null_true_expected.html | 2 +-
.../html/form/FormMethodTestPage_expected.html | 4 ++--
.../RadioGroupDisabledTestPage_expected.html | 2 +-
.../html/form/RadioGroupTestPage1_expected.html | 2 +-
.../html/form/RadioGroupTestPage3_expected.html | 2 +-
.../form/feedback/FeedbackFormPage_result1.html | 2 +-
.../form/feedback/FeedbackFormPage_result2.html | 2 +-
.../FeedbackIndicatorFormPage_result1.html | 2 +-
.../FeedbackIndicatorFormPage_result2.html | 2 +-
.../html/form/pageWithParameters_expected.html | 4 ++--
.../validation/HomePage1_ExpectedResult.html | 2 +-
.../testing3/TestPage_ExpectedResult-1.html | 2 +-
.../testing3/TestPage_ExpectedResult-2.html | 2 +-
.../internal/EnclosurePageExpectedResult_3.html | 2 +-
.../EnclosurePageExpectedResult_9-1-1.html | 2 +-
.../EnclosurePageExpectedResult_9-1.html | 2 +-
.../EnclosurePageExpectedResult_9-2-1.html | 2 +-
.../EnclosurePageExpectedResult_9-2.html | 2 +-
.../EnclosurePageExpectedResult_9-3-1.html | 2 +-
.../EnclosurePageExpectedResult_9-3-2.html | 2 +-
.../EnclosurePageExpectedResult_9-3.html | 2 +-
.../EnclosurePageExpectedResult_9-4.html | 2 +-
.../internal/EnclosurePageExpectedResult_9.html | 2 +-
...lTableNavigationPage_ExpectedResult_1-1.html | 2 +-
...lTableNavigationPage_ExpectedResult_1-2.html | 2 +-
...talTableNavigationPage_ExpectedResult_1.html | 2 +-
.../PagedTableNavigatorExpectedResult_1.html | 10 +++++-----
.../PagedTableNavigatorExpectedResult_2.html | 14 +++++++-------
.../PagedTableNavigatorExpectedResult_3.html | 10 +++++-----
.../PagedTableNavigatorExpectedResult_4.html | 10 +++++-----
.../PagedTableNavigatorExpectedResult_5.html | 10 +++++-----
.../PagedTableNavigatorExpectedResult_6.html | 14 +++++++-------
.../PagedTableNavigatorExpectedResult_7.html | 14 +++++++-------
.../PagedTableNavigatorExpectedResult_8.html | 14 +++++++-------
...igatorWithLabelProviderExpectedResult_1.html | 16 ++++++++--------
...igatorWithLabelProviderExpectedResult_2.html | 20 ++++++++++----------
...igatorWithLabelProviderExpectedResult_3.html | 16 ++++++++--------
...igatorWithLabelProviderExpectedResult_4.html | 16 ++++++++--------
...igatorWithLabelProviderExpectedResult_5.html | 16 ++++++++--------
...igatorWithLabelProviderExpectedResult_6.html | 20 ++++++++++----------
...igatorWithLabelProviderExpectedResult_7.html | 20 ++++++++++----------
...igatorWithLabelProviderExpectedResult_8.html | 10 +++++-----
...ableNavigatorWithMarginExpectedResult_1.html | 12 ++++++------
...ableNavigatorWithMarginExpectedResult_2.html | 16 ++++++++--------
...ableNavigatorWithMarginExpectedResult_3.html | 12 ++++++------
...ableNavigatorWithMarginExpectedResult_4.html | 12 ++++++------
...ableNavigatorWithMarginExpectedResult_5.html | 12 ++++++------
...ableNavigatorWithMarginExpectedResult_6.html | 16 ++++++++--------
...ableNavigatorWithMarginExpectedResult_7.html | 16 ++++++++--------
.../html/list/PagedTablePageExpectedResult.html | 2 +-
.../panel/InlinePanelPageExpectedResult_7.html | 2 +-
.../panel/InlinePanelPageExpectedResult_8.html | 2 +-
.../tags/InputTagNotVisibleWebPageResult.html | 2 +-
.../html/tags/InputTagVisibleWebPageResult.html | 2 +-
.../protocol/http/MockPage_expectedResult.html | 2 +-
.../protocol/http/MockPage_expectedResult2.html | 2 +-
.../wicket/protocol/http/firstpage_result.html | 2 +-
.../wicket/protocol/http/firstpage_result2.html | 2 +-
.../wicket/protocol/http/secondpage_result.html | 2 +-
.../request/mapper/info/ComponentInfoTest.java | 17 ++++++++---------
...nentPageWithParams_indexed_mount_result.html | 2 +-
...essComponentPageWithParams_mount_result.html | 2 +-
...StatelessComponentPageWithParams_result.html | 2 +-
.../StatelessComponentPage_mount_result.html | 2 +-
.../StatelessComponentPage_result.html | 2 +-
.../StatelessPageWithForm_expected.html | 2 +-
.../yui/calendar/DatesPage1_ExpectedResult.html | 8 ++++----
.../examples/spring/annot/web/AnnotPage.html | 2 +-
.../wicket/spring/injection/annot/package.html | 2 +-
101 files changed, 267 insertions(+), 268 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java b/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java
index f45b09e..075cabc 100644
--- a/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java
+++ b/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java
@@ -166,7 +166,7 @@ public class RequestListenerInterface
// we are in Wicket core land
final Component component = (Component)rcomponent;
- if (!component.canCallListenerInterface(null))
+ if (!component.canCallListenerInterface())
{
// just return so that we have a silent fail and just re-render the
// page
@@ -192,7 +192,7 @@ public class RequestListenerInterface
// we are in Wicket core land
final Component component = (Component)rcomponent;
- if (!behavior.canCallListenerInterface(component, null))
+ if (!behavior.canCallListenerInterface(component))
{
log.warn("behavior not enabled; ignore call. Behavior {} at component {}", behavior,
component);
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/DisabledComponentPage1a_result.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/DisabledComponentPage1a_result.html b/wicket-core/src/test/java/org/apache/wicket/DisabledComponentPage1a_result.html
index 787fee4..bcb4461 100644
--- a/wicket-core/src/test/java/org/apache/wicket/DisabledComponentPage1a_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/DisabledComponentPage1a_result.html
@@ -1,5 +1,5 @@
<html xmlns:wicket>
<body>
-<a href="./org.apache.wicket.DisabledComponentPage1?0-1.ILinkListener-link" wicket:id="link">test</a>
+<a href="./org.apache.wicket.DisabledComponentPage1?0-1.-link" wicket:id="link">test</a>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html b/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
index 9614ac0..baff783 100644
--- a/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
@@ -9,7 +9,7 @@ Wicket.Ajax.DebugWindow.enabled=true;
</script>
<script type="text/javascript" id="wicket-ajax-base-url">
/*<![CDATA[*/
-Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.TestDetachPage?0-1.IBehaviorListener.0-comp";
+Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.TestDetachPage?0-1.0-comp";
/*]]]]><![CDATA[>*/
</script>
-</head>]]></header-contribution><evaluate><![CDATA[(function(){Wicket.Ajax.ajax({"u":"./org.apache.wicket.TestDetachPage?0-1.IBehaviorListener.0-comp","c":"comp1","e":"click"});})();]]></evaluate></ajax-response>
\ No newline at end of file
+</head>]]></header-contribution><evaluate><![CDATA[(function(){Wicket.Ajax.ajax({"u":"./org.apache.wicket.TestDetachPage?0-1.0-comp","c":"comp1","e":"click"});})();]]></evaluate></ajax-response>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html
index 8933fe6..469f7fc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html
@@ -16,7 +16,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.TestDetachPage?0";
<script type="text/javascript" >
/*<![CDATA[*/
Wicket.Event.add(window, "domready", function(event) {
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.TestDetachPage?0-1.IBehaviorListener.0-comp","c":"comp1","e":"click"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.TestDetachPage?0-1.0-comp","c":"comp1","e":"click"});;
Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
;});
/*]]>*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabled_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabled_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabled_expected.html
index 39094d1..7875bac 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabled_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabled_expected.html
@@ -20,7 +20,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.AjaxBehaviorEnab
<script type="text/javascript" >
/*<![CDATA[*/
Wicket.Event.add(window, "domready", function(event) {
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.AjaxBehaviorEnabledPage?0-1.IBehaviorListener.0-enabled","c":"enabled1","e":"click"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.AjaxBehaviorEnabledPage?0-1.0-enabled","c":"enabled1","e":"click"});;
Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
;});
/*]]>*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
index 1013ee1..37c6ebd 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
@@ -24,7 +24,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.AjaxHeaderContri
Wicket.Event.add(window, "domready", function(event) {
domReady();;
domReadyB();;
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.AjaxHeaderContributionPage2?0-1.IBehaviorListener.0-link","c":"link1","e":"click","pd":true});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.AjaxHeaderContributionPage2?0-1.0-link","c":"link1","e":"click","pd":true});;
Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
;});
/*]]>*/
@@ -56,6 +56,6 @@ test
<span wicket:id="btest3" id="btest37"><wicket:panel>
test
</wicket:panel></span>
-<a href="./org.apache.wicket.ajax.AjaxHeaderContributionPage2?0-1.ILinkListener-link" wicket:id="link" id="link1">Test</a>
+<a href="./org.apache.wicket.ajax.AjaxHeaderContributionPage2?0-1.-link" wicket:id="link" id="link1">Test</a>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
index 49a4871..e7dbdbd 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
@@ -20,7 +20,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.AjaxHeaderContri
/*<![CDATA[*/
Wicket.Event.add(window, "domready", function(event) {
domReady();;
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.AjaxHeaderContributionPage?0-1.IBehaviorListener.0-link","c":"link1","e":"click","pd":true});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.AjaxHeaderContributionPage?0-1.0-link","c":"link1","e":"click","pd":true});;
Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
;});
/*]]>*/
@@ -42,6 +42,6 @@ test
<span wicket:id="test3" id="test34"><wicket:panel>
test
</wicket:panel></span>
-<a href="./org.apache.wicket.ajax.AjaxHeaderContributionPage?0-1.ILinkListener-link" wicket:id="link" id="link1">Test</a>
+<a href="./org.apache.wicket.ajax.AjaxHeaderContributionPage?0-1.-link" wicket:id="link" id="link1">Test</a>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
index c404a02..627249e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><ajax-response><component id="test1" ><![CDATA[<a href="./org.apache.wicket.ajax.DomReadyOrderPage?0-1.ILinkListener-test" wicket:id="test" id="test1">Test</a>]]></component><header-contribution><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-1.12.3.js"></script>
+<?xml version="1.0" encoding="UTF-8"?><ajax-response><component id="test1" ><![CDATA[<a href="./org.apache.wicket.ajax.DomReadyOrderPage?0-1.-test" wicket:id="test" id="test1">Test</a>]]></component><header-contribution><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-1.12.3.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery-debug.js"></script>
@@ -9,7 +9,7 @@ Wicket.Ajax.DebugWindow.enabled=true;
</script>
<script type="text/javascript" id="wicket-ajax-base-url">
/*<![CDATA[*/
-Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.DomReadyOrderPage?0-1.IBehaviorListener.0-test";
+Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.DomReadyOrderPage?0-1.0-test";
/*]]]]><![CDATA[>*/
</script>
-</head>]]></header-contribution><evaluate><![CDATA[(function(){Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.DomReadyOrderPage?0-1.IBehaviorListener.0-test","c":"test1","e":"click","pd":true});})();(function(){test1();})();(function(){test2();})();]]></evaluate></ajax-response>
\ No newline at end of file
+</head>]]></header-contribution><evaluate><![CDATA[(function(){Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.DomReadyOrderPage?0-1.0-test","c":"test1","e":"click","pd":true});})();(function(){test1();})();(function(){test2();})();]]></evaluate></ajax-response>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
index 4c85cc0..75f0428 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
@@ -16,7 +16,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.DomReadyOrderPag
<script type="text/javascript" >
/*<![CDATA[*/
Wicket.Event.add(window, "domready", function(event) {
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.DomReadyOrderPage?0-1.IBehaviorListener.0-test","c":"test1","e":"click","pd":true});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.DomReadyOrderPage?0-1.0-test","c":"test1","e":"click","pd":true});;
test1();;
test2();;
Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
@@ -24,6 +24,6 @@ Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
/*]]>*/
</script>
</head><body>
-<a href="./org.apache.wicket.ajax.DomReadyOrderPage?0-1.ILinkListener-test" wicket:id="test" id="test1">Test</a>
+<a href="./org.apache.wicket.ajax.DomReadyOrderPage?0-1.-test" wicket:id="test" id="test1">Test</a>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html
index 779587c..513dcfa 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html
@@ -16,13 +16,13 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.form.AjaxFormSub
<script type="text/javascript" >
/*<![CDATA[*/
Wicket.Event.add(window, "domready", function(event) {
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.form.AjaxFormSubmitTestPage?0-1.IBehaviorListener.0-form-submit","m":"POST","c":"submit2","f":"form1","sc":"p::submit","e":"click","pd":true});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.form.AjaxFormSubmitTestPage?0-1.0-form-submit","m":"POST","c":"submit2","f":"form1","sc":"p::submit","e":"click","pd":true});;
Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
;});
/*]]>*/
</script>
</head><body>
- <form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.ajax.form.AjaxFormSubmitTestPage?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.ajax.form.AjaxFormSubmitTestPage?0-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<input type="text" wicket:id="txt1" value="foo" name="txt1"/>
<input type="text" wicket:id="txt2" value="bar" name="txt2"/>
<input type="submit" value="Submit" wicket:id="submit" name="p::submit" id="submit2"/>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html
index d1b7bf9..61b291f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html
@@ -16,14 +16,14 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.form.OnChangeAja
<script type="text/javascript" >
/*<![CDATA[*/
Wicket.Event.add(window, "domready", function(event) {
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.form.OnChangeAjaxBehaviorTestPage?0-1.IBehaviorListener.0-form-field","m":"POST","c":"field1","e":"inputchange change"});;
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.form.OnChangeAjaxBehaviorTestPage?0-1.IBehaviorListener.0-form-dropDown","m":"POST","c":"dropDown2","e":"change"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.form.OnChangeAjaxBehaviorTestPage?0-1.0-form-field","m":"POST","c":"field1","e":"inputchange change"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.form.OnChangeAjaxBehaviorTestPage?0-1.0-form-dropDown","m":"POST","c":"dropDown2","e":"change"});;
Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
;});
/*]]>*/
</script>
</head><body>
- <form wicket:id="form" id="form3" method="post" action="./org.apache.wicket.ajax.form.OnChangeAjaxBehaviorTestPage?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form3_hf_0" id="form3_hf_0" /></div>
+ <form wicket:id="form" id="form3" method="post" action="./org.apache.wicket.ajax.form.OnChangeAjaxBehaviorTestPage?0-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form3_hf_0" id="form3_hf_0" /></div>
<input type="text" wicket:id="field" value="" name="field" id="field1"/>
<select wicket:id="dropDown" name="dropDown" id="dropDown2">
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html
index d983b08..f21fee1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html
@@ -16,7 +16,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.markup.html.ajax
<script type="text/javascript" >
/*<![CDATA[*/
Wicket.Event.add(window, "domready", function(event) {
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.markup.html.ajaxLink.AjaxLinkPage?0-1.IBehaviorListener.0-ajaxLink","c":"ajaxLink1","e":"click"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.markup.html.ajaxLink.AjaxLinkPage?0-1.0-ajaxLink","c":"ajaxLink1","e":"click"});;
Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
;});
/*]]>*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html
index b8dd053..d65968e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html
@@ -16,7 +16,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.markup.html.ajax
<script type="text/javascript" >
/*<![CDATA[*/
Wicket.Event.add(window, "domready", function(event) {
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.markup.html.ajaxLink.AjaxLinkWithBorderPage?0-1.IBehaviorListener.0-border-border_body-ajaxLink","c":"ajaxLink1","e":"click"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.markup.html.ajaxLink.AjaxLinkWithBorderPage?0-1.0-border-border_body-ajaxLink","c":"ajaxLink1","e":"click"});;
Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
;});
/*]]>*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html
index 7bedc8d..b13d205 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html
@@ -16,7 +16,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.markup.html.ajax
<script type="text/javascript" >
/*<![CDATA[*/
Wicket.Event.add(window, "domready", function(event) {
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.markup.html.ajaxLink.AjaxPage2?0-1.IBehaviorListener.0-pageLayout-pageLayout_body-ajaxLink","c":"ajaxLink1","e":"click"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.markup.html.ajaxLink.AjaxPage2?0-1.0-pageLayout-pageLayout_body-ajaxLink","c":"ajaxLink1","e":"click"});;
Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
;});
/*]]>*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
index 9bd17c6..88e6898 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
@@ -9,7 +9,7 @@ Wicket.Ajax.DebugWindow.enabled=true;
</script>
<script type="text/javascript" id="wicket-ajax-base-url">
/*<![CDATA[*/
-Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.markup.html.componentMap.SimpleTestPage?0-1.IBehaviorListener.0-testPanel-baseSpan-linja1";
+Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.markup.html.componentMap.SimpleTestPage?0-1.0-testPanel-baseSpan-linja1";
/*]]]]><![CDATA[>*/
</script>
-</head>]]></header-contribution><evaluate><![CDATA[(function(){Wicket.Timer.set('linja11', function(){Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.markup.html.componentMap.SimpleTestPage?0-1.IBehaviorListener.0-testPanel-baseSpan-linja1","c":"linja11"});}, 2000);})();]]></evaluate></ajax-response>
\ No newline at end of file
+</head>]]></header-contribution><evaluate><![CDATA[(function(){Wicket.Timer.set('linja11', function(){Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.markup.html.componentMap.SimpleTestPage?0-1.0-testPanel-baseSpan-linja1","c":"linja11"});}, 2000);})();]]></evaluate></ajax-response>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html
index 7bd3f19..3d70ff0 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html
@@ -18,7 +18,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.markup.html.comp
<script type="text/javascript" >
/*<![CDATA[*/
Wicket.Event.add(window, "load", function(event) {
-Wicket.Timer.set('linja11', function(){Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.markup.html.componentMap.SimpleTestPage?0-1.IBehaviorListener.0-testPanel-baseSpan-linja1","c":"linja11"});}, 2000);;
+Wicket.Timer.set('linja11', function(){Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.markup.html.componentMap.SimpleTestPage?0-1.0-testPanel-baseSpan-linja1","c":"linja11"});}, 2000);;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/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 bc0aaba..b622e7c 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
@@ -70,8 +70,8 @@ public class ImmutableBehaviorIdsTest extends WicketTestCase
assertTrue(output.contains("autocomplete=\"off\""));
assertTrue(output.contains("class2=\"border\""));
assertTrue(output.contains("autocomplete2=\"off\""));
- assertTrue(output.contains("IBehaviorListener.0"));
- assertTrue(output.contains("IBehaviorListener.1"));
+ assertTrue(output.contains(".0"));
+ assertTrue(output.contains(".1"));
assertEquals(link, page.getContainer().getBehaviorById(0));
assertEquals(link2, page.getContainer().getBehaviorById(1));
@@ -86,8 +86,8 @@ public class ImmutableBehaviorIdsTest extends WicketTestCase
tester.startPage(page);
output = tester.getLastResponseAsString();
// System.out.println(output);
- assertTrue(output.contains("IBehaviorListener.0"));
- assertTrue(output.contains("IBehaviorListener.1"));
+ assertTrue(output.contains(".0"));
+ assertTrue(output.contains(".1"));
assertEquals(link, page.getContainer().getBehaviorById(0));
assertEquals(link2, page.getContainer().getBehaviorById(1));
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_12.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_12.html b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_12.html
index e370ee8..ba5a54f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_12.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_12.html
@@ -9,6 +9,6 @@
<wicket:child><wicket:extend>
888<span wicket:id="label3">extension label</span>999
</wicket:extend></wicket:child>
- 333<a href="./org.apache.wicket.markup.MarkupInheritanceExtension_12?0-1.ILinkListener-link" wicket:id="link">increment</a>444
+ 333<a href="./org.apache.wicket.markup.MarkupInheritanceExtension_12?0-1.-link" wicket:id="link">increment</a>444
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_4-1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_4-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_4-1.html
index 9eff1ac..88a6069 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_4-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_4-1.html
@@ -5,5 +5,5 @@
<!-- note: extension and base can not have equals ids like e.g. "label" -->
extension: 1 <span wicket:id="label3">extension label</span> extension: 2
</wicket:extend></wicket:child>
- extension: 1 <a href="./org.apache.wicket.markup.MarkupInheritanceExtension_4?0-2.ILinkListener-link" wicket:id="link">increment</a> extension: 2
+ extension: 1 <a href="./org.apache.wicket.markup.MarkupInheritanceExtension_4?0-2.-link" wicket:id="link">increment</a> extension: 2
base: after
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_4.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_4.html b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_4.html
index b6f7e2a..6e16220 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_4.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_4.html
@@ -5,5 +5,5 @@
<!-- note: extension and base can not have equals ids like e.g. "label" -->
extension: 1 <span wicket:id="label3">extension label</span> extension: 2
</wicket:extend></wicket:child>
- extension: 1 <a href="./org.apache.wicket.markup.MarkupInheritanceExtension_4?0-1.ILinkListener-link" wicket:id="link">increment</a> extension: 2
+ extension: 1 <a href="./org.apache.wicket.markup.MarkupInheritanceExtension_4?0-1.-link" wicket:id="link">increment</a> extension: 2
base: after
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_5.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_5.html b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_5.html
index e20aef9..31d0119 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_5.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_5.html
@@ -7,6 +7,6 @@
<wicket:child><wicket:extend>
888<span wicket:id="label3">extension label</span>999
</wicket:extend></wicket:child>
- 333<a href="./org.apache.wicket.markup.MarkupInheritanceExtension_5?0-1.ILinkListener-link" wicket:id="link">increment</a>444
+ 333<a href="./org.apache.wicket.markup.MarkupInheritanceExtension_5?0-1.-link" wicket:id="link">increment</a>444
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_7.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_7.html b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_7.html
index d59f6d2..5e380d9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_7.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_7.html
@@ -9,6 +9,6 @@
<wicket:child><wicket:extend>
888<span wicket:id="label3">extension label</span>999
</wicket:extend></wicket:child>
- 333<a href="./org.apache.wicket.markup.MarkupInheritanceExtension_7?0-1.ILinkListener-link" wicket:id="link">increment</a>444
+ 333<a href="./org.apache.wicket.markup.MarkupInheritanceExtension_7?0-1.-link" wicket:id="link">increment</a>444
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html
index 2105e7c..7427a86 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html
@@ -20,7 +20,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.basic.Sim
<script type="text/javascript" >
/*<![CDATA[*/
Wicket.Event.add(window, "domready", function(event) {
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.basic.SimplePage_13?0-1.IBehaviorListener.0-html","c":"html1","e":"click"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.basic.SimplePage_13?0-1.0-html","c":"html1","e":"click"});;
Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
;});
/*]]>*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
index 9db233c..4d77073 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
@@ -16,7 +16,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.border.Hi
<script type="text/javascript" >
/*<![CDATA[*/
Wicket.Event.add(window, "domready", function(event) {
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.border.HideableBorderPage?0-1.IBehaviorListener.0-hideable-hideLink","c":"hideLink1","e":"click"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.border.HideableBorderPage?0-1.0-hideable-hideLink","c":"hideLink1","e":"click"});;
Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
;});
/*]]>*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html
index dfba8d0..4ac8378 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html
@@ -2,7 +2,7 @@
<head><title>CheckGroupTestPage1</title></head>
<body>
<!-- In addition test that chars are not converted from upper to lower and vice versa -->
- <FORM wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.CheckGroupDisabledTestPage?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <FORM wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.CheckGroupDisabledTestPage?0-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<span wicket:id="group">
<input type="checkbox" wicket:id="check1" id="check12" name="group" value="check0" checked="checked" disabled="disabled">check1</input>
<span wicket:id="container">
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1_expected.html
index 8f23b9b..abd39dc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1_expected.html
@@ -2,7 +2,7 @@
<head><title>CheckGroupTestPage1</title></head>
<body>
<!-- In addition test that chars are not converted from upper to lower and vice versa -->
- <FORM wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.CheckGroupTestPage1?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <FORM wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.CheckGroupTestPage1?0-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<input type="checkbox" wicket:id="check1" id="check12" name="group" value="check0">check1</input>
<span wicket:id="container">
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage2_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage2_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage2_expected.html
index c35c499..1683546 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage2_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage2_expected.html
@@ -1,7 +1,7 @@
<html>
<head><title>CheckGroupTestPage2</title></head>
<body>
- <form wicket:id="form" id="form4" method="post" action="./org.apache.wicket.markup.html.form.CheckGroupTestPage2?1-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form4_hf_0" id="form4_hf_0" /></div>
+ <form wicket:id="form" id="form4" method="post" action="./org.apache.wicket.markup.html.form.CheckGroupTestPage2?1-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form4_hf_0" id="form4_hf_0" /></div>
<input type="checkbox" wicket:id="check1" id="check15" name="group" value="check0" checked="checked">check1</input>
<span wicket:id="container">
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage3_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage3_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage3_expected.html
index 0af457e..8030cc7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage3_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage3_expected.html
@@ -1,7 +1,7 @@
<html>
<head><title>CheckGroupTestPage3</title></head>
<body>
- <form wicket:id="form" id="form7" method="post" action="./org.apache.wicket.markup.html.form.CheckGroupTestPage3?2-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form7_hf_0" id="form7_hf_0" /></div>
+ <form wicket:id="form" id="form7" method="post" action="./org.apache.wicket.markup.html.form.CheckGroupTestPage3?2-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form7_hf_0" id="form7_hf_0" /></div>
<input type="checkbox" wicket:id="check1" id="check18" name="group" value="check0">check1</input>
<span wicket:id="container">
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage4_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage4_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage4_expected.html
index 9a76d22..5eb87ac 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage4_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage4_expected.html
@@ -1,7 +1,7 @@
<html>
<head><title>CheckGroupTestPage4</title></head>
<body>
- <form wicket:id="form" id="forma" method="post" action="./org.apache.wicket.markup.html.form.CheckGroupTestPage4?3-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="forma_hf_0" id="forma_hf_0" /></div>
+ <form wicket:id="form" id="forma" method="post" action="./org.apache.wicket.markup.html.form.CheckGroupTestPage4?3-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="forma_hf_0" id="forma_hf_0" /></div>
<input type="checkbox" wicket:id="check1" id="check1b" name="group" value="check0" checked="checked">check1</input>
<span wicket:id="container">
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_false_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_false_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_false_expected.html
index 7631045..26965dc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_false_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_false_expected.html
@@ -1,6 +1,6 @@
<html>
<body>
- <form wicket:id="form" id="form1" method="post" action="./page?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?0-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<select wicket:id="dropdown" name="dropdown">
<option selected="selected" value="0">A</option>
<option value="1">B</option>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_true_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_true_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_true_expected.html
index ab08e2d..125c2fe 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_true_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_true_expected.html
@@ -1,6 +1,6 @@
<html>
<body>
- <form wicket:id="form" id="form1" method="post" action="./page?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?0-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<select wicket:id="dropdown" name="dropdown">
<option value=""></option>
<option selected="selected" value="0">A</option>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_false_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_false_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_false_expected.html
index daaf8c4..c1263ea 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_false_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_false_expected.html
@@ -1,6 +1,6 @@
<html>
<body>
- <form wicket:id="form" id="form1" method="post" action="./page?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?0-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<select wicket:id="dropdown" name="dropdown">
<option selected="selected" value="">Choose One</option>
<option value="0">A</option>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_true_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_true_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_true_expected.html
index 7c87409..7dc93d7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_true_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_true_expected.html
@@ -1,6 +1,6 @@
<html>
<body>
- <form wicket:id="form" id="form1" method="post" action="./page?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?0-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<select wicket:id="dropdown" name="dropdown">
<option selected="selected" value=""></option>
<option value="0">A</option>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage_expected.html
index 5c824af..6050ab1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage_expected.html
@@ -1,6 +1,6 @@
<html>
<body>
- <form wicket:id="formpost" id="formpost1" method="post" action="./org.apache.wicket.markup.html.form.FormMethodTestPage?0-1.IFormSubmitListener-formpost"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="formpost1_hf_0" id="formpost1_hf_0" /></div></form>
- <form wicket:id="formget" id="formget2" method="get" action="./org.apache.wicket.markup.html.form.FormMethodTestPage"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="formget2_hf_0" id="formget2_hf_0" /><input type="hidden" name="0-1.IFormSubmitListener-formget" value="" /></div></form>
+ <form wicket:id="formpost" id="formpost1" method="post" action="./org.apache.wicket.markup.html.form.FormMethodTestPage?0-1.-formpost"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="formpost1_hf_0" id="formpost1_hf_0" /></div></form>
+ <form wicket:id="formget" id="formget2" method="get" action="./org.apache.wicket.markup.html.form.FormMethodTestPage"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="formget2_hf_0" id="formget2_hf_0" /><input type="hidden" name="0-1.-formget" value="" /></div></form>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage_expected.html
index ad4f11a..3f468c0 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage_expected.html
@@ -1,7 +1,7 @@
<html>
<head><title>RadioGroupTestPage1</title></head>
<body>
- <form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.RadioGroupDisabledTestPage?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.RadioGroupDisabledTestPage?0-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<span wicket:id="group">
<input type="radio" wicket:id="radio1" id="radio12" name="group" value="radio0" disabled="disabled">radio1</input>
<span wicket:id="container">
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1_expected.html
index 5d518b7..09dee23 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1_expected.html
@@ -1,7 +1,7 @@
<html>
<head><title>RadioGroupTestPage1</title></head>
<body>
- <form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.RadioGroupTestPage1?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.RadioGroupTestPage1?0-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<input type="radio" wicket:id="radio1" id="radio12" name="group" value="radio0">radio1</input>
<span wicket:id="container">
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage3_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage3_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage3_expected.html
index 30d2934..4a6a0b6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage3_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage3_expected.html
@@ -1,6 +1,6 @@
<html>
<body>
-<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.RadioGroupTestPage3?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.RadioGroupTestPage3?0-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<input wicket:id="check1" type="radio" id="check12" name="radio" value="radio0" checked="checked">Yes
<input wicket:id="check2" type="radio" id="check23" name="radio" value="radio1" checked="checked">No
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result1.html
index b349a8e..1beb7a5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result1.html
@@ -1,6 +1,6 @@
<html>
<body>
-<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.feedback.FeedbackFormPage?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.feedback.FeedbackFormPage?0-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<span wicket:id="feedback"><wicket:border>
<wicket:body>
<input type="text" wicket:id="input" value="" name="feedback:feedback_body:input">
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result2.html
index da7d6b2..c1f54fc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result2.html
@@ -1,6 +1,6 @@
<html>
<body>
-<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.feedback.FeedbackFormPage?1-2.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.feedback.FeedbackFormPage?1-2.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<span wicket:id="feedback"><wicket:border>
<wicket:body>
<input type="text" wicket:id="input" value="" name="feedback:feedback_body:input">
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result1.html
index dd0d17b..3fe836e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result1.html
@@ -1,6 +1,6 @@
<html>
<body>
-<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.feedback.FeedbackIndicatorFormPage?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.feedback.FeedbackIndicatorFormPage?0-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<input type="text" wicket:id="input" value="" name="input">
</form>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result2.html
index fd9e1fa..e1fe256 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result2.html
@@ -1,6 +1,6 @@
<html>
<body>
-<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.feedback.FeedbackIndicatorFormPage?1-2.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.feedback.FeedbackIndicatorFormPage?1-2.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<input type="text" wicket:id="input" value="" name="input">
<span wicket:id="feedback"><wicket:panel><span style="color:red;">*</span></wicket:panel></span>
</form>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/form/pageWithParameters_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/pageWithParameters_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/pageWithParameters_expected.html
index 726c41a..665c8b4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/pageWithParameters_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/pageWithParameters_expected.html
@@ -1,6 +1,6 @@
<html>
<body>
- <form wicket:id="formpost" id="formpost1" method="post" action="./org.apache.wicket.markup.html.form.FormMethodTestPage?0-1.IFormSubmitListener-formpost&first=foo&second=bar"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="formpost1_hf_0" id="formpost1_hf_0" /></div></form>
- <form wicket:id="formget" id="formget2" method="get" action="./org.apache.wicket.markup.html.form.FormMethodTestPage"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="formget2_hf_0" id="formget2_hf_0" /><input type="hidden" name="0-1.IFormSubmitListener-formget" value="" /><input type="hidden" name="first" value="foo" /><input type="hidden" name="second" value="bar" /></div></form>
+ <form wicket:id="formpost" id="formpost1" method="post" action="./org.apache.wicket.markup.html.form.FormMethodTestPage?0-1.-formpost&first=foo&second=bar"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="formpost1_hf_0" id="formpost1_hf_0" /></div></form>
+ <form wicket:id="formget" id="formget2" method="get" action="./org.apache.wicket.markup.html.form.FormMethodTestPage"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="formget2_hf_0" id="formget2_hf_0" /><input type="hidden" name="0-1.-formget" value="" /><input type="hidden" name="first" value="foo" /><input type="hidden" name="second" value="bar" /></div></form>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage1_ExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage1_ExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage1_ExpectedResult.html
index 3b8ec37..561b878 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage1_ExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage1_ExpectedResult.html
@@ -8,7 +8,7 @@
<span wicket:id="message">If you see this message wicket is properly configured and running</span>
<div wicket:id="bug"><wicket:panel>
- <form wicket:id="form" id="form8" method="post" action="./org.apache.wicket.markup.html.form.validation.HomePage1?1-1.IFormSubmitListener-bug-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form8_hf_0" id="form8_hf_0" /></div>
+ <form wicket:id="form" id="form8" method="post" action="./org.apache.wicket.markup.html.form.validation.HomePage1?1-1.-bug-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form8_hf_0" id="form8_hf_0" /></div>
<div wicket:id="border"><wicket:border>
<wicket:body>
<input wicket:id="name" value="" name="border:border_body:name"/>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-1.html
index 5ba92fb..0540f9d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-1.html
@@ -7,6 +7,6 @@
<span wicket:id="panel"><wicket:panel>
Panel 1
</wicket:panel></span>
- <a wicket:id="link" href="./org.apache.wicket.markup.html.header.testing3.TestPage?0-1.ILinkListener-link">Replace the panel</a>
+ <a wicket:id="link" href="./org.apache.wicket.markup.html.header.testing3.TestPage?0-1.-link">Replace the panel</a>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-2.html
index b0b2a08..6a1f8a3 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-2.html
@@ -7,6 +7,6 @@
<span wicket:id="panel"><wicket:panel>
Panel 2
</wicket:panel></span>
- <a wicket:id="link" href="./org.apache.wicket.markup.html.header.testing3.TestPage?1-2.ILinkListener-link">Replace the panel</a>
+ <a wicket:id="link" href="./org.apache.wicket.markup.html.header.testing3.TestPage?1-2.-link">Replace the panel</a>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_3.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_3.html
index dc10071..bd8e800 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_3.html
@@ -4,7 +4,7 @@
before <wicket:body>
<wicket:enclosure child="newLink">
<div class="action">
- <a wicket:id="newLink" href="./org.apache.wicket.markup.html.internal.EnclosurePage_3?0-1.ILinkListener-border-border_body-newLink">test</a>
+ <a wicket:id="newLink" href="./org.apache.wicket.markup.html.internal.EnclosurePage_3?0-1.-border-border_body-newLink">test</a>
</div>
</wicket:enclosure>
</wicket:body> after
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1-1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1-1.html
index 21c441d..ec477f4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1-1.html
@@ -1,6 +1,6 @@
<html xmlns:wicket>
<body>
- <form wicket:id="form" id="form1" method="post" action="./page?2-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?2-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
<wicket:enclosure child="label">
<input wicket:id="input" type="checkbox" name="input"/>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html
index 6ae92e0..96a4816 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html
@@ -1,6 +1,6 @@
<html xmlns:wicket>
<body>
- <form wicket:id="form" id="form1" method="post" action="./page?1-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?1-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
</form>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2-1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2-1.html
index baeac11..36e99d4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2-1.html
@@ -1,6 +1,6 @@
<html xmlns:wicket>
<body>
- <form wicket:id="form" id="form1" method="post" action="./page?2-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?2-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
</form>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2.html
index 987b223..ab64beb 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2.html
@@ -1,6 +1,6 @@
<html xmlns:wicket>
<body>
- <form wicket:id="form" id="form1" method="post" action="./page?4-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?4-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
</form>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-1.html
index df38e88..78db5e1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-1.html
@@ -1,6 +1,6 @@
<html xmlns:wicket>
<body>
- <form wicket:id="form" id="form1" method="post" action="./page?5-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?5-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
<wicket:enclosure child="label">
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-2.html
index 87eb79e..a662144 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-2.html
@@ -1,6 +1,6 @@
<html xmlns:wicket>
<body>
- <form wicket:id="form" id="form1" method="post" action="./page?6-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?6-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
<wicket:enclosure child="label">
<input wicket:id="input" type="checkbox" name="input"/>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3.html
index 3e86ff0..3776723 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3.html
@@ -1,6 +1,6 @@
<html xmlns:wicket>
<body>
- <form wicket:id="form" id="form1" method="post" action="./page?3-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?3-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
<wicket:enclosure child="label">
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-4.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-4.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-4.html
index 2186bd1..c2642aa 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-4.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-4.html
@@ -1,6 +1,6 @@
<html xmlns:wicket>
<body>
- <form wicket:id="form" id="form1" method="post" action="./page?1-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?1-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
<wicket:enclosure child="label">
<input wicket:id="input" type="checkbox" checked="checked" name="input"/>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9.html
index 638925b..bf42d8d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9.html
@@ -1,6 +1,6 @@
<html xmlns:wicket>
<body>
- <form wicket:id="form" id="form1" method="post" action="./page?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+ <form wicket:id="form" id="form1" method="post" action="./page?0-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
<wicket:enclosure child="label">
<input wicket:id="input" type="checkbox" name="input"/>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-1.html
index 625af01..41bbbe0 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-1.html
@@ -3,6 +3,6 @@
<title>Paged Table Page</title>
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">five</span></li><li wicket:id="table"><span wicket:id="txt">six</span></li></ul>
-<a wicket:id="prev" href="./org.apache.wicket.markup.html.list.IncrementalTableNavigationPage?1-2.ILinkListener-prev">Prev</a><a wicket:id="nextNext" href="./org.apache.wicket.markup.html.list.IncrementalTableNavigationPage?1-2.ILinkListener-nextNext">NextNext</a>
+<a wicket:id="prev" href="./org.apache.wicket.markup.html.list.IncrementalTableNavigationPage?1-2.-prev">Prev</a><a wicket:id="nextNext" href="./org.apache.wicket.markup.html.list.IncrementalTableNavigationPage?1-2.-nextNext">NextNext</a>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-2.html
index d7e9fac..87dd203 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-2.html
@@ -3,6 +3,6 @@
<title>Paged Table Page</title>
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">three</span></li><li wicket:id="table"><span wicket:id="txt">four</span></li></ul>
-<a wicket:id="prev" href="./org.apache.wicket.markup.html.list.IncrementalTableNavigationPage?2-3.ILinkListener-prev">Prev</a><a wicket:id="nextNext" href="./org.apache.wicket.markup.html.list.IncrementalTableNavigationPage?2-3.ILinkListener-nextNext">NextNext</a>
+<a wicket:id="prev" href="./org.apache.wicket.markup.html.list.IncrementalTableNavigationPage?2-3.-prev">Prev</a><a wicket:id="nextNext" href="./org.apache.wicket.markup.html.list.IncrementalTableNavigationPage?2-3.-nextNext">NextNext</a>
</body>
</html>
[03/17] wicket git commit: WICKET-6137 remove RequestListenerInterface
Posted by sv...@apache.org.
WICKET-6137 remove RequestListenerInterface
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d1710298
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d1710298
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d1710298
Branch: refs/heads/master
Commit: d1710298c7e371f260299f732c58d0bf4d647161
Parents: 7dcdae5
Author: Sven Meier <sv...@apache.org>
Authored: Sat Mar 19 19:57:00 2016 +0100
Committer: Sven Meier <sv...@apache.org>
Committed: Mon Apr 25 11:44:33 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/wicket/Component.java | 22 ++-
.../org/apache/wicket/DefaultMapperContext.java | 12 --
.../org/apache/wicket/IRequestListener.java | 2 +
.../org/apache/wicket/IResourceListener.java | 39 ------
.../java/org/apache/wicket/Initializer.java | 13 --
.../apache/wicket/RequestListenerInterface.java | 10 +-
.../wicket/behavior/AbstractAjaxBehavior.java | 16 ++-
.../org/apache/wicket/behavior/Behavior.java | 3 +-
.../wicket/behavior/IBehaviorListener.java | 36 -----
...markableListenerInterfaceRequestHandler.java | 31 ++--
.../ListenerInterfaceRequestHandler.java | 140 +++++++++++++------
.../ListenerInvocationNotAllowedException.java | 10 +-
.../logger/ListenerInterfaceLogData.java | 29 +---
.../mapper/AbstractBookmarkableMapper.java | 39 +-----
.../request/mapper/AbstractComponentMapper.java | 27 ----
.../core/request/mapper/IMapperContext.java | 17 ---
.../core/request/mapper/MountedMapper.java | 11 +-
.../core/request/mapper/PageInstanceMapper.java | 14 +-
.../apache/wicket/markup/html/form/Check.java | 2 +-
.../wicket/markup/html/form/CheckBox.java | 11 +-
.../wicket/markup/html/form/CheckGroup.java | 9 +-
.../wicket/markup/html/form/DropDownChoice.java | 11 +-
.../apache/wicket/markup/html/form/Form.java | 11 +-
.../markup/html/form/IFormSubmitListener.java | 33 -----
.../markup/html/form/IOnChangeListener.java | 35 -----
.../wicket/markup/html/form/ImageButton.java | 9 +-
.../apache/wicket/markup/html/form/Radio.java | 2 +-
.../wicket/markup/html/form/RadioChoice.java | 11 +-
.../wicket/markup/html/form/RadioGroup.java | 9 +-
.../wicket/markup/html/form/StatelessForm.java | 2 +-
.../apache/wicket/markup/html/image/Image.java | 14 +-
.../image/resource/LocalizedImageResource.java | 5 +-
.../wicket/markup/html/link/ILinkListener.java | 32 -----
.../wicket/markup/html/link/InlineFrame.java | 11 +-
.../apache/wicket/markup/html/link/Link.java | 11 +-
.../wicket/markup/html/link/ResourceLink.java | 12 +-
.../wicket/markup/html/link/StatelessLink.java | 8 +-
.../wicket/util/tester/BaseWicketTester.java | 41 ++----
.../apache/wicket/util/tester/FormTester.java | 3 +-
.../org/apache/wicket/BehaviorRequestTest.java | 23 +--
.../java/org/apache/wicket/BehaviorUrlTest.java | 11 +-
.../ComponentWithLazyModelCreationTest.java | 16 ++-
.../behavior/ImmutableBehaviorIdsTest.java | 11 +-
.../ListenerInterfaceRequestHandlerTest.java | 10 +-
.../core/request/mapper/AbstractMapperTest.java | 13 --
.../AbstractResourceReferenceMapperTest.java | 1 -
.../request/mapper/BookmarkableMapperTest.java | 15 +-
.../core/request/mapper/CryptoMapperTest.java | 11 +-
.../core/request/mapper/MountedMapperTest.java | 17 +--
.../core/request/mapper/PackageMapperTest.java | 12 +-
.../request/mapper/PageInstanceMapperTest.java | 6 +-
.../core/request/mapper/TestMapperContext.java | 15 +-
.../request/mapper/info/ComponentInfoTest.java | 11 +-
.../mapper/info/PageComponentInfoTest.java | 5 +-
.../wicket/examples/ajax/prototype/Index.java | 9 +-
wicket-examples/src/main/webapp/WEB-INF/web.xml | 21 ---
.../captcha/kittens/KittenCaptchaPanel.java | 4 +-
.../request/mapper/info/ComponentInfo.java | 49 +------
58 files changed, 350 insertions(+), 663 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/main/java/org/apache/wicket/Component.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java
index f9a8cd9..877e963 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -58,7 +58,6 @@ import org.apache.wicket.markup.head.StringHeaderItem;
import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.FormComponent;
-import org.apache.wicket.markup.html.form.IFormSubmitListener;
import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;
import org.apache.wicket.markup.html.panel.DefaultMarkupSourcingStrategy;
import org.apache.wicket.markup.html.panel.IMarkupSourcingStrategy;
@@ -852,7 +851,7 @@ public abstract class Component
*
* @return {@code true} if component has been initialized
*/
- final boolean isInitialized()
+ public final boolean isInitialized()
{
return getFlag(FLAG_INITIALIZED);
}
@@ -3343,19 +3342,17 @@ public abstract class Component
* The parameters that should be rendered into the urls
* @return The URL
*/
- public final CharSequence urlFor(final Behavior behaviour,
- final RequestListenerInterface listener, final PageParameters parameters)
+ public final CharSequence urlFor(final Behavior behaviour, final PageParameters parameters)
{
int id = getBehaviorId(behaviour);
- IRequestHandler handler = createRequestHandler(listener, parameters, id);
+ IRequestHandler handler = createRequestHandler(parameters, id);
return getRequestCycle().urlFor(handler);
}
/**
* Create a suitable request handler depending whether the page is stateless or bookmarkable.
*/
- private IRequestHandler createRequestHandler(RequestListenerInterface listener,
- PageParameters parameters, Integer id)
+ private IRequestHandler createRequestHandler(PageParameters parameters, Integer id)
{
Page page = getPage();
@@ -3365,11 +3362,11 @@ public abstract class Component
|| (getApplication().getPageSettings().getRecreateBookmarkablePagesAfterExpiry()
&& page.isBookmarkable() && page.wasCreatedBookmarkable()))
{
- return new BookmarkableListenerInterfaceRequestHandler(provider, listener, id);
+ return new BookmarkableListenerInterfaceRequestHandler(provider, id);
}
else
{
- return new ListenerInterfaceRequestHandler(provider, listener, id);
+ return new ListenerInterfaceRequestHandler(provider, id);
}
}
@@ -3393,16 +3390,13 @@ public abstract class Component
*
* @see RequestCycle#urlFor(IRequestHandler)
*
- * @param listener
- * The listener interface that the URL should call
* @param parameters
* The parameters that should be rendered into the urls
* @return The URL
*/
- public final CharSequence urlFor(final RequestListenerInterface listener,
- final PageParameters parameters)
+ public final CharSequence urlFor(final PageParameters parameters)
{
- IRequestHandler handler = createRequestHandler(listener, parameters, null);
+ IRequestHandler handler = createRequestHandler(parameters, null);
return getRequestCycle().urlFor(handler);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/main/java/org/apache/wicket/DefaultMapperContext.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/DefaultMapperContext.java b/wicket-core/src/main/java/org/apache/wicket/DefaultMapperContext.java
index 486dbf9..6527f96 100644
--- a/wicket-core/src/main/java/org/apache/wicket/DefaultMapperContext.java
+++ b/wicket-core/src/main/java/org/apache/wicket/DefaultMapperContext.java
@@ -82,18 +82,6 @@ public class DefaultMapperContext implements IMapperContext
}
@Override
- public RequestListenerInterface requestListenerInterfaceFromString(final String interfaceName)
- {
- return RequestListenerInterface.forName(interfaceName);
- }
-
- @Override
- public String requestListenerInterfaceToString(final RequestListenerInterface listenerInterface)
- {
- return listenerInterface.getName();
- }
-
- @Override
public IRequestablePage newPageInstance(final Class<? extends IRequestablePage> pageClass,
final PageParameters pageParameters)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/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 350717f..d94416d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/IRequestListener.java
+++ b/wicket-core/src/main/java/org/apache/wicket/IRequestListener.java
@@ -33,6 +33,8 @@ import org.apache.wicket.util.io.IClusterable;
*/
public interface IRequestListener extends IClusterable
{
+
+ boolean includeRenderCount();
/**
* Called when a request to a behavior is received.
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/main/java/org/apache/wicket/IResourceListener.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/IResourceListener.java b/wicket-core/src/main/java/org/apache/wicket/IResourceListener.java
deleted file mode 100644
index 983594c..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/IResourceListener.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket;
-
-
-/**
- * Listens for requests regarding resources. Such resources are typically non-static in nature and
- * may even be created on the fly.
- * <p>
- * One use for resource listeners is that they may be used to create components such as Image which
- * respond to requests with a localized resource loaded from the classpath. The Image class allows
- * reusable components to transparently bundle localized image resources. Components that use Image
- * resources (instead of referencing static images in their markup) can be distributed as a
- * self-contained JAR file.
- *
- * @see org.apache.wicket.markup.html.image.Image
- * @see org.apache.wicket.markup.html.image.resource.RenderedDynamicImageResource
- * @author Jonathan Locke
- */
-public interface IResourceListener extends IRequestListener
-{
- /** Resource listener interface object */
- RequestListenerInterface INTERFACE = new RequestListenerInterface(
- IResourceListener.class).setIncludeRenderCount(false).setRenderPageAfterInvocation(false);
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/main/java/org/apache/wicket/Initializer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Initializer.java b/wicket-core/src/main/java/org/apache/wicket/Initializer.java
index 19fa544..cb81938 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Initializer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Initializer.java
@@ -16,11 +16,6 @@
*/
package org.apache.wicket;
-import org.apache.wicket.behavior.IBehaviorListener;
-import org.apache.wicket.markup.html.form.IFormSubmitListener;
-import org.apache.wicket.markup.html.form.IOnChangeListener;
-import org.apache.wicket.markup.html.link.ILinkListener;
-
/**
* Initializer for components in wicket core library.
*
@@ -34,14 +29,6 @@ public class Initializer implements IInitializer
@Override
public void init(Application application)
{
- // Register listener interfaces explicitly (even though they implicitly
- // register when loaded) because deserialization of an object that
- // implements an interface does not load the interfaces it implements!
- IBehaviorListener.INTERFACE.register();
- IFormSubmitListener.INTERFACE.register();
- ILinkListener.INTERFACE.register();
- IOnChangeListener.INTERFACE.register();
- IResourceListener.INTERFACE.register();
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java b/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java
index 64c26f0..f45b09e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java
+++ b/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java
@@ -16,18 +16,14 @@
*/
package org.apache.wicket;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.wicket.authorization.AuthorizationException;
import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.request.RequestHandlerExecutor.ReplaceHandlerException;
-import org.apache.wicket.request.component.IRequestableComponent;
import org.apache.wicket.core.request.handler.ListenerInvocationNotAllowedException;
+import org.apache.wicket.request.component.IRequestableComponent;
import org.apache.wicket.util.lang.Classes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -175,7 +171,7 @@ public class RequestListenerInterface
// just return so that we have a silent fail and just re-render the
// page
log.info("component not enabled or visible; ignoring call. Component: " + component);
- throw new ListenerInvocationNotAllowedException(this, component, null,
+ throw new ListenerInvocationNotAllowedException(component, null,
"Component rejected interface invocation");
}
@@ -200,7 +196,7 @@ public class RequestListenerInterface
{
log.warn("behavior not enabled; ignore call. Behavior {} at component {}", behavior,
component);
- throw new ListenerInvocationNotAllowedException(this, component, behavior,
+ throw new ListenerInvocationNotAllowedException(component, behavior,
"Behavior rejected interface invocation. ");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/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 5a25fc9..d4c9877 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
@@ -17,7 +17,7 @@
package org.apache.wicket.behavior;
import org.apache.wicket.Component;
-import org.apache.wicket.RequestListenerInterface;
+import org.apache.wicket.IRequestListener;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.lang.Args;
@@ -30,7 +30,7 @@ import org.apache.wicket.util.lang.Args;
* @author Ralf Ebert
* @author Igor Vaynberg
*/
-public abstract class AbstractAjaxBehavior extends Behavior implements IBehaviorListener
+public abstract class AbstractAjaxBehavior extends Behavior implements IRequestListener
{
private static final long serialVersionUID = 1L;
@@ -68,6 +68,12 @@ public abstract class AbstractAjaxBehavior extends Behavior implements IBehavior
onBind();
}
+ @Override
+ public boolean includeRenderCount()
+ {
+ return true;
+ }
+
/**
* Gets the url that references this handler.
*
@@ -81,11 +87,7 @@ public abstract class AbstractAjaxBehavior extends Behavior implements IBehavior
"Behavior must be bound to a component to create the URL");
}
- final RequestListenerInterface rli;
-
- rli = IBehaviorListener.INTERFACE;
-
- return getComponent().urlFor(this, rli, new PageParameters());
+ return getComponent().urlFor(this, new PageParameters());
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/main/java/org/apache/wicket/behavior/Behavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/behavior/Behavior.java b/wicket-core/src/main/java/org/apache/wicket/behavior/Behavior.java
index 55517d2..2267e74 100644
--- a/wicket-core/src/main/java/org/apache/wicket/behavior/Behavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/behavior/Behavior.java
@@ -21,6 +21,7 @@ import java.lang.reflect.Method;
import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.IComponentAwareEventSink;
+import org.apache.wicket.IRequestListener;
import org.apache.wicket.event.IEvent;
import org.apache.wicket.lambda.WicketConsumer;
import org.apache.wicket.lambda.WicketFunction;
@@ -153,7 +154,7 @@ public abstract class Behavior
*/
public boolean getStatelessHint(Component component)
{
- if (this instanceof IBehaviorListener)
+ if (this instanceof IRequestListener)
{
// this behavior implements a callback interface, so it cannot be stateless
return false;
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/main/java/org/apache/wicket/behavior/IBehaviorListener.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/behavior/IBehaviorListener.java b/wicket-core/src/main/java/org/apache/wicket/behavior/IBehaviorListener.java
deleted file mode 100644
index 8b029d0..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/behavior/IBehaviorListener.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.behavior;
-
-import org.apache.wicket.IRequestListener;
-import org.apache.wicket.RequestListenerInterface;
-
-/**
- * Listens for requests to behaviors. When {@link org.apache.wicket.behavior.Behavior}s are
- * 'enriched' with this interface, they can receive requests themselves. You can use this for
- * example to implement AJAX behavior, though you'll probably want to extend from
- * {@link org.apache.wicket.behavior.AbstractAjaxBehavior} directly instead in that case.
- *
- * @author Eelco Hillenius
- */
-public interface IBehaviorListener extends IRequestListener
-{
- /** Behavior listener interface */
- RequestListenerInterface INTERFACE = new RequestListenerInterface(
- IBehaviorListener.class);
-
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/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 edc65a8..01eecfe 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
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.core.request.handler;
-import org.apache.wicket.RequestListenerInterface;
+import org.apache.wicket.IRequestListener;
import org.apache.wicket.request.IRequestCycle;
import org.apache.wicket.request.component.IRequestableComponent;
import org.apache.wicket.request.component.IRequestablePage;
@@ -36,8 +36,6 @@ public class BookmarkableListenerInterfaceRequestHandler
{
private final IPageAndComponentProvider pageComponentProvider;
- private final RequestListenerInterface listenerInterface;
-
private final Integer behaviorIndex;
/**
@@ -49,13 +47,11 @@ public class BookmarkableListenerInterfaceRequestHandler
*/
public BookmarkableListenerInterfaceRequestHandler(
IPageAndComponentProvider pageComponentProvider,
- RequestListenerInterface listenerInterface, Integer behaviorIndex)
+ Integer behaviorIndex)
{
Args.notNull(pageComponentProvider, "pageComponentProvider");
- Args.notNull(listenerInterface, "listenerInterface");
this.pageComponentProvider = pageComponentProvider;
- this.listenerInterface = listenerInterface;
this.behaviorIndex = behaviorIndex;
}
@@ -65,10 +61,17 @@ public class BookmarkableListenerInterfaceRequestHandler
* @param pageComponentProvider
* @param listenerInterface
*/
- public BookmarkableListenerInterfaceRequestHandler(
- PageAndComponentProvider pageComponentProvider, RequestListenerInterface listenerInterface)
+ public BookmarkableListenerInterfaceRequestHandler(PageAndComponentProvider pageComponentProvider)
{
- this(pageComponentProvider, listenerInterface, null);
+ this(pageComponentProvider, null);
+ }
+
+ public boolean includeRenderCount() {
+ if (behaviorIndex == null) {
+ return ((IRequestListener)getComponent()).includeRenderCount();
+ } else {
+ return ((IRequestListener)getComponent().getBehaviorById(getBehaviorIndex())).includeRenderCount();
+ }
}
/**
@@ -132,16 +135,6 @@ public class BookmarkableListenerInterfaceRequestHandler
}
/**
- * Returns the listener interface.
- *
- * @return listener interface
- */
- public RequestListenerInterface getListenerInterface()
- {
- return listenerInterface;
- }
-
- /**
* Returns index of behavior this listener is targeted on or <code>null</code> if component is
* the target
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/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 ce3286f..a098f02 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
@@ -16,8 +16,9 @@
*/
package org.apache.wicket.core.request.handler;
+import org.apache.wicket.Component;
+import org.apache.wicket.IRequestListener;
import org.apache.wicket.Page;
-import org.apache.wicket.RequestListenerInterface;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.core.request.handler.RenderPageRequestHandler.RedirectPolicy;
@@ -43,13 +44,11 @@ public class ListenerInterfaceRequestHandler
IComponentRequestHandler,
ILoggableRequestHandler
{
-
+
private static final Logger LOG = LoggerFactory.getLogger(ListenerInterfaceRequestHandler.class);
private final IPageAndComponentProvider pageComponentProvider;
- private final RequestListenerInterface listenerInterface;
-
private final Integer behaviorId;
private ListenerInterfaceLogData logData;
@@ -61,14 +60,11 @@ public class ListenerInterfaceRequestHandler
* @param listenerInterface
* @param behaviorIndex
*/
- public ListenerInterfaceRequestHandler(IPageAndComponentProvider pageComponentProvider,
- RequestListenerInterface listenerInterface, Integer behaviorIndex)
+ public ListenerInterfaceRequestHandler(IPageAndComponentProvider pageComponentProvider, Integer behaviorIndex)
{
Args.notNull(pageComponentProvider, "pageComponentProvider");
- Args.notNull(listenerInterface, "listenerInterface");
this.pageComponentProvider = pageComponentProvider;
- this.listenerInterface = listenerInterface;
behaviorId = behaviorIndex;
}
@@ -78,12 +74,19 @@ public class ListenerInterfaceRequestHandler
* @param pageComponentProvider
* @param listenerInterface
*/
- public ListenerInterfaceRequestHandler(PageAndComponentProvider pageComponentProvider,
- RequestListenerInterface listenerInterface)
+ public ListenerInterfaceRequestHandler(PageAndComponentProvider pageComponentProvider)
{
- this(pageComponentProvider, listenerInterface, null);
+ this(pageComponentProvider, null);
}
+ public boolean includeRenderCount() {
+ if (behaviorId == null) {
+ return ((IRequestListener)getComponent()).includeRenderCount();
+ } else {
+ return ((IRequestListener)getComponent().getBehaviorById(getBehaviorIndex())).includeRenderCount();
+ }
+ }
+
@Override
public IRequestableComponent getComponent()
{
@@ -122,23 +125,12 @@ public class ListenerInterfaceRequestHandler
{
if (logData == null)
{
- logData = new ListenerInterfaceLogData(pageComponentProvider, listenerInterface,
- behaviorId);
+ logData = new ListenerInterfaceLogData(pageComponentProvider, behaviorId);
}
pageComponentProvider.detach();
}
/**
- * Returns the listener interface.
- *
- * @return listener interface
- */
- public RequestListenerInterface getListenerInterface()
- {
- return listenerInterface;
- }
-
- /**
* Index of target behavior or <code>null</code> if component is the target.
*
* @return behavior index or <code>null</code>
@@ -188,7 +180,6 @@ public class ListenerInterfaceRequestHandler
RedirectPolicy policy = isStateless
? RedirectPolicy.NEVER_REDIRECT
: RedirectPolicy.AUTO_REDIRECT;
- final IPageProvider pageProvider = new PageProvider(page);
final boolean canCallListenerInterfaceAfterExpiry = component != null
? component.canCallListenerInterfaceAfterExpiry()
@@ -207,9 +198,9 @@ public class ListenerInterfaceRequestHandler
if (LOG.isDebugEnabled())
{
LOG.debug(
- "A ListenerInterface '{}' assigned to '{}' is executed on an expired stateful page. "
+ "A ListenerInterface assigned to '{}' is executed on an expired stateful page. "
+ "Scheduling re-create of the page and ignoring the listener interface...",
- listenerInterface, getComponentPath());
+ getComponentPath());
}
if (isAjax)
@@ -218,34 +209,25 @@ public class ListenerInterfaceRequestHandler
}
requestCycle.scheduleRequestHandlerAfterCurrent(new RenderPageRequestHandler(
- pageProvider, policy));
+ new PageProvider(page), policy));
return;
}
- if (isAjax == false && listenerInterface.isRenderPageAfterInvocation())
- {
- // 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();
+ invokeListener(requestCycle, policy, isAjax);
}
- private void invokeListener()
+ private void invokeListener(IRequestCycle requestCycle, RedirectPolicy policy, boolean ajax)
{
if (getBehaviorIndex() == null)
{
- listenerInterface.invoke(getComponent());
+ invoke(requestCycle, policy, ajax, getComponent());
}
else
{
try
{
Behavior behavior = getComponent().getBehaviorById(behaviorId);
- listenerInterface.invoke(getComponent(), behavior);
+ invoke(requestCycle, policy, ajax, getComponent(), behavior);
}
catch (IndexOutOfBoundsException e)
{
@@ -254,6 +236,84 @@ public class ListenerInterfaceRequestHandler
}
}
+
+ /**
+ * Invokes a given interface on a component.
+ *
+ * @param rcomponent
+ * The component
+ *
+ * @throws ListenerInvocationNotAllowedException
+ * when listener invocation attempted on a component that does not allow it
+ */
+ private final void invoke(final IRequestCycle requestCycle, RedirectPolicy policy, boolean ajax, final IRequestableComponent rcomponent)
+ {
+ // we are in Wicket core land
+ final Component component = (Component)rcomponent;
+
+ if (!component.canCallListenerInterface(null))
+ {
+ // just return so that we have a silent fail and just re-render the
+ // page
+ LOG.info("component not enabled or visible; ignoring call. Component: " + component);
+ throw new ListenerInvocationNotAllowedException(component, null,
+ "Component rejected interface invocation");
+ }
+
+ internalInvoke(requestCycle, policy, ajax, component, component);
+ }
+
+ /**
+ * Invokes a given interface on a component's behavior.
+ *
+ * @param rcomponent
+ * The component
+ * @param behavior
+ * @throws ListenerInvocationNotAllowedException
+ * when listener invocation attempted on a component that does not allow it
+ */
+ private final void invoke(final IRequestCycle requestCycle, RedirectPolicy policy, boolean ajax, final IRequestableComponent rcomponent, final Behavior behavior)
+ {
+ // we are in Wicket core land
+ final Component component = (Component)rcomponent;
+
+ if (!behavior.canCallListenerInterface(component, null))
+ {
+ LOG.warn("behavior not enabled; ignore call. Behavior {} at component {}", behavior,
+ component);
+ throw new ListenerInvocationNotAllowedException(component, behavior,
+ "Behavior rejected interface invocation. ");
+ }
+
+ internalInvoke(requestCycle, policy, ajax, component, behavior);
+ }
+
+ private void internalInvoke(final IRequestCycle requestCycle, RedirectPolicy policy, boolean ajax, final Component component, final Object target)
+ {
+ // save a reference to the page because the component can be removed
+ // during the invocation of the listener and thus lose its parent
+ Page page = component.getPage();
+
+ // initialization is required for stateless pages
+ if (!page.isInitialized())
+ {
+ page.internalInitialize();
+ }
+
+ IRequestListener requestListener = (IRequestListener)target;
+
+ if (requestListener.includeRenderCount() && !ajax)
+ {
+ // 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(
+ new PageProvider(page), policy));
+ }
+
+
+ requestListener.onRequest();
+ }
@Override
public final boolean isPageInstanceCreated()
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/main/java/org/apache/wicket/core/request/handler/ListenerInvocationNotAllowedException.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/ListenerInvocationNotAllowedException.java b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/ListenerInvocationNotAllowedException.java
index a97d99d..f878b89 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/ListenerInvocationNotAllowedException.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/ListenerInvocationNotAllowedException.java
@@ -17,7 +17,6 @@
package org.apache.wicket.core.request.handler;
import org.apache.wicket.Component;
-import org.apache.wicket.RequestListenerInterface;
import org.apache.wicket.behavior.Behavior;
/**
@@ -36,20 +35,18 @@ public class ListenerInvocationNotAllowedException extends RuntimeException
/**
* Constructor
*
- * @param iface
* @param component
* @param behavior
* @param message
*/
- public ListenerInvocationNotAllowedException(RequestListenerInterface iface,
- Component component, Behavior behavior, String message)
+ public ListenerInvocationNotAllowedException(Component component, Behavior behavior, String message)
{
- super(message + detail(iface, component, behavior));
+ super(message + detail(component, behavior));
this.component = component;
this.behavior = behavior;
}
- private static String detail(RequestListenerInterface iface, Component component,
+ private static String detail(Component component,
Behavior behavior)
{
StringBuilder detail = new StringBuilder("Component: ").append(component.toString(false));
@@ -57,7 +54,6 @@ public class ListenerInvocationNotAllowedException extends RuntimeException
{
detail.append(" Behavior: ").append(behavior.toString());
}
- detail.append(" Listener: ").append(iface.toString());
return detail.toString();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/main/java/org/apache/wicket/core/request/handler/logger/ListenerInterfaceLogData.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/logger/ListenerInterfaceLogData.java b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/logger/ListenerInterfaceLogData.java
index 4a5ad40..5ed97a7 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/logger/ListenerInterfaceLogData.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/logger/ListenerInterfaceLogData.java
@@ -17,11 +17,9 @@
package org.apache.wicket.core.request.handler.logger;
import org.apache.wicket.Component;
-import org.apache.wicket.RequestListenerInterface;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.core.request.handler.IPageAndComponentProvider;
import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.IFormSubmitListener;
import org.apache.wicket.markup.html.form.IFormSubmitter;
import org.apache.wicket.request.component.IRequestableComponent;
@@ -38,7 +36,6 @@ public class ListenerInterfaceLogData extends PageLogData
private final String componentPath;
private final Integer behaviorIndex;
private Class<? extends Behavior> behaviorClass;
- private final String interfaceName;
private Class<? extends IRequestableComponent> submittingComponentClass;
private String submittingComponentPath;
@@ -49,8 +46,7 @@ public class ListenerInterfaceLogData extends PageLogData
* @param listenerInterface
* @param behaviorIndex
*/
- public ListenerInterfaceLogData(IPageAndComponentProvider pageAndComponentProvider,
- RequestListenerInterface listenerInterface, Integer behaviorIndex)
+ public ListenerInterfaceLogData(IPageAndComponentProvider pageAndComponentProvider, Integer behaviorIndex)
{
super(pageAndComponentProvider);
componentClass = tryToGetComponentClass(pageAndComponentProvider);
@@ -73,15 +69,12 @@ public class ListenerInterfaceLogData extends PageLogData
{
behaviorClass = null;
}
- interfaceName = listenerInterface.getName();
- if (listenerInterface.getListenerInterfaceClass().equals(IFormSubmitListener.class))
+
+ final Component formSubmitter = tryToGetFormSubmittingComponent(pageAndComponentProvider);
+ if (formSubmitter != null)
{
- final Component formSubmitter = tryToGetFormSubmittingComponent(pageAndComponentProvider);
- if (formSubmitter != null)
- {
- submittingComponentClass = formSubmitter.getClass();
- submittingComponentPath = formSubmitter.getPageRelativePath();
- }
+ submittingComponentClass = formSubmitter.getClass();
+ submittingComponentPath = formSubmitter.getPageRelativePath();
}
}
@@ -166,14 +159,6 @@ public class ListenerInterfaceLogData extends PageLogData
}
/**
- * @return interfaceName
- */
- public final String getInterfaceName()
- {
- return interfaceName;
- }
-
- /**
* @return submittingComponentClass
*/
public Class<? extends IRequestableComponent> getSubmittingComponentClass()
@@ -213,8 +198,6 @@ public class ListenerInterfaceLogData extends PageLogData
sb.append(",behaviorClass=");
sb.append(getBehaviorClass().getName());
}
- sb.append(",interfaceName=");
- sb.append(getInterfaceName());
if (getSubmittingComponentClass() != null)
{
sb.append(",submittingComponentClass=");
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java
index 4d34e8c..963c698 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java
@@ -19,7 +19,6 @@ package org.apache.wicket.core.request.mapper;
import java.util.ArrayList;
import java.util.List;
-import org.apache.wicket.RequestListenerInterface;
import org.apache.wicket.core.request.handler.BookmarkableListenerInterfaceRequestHandler;
import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler;
import org.apache.wicket.core.request.handler.IPageRequestHandler;
@@ -31,7 +30,6 @@ import org.apache.wicket.protocol.http.PageExpiredException;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.IRequestHandlerDelegate;
-import org.apache.wicket.request.IRequestMapper;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.component.IRequestablePage;
@@ -297,41 +295,18 @@ public abstract class AbstractBookmarkableMapper extends AbstractComponentMapper
PageInfo pageInfo = pageComponentInfo.getPageInfo();
ComponentInfo componentInfo = pageComponentInfo.getComponentInfo();
Integer renderCount = null;
- RequestListenerInterface listenerInterface = null;
if (componentInfo != null)
{
renderCount = componentInfo.getRenderCount();
- listenerInterface = requestListenerInterfaceFromString(componentInfo.getListenerInterface());
}
- if (listenerInterface != null)
- {
- PageAndComponentProvider provider = new PageAndComponentProvider(pageInfo.getPageId(),
- pageClass, pageParameters, renderCount, componentInfo.getComponentPath());
+ PageAndComponentProvider provider = new PageAndComponentProvider(pageInfo.getPageId(),
+ pageClass, pageParameters, renderCount, componentInfo.getComponentPath());
- provider.setPageSource(getContext());
+ provider.setPageSource(getContext());
- return new ListenerInterfaceRequestHandler(provider, listenerInterface,
- componentInfo.getBehaviorId());
- }
- else
- {
- if (logger.isWarnEnabled())
- {
- if (componentInfo != null)
- {
- logger.warn("Unknown listener interface '{}'",
- componentInfo.getListenerInterface());
- }
- else
- {
- logger.warn("Cannot extract the listener interface for PageComponentInfo: '{}'" +
- pageComponentInfo);
- }
- }
- return null;
- }
+ return new ListenerInterfaceRequestHandler(provider, componentInfo.getBehaviorId());
}
/**
@@ -463,15 +438,13 @@ public abstract class AbstractBookmarkableMapper extends AbstractComponentMapper
}
Integer renderCount = null;
- if (handler.getListenerInterface().isIncludeRenderCount())
+ if (handler.includeRenderCount())
{
renderCount = handler.getRenderCount();
}
PageInfo pageInfo = getPageInfo(handler);
- ComponentInfo componentInfo = new ComponentInfo(renderCount,
- requestListenerInterfaceToString(handler.getListenerInterface()),
- handler.getComponentPath(), handler.getBehaviorIndex());
+ ComponentInfo componentInfo = new ComponentInfo(renderCount, handler.getComponentPath(), handler.getBehaviorIndex());
PageParameters parameters = getRecreateMountedPagesAfterExpiry() ? new PageParameters(
handler.getPage().getPageParameters()).mergeWith(handler.getPageParameters())
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractComponentMapper.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractComponentMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractComponentMapper.java
index 923a43f..71a28f5 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractComponentMapper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractComponentMapper.java
@@ -17,7 +17,6 @@
package org.apache.wicket.core.request.mapper;
import org.apache.wicket.Application;
-import org.apache.wicket.RequestListenerInterface;
import org.apache.wicket.core.util.lang.WicketObjects;
import org.apache.wicket.request.IRequestMapper;
import org.apache.wicket.request.Url;
@@ -48,32 +47,6 @@ public abstract class AbstractComponentMapper extends AbstractMapper implements
}
/**
- * Converts the specified listener interface to String.
- *
- * @param listenerInterface
- * @return listenerInterface name as string
- */
- protected String requestListenerInterfaceToString(RequestListenerInterface listenerInterface)
- {
- Args.notNull(listenerInterface, "listenerInterface");
-
- return getContext().requestListenerInterfaceToString(listenerInterface);
- }
-
- /**
- * Creates listener interface from the specified string
- *
- * @param interfaceName
- * @return listener interface
- */
- protected RequestListenerInterface requestListenerInterfaceFromString(String interfaceName)
- {
- Args.notEmpty(interfaceName, "interfaceName");
-
- return getContext().requestListenerInterfaceFromString(interfaceName);
- }
-
- /**
* Extracts the {@link PageComponentInfo} from the URL. The {@link PageComponentInfo} is encoded
* as the very first query parameter and the parameter consists of name only (no value).
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/IMapperContext.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/IMapperContext.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/IMapperContext.java
index 52366d3..792904f 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/IMapperContext.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/IMapperContext.java
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.core.request.mapper;
-import org.apache.wicket.RequestListenerInterface;
import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.resource.ResourceReferenceRegistry;
@@ -53,22 +52,6 @@ public interface IMapperContext extends IPageSource
ResourceReferenceRegistry getResourceReferenceRegistry();
/**
- * Returns the listener interface name as string.
- *
- * @param listenerInterface
- * @return listener interface name as string
- */
- String requestListenerInterfaceToString(RequestListenerInterface listenerInterface);
-
- /**
- * Returns listener interface for the name
- *
- * @param interfaceName
- * @return listener interface
- */
- RequestListenerInterface requestListenerInterfaceFromString(String interfaceName);
-
- /**
* Returns the home page class.
*
* @return home page class
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/MountedMapper.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/MountedMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/MountedMapper.java
index 965b316..1b6aa28 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/MountedMapper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/MountedMapper.java
@@ -18,7 +18,6 @@ package org.apache.wicket.core.request.mapper;
import java.util.function.Supplier;
-import org.apache.wicket.RequestListenerInterface;
import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Request;
@@ -166,19 +165,15 @@ public class MountedMapper extends AbstractBookmarkableMapper
IRequestablePage page = handler.getPage();
if (checkPageInstance(page))
{
- String componentPath = handler.getComponentPath();
- RequestListenerInterface listenerInterface = handler.getListenerInterface();
-
Integer renderCount = null;
- if (listenerInterface.isIncludeRenderCount())
+ if (handler.includeRenderCount())
{
renderCount = page.getRenderCount();
}
+ String componentPath = handler.getComponentPath();
PageInfo pageInfo = getPageInfo(handler);
- ComponentInfo componentInfo = new ComponentInfo(renderCount,
- requestListenerInterfaceToString(listenerInterface), componentPath,
- handler.getBehaviorIndex());
+ ComponentInfo componentInfo = new ComponentInfo(renderCount, componentPath, handler.getBehaviorIndex());
PageComponentInfo pageComponentInfo = new PageComponentInfo(pageInfo, componentInfo);
PageParameters parameters = new PageParameters(page.getPageParameters());
UrlInfo urlInfo = new UrlInfo(pageComponentInfo, page.getClass(),
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
index a034642..e983131 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.core.request.mapper;
-import org.apache.wicket.RequestListenerInterface;
import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler;
import org.apache.wicket.core.request.handler.PageAndComponentProvider;
import org.apache.wicket.core.request.handler.PageProvider;
@@ -86,11 +85,7 @@ public class PageInstanceMapper extends AbstractComponentMapper
provider.setPageSource(getContext());
- // listener interface
- RequestListenerInterface listenerInterface = requestListenerInterfaceFromString(componentInfo.getListenerInterface());
-
- return new ListenerInterfaceRequestHandler(provider, listenerInterface,
- componentInfo.getBehaviorId());
+ return new ListenerInterfaceRequestHandler(provider, componentInfo.getBehaviorId());
}
}
}
@@ -117,18 +112,15 @@ public class PageInstanceMapper extends AbstractComponentMapper
ListenerInterfaceRequestHandler handler = (ListenerInterfaceRequestHandler)requestHandler;
IRequestablePage page = handler.getPage();
String componentPath = handler.getComponentPath();
- RequestListenerInterface listenerInterface = handler.getListenerInterface();
Integer renderCount = null;
- if (listenerInterface.isIncludeRenderCount())
+ if (handler.includeRenderCount())
{
renderCount = page.getRenderCount();
}
PageInfo pageInfo = new PageInfo(page.getPageId());
- ComponentInfo componentInfo = new ComponentInfo(renderCount,
- requestListenerInterfaceToString(listenerInterface), componentPath,
- handler.getBehaviorIndex());
+ ComponentInfo componentInfo = new ComponentInfo(renderCount, componentPath, handler.getBehaviorIndex());
info = new PageComponentInfo(pageInfo, componentInfo);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Check.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Check.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Check.java
index dab8129..91aff59 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Check.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Check.java
@@ -198,7 +198,7 @@ public class Check<T> extends LabeledWebMarkupContainer implements IGenericCompo
if (group.wantOnSelectionChangedNotifications())
{
// url that points to this components IOnChangeListener method
- CharSequence url = group.urlFor(IOnChangeListener.INTERFACE, new PageParameters());
+ CharSequence url = group.urlFor(new PageParameters());
Form<?> form = group.findParent(Form.class);
if (form != null)
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/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 180f191..655533a 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
@@ -18,6 +18,7 @@ package org.apache.wicket.markup.html.form;
import java.util.Locale;
+import org.apache.wicket.IRequestListener;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -51,7 +52,7 @@ import org.apache.wicket.util.convert.IConverter;
*
* @author Jonathan Locke
*/
-public class CheckBox extends FormComponent<Boolean> implements IOnChangeListener
+public class CheckBox extends FormComponent<Boolean> implements IRequestListener
{
private static final long serialVersionUID = 1L;
@@ -74,6 +75,12 @@ public class CheckBox extends FormComponent<Boolean> implements IOnChangeListene
setType(Boolean.class);
}
+ @Override
+ public boolean includeRenderCount()
+ {
+ return true;
+ }
+
/**
* @see org.apache.wicket.markup.html.form.IOnChangeListener#onSelectionChanged()
*/
@@ -163,7 +170,7 @@ public class CheckBox extends FormComponent<Boolean> implements IOnChangeListene
// checkbox is clicked?
if (wantOnSelectionChangedNotifications())
{
- CharSequence url = urlFor(IOnChangeListener.INTERFACE, new PageParameters());
+ CharSequence url = urlFor(new PageParameters());
Form<?> form = findParent(Form.class);
if (form != null)
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/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 1e6d804..5c62da5 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
@@ -19,6 +19,7 @@ package org.apache.wicket.markup.html.form;
import java.util.Collection;
import java.util.List;
+import org.apache.wicket.IRequestListener;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -58,7 +59,7 @@ import org.slf4j.LoggerFactory;
* @param <T>
* The model object type
*/
-public class CheckGroup<T> extends FormComponent<Collection<T>> implements IOnChangeListener
+public class CheckGroup<T> extends FormComponent<Collection<T>> implements IRequestListener
{
private static final long serialVersionUID = 1L;
@@ -200,6 +201,12 @@ public class CheckGroup<T> extends FormComponent<Collection<T>> implements IOnCh
tag.remove("name");
}
+ @Override
+ public boolean includeRenderCount()
+ {
+ return true;
+ }
+
/**
* Called when a selection changes.
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/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 ca03dfd..60f97fa 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
@@ -18,6 +18,7 @@ package org.apache.wicket.markup.html.form;
import java.util.List;
+import org.apache.wicket.IRequestListener;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.model.IModel;
@@ -63,7 +64,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
* @param <T>
* The model object type
*/
-public class DropDownChoice<T> extends AbstractSingleSelectChoice<T> implements IOnChangeListener
+public class DropDownChoice<T> extends AbstractSingleSelectChoice<T> implements IRequestListener
{
private static final long serialVersionUID = 1L;
@@ -202,6 +203,12 @@ public class DropDownChoice<T> extends AbstractSingleSelectChoice<T> implements
super(id, model, choices, renderer);
}
+ @Override
+ public boolean includeRenderCount()
+ {
+ return true;
+ }
+
/**
* Called when a selection changes.
*/
@@ -231,7 +238,7 @@ public class DropDownChoice<T> extends AbstractSingleSelectChoice<T> implements
{
// we do not want relative URL here, because it will be used by
// Form#dispatchEvent
- CharSequence url = urlFor(IOnChangeListener.INTERFACE, new PageParameters());
+ CharSequence url = urlFor(new PageParameters());
Form<?> form = findParent(Form.class);
if (form != null)
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/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 efa7137..fbdc568 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
@@ -30,6 +30,7 @@ import org.apache.commons.fileupload.FileUploadBase;
import org.apache.commons.fileupload.FileUploadException;
import org.apache.wicket.Component;
import org.apache.wicket.IGenericComponent;
+import org.apache.wicket.IRequestListener;
import org.apache.wicket.Page;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -146,7 +147,7 @@ import org.slf4j.LoggerFactory;
*/
public class Form<T> extends WebMarkupContainer
implements
- IFormSubmitListener,
+ IRequestListener,
IGenericComponent<T, Form<T>>
{
private static final String HIDDEN_DIV_START = "<div style=\"width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden\">";
@@ -674,6 +675,12 @@ 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.
*
@@ -1646,7 +1653,7 @@ public class Form<T> extends WebMarkupContainer
*/
protected CharSequence getActionUrl()
{
- return urlFor(IFormSubmitListener.INTERFACE, new PageParameters());
+ return urlFor(new PageParameters());
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IFormSubmitListener.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IFormSubmitListener.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IFormSubmitListener.java
deleted file mode 100644
index 3dfff96..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IFormSubmitListener.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.markup.html.form;
-
-import org.apache.wicket.IRequestListener;
-import org.apache.wicket.RequestListenerInterface;
-
-/**
- * Listener interface that is called when a form is submitted.
- *
- * @author Jonathan Locke
- */
-public interface IFormSubmitListener extends IRequestListener
-{
- /** Listener interface */
- RequestListenerInterface INTERFACE = new RequestListenerInterface(
- IFormSubmitListener.class);
-
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IOnChangeListener.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IOnChangeListener.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IOnChangeListener.java
deleted file mode 100644
index 964c531..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/IOnChangeListener.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.markup.html.form;
-
-import org.apache.wicket.IRequestListener;
-import org.apache.wicket.RequestListenerInterface;
-
-/**
- * Listener method for OnChange events of dropdown lists and onclick events of CheckBoxes and
- * RadioChoice components. When any of those components wantOnSelectionChangedNotifications() method
- * returns true, a javascript onchange or onclick handler will be generated that calls this
- * interface method when the user changes the selection.
- *
- * @author Eelco Hillenius
- */
-public interface IOnChangeListener extends IRequestListener
-{
- /** Listener interface */
- RequestListenerInterface INTERFACE = new RequestListenerInterface(
- IOnChangeListener.class);
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/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 978d138..702daad 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
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.html.form;
-import org.apache.wicket.IResourceListener;
+import org.apache.wicket.IRequestListener;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.image.resource.LocalizedImageResource;
import org.apache.wicket.model.IModel;
@@ -34,7 +34,7 @@ import org.apache.wicket.request.resource.ResourceReference;
*
* @author Jonathan Locke
*/
-public class ImageButton extends Button implements IResourceListener
+public class ImageButton extends Button implements IRequestListener
{
private static final long serialVersionUID = 1L;
@@ -126,6 +126,11 @@ public class ImageButton extends Button implements IResourceListener
this(id, new Model<String>(string));
}
+ @Override
+ public boolean includeRenderCount()
+ {
+ return false;
+ }
/**
* @see org.apache.wicket.IResourceListener#onResourceRequested()
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Radio.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Radio.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Radio.java
index 20965b2..8db42ed 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Radio.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Radio.java
@@ -183,7 +183,7 @@ public class Radio<T> extends LabeledWebMarkupContainer implements IGenericCompo
if (group.wantOnSelectionChangedNotifications())
{
// url that points to this components IOnChangeListener method
- CharSequence url = group.urlFor(IOnChangeListener.INTERFACE, new PageParameters());
+ CharSequence url = group.urlFor(new PageParameters());
Form<?> form = group.findParent(Form.class);
if (form != null)
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/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 e8af55e..1d336ea 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
@@ -19,6 +19,7 @@ package org.apache.wicket.markup.html.form;
import java.util.List;
import java.util.Map;
+import org.apache.wicket.IRequestListener;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.model.IModel;
@@ -65,7 +66,7 @@ import org.apache.wicket.util.value.IValueMap;
* @param <T>
* The model object type
*/
-public class RadioChoice<T> extends AbstractSingleSelectChoice<T> implements IOnChangeListener
+public class RadioChoice<T> extends AbstractSingleSelectChoice<T> implements IRequestListener
{
private static final long serialVersionUID = 1L;
@@ -244,6 +245,12 @@ public class RadioChoice<T> extends AbstractSingleSelectChoice<T> implements IOn
tag.remove("name");
}
+ @Override
+ public boolean includeRenderCount()
+ {
+ return true;
+ }
+
/**
* @see org.apache.wicket.markup.html.form.IOnChangeListener#onSelectionChanged()
*/
@@ -527,7 +534,7 @@ public class RadioChoice<T> extends AbstractSingleSelectChoice<T> implements IOn
// when the option is clicked?
if (wantOnSelectionChangedNotifications())
{
- CharSequence url = urlFor(IOnChangeListener.INTERFACE, new PageParameters());
+ CharSequence url = urlFor(new PageParameters());
Form<?> form = findParent(Form.class);
if (form != null)
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/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 e4f142e..795132d 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
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.markup.html.form;
+import org.apache.wicket.IRequestListener;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -47,7 +48,7 @@ import org.apache.wicket.util.visit.IVisitor;
* @param <T>
* The model object type
*/
-public class RadioGroup<T> extends FormComponent<T> implements IOnChangeListener
+public class RadioGroup<T> extends FormComponent<T> implements IRequestListener
{
private static final long serialVersionUID = 1L;
@@ -163,6 +164,12 @@ public class RadioGroup<T> extends FormComponent<T> implements IOnChangeListener
tag.remove("name");
}
+ @Override
+ public boolean includeRenderCount()
+ {
+ return true;
+ }
+
/**
* Called when a selection changes.
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/main/java/org/apache/wicket/markup/html/form/StatelessForm.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/StatelessForm.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/StatelessForm.java
index 2e41325..f258556 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/StatelessForm.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/StatelessForm.java
@@ -82,7 +82,7 @@ public class StatelessForm<T> extends Form<T>
@Override
protected CharSequence getActionUrl()
{
- return urlFor(IFormSubmitListener.INTERFACE, getPage().getPageParameters());
+ return urlFor(getPage().getPageParameters());
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/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 1b9622c..28f17ee 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
@@ -22,7 +22,7 @@ import java.util.Arrays;
import java.util.List;
import org.apache.wicket.Component;
-import org.apache.wicket.IResourceListener;
+import org.apache.wicket.IRequestListener;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
@@ -49,7 +49,7 @@ import org.apache.wicket.request.resource.ResourceReference;
* @author Jonathan Locke
* @author Tobias Soloschenko
*/
-public class Image extends WebComponent implements IResourceListener
+public class Image extends WebComponent implements IRequestListener
{
private static final long serialVersionUID = 1L;
@@ -210,6 +210,12 @@ public class Image extends WebComponent implements IResourceListener
this(id, new Model<>(string));
}
+ @Override
+ public boolean includeRenderCount()
+ {
+ return false;
+ }
+
/**
* @see org.apache.wicket.IResourceListener#onResourceRequested()
*/
@@ -582,9 +588,7 @@ public class Image extends WebComponent implements IResourceListener
@Override
public boolean canCallListenerInterface(Method method)
{
- boolean isResource = method != null &&
- IResourceListener.class.isAssignableFrom(method.getDeclaringClass());
- if (isResource && isVisibleInHierarchy())
+ if (isVisibleInHierarchy())
{
// when the image data is requested we do not care if this component
// is enabled in
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
index 10f25f0..93a2e39 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
@@ -20,9 +20,7 @@ import java.util.Locale;
import org.apache.wicket.Application;
import org.apache.wicket.Component;
-import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.IResourceFactory;
-import org.apache.wicket.IResourceListener;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.markup.ComponentTag;
@@ -33,6 +31,7 @@ import org.apache.wicket.request.resource.IResource;
import org.apache.wicket.request.resource.IResource.Attributes;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
+import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.util.lang.Objects;
import org.apache.wicket.util.parse.metapattern.Group;
import org.apache.wicket.util.parse.metapattern.MetaPattern;
@@ -333,7 +332,7 @@ public final class LocalizedImageResource implements IClusterable
else
{
// Create URL to component
- url = component.urlFor(IResourceListener.INTERFACE, resourceParameters);
+ url = component.urlFor(resourceParameters);
}
// Set the SRC attribute to point to the component or shared resource
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ILinkListener.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ILinkListener.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ILinkListener.java
deleted file mode 100644
index c2d37f1..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ILinkListener.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.markup.html.link;
-
-import org.apache.wicket.IRequestListener;
-import org.apache.wicket.RequestListenerInterface;
-
-/**
- * Listener method for link clicks.
- *
- * @author Jonathan Locke
- */
-public interface ILinkListener extends IRequestListener
-{
- /** Listener interface */
- RequestListenerInterface INTERFACE = new RequestListenerInterface(
- ILinkListener.class);
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/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 566bdae..0663620 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
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.markup.html.link;
+import org.apache.wicket.IRequestListener;
import org.apache.wicket.Page;
import org.apache.wicket.core.request.handler.IPageProvider;
import org.apache.wicket.core.request.handler.PageProvider;
@@ -33,7 +34,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
*
*/
-public class InlineFrame extends WebMarkupContainer implements ILinkListener
+public class InlineFrame extends WebMarkupContainer implements IRequestListener
{
private static final long serialVersionUID = 1L;
@@ -122,7 +123,7 @@ public class InlineFrame extends WebMarkupContainer implements ILinkListener
*/
protected CharSequence getURL()
{
- return urlFor(ILinkListener.INTERFACE, new PageParameters());
+ return urlFor(new PageParameters());
}
/**
@@ -146,6 +147,12 @@ public class InlineFrame extends WebMarkupContainer implements ILinkListener
super.onComponentTag(tag);
}
+ @Override
+ public boolean includeRenderCount()
+ {
+ return true;
+ }
+
/**
* @see org.apache.wicket.markup.html.link.ILinkListener#onLinkClicked()
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/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 413698c..cfc23ec 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
@@ -18,6 +18,7 @@ package org.apache.wicket.markup.html.link;
import org.apache.wicket.Component;
import org.apache.wicket.IGenericComponent;
+import org.apache.wicket.IRequestListener;
import org.apache.wicket.Page;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.lambda.WicketConsumer;
@@ -75,7 +76,7 @@ import org.apache.wicket.util.lang.Args;
* @param <T>
* type of model object
*/
-public abstract class Link<T> extends AbstractLink implements ILinkListener, IGenericComponent<T, Link<T>>
+public abstract class Link<T> extends AbstractLink implements IRequestListener, IGenericComponent<T, Link<T>>
{
private static final long serialVersionUID = 1L;
@@ -177,6 +178,12 @@ public abstract class Link<T> extends AbstractLink implements ILinkListener, IGe
*/
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.
*
@@ -326,7 +333,7 @@ public abstract class Link<T> extends AbstractLink implements ILinkListener, IGe
*/
protected CharSequence getURL()
{
- return urlFor(ILinkListener.INTERFACE, new PageParameters());
+ return urlFor(new PageParameters());
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/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 b8bbff4..6e8e73d 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
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.html.link;
-import org.apache.wicket.IResourceListener;
+import org.apache.wicket.IRequestListener;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -31,7 +31,7 @@ import org.apache.wicket.request.resource.ResourceReference;
* @param <T>
* type of model object
*/
-public class ResourceLink<T> extends Link<T> implements IResourceListener
+public class ResourceLink<T> extends Link<T> implements IRequestListener
{
private static final long serialVersionUID = 1L;
@@ -103,6 +103,12 @@ public class ResourceLink<T> extends Link<T> implements IResourceListener
{
}
+ @Override
+ public boolean includeRenderCount()
+ {
+ return false;
+ }
+
/**
* @see org.apache.wicket.IResourceListener#onResourceRequested()
*/
@@ -142,6 +148,6 @@ public class ResourceLink<T> extends Link<T> implements IResourceListener
return getRequestCycle().urlFor(
new ResourceReferenceRequestHandler(resourceReference, resourceParameters));
}
- return urlFor(IResourceListener.INTERFACE, resourceParameters);
+ return urlFor(resourceParameters);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/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 9a4a5c5..62e0581 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,8 +50,14 @@ public abstract class StatelessLink<T> extends Link<T>
}
@Override
+ public boolean includeRenderCount()
+ {
+ return false;
+ }
+
+ @Override
protected CharSequence getURL()
{
- return urlFor(ILinkListener.INTERFACE, getPage().getPageParameters());
+ return urlFor(getPage().getPageParameters());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
index e7d582a..8544339 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
@@ -40,8 +40,6 @@ import javax.servlet.ServletContext;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpSession;
-import junit.framework.AssertionFailedError;
-
import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.IPageManagerProvider;
@@ -50,7 +48,6 @@ import org.apache.wicket.IRequestCycleProvider;
import org.apache.wicket.IRequestListener;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
-import org.apache.wicket.RequestListenerInterface;
import org.apache.wicket.Session;
import org.apache.wicket.ThreadContext;
import org.apache.wicket.WicketRuntimeException;
@@ -82,12 +79,10 @@ import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.FormComponent;
-import org.apache.wicket.markup.html.form.IFormSubmitListener;
import org.apache.wicket.markup.html.form.SubmitLink;
import org.apache.wicket.markup.html.link.AbstractLink;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.ExternalLink;
-import org.apache.wicket.markup.html.link.ILinkListener;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.link.ResourceLink;
import org.apache.wicket.markup.html.list.ListView;
@@ -140,6 +135,8 @@ import org.apache.wicket.util.visit.IVisitor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import junit.framework.AssertionFailedError;
+
/**
* A helper class to ease unit testing of Wicket applications without the need for a servlet
* container. See javadoc of <code>WicketTester</code> for example usage. This class can be used as
@@ -1070,7 +1067,7 @@ public class BaseWicketTester
{
Args.notNull(link, "link");
- Url url = Url.parse(link.urlFor(ILinkListener.INTERFACE, new PageParameters()).toString());
+ Url url = Url.parse(link.urlFor(new PageParameters()).toString());
return transform(url).toString();
}
@@ -1084,14 +1081,14 @@ public class BaseWicketTester
* @param component
* @param listener
*/
- public void executeListener(final Component component, final RequestListenerInterface listener)
+ public void executeListener(final Component component)
{
Args.notNull(component, "component");
// there are two ways to do this. RequestCycle could be forced to call the handler
// directly but constructing and parsing the URL increases the chance of triggering bugs
IRequestHandler handler = new ListenerInterfaceRequestHandler(new PageAndComponentProvider(
- component.getPage(), component), listener);
+ component.getPage(), component));
Url url = urlFor(handler);
request.setUrl(url);
@@ -1110,39 +1107,19 @@ public class BaseWicketTester
* @param component
* @param listener
*/
- public void invokeListener(final Component component, final RequestListenerInterface listener)
+ public void invokeListener(final Component component)
{
Args.notNull(component, "component");
// there are two ways to do this. RequestCycle could be forced to call the handler
// directly but constructing and parsing the URL increases the chance of triggering bugs
IRequestHandler handler = new ListenerInterfaceRequestHandler(new PageAndComponentProvider(
- component.getPage(), component), listener);
+ component.getPage(), component));
processRequest(handler);
}
/**
- * Builds and processes a request suitable for invoking a listener. The <code>Component</code>
- * must implement any of the known <code>IListener</code> interfaces.
- *
- * @param component
- * the listener to invoke
- */
- public void executeListener(final Component component)
- {
- Args.notNull(component, "component");
-
- for (RequestListenerInterface iface : RequestListenerInterface.getRegisteredInterfaces())
- {
- if (iface.getListenerInterfaceClass().isAssignableFrom(component.getClass()))
- {
- executeListener(component, iface);
- }
- }
- }
-
- /**
* Builds and processes a request suitable for executing an <code>AbstractAjaxBehavior</code>.
*
* @param behavior
@@ -1988,7 +1965,7 @@ public class BaseWicketTester
}
else
{
- executeListener(link, ILinkListener.INTERFACE);
+ executeListener(link);
}
}
// The link requires AJAX
@@ -2029,7 +2006,7 @@ public class BaseWicketTester
Form<?> form = (Form<?>)getComponentFromLastRenderedPage(path);
Url url = Url.parse(
form.getRootForm()
- .urlFor(IFormSubmitListener.INTERFACE, new PageParameters())
+ .urlFor(new PageParameters())
.toString(), Charset.forName(request.getCharacterEncoding()));
// make url absolute
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/main/java/org/apache/wicket/util/tester/FormTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/FormTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/FormTester.java
index 91c8890..ed18e0e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/FormTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/FormTester.java
@@ -35,7 +35,6 @@ import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.markup.html.form.IFormSubmittingComponent;
-import org.apache.wicket.markup.html.form.IOnChangeListener;
import org.apache.wicket.markup.html.form.ListMultipleChoice;
import org.apache.wicket.markup.html.form.Radio;
import org.apache.wicket.markup.html.form.RadioGroup;
@@ -517,7 +516,7 @@ public class FormTester
boolean wantOnSelectionChangedNotifications = (Boolean)wantOnSelectionChangedNotificationsMethod.invoke(component);
if (wantOnSelectionChangedNotifications)
{
- tester.invokeListener(component, IOnChangeListener.INTERFACE);
+ tester.invokeListener(component);
}
}
catch (final Exception x)
[13/17] wicket git commit: WICKET-6137 more stateless urls without
render count
Posted by sv...@apache.org.
WICKET-6137 more stateless urls without render count
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/53c5dc67
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/53c5dc67
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/53c5dc67
Branch: refs/heads/master
Commit: 53c5dc67316d49b147e61efe2c493adc5434ed85
Parents: 18ab9be
Author: Sven Meier <sv...@apache.org>
Authored: Mon Mar 28 23:46:28 2016 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Mon Apr 25 11:44:57 2016 +0200
----------------------------------------------------------------------
.../StatelessComponentPageWithParams_indexed_mount_result.html | 2 +-
.../wicket/stateless/StatelessComponentPageWithParams_result.html | 2 +-
.../wicket/stateless/StatelessComponentPage_mount_result.html | 2 +-
.../org/apache/wicket/stateless/StatelessComponentPage_result.html | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/53c5dc67/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
index 83e7ae6..9ef2c2e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
@@ -1,5 +1,5 @@
<html>
<body>
-<a href="./testValue2?-1.-link" wicket:id="link">test</a>
+<a href="./testValue2?-.-link" wicket:id="link">test</a>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/53c5dc67/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
index 63b427ac..bd3d46c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
@@ -1,5 +1,5 @@
<html>
<body>
-<a href="./org.apache.wicket.stateless.StatelessComponentPageWithParams?-1.-link&testParam1=testValue1&testParam2=testValue2" wicket:id="link">test</a>
+<a href="./org.apache.wicket.stateless.StatelessComponentPageWithParams?-.-link&testParam1=testValue1&testParam2=testValue2" wicket:id="link">test</a>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/53c5dc67/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
index ac5f821..905d21e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
@@ -1,5 +1,5 @@
<html>
<body>
-<a href="./stateless?-1.-link" wicket:id="link">test</a>
+<a href="./stateless?-.-link" wicket:id="link">test</a>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/53c5dc67/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
index 472458f..7c1f8f3 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
@@ -1,5 +1,5 @@
<html>
<body>
-<a href="./org.apache.wicket.stateless.StatelessComponentPage?-1.-link" wicket:id="link">test</a>
+<a href="./org.apache.wicket.stateless.StatelessComponentPage?-.-link" wicket:id="link">test</a>
</body>
</html>
\ No newline at end of file
[07/17] wicket git commit: WICKET-6137 renamed to
IRequstListener#rendersPage() with default; javadoc;
InlineFrame needs not to be dependent on rendering
Posted by sv...@apache.org.
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()
{
}
[08/17] wicket git commit: WICKET-6137 Javadoc fix and code formatting
Posted by sv...@apache.org.
WICKET-6137 Javadoc fix and code formatting
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e9be1b97
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e9be1b97
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e9be1b97
Branch: refs/heads/master
Commit: e9be1b97a993cb4777e7bcddc57ce9a63801be2c
Parents: 0b798d9
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Mar 28 21:34:51 2016 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Mon Apr 25 11:44:50 2016 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/IRequestListener.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/e9be1b97/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 a00958e..1888802 100644
--- a/wicket-core/src/main/java/org/apache/wicket/IRequestListener.java
+++ b/wicket-core/src/main/java/org/apache/wicket/IRequestListener.java
@@ -21,7 +21,8 @@ import org.apache.wicket.core.request.handler.RenderPageRequestHandler;
import org.apache.wicket.util.io.IClusterable;
/**
- * Interface to be implemented by {@link Component}s or {@link Behaviors} that listen for requests from the client browser.
+ * Interface to be implemented by {@link Component}s or {@link org.apache.wicket.behavior.Behavior}s
+ * that listen for requests from the client browser.
*
* @author Jonathan Locke
*/
@@ -33,7 +34,8 @@ public interface IRequestListener extends IClusterable
*
* @return default {@code true}, i.e. a {@link RenderPageRequestHandler} is schedules after invocation
*/
- default boolean rendersPage() {
+ default boolean rendersPage()
+ {
return true;
}
[17/17] wicket git commit: WICKET-6137 javadoc adjustments
Posted by sv...@apache.org.
WICKET-6137 javadoc adjustments
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3e6c0a81
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3e6c0a81
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3e6c0a81
Branch: refs/heads/master
Commit: 3e6c0a819a98d4893434ed219186f945f8530352
Parents: 69f4862
Author: Sven Meier <sv...@apache.org>
Authored: Wed Apr 20 09:18:56 2016 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Mon Apr 25 11:45:04 2016 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/Component.java | 4 ++--
.../main/java/org/apache/wicket/behavior/Behavior.java | 2 +-
.../BookmarkableListenerInterfaceRequestHandler.java | 4 +---
.../handler/ListenerInterfaceRequestHandler.java | 12 +++++-------
.../request/mapper/AbstractBookmarkableMapper.java | 9 +++++----
.../request/component/IRequestableComponent.java | 3 ++-
.../wicket/request/component/IRequestablePage.java | 4 ++--
.../wicket/request/handler/render/PageRenderer.java | 2 +-
.../wicket/request/handler/render/WebPageRenderer.java | 2 +-
.../java/org/apache/wicket/settings/PageSettings.java | 11 ++++++-----
.../apache/wicket/util/tester/BaseWicketTester.java | 9 ++++-----
.../wicket/request/mapper/info/ComponentInfo.java | 13 ++++++-------
12 files changed, 36 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/3e6c0a81/wicket-core/src/main/java/org/apache/wicket/Component.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java
index 22a032d..0c6f39c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -2066,7 +2066,7 @@ public abstract class Component
{
if ((isVisibleInHierarchy() && isEnabledInHierarchy()) == false && canCallListenerInterface() == false)
{
- // the component is either invisible or disabled and it can't call listener interfaces
+ // the component is either invisible or disabled and it can't call listeners
// then pretend the component is stateless
return true;
}
@@ -4423,7 +4423,7 @@ public abstract class Component
}
/**
- * Checks whether or not a listener method can be invoked on this component. Usually components
+ * Checks whether or not an {@link IRequestListener} can be invoked on this component. Usually components
* deny these invocations if they are either invisible or disabled in hierarchy.
* <p>
* WARNING: be careful when overriding this method because it may open security holes - such as
http://git-wip-us.apache.org/repos/asf/wicket/blob/3e6c0a81/wicket-core/src/main/java/org/apache/wicket/behavior/Behavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/behavior/Behavior.java b/wicket-core/src/main/java/org/apache/wicket/behavior/Behavior.java
index 51e5143..74a713e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/behavior/Behavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/behavior/Behavior.java
@@ -202,7 +202,7 @@ public abstract class Behavior
}
/**
- * Checks whether or not a listener interface can be invoked on this behavior. For further
+ * Checks whether or not an {@link IRequestListener} can be invoked on this behavior. For further
* information please read the javadoc on {@link Component#canCallListenerInterface()},
* this method has the same semantics.
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/3e6c0a81/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 f2a20ec..b3de191 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
@@ -24,7 +24,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.lang.Args;
/**
- * Request handler for bookmarkable pages with listener interface. This handler is only used to
+ * Request handler for bookmarkable pages with an {@link IRequestListener}. This handler is only used to
* generate URLs. Rendering is always handled by {@link ListenerInterfaceRequestHandler}.
*
* @author Matej Knopp
@@ -42,7 +42,6 @@ public class BookmarkableListenerInterfaceRequestHandler
* Construct.
*
* @param pageComponentProvider
- * @param listenerInterface
* @param behaviorIndex
*/
public BookmarkableListenerInterfaceRequestHandler(
@@ -59,7 +58,6 @@ public class BookmarkableListenerInterfaceRequestHandler
* Construct.
*
* @param pageComponentProvider
- * @param listenerInterface
*/
public BookmarkableListenerInterfaceRequestHandler(PageAndComponentProvider pageComponentProvider)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/3e6c0a81/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 1438d9c..8359749 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
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Request handler that invokes the listener interface on component and renders page afterwards.
+ * Request handler that invokes an {@link IRequestListener} on component or behavior and renders page afterwards.
*
* @author Matej Knopp
*/
@@ -57,7 +57,6 @@ public class ListenerInterfaceRequestHandler
* Construct.
*
* @param pageComponentProvider
- * @param listenerInterface
* @param behaviorIndex
*/
public ListenerInterfaceRequestHandler(IPageAndComponentProvider pageComponentProvider, Integer behaviorIndex)
@@ -72,7 +71,6 @@ public class ListenerInterfaceRequestHandler
* Construct.
*
* @param pageComponentProvider
- * @param listenerInterface
*/
public ListenerInterfaceRequestHandler(PageAndComponentProvider pageComponentProvider)
{
@@ -187,18 +185,18 @@ public class ListenerInterfaceRequestHandler
if (!canCallListenerInterfaceAfterExpiry && freshPage && (isStateless == false || component == null))
{
- // A listener interface is invoked on an expired page.
+ // A request listener is invoked on an expired page.
- // If the page is stateful then we cannot assume that the listener interface is
+ // If the page is stateful then we cannot assume that the listener 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
+ // component and/or behavior will be available. That's why the listener
// 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. "
+ "An IRequestListener on '{}' is executed on an expired stateful page. "
+ "Scheduling re-create of the page and ignoring the listener interface...",
getComponentPath());
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/3e6c0a81/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java
index 963c698..78eed83 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java
@@ -19,6 +19,7 @@ package org.apache.wicket.core.request.mapper;
import java.util.ArrayList;
import java.util.List;
+import org.apache.wicket.IRequestListener;
import org.apache.wicket.core.request.handler.BookmarkableListenerInterfaceRequestHandler;
import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler;
import org.apache.wicket.core.request.handler.IPageRequestHandler;
@@ -282,12 +283,12 @@ public abstract class AbstractBookmarkableMapper extends AbstractComponentMapper
}
/**
- * Creates a {@code IRequestHandler} that processes a listener request.
+ * Creates a {@code IRequestHandler} that notifies an {@link IRequestListener}.
*
* @param pageComponentInfo
* @param pageClass
* @param pageParameters
- * @return a {@code IRequestHandler} that invokes the listener interface
+ * @return a {@code IRequestHandler} that notifies an {@link IRequestListener}.
*/
protected IRequestHandler processListener(PageComponentInfo pageComponentInfo,
Class<? extends IRequestablePage> pageClass, PageParameters pageParameters)
@@ -338,7 +339,7 @@ public abstract class AbstractBookmarkableMapper extends AbstractComponentMapper
}
else if (info.getComponentInfo() != null)
{
- // with both page instance and component+listener this is a listener interface URL
+ // with both page instance and component this is a request listener URL
return processListener(info, pageClass, pageParameters);
}
else if (info.getPageInfo().getPageId() == null)
@@ -428,7 +429,7 @@ public abstract class AbstractBookmarkableMapper extends AbstractComponentMapper
}
else if (requestHandler instanceof BookmarkableListenerInterfaceRequestHandler)
{
- // listener interface URL with page class information
+ // request listener URL with page class information
BookmarkableListenerInterfaceRequestHandler handler = (BookmarkableListenerInterfaceRequestHandler)requestHandler;
Class<? extends IRequestablePage> pageClass = handler.getPageClass();
http://git-wip-us.apache.org/repos/asf/wicket/blob/3e6c0a81/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 bea84e5..33fdbad 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
@@ -17,6 +17,7 @@
package org.apache.wicket.request.component;
import org.apache.wicket.Component;
+import org.apache.wicket.IRequestListener;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.behavior.InvalidBehaviorIdException;
import org.apache.wicket.model.IDetachable;
@@ -107,7 +108,7 @@ public interface IRequestableComponent
void detach();
/**
- * @return {@code true} if it is save to call the listener interface on this component
+ * @return {@code true} if it is save to call an {@link IRequestListener} on this component
* when the owner page is freshly created after expiration
*/
boolean canCallListenerInterfaceAfterExpiry();
http://git-wip-us.apache.org/repos/asf/wicket/blob/3e6c0a81/wicket-core/src/main/java/org/apache/wicket/request/component/IRequestablePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/component/IRequestablePage.java b/wicket-core/src/main/java/org/apache/wicket/request/component/IRequestablePage.java
index fff5e14..a5cfb22 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/component/IRequestablePage.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/component/IRequestablePage.java
@@ -43,10 +43,10 @@ public interface IRequestablePage extends IRequestableComponent, IManageablePage
/**
* Returns the number of times this page has been rendered. The number will be appended to
- * listener interface links in order to prevent invoking listeners from staled page version.
+ * request listener links in order to prevent invoking listeners from staled page version.
* <p>
* For example a same page might have been rendered in two separate tabs. Page render doesn't
- * change page id but it can modify component hierarchy. Listener interface links on such page
+ * change page id but it can modify component hierarchy. Request listeners on such page
* should only work in tab where the page was rendered most recently.
*
* @return render count
http://git-wip-us.apache.org/repos/asf/wicket/blob/3e6c0a81/wicket-core/src/main/java/org/apache/wicket/request/handler/render/PageRenderer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/handler/render/PageRenderer.java b/wicket-core/src/main/java/org/apache/wicket/request/handler/render/PageRenderer.java
index 975d004..be01bd8 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/handler/render/PageRenderer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/handler/render/PageRenderer.java
@@ -118,7 +118,7 @@ public abstract class PageRenderer
* <p>
* By default we will redirect. This is so we do not end up having the browser be on a listener
* URL. A simple scenario is calling {@code setResponsePage(new StatelessPage())} inside form's
- * {@code onSubmit()} or link's {@code onClick()} callbacks, or any other listener interface
+ * {@code onSubmit()} or link's {@code onClick()} callbacks, or any other request listener
* callback. What will happen is that the browser will be on URL like
* {@code ./wicket/page?0-2.IFormSubmitListener-form}, and we will not redirect - leaving the
* browser on such URL. This is a worse alternative then saving one redirect because it may
http://git-wip-us.apache.org/repos/asf/wicket/blob/3e6c0a81/wicket-core/src/main/java/org/apache/wicket/request/handler/render/WebPageRenderer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/handler/render/WebPageRenderer.java b/wicket-core/src/main/java/org/apache/wicket/request/handler/render/WebPageRenderer.java
index a59e585..c48942b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/handler/render/WebPageRenderer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/handler/render/WebPageRenderer.java
@@ -268,7 +268,7 @@ public class WebPageRenderer extends PageRenderer
// when a normal mounted stateful page is hit at /mount/point
// wicket renders the page to buffer and redirects to /mount/point?12
// but for stateless page the redirect is not necessary
- // also for listener interface on stateful page we want to redirect
+ // also for request listeners on stateful page we want to redirect
// after the listener is invoked, but on stateless page the user
// must ask for redirect explicitly
response.writeTo((WebResponse)requestCycle.getResponse());
http://git-wip-us.apache.org/repos/asf/wicket/blob/3e6c0a81/wicket-core/src/main/java/org/apache/wicket/settings/PageSettings.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/settings/PageSettings.java b/wicket-core/src/main/java/org/apache/wicket/settings/PageSettings.java
index 4f973b5..b45710e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/settings/PageSettings.java
+++ b/wicket-core/src/main/java/org/apache/wicket/settings/PageSettings.java
@@ -18,6 +18,7 @@ package org.apache.wicket.settings;
import java.util.List;
+import org.apache.wicket.IRequestListener;
import org.apache.wicket.markup.resolver.IComponentResolver;
import org.apache.wicket.util.lang.Generics;
@@ -45,8 +46,8 @@ public class PageSettings
private boolean recreateBookmarkablePagesAfterExpiry = true;
/**
- * determines whether component's listener interface can be executed
- * when its owner page is freshly created after expiration
+ * determines whether an {@link IRequestListener} can be executed
+ * when its owning page is freshly created after expiration
*/
private boolean callListenerInterfaceAfterExpiry = false;
@@ -129,8 +130,8 @@ public class PageSettings
}
/**
- * @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
+ * @return {@code true} if Wicket should execute an {@link IRequestListener} on a component
+ * which owning page is freshly created after expiration of the old one
* @see #getRecreateBookmarkablePagesAfterExpiry()
* @see org.apache.wicket.request.component.IRequestableComponent#canCallListenerInterfaceAfterExpiry()
*/
@@ -140,7 +141,7 @@ public class PageSettings
}
/**
- * Sets a setting that determines whether Wicket should execute the listener interface of a component
+ * Sets a setting that determines whether Wicket should execute the {@link IRequestListener} on a component
* which owner page is freshly created after expiration of the old one
*
* @param callListenerInterfaceAfterExpiry
http://git-wip-us.apache.org/repos/asf/wicket/blob/3e6c0a81/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
index 531c89a..1eab3af 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
@@ -1072,10 +1072,9 @@ public class BaseWicketTester
}
/**
- * Simulates processing URL that invokes specified {@link RequestListenerInterface} on
- * component.
+ * Simulates processing URL that invokes an {@link IRequestListener} on a component.
*
- * After the listener interface is invoked the page containing the component will be rendered
+ * After the listener is invoked the page containing the component will be rendered
* (with an optional redirect - depending on {@link RenderStrategy}).
*
* @param component
@@ -1098,10 +1097,10 @@ public class BaseWicketTester
}
/**
- * Simulates invoking a listener on a component. As opposed to the
+ * Simulates invoking an {@link IRequestListener} on a component. As opposed to the
* {@link #executeListener(Component)} method, current request/response objects will be used
*
- * After the listener interface is invoked the page containing the component will be rendered
+ * After the listener is invoked the page containing the component will be rendered
* (with an optional redirect - depending on {@link RenderStrategy}).
*
* @param component
http://git-wip-us.apache.org/repos/asf/wicket/blob/3e6c0a81/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java b/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java
index ca11e48..6afa70b 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java
@@ -20,10 +20,10 @@ import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.string.Strings;
/**
- * Encodes listener interface and component path in form of
- * <listenerInterface>-<componentPath>,
- * <listenerInterface>.<behaviorIndex>-<componentPath> or
- * <render-count>.<listenerInterface>.<behaviorIndex>-<componentPath>
+ * Encodes listener and component path in form of
+ * {@code <listener>-<componentPath>},
+ * {@code <listener>.<behaviorIndex>-<componentPath>} or
+ * {@code <render-count>.<listener>.<behaviorIndex>-<componentPath>}
* <p>
* Component path is escaped (':' characters are replaced by '~')
*
@@ -116,7 +116,6 @@ public class ComponentInfo
* Construct.
*
* @param renderCount
- * @param listenerInterface
* @param componentPath
* @param behaviorId
*/
@@ -222,13 +221,13 @@ public class ComponentInfo
}
else
{
- String listenerInterface = string.substring(0, i);
+ String listener = string.substring(0, i);
String componentPath = decodeComponentPath(string.substring(i + 1));
Integer behaviorIndex = null;
Integer renderCount = null;
- String listenerParts[] = Strings.split(listenerInterface, BEHAVIOR_INDEX_SEPARATOR);
+ String listenerParts[] = Strings.split(listener, BEHAVIOR_INDEX_SEPARATOR);
if (listenerParts.length == 0)
{
return new ComponentInfo(renderCount, componentPath, behaviorIndex);
[06/17] wicket git commit: WICKET-6137 Fix javadocs
Posted by sv...@apache.org.
WICKET-6137 Fix javadocs
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/657e449a
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/657e449a
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/657e449a
Branch: refs/heads/master
Commit: 657e449a7334aa933512f8b5a5700a04c3964e16
Parents: 034a14d
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Mar 28 08:45:59 2016 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Mon Apr 25 11:44:44 2016 +0200
----------------------------------------------------------------------
wicket-core/src/main/java/org/apache/wicket/Component.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/657e449a/wicket-core/src/main/java/org/apache/wicket/Component.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java
index b1e56f0..22a032d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -3326,13 +3326,11 @@ public abstract class Component
}
/**
- * Gets a URL for the listener interface on a behavior (e.g. IRequestBehaviorListener on
- * AjaxPagingNavigationBehavior).
+ * Gets a URL for the listener interface on a behavior (e.g. {@link IRequestListener} on
+ * {@link org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigationBehavior}).
*
* @param behaviour
* The behavior that the URL should point to
- * @param listener
- * The listener interface that the URL should call
* @param parameters
* The parameters that should be rendered into the urls
* @return The URL
[04/17] wicket git commit: WICKET-6137 remove method paramter from
canCallListenerInterface - it is not needed any longer
Posted by sv...@apache.org.
WICKET-6137 remove method paramter from canCallListenerInterface - it is not needed any longer
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c5194b4a
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c5194b4a
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c5194b4a
Branch: refs/heads/master
Commit: c5194b4af9c578708398832224722e6f3436e50e
Parents: d171029
Author: Sven Meier <sv...@apache.org>
Authored: Sun Mar 27 22:43:44 2016 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Mon Apr 25 11:44:37 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/wicket/Component.java | 23 +++++---------------
.../org/apache/wicket/behavior/Behavior.java | 12 ++++------
.../ListenerInterfaceRequestHandler.java | 4 ++--
.../apache/wicket/markup/html/image/Image.java | 5 ++---
.../java/org/apache/wicket/ComponentTest.java | 7 +++---
.../apache/wicket/util/time/TimeOfDayTest.java | 2 +-
6 files changed, 18 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/c5194b4a/wicket-core/src/main/java/org/apache/wicket/Component.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java
index 877e963..2c8150d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -17,7 +17,6 @@
package org.apache.wicket;
import java.io.Serializable;
-import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
@@ -2065,13 +2064,9 @@ public abstract class Component
*/
public final boolean isStateless()
{
- if (
- // the component is either invisible or disabled
- (isVisibleInHierarchy() && isEnabledInHierarchy()) == false &&
-
- // and it can't call listener interfaces
- canCallListenerInterface(null) == false)
+ if ((isVisibleInHierarchy() && isEnabledInHierarchy()) == false && canCallListenerInterface() == false)
{
+ // the component is either invisible or disabled and it can't call listener interfaces
// then pretend the component is stateless
return true;
}
@@ -4431,9 +4426,7 @@ public abstract class Component
/**
* Checks whether or not a listener method can be invoked on this component. Usually components
- * deny these invocations if they are either invisible or disabled in hierarchy. Components can
- * examine which listener interface is being invoked by examining the declaring class of the
- * passed in {@literal method} parameter.
+ * deny these invocations if they are either invisible or disabled in hierarchy.
* <p>
* WARNING: be careful when overriding this method because it may open security holes - such as
* allowing a user to click on a link that should be disabled.
@@ -4442,18 +4435,14 @@ public abstract class Component
* Example usecase for overriding: Suppose you are building an component that displays images.
* The component generates a callback to itself using {@link IRequestListener} interface and
* uses this callback to stream image data. If such a component is placed inside a disabled
- * webmarkupcontainer we still want to allow the invocation of the request listener callback
+ * {@code WebMarkupContainer} we still want to allow the invocation of the request listener callback
* method so that image data can be streamed. Such a component would override this method and
- * return {@literal true} if the listener method belongs to {@link IRequestListener}.
+ * return {@literal true}.
* </p>
*
- * @param method
- * listener method about to be invoked on this component. Could be {@code null} - in
- * this case it means <em>any</em> method.
- *
* @return {@literal true} iff the listener method can be invoked on this component
*/
- public boolean canCallListenerInterface(Method method)
+ public boolean canCallListenerInterface()
{
return isEnabledInHierarchy() && isVisibleInHierarchy();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/c5194b4a/wicket-core/src/main/java/org/apache/wicket/behavior/Behavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/behavior/Behavior.java b/wicket-core/src/main/java/org/apache/wicket/behavior/Behavior.java
index 2267e74..51e5143 100644
--- a/wicket-core/src/main/java/org/apache/wicket/behavior/Behavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/behavior/Behavior.java
@@ -16,8 +16,6 @@
*/
package org.apache.wicket.behavior;
-import java.lang.reflect.Method;
-
import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.IComponentAwareEventSink;
@@ -205,21 +203,19 @@ public abstract class Behavior
/**
* Checks whether or not a listener interface can be invoked on this behavior. For further
- * information please read the javadoc on {@link Component#canCallListenerInterface(Method)},
+ * information please read the javadoc on {@link Component#canCallListenerInterface()},
* this method has the same semantics.
*
- * WARNING: Read the javadoc of {@link Component#canCallListenerInterface(Method)} for important
+ * WARNING: Read the javadoc of {@link Component#canCallListenerInterface()} for important
* security-related information.
*
* @param component
* component this behavior is attached to
- * @param method
- * listener method being invoked
* @return {@literal true} iff the listener method can be invoked
*/
- public boolean canCallListenerInterface(Component component, Method method)
+ public boolean canCallListenerInterface(Component component)
{
- return isEnabled(component) && component.canCallListenerInterface(method);
+ return isEnabled(component) && component.canCallListenerInterface();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/c5194b4a/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 a098f02..71696ce 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
@@ -251,7 +251,7 @@ public class ListenerInterfaceRequestHandler
// we are in Wicket core land
final Component component = (Component)rcomponent;
- if (!component.canCallListenerInterface(null))
+ if (!component.canCallListenerInterface())
{
// just return so that we have a silent fail and just re-render the
// page
@@ -277,7 +277,7 @@ public class ListenerInterfaceRequestHandler
// we are in Wicket core land
final Component component = (Component)rcomponent;
- if (!behavior.canCallListenerInterface(component, null))
+ if (!behavior.canCallListenerInterface(component))
{
LOG.warn("behavior not enabled; ignore call. Behavior {} at component {}", behavior,
component);
http://git-wip-us.apache.org/repos/asf/wicket/blob/c5194b4a/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 28f17ee..bbe5bc1 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
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.markup.html.image;
-import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -586,7 +585,7 @@ public class Image extends WebComponent implements IRequestListener
}
@Override
- public boolean canCallListenerInterface(Method method)
+ public boolean canCallListenerInterface()
{
if (isVisibleInHierarchy())
{
@@ -597,7 +596,7 @@ public class Image extends WebComponent implements IRequestListener
}
else
{
- return super.canCallListenerInterface(method);
+ return super.canCallListenerInterface();
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/c5194b4a/wicket-core/src/test/java/org/apache/wicket/ComponentTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ComponentTest.java b/wicket-core/src/test/java/org/apache/wicket/ComponentTest.java
index 496718b..ca59d80 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ComponentTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ComponentTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.wicket;
-import java.lang.reflect.Method;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.wicket.ajax.AjaxEventBehavior;
@@ -143,7 +142,7 @@ public class ComponentTest extends WicketTestCase
// methods no matter whether it is visible or enabled
component = new WebComponent("someId") {
@Override
- public boolean canCallListenerInterface(Method method)
+ public boolean canCallListenerInterface()
{
return true;
}
@@ -181,8 +180,8 @@ public class ComponentTest extends WicketTestCase
link = new Link<Void>("someId") {
@Override
- public boolean canCallListenerInterface(Method method) {
- return true;
+ public boolean canCallListenerInterface() {
+ return true;
}
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/c5194b4a/wicket-util/src/test/java/org/apache/wicket/util/time/TimeOfDayTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/time/TimeOfDayTest.java b/wicket-util/src/test/java/org/apache/wicket/util/time/TimeOfDayTest.java
index 2dc7949..b4e3a17 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/time/TimeOfDayTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/time/TimeOfDayTest.java
@@ -20,7 +20,7 @@ import org.junit.Assert;
import org.junit.Test;
/**
- * Test cases for this object
+ * Test cases for {@link TimeOfDay}.
*
* @author Jonathan Locke
*/
[09/17] wicket git commit: WICKET-6137 fixing tests: listener
interface no longer in url;
stateless components don't need render count in url
Posted by sv...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_6.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_6.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_6.html
index 43d794e..8405f4d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_6.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_6.html
@@ -18,21 +18,21 @@
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">seven</span></li><li wicket:id="table"><span wicket:id="txt">eight</span></li></ul>
<span wicket:id="navigator"><wicket:panel>
- <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.ILinkListener-navigator-first" title="Go to first page"><<</a>
- <a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.ILinkListener-navigator-prev" title="Go to previous page"><</a>
+ <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.-navigator-first" title="Go to first page"><<</a>
+ <a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.-navigator-prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.-navigator-navigation-0-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.-navigator-navigation-1-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span>, <span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" disabled="disabled" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.-navigator-navigation-3-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 6"><span wicket:id="pageNumber">6</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.-navigator-navigation-4-pageLink" title="Go to page 6"><span wicket:id="pageNumber">6</span></a>
</span>
- <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.-navigator-next" title="Go to next page">></a>
+ <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.-navigator-last" title="Go to last page">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_7.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_7.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_7.html
index b00cb03..c7c162b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_7.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_7.html
@@ -18,21 +18,21 @@
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">five</span></li><li wicket:id="table"><span wicket:id="txt">six</span></li></ul>
<span wicket:id="navigator"><wicket:panel>
- <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.ILinkListener-navigator-first" title="Go to first page"><<</a>
- <a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.ILinkListener-navigator-prev" title="Go to previous page"><</a>
+ <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.-navigator-first" title="Go to first page"><<</a>
+ <a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.-navigator-prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span>, <span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" disabled="disabled" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
+ <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
</span>
- <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.ILinkListener-navigator-next" title="Go to next page">></a>
- <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.ILinkListener-navigator-last" title="Go to last page">>></a>
+ <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.-navigator-next" title="Go to next page">></a>
+ <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.-navigator-last" title="Go to last page">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTablePageExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTablePageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTablePageExpectedResult.html
index 5791acd..d9cd315 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTablePageExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTablePageExpectedResult.html
@@ -17,6 +17,6 @@
<title>Paged Table Page</title>
</head>
<body><ul><li wicket:id="table"><span wicket:id="txt">three</span></li></ul>
-<ul><li wicket:id="navigation"><a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTablePage?1-2.ILinkListener-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a></li><li wicket:id="navigation"><a wicket:id="pageLink" disabled="disabled" title="Go to page 2"><span wicket:id="pageNumber">2</span></a></li></ul>
+<ul><li wicket:id="navigation"><a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTablePage?1-2.-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a></li><li wicket:id="navigation"><a wicket:id="pageLink" disabled="disabled" title="Go to page 2"><span wicket:id="pageNumber">2</span></a></li></ul>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html
index ae86aee..642b786 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html
@@ -16,7 +16,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.panel.Inl
<script type="text/javascript" >
/*<![CDATA[*/
Wicket.Event.add(window, "domready", function(event) {
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.panel.InlinePanelPage_7?0-1.IBehaviorListener.0-provider-ajaxRefresh","c":"ajaxRefresh1","e":"click"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.panel.InlinePanelPage_7?0-1.0-provider-ajaxRefresh","c":"ajaxRefresh1","e":"click"});;
Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
;});
/*]]>*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html
index fc13229..dce698f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html
@@ -16,7 +16,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.panel.Inl
<script type="text/javascript" >
/*<![CDATA[*/
Wicket.Event.add(window, "domready", function(event) {
-Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.panel.InlinePanelPage_8?0-1.IBehaviorListener.0-add","c":"add1","e":"click"});;
+Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.panel.InlinePanelPage_8?0-1.0-add","c":"add1","e":"click"});;
Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
;});
/*]]>*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html
index 2545175..f384cd4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html
@@ -1,6 +1,6 @@
<html>
<body>
-<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.tags.InputTagNotVisibleWebPage?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.tags.InputTagNotVisibleWebPage?0-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
</form>
</body>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPageResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPageResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPageResult.html
index ff8b622..59dfed5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPageResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPageResult.html
@@ -1,6 +1,6 @@
<html>
<body>
-<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.tags.InputTagVisibleWebPage?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
+<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.tags.InputTagVisibleWebPage?0-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div>
<input wicket:id="input" type="text" value="" name="input">
</form>
</body>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/protocol/http/MockPage_expectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/MockPage_expectedResult.html b/wicket-core/src/test/java/org/apache/wicket/protocol/http/MockPage_expectedResult.html
index dc74ce6..c1c220d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/MockPage_expectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/MockPage_expectedResult.html
@@ -16,6 +16,6 @@
<title>Mock Page</title>
</head>
<body>
-<a href="?wicket:interface=:0:actionLink::ILinkListener::" wicket:id="actionLink">Action link clicked <span wicket:id="linkClickCount">0</span> times</a>
+<a href="?wicket:interface=:0:actionLink::.::" wicket:id="actionLink">Action link clicked <span wicket:id="linkClickCount">0</span> times</a>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/protocol/http/MockPage_expectedResult2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/MockPage_expectedResult2.html b/wicket-core/src/test/java/org/apache/wicket/protocol/http/MockPage_expectedResult2.html
index a8c8df2..ef74779 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/MockPage_expectedResult2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/MockPage_expectedResult2.html
@@ -16,6 +16,6 @@
<title>Mock Page</title>
</head>
<body>
-<a href="?wicket:interface=:0:actionLink::ILinkListener::" wicket:id="actionLink">Action link clicked <span wicket:id="linkClickCount">1</span> times</a>
+<a href="?wicket:interface=:0:actionLink::.::" wicket:id="actionLink">Action link clicked <span wicket:id="linkClickCount">1</span> times</a>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/protocol/http/firstpage_result.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/firstpage_result.html b/wicket-core/src/test/java/org/apache/wicket/protocol/http/firstpage_result.html
index b4d82ff..da788e4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/firstpage_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/firstpage_result.html
@@ -4,7 +4,7 @@
</head>
<body>
first page<br/>
- <a href="?wicket:interface=:0:link::ILinkListener::" wicket:id="link">link to second page</a>
+ <a href="?wicket:interface=:0:link::.::" wicket:id="link">link to second page</a>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/protocol/http/firstpage_result2.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/firstpage_result2.html b/wicket-core/src/test/java/org/apache/wicket/protocol/http/firstpage_result2.html
index cdd5091..ab3ab35 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/firstpage_result2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/firstpage_result2.html
@@ -4,7 +4,7 @@
</head>
<body>
first page<br/>
- <a href="?wicket:interface=:2:link::ILinkListener::" wicket:id="link">link to second page</a>
+ <a href="?wicket:interface=:2:link::.::" wicket:id="link">link to second page</a>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/protocol/http/secondpage_result.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/secondpage_result.html b/wicket-core/src/test/java/org/apache/wicket/protocol/http/secondpage_result.html
index cbadffa..77e54cc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/secondpage_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/secondpage_result.html
@@ -2,6 +2,6 @@
<body>
second page<br/>
- <a href="?wicket:interface=:1:link::ILinkListener::" wicket:id="link">link to first page</a>
+ <a href="?wicket:interface=:1:link::.::" wicket:id="link">link to first page</a>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java
index 0a7ce91..431ed3a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java
@@ -31,7 +31,7 @@ public class ComponentInfoTest extends Assert
@Test
public void test1()
{
- String s = "listener-component-path";
+ String s = ".-component-path";
ComponentInfo info = ComponentInfo.parse(s);
assertEquals("component:path", info.getComponentPath());
assertNull(info.getBehaviorId());
@@ -56,7 +56,7 @@ public class ComponentInfoTest extends Assert
@Test
public void test3()
{
- String s = "listener-";
+ String s = ".-";
ComponentInfo info = ComponentInfo.parse(s);
// empty component path is allowed - listener invoked on page
assertEquals("", info.getComponentPath());
@@ -89,7 +89,7 @@ public class ComponentInfoTest extends Assert
@Test
public void test6()
{
- String s = "listener-compo~~nent-path";
+ String s = ".-compo~~nent-path";
ComponentInfo info = ComponentInfo.parse(s);
assertEquals("compo--nent:path", info.getComponentPath());
assertNull(info.getBehaviorId());
@@ -103,7 +103,7 @@ public class ComponentInfoTest extends Assert
@Test
public void test7()
{
- String s = "listener-co~mpo~~nent-path";
+ String s = ".-co~mpo~~nent-path";
ComponentInfo info = ComponentInfo.parse(s);
assertEquals("co-mpo--nent:path", info.getComponentPath());
assertNull(info.getBehaviorId());
@@ -117,7 +117,7 @@ public class ComponentInfoTest extends Assert
@Test
public void test8()
{
- String s = "listener.12-component-path";
+ String s = ".12-component-path";
ComponentInfo info = ComponentInfo.parse(s);
assertEquals("component:path", info.getComponentPath());
assertEquals((Object)12, info.getBehaviorId());
@@ -131,7 +131,7 @@ public class ComponentInfoTest extends Assert
@Test
public void test9()
{
- String s = "4.listener-a-b";
+ String s = "4.-a-b";
ComponentInfo info = ComponentInfo.parse(s);
assertEquals((Integer)4, info.getRenderCount());
@@ -144,7 +144,7 @@ public class ComponentInfoTest extends Assert
@Test
public void test10()
{
- String s = "4.listener.5-a-b";
+ String s = "4.5-a-b";
ComponentInfo info = ComponentInfo.parse(s);
assertEquals((Integer)4, info.getRenderCount());
assertEquals((Integer)5, info.getBehaviorId());
@@ -159,14 +159,13 @@ public class ComponentInfoTest extends Assert
public void encodeDecode()
{
final Integer renderCount = 1;
- final String listenerInterface = "ILinkListener";
final String componentPath = "-nav-container-:-nav:1:link";
final Integer behaviorId = null;
ComponentInfo info = new ComponentInfo(renderCount, componentPath, behaviorId);
final String encoded = info.toString();
- assertEquals("1.ILinkListener-~nav~container~-~nav-1-link", encoded);
+ assertEquals("1.-~nav~container~-~nav-1-link", encoded);
ComponentInfo decoded = ComponentInfo.parse(encoded);
assertEquals(renderCount, decoded.getRenderCount());
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
index a1fedc7..83e7ae6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
@@ -1,5 +1,5 @@
<html>
<body>
-<a href="./testValue2?-1.ILinkListener-link" wicket:id="link">test</a>
+<a href="./testValue2?-1.-link" wicket:id="link">test</a>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
index 5424ccb..01be322 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
@@ -1,5 +1,5 @@
<html>
<body>
-<a href="./stateless?-1.ILinkListener-link&testParam1=testValue1&testParam2=testValue2" wicket:id="link">test</a>
+<a href="./stateless?-.-link&testParam1=testValue1&testParam2=testValue2" wicket:id="link">test</a>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
index c641ea0..63b427ac 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
@@ -1,5 +1,5 @@
<html>
<body>
-<a href="./org.apache.wicket.stateless.StatelessComponentPageWithParams?-1.ILinkListener-link&testParam1=testValue1&testParam2=testValue2" wicket:id="link">test</a>
+<a href="./org.apache.wicket.stateless.StatelessComponentPageWithParams?-1.-link&testParam1=testValue1&testParam2=testValue2" wicket:id="link">test</a>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
index 12adc15..ac5f821 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
@@ -1,5 +1,5 @@
<html>
<body>
-<a href="./stateless?-1.ILinkListener-link" wicket:id="link">test</a>
+<a href="./stateless?-1.-link" wicket:id="link">test</a>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
index a94ff07..472458f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
@@ -1,5 +1,5 @@
<html>
<body>
-<a href="./org.apache.wicket.stateless.StatelessComponentPage?-1.ILinkListener-link" wicket:id="link">test</a>
+<a href="./org.apache.wicket.stateless.StatelessComponentPage?-1.-link" wicket:id="link">test</a>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm_expected.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm_expected.html
index f02f46a..6360d02 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm_expected.html
@@ -1,5 +1,5 @@
<html>
<body>
-<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.stateless.StatelessPageWithForm?-1.IFormSubmitListener-form&first=foo&second=bar"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div></form>
+<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.stateless.StatelessPageWithForm?-1.-form&first=foo&second=bar"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div></form>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html b/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html
index 7f6c79f..aded085 100644
--- a/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html
+++ b/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html
@@ -105,8 +105,8 @@ Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
</script>
</head>
<body>
-<form wicket:id="localeForm" id="localeForm2" method="post" action="./org.apache.wicket.extensions.yui.calendar.DatesPage1?0-1.IFormSubmitListener-localeForm"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="localeForm2_hf_0" id="localeForm2_hf_0" /></div>
-<p><select wicket:id="localeSelect" onchange="document.getElementById('localeForm2_hf_0').value='./org.apache.wicket.extensions.yui.calendar.DatesPage1?0-1.IOnChangeListener-localeForm-localeSelect';document.getElementById('localeForm2').submit();" name="localeSelect">
+<form wicket:id="localeForm" id="localeForm2" method="post" action="./org.apache.wicket.extensions.yui.calendar.DatesPage1?0-1.-localeForm"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="localeForm2_hf_0" id="localeForm2_hf_0" /></div>
+<p><select wicket:id="localeSelect" onchange="document.getElementById('localeForm2_hf_0').value='./org.apache.wicket.extensions.yui.calendar.DatesPage1?0-1.-localeForm-localeSelect';document.getElementById('localeForm2').submit();" name="localeSelect">
<option value="0">cinese (Cina) (Chinese (China))</option>
<option value="1">cinese (Cina) (Chinese (China))</option>
<option value="2">cinese (Cina) (Chinese (China))</option>
@@ -127,10 +127,10 @@ Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
<option value="17">italiano (Italia) (Italian (Italy))</option>
<option value="18">tedesco (German)</option>
<option value="19">tedesco (Germania) (German (Germany))</option>
-</select> [<a href="./org.apache.wicket.extensions.yui.calendar.DatesPage1?0-1.ILinkListener-localeForm-localeUSLink" wicket:id="localeUSLink">set to english</a>]</p>
+</select> [<a href="./org.apache.wicket.extensions.yui.calendar.DatesPage1?0-1.-localeForm-localeUSLink" wicket:id="localeUSLink">set to english</a>]</p>
</form>
<p>
-<form wicket:id="form" id="form3" method="post" action="./org.apache.wicket.extensions.yui.calendar.DatesPage1?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form3_hf_0" id="form3_hf_0" /></div><input type="text" wicket:id="dateTextField" value="xx/xx/xx" name="dateTextField" id="dateTextField1"/>
+<form wicket:id="form" id="form3" method="post" action="./org.apache.wicket.extensions.yui.calendar.DatesPage1?0-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form3_hf_0" id="form3_hf_0" /></div><input type="text" wicket:id="dateTextField" value="xx/xx/xx" name="dateTextField" id="dateTextField1"/>
<span class="yui-skin-sam"> <span style="display:none;position:absolute;z-index: 99999;" id="dateTextField1Dp"></span><img style="cursor: pointer; border: none;" id="dateTextField1Icon" src="../resource/org.apache.wicket.extensions.yui.calendar.DatePicker/icon1.gif" alt="" title=""/></span> <input type="submit" value="submit" /></form>
</p>
<p>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.html
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.html
index 128260b..704c4ec 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.html
@@ -19,7 +19,7 @@
This approach allows users to quickly and easily inject any component with bean proxies. Components simply have to annotate any fields they wish injected with @SpringBean annotation.
Interesting classes:<br/>
<ul>
- <li>SpringComponentInjector - an implementation of IComponentInstantiationListener that performs the injection</li>
+ <li>SpringComponentInjector - an implementation of . that performs the injection</li>
<li>AnnotPage - contains an annotated field whose value will be initialized with a proxy by the injector</li>
</ul>
<table wicket:id="contacts" cellspacing="0" cellpadding="2" class="grid"></table>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/package.html
----------------------------------------------------------------------
diff --git a/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/package.html b/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/package.html
index 2c7d72d..a1a8875 100644
--- a/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/package.html
+++ b/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/package.html
@@ -26,7 +26,7 @@ This package contains all the classes to make your wicket components and other p
<p>
To setup automatic injection of wicket components in your application subclass init() method call:
<code>
-addComponentInstantiationListener(new SpringComponentInjector(this));
+addComponent.(new SpringComponentInjector(this));
</code>
To inject any pojo call <code>InjectorHolder.getInjector().inject(this)</code> in the pojo's constructor.
</p>