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/03/27 23:47:07 UTC
wicket git commit: renamed #urlFor() to #urlForListener() for
component and behavior listener
Repository: wicket
Updated Branches:
refs/heads/request_listener_simplification 66c6c4247 -> 08be37f28
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/08be37f2
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/08be37f2
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/08be37f2
Branch: refs/heads/request_listener_simplification
Commit: 08be37f28753328a82e1d30616981d0468f1d7ac
Parents: 66c6c42
Author: Sven Meier <sv...@apache.org>
Authored: Sun Mar 27 23:46:44 2016 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Sun Mar 27 23:46:44 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/08be37f2/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 008f25d..33b715f 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -3324,7 +3324,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
@@ -3335,7 +3335,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);
@@ -3379,15 +3379,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/08be37f2/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/08be37f2/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/08be37f2/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/08be37f2/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/08be37f2/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/08be37f2/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/08be37f2/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/08be37f2/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/08be37f2/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/08be37f2/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/08be37f2/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 e7374af..c9c1fbd 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
@@ -338,7 +338,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/08be37f2/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/08be37f2/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/08be37f2/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 d7e18a4..e6cb809 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
@@ -1086,7 +1086,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();
}
@@ -2025,7 +2025,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/08be37f2/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/08be37f2/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/08be37f2/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/08be37f2/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=")