Updated Branches: refs/heads/master 7ff927367 -> efeae4f40
WICKET-5091 Extract the short names of the ajax attributes as a constants Make sure the JSON name of an attribute is non-empty. Add #toString() to simplify the usage when possible Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/efeae4f4 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/efeae4f4 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/efeae4f4 Branch: refs/heads/master Commit: efeae4f4085650f8c4203fa90b8b340fca0ac186 Parents: da14404 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Mar 11 13:31:34 2013 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Mar 11 13:31:34 2013 +0100 ---------------------------------------------------------------------- .../wicket/ajax/attributes/AjaxAttributeName.java | 9 ++++++++- .../ajax/AbstractDefaultAjaxBehaviorTest.java | 14 +++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/efeae4f4/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/AjaxAttributeName.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/AjaxAttributeName.java b/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/AjaxAttributeName.java index d57b995..e2f9b30 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/AjaxAttributeName.java +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/AjaxAttributeName.java @@ -17,6 +17,7 @@ package org.apache.wicket.ajax.attributes; import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior; +import org.apache.wicket.util.lang.Args; /** * ajax attribute names @@ -216,7 +217,7 @@ public enum AjaxAttributeName { private AjaxAttributeName(String jsonName) { - this.jsonName = jsonName; + this.jsonName = Args.notNull(jsonName, "jsonName"); } /** @@ -228,4 +229,10 @@ public enum AjaxAttributeName { { return jsonName; } + + @Override + public String toString() + { + return jsonName; + } } http://git-wip-us.apache.org/repos/asf/wicket/blob/efeae4f4/wicket-core/src/test/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehaviorTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehaviorTest.java index 4363836..3f848b5 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehaviorTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehaviorTest.java @@ -66,18 +66,18 @@ public class AbstractDefaultAjaxBehaviorTest extends Assert CharSequence json = behavior.renderAjaxAttributes(component, attributes); - String expected = "{\"" + AjaxAttributeName.COMPLETE_HANDLER.jsonName() + + String expected = "{\"" + AjaxAttributeName.COMPLETE_HANDLER + "\":[function(attrs, jqXHR, textStatus){alert('Complete!');}],\"" + - AjaxAttributeName.URL.jsonName() + "\":\"some/url\",\"" + - AjaxAttributeName.PRECONDITION.jsonName() + + AjaxAttributeName.URL + "\":\"some/url\",\"" + + AjaxAttributeName.PRECONDITION + "\":[function(attrs){return somePrecondition();}],\"" + - AjaxAttributeName.FAILURE_HANDLER.jsonName() + + AjaxAttributeName.FAILURE_HANDLER + "\":[function(attrs, jqXHR, errorMessage, textStatus){alert('Failure!');}],\"" + - AjaxAttributeName.BEFORE_HANDLER.jsonName() + + AjaxAttributeName.BEFORE_HANDLER + "\":[function(attrs){alert('Before!');}],\"" + - AjaxAttributeName.SUCCESS_HANDLER.jsonName() + + AjaxAttributeName.SUCCESS_HANDLER + "\":[function(attrs, jqXHR, data, textStatus){alert('Success!');}],\"" + - AjaxAttributeName.AFTER_HANDLER.jsonName() + "\":[function(attrs){alert('After!');}]}"; + AjaxAttributeName.AFTER_HANDLER + "\":[function(attrs){alert('After!');}]}"; assertEquals(expected, json); } }
