You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/05/22 14:59:39 UTC
[1/3] git commit: Java 1.7 - diamond operators
Updated Branches:
refs/heads/master 9fdbd9f6a -> 548e63efa
Java 1.7 - diamond operators
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/92629fdf
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/92629fdf
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/92629fdf
Branch: refs/heads/master
Commit: 92629fdf0d337fddfe29d9317bb9573ade4ad7a1
Parents: 9fdbd9f
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu May 16 15:10:47 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu May 16 17:30:04 2013 +0300
----------------------------------------------------------------------
.../examples/repeater/AjaxDataTablePage.java | 16 +++++++-------
1 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/92629fdf/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.java
index af14345..b82a514 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.java
@@ -39,9 +39,9 @@ public class AjaxDataTablePage extends BasePage
*/
public AjaxDataTablePage()
{
- List<IColumn<Contact, String>> columns = new ArrayList<IColumn<Contact, String>>();
+ List<IColumn<Contact, String>> columns = new ArrayList<>();
- columns.add(new AbstractColumn<Contact, String>(new Model<String>("Actions"))
+ columns.add(new AbstractColumn<Contact, String>(Model.of("Actions"))
{
@Override
public void populateItem(Item<ICellPopulator<Contact>> cellItem, String componentId,
@@ -51,15 +51,15 @@ public class AjaxDataTablePage extends BasePage
}
});
- columns.add(new PropertyColumn<Contact, String>(new Model<String>("ID"), "id"));
- columns.add(new PropertyColumn<Contact, String>(new Model<String>("First Name"), "firstName",
+ columns.add(new PropertyColumn<Contact, String>(Model.of("ID"), "id"));
+ columns.add(new PropertyColumn<Contact, String>(Model.of("First Name"), "firstName",
"firstName"));
- columns.add(new PropertyColumn<Contact, String>(new Model<String>("Last Name"), "lastName",
+ columns.add(new PropertyColumn<Contact, String>(Model.of("Last Name"), "lastName",
"lastName"));
- columns.add(new PropertyColumn<Contact, String>(new Model<String>("Home Phone"), "homePhone"));
- columns.add(new PropertyColumn<Contact, String>(new Model<String>("Cell Phone"), "cellPhone"));
+ columns.add(new PropertyColumn<Contact, String>(Model.of("Home Phone"), "homePhone"));
+ columns.add(new PropertyColumn<Contact, String>(Model.of("Cell Phone"), "cellPhone"));
- add(new AjaxFallbackDefaultDataTable<Contact, String>("table", columns,
+ add(new AjaxFallbackDefaultDataTable<>("table", columns,
new SortableContactDataProvider(), 8));
}
}
[2/3] git commit: Java 1.7 - diamonds operator
Posted by mg...@apache.org.
Java 1.7 - diamonds operator
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/66375f6c
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/66375f6c
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/66375f6c
Branch: refs/heads/master
Commit: 66375f6c4ad9a1e865282d7ea9e688fa539e2c41
Parents: 92629fd
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri May 17 10:59:06 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri May 17 10:59:06 2013 +0300
----------------------------------------------------------------------
.../servlet/MultipartServletWebRequestImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/66375f6c/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java
index 4e96e4b..88f5622 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java
@@ -119,7 +119,7 @@ public class MultipartServletWebRequestImpl extends MultipartServletWebRequest
Args.notNull(upload, "upload");
this.upload = upload;
parameters = new ValueMap();
- files = new HashMap<String, List<FileItem>>();
+ files = new HashMap<>();
// Check that request is multipart
final boolean isMultipart = ServletFileUpload.isMultipartContent(request);
@@ -214,7 +214,7 @@ public class MultipartServletWebRequestImpl extends MultipartServletWebRequest
List<FileItem> fileItems = files.get(item.getFieldName());
if (fileItems == null)
{
- fileItems = new ArrayList<FileItem>();
+ fileItems = new ArrayList<>();
files.put(item.getFieldName(), fileItems);
}
// Add to file list
@@ -277,13 +277,13 @@ public class MultipartServletWebRequestImpl extends MultipartServletWebRequest
@Override
protected Map<String, List<StringValue>> generatePostParameters()
{
- Map<String, List<StringValue>> res = new HashMap<String, List<StringValue>>();
+ Map<String, List<StringValue>> res = new HashMap<>();
for (String key : parameters.keySet())
{
String[] val = (String[])parameters.get(key);
if (val != null && val.length > 0)
{
- List<StringValue> items = new ArrayList<StringValue>();
+ List<StringValue> items = new ArrayList<>();
for (String s : val)
{
items.add(StringValue.valueOf(s));
[3/3] git commit: WICKET-5197 Rename
AjaxRequestAttributes#allowDefault to #preventDefault
Posted by mg...@apache.org.
WICKET-5197 Rename AjaxRequestAttributes#allowDefault to #preventDefault
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/548e63ef
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/548e63ef
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/548e63ef
Branch: refs/heads/master
Commit: 548e63efa516a574dee06c9f384847d84ed79e09
Parents: 66375f6
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed May 22 15:59:12 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed May 22 15:59:12 2013 +0300
----------------------------------------------------------------------
.../wicket/ajax/AbstractDefaultAjaxBehavior.java | 4 +-
.../wicket/ajax/attributes/AjaxAttributeName.java | 4 +-
.../ajax/attributes/AjaxRequestAttributes.java | 18 +++++++-------
.../form/AjaxFormComponentUpdatingBehavior.java | 1 -
.../wicket/ajax/markup/html/AjaxFallbackLink.java | 1 +
.../ajax/markup/html/form/AjaxFallbackButton.java | 1 +
.../wicket/ajax/res/js/wicket-ajax-jquery.js | 4 +-
.../ajax/AjaxHeaderContributionPage2_expected.html | 2 +-
.../ajax/AjaxHeaderContributionPage_expected.html | 2 +-
.../ajax/DomReadyOrderPage_ajax_expected.html | 2 +-
.../wicket/ajax/DomReadyOrderPage_expected.html | 2 +-
.../ajax/attributes/AjaxAttributeNameTest.java | 13 +++++-----
.../ajax/form/AjaxFormSubmitTestPage_expected.html | 2 +-
.../OnChangeAjaxBehaviorTestPage_expected.html | 4 +-
.../data/sort/AjaxFallbackOrderByLink.java | 1 +
15 files changed, 31 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/548e63ef/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
index 1cd9ec6..30e177b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
@@ -340,9 +340,9 @@ public abstract class AbstractDefaultAjaxBehavior extends AbstractAjaxBehavior
attributesJson.put(AjaxAttributeName.CHANNEL.jsonName(), channel);
}
- if (attributes.isAllowDefault())
+ if (attributes.isPreventDefault())
{
- attributesJson.put(AjaxAttributeName.IS_ALLOW_DEFAULT.jsonName(), true);
+ attributesJson.put(AjaxAttributeName.IS_PREVENT_DEFAULT.jsonName(), true);
}
if (AjaxRequestAttributes.EventPropagation.BUBBLE.equals(attributes.getEventPropagation()))
http://git-wip-us.apache.org/repos/asf/wicket/blob/548e63ef/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 1042deb..e0ce088 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
@@ -78,9 +78,9 @@ public enum AjaxAttributeName {
/**
* allow default
*
- * @see AjaxRequestAttributes#isAllowDefault()
+ * @see AjaxRequestAttributes#isPreventDefault()
*/
- IS_ALLOW_DEFAULT("ad"),
+ IS_PREVENT_DEFAULT("pd"),
/**
* stop propagation
http://git-wip-us.apache.org/repos/asf/wicket/blob/548e63ef/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/AjaxRequestAttributes.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/AjaxRequestAttributes.java b/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/AjaxRequestAttributes.java
index 896c4fd..676c907 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/AjaxRequestAttributes.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/AjaxRequestAttributes.java
@@ -80,7 +80,7 @@ public final class AjaxRequestAttributes
private Duration requestTimeout;
- private boolean allowDefault = false;
+ private boolean preventDefault = false;
private EventPropagation eventPropagation = EventPropagation.STOP;
@@ -291,16 +291,16 @@ public final class AjaxRequestAttributes
/**
* Only applies for event behaviors. Returns whether the behavior should allow the default event
* handler to be invoked. For example if the behavior is attached to a link and
- * {@link #isAllowDefault()} returns <code>false</code> (which is default value), the link's URL
+ * {@link #isPreventDefault()} returns <code>false</code> (which is default value), the link's URL
* will not be followed. If the Ajax behavior is attached to a checkbox or a radio button then
* the default behavior should be allowed to actually check the box or radio button, i.e. this
* method should return <code>true</code>.
*
* @return {@code true} if the default event handler should be invoked, {@code false} otherwise.
*/
- public boolean isAllowDefault()
+ public boolean isPreventDefault()
{
- return allowDefault;
+ return preventDefault;
}
/**
@@ -316,15 +316,15 @@ public final class AjaxRequestAttributes
* Only applies for event behaviors. Determines whether the behavior should allow the default
* event handler to be invoked.
*
- * @see #isAllowDefault()
+ * @see #isPreventDefault()
*
- * @param allowDefault
+ * @param preventDefault
* @return {@code this} object for chaining
- * @see #isAllowDefault()
+ * @see #isPreventDefault()
*/
- public AjaxRequestAttributes setAllowDefault(boolean allowDefault)
+ public AjaxRequestAttributes setPreventDefault(boolean preventDefault)
{
- this.allowDefault = allowDefault;
+ this.preventDefault = preventDefault;
return this;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/548e63ef/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
index e78c67d..c5b15ec 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
@@ -119,7 +119,6 @@ public abstract class AjaxFormComponentUpdatingBehavior extends AjaxEventBehavio
super.updateAjaxAttributes(attributes);
attributes.setMethod(Method.POST);
- attributes.setAllowDefault(true);
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/548e63ef/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.java
index d2a77bf..638fa76 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.java
@@ -116,6 +116,7 @@ public abstract class AjaxFallbackLink<T> extends Link<T> implements IAjaxLink
protected void updateAjaxAttributes(AjaxRequestAttributes attributes)
{
super.updateAjaxAttributes(attributes);
+ attributes.setPreventDefault(true);
AjaxFallbackLink.this.updateAjaxAttributes(attributes);
}
};
http://git-wip-us.apache.org/repos/asf/wicket/blob/548e63ef/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
index ba7fdb0..63b7e52 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
@@ -104,6 +104,7 @@ public abstract class AjaxFallbackButton extends Button
protected void updateAjaxAttributes(AjaxRequestAttributes attributes)
{
super.updateAjaxAttributes(attributes);
+ attributes.setPreventDefault(true);
AjaxFallbackButton.this.updateAjaxAttributes(attributes);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/548e63ef/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
index fdce64e..eb9827b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
@@ -358,8 +358,8 @@
attrs.rt = 0;
}
- if (attrs.ad !== true) {
- attrs.ad = false;
+ if (attrs.pd !== true) {
+ attrs.pd = false;
}
if (!attrs.sp) {
http://git-wip-us.apache.org/repos/asf/wicket/blob/548e63ef/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 ffddb3c..77693d0 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":"../page?0-1.IBehaviorListener.0-link","e":"click","c":"link1"});;
+Wicket.Ajax.ajax({"pd":true,"u":"../page?0-1.IBehaviorListener.0-link","e":"click","c":"link1"});;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/548e63ef/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 cbcf576..328c5da 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":"../page?0-1.IBehaviorListener.0-link","e":"click","c":"link1"});;
+Wicket.Ajax.ajax({"pd":true,"u":"../page?0-1.IBehaviorListener.0-link","e":"click","c":"link1"});;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/548e63ef/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 c62457a..d404dcb 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
@@ -12,4 +12,4 @@ Wicket.Ajax.DebugWindow.enabled=true;
Wicket.Ajax.baseUrl="wicket/page?0-1.IBehaviorListener.0-test";
/*]^]^>*/
</script>
-</head>]]></header-contribution><evaluate><![CDATA[(function(){Wicket.Ajax.ajax({"u":"./page?0-1.IBehaviorListener.0-test","e":"click","c":"test1"});})();(function(){test1();})();(function(){test2();})();]]></evaluate></ajax-response>
\ No newline at end of file
+</head>]]></header-contribution><evaluate><![CDATA[(function(){Wicket.Ajax.ajax({"pd":true,"u":"./page?0-1.IBehaviorListener.0-test","e":"click","c":"test1"});})();(function(){test1();})();(function(){test2();})();]]></evaluate></ajax-response>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/548e63ef/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 3522c63..6345e2d 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":"../page?0-1.IBehaviorListener.0-test","e":"click","c":"test1"});;
+Wicket.Ajax.ajax({"pd":true,"u":"../page?0-1.IBehaviorListener.0-test","e":"click","c":"test1"});;
test1();;
test2();;
;});
http://git-wip-us.apache.org/repos/asf/wicket/blob/548e63ef/wicket-core/src/test/java/org/apache/wicket/ajax/attributes/AjaxAttributeNameTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/attributes/AjaxAttributeNameTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/attributes/AjaxAttributeNameTest.java
index 47625c0..51027eb 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/attributes/AjaxAttributeNameTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/attributes/AjaxAttributeNameTest.java
@@ -19,8 +19,7 @@ package org.apache.wicket.ajax.attributes;
import java.util.HashSet;
import java.util.Set;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.junit.Test;
/**
@@ -28,7 +27,7 @@ import org.junit.Test;
*
* @author mosmann
*/
-public class AjaxAttributeNameTest
+public class AjaxAttributeNameTest extends Assert
{
/**
* do not let json parameter names collide
@@ -39,7 +38,7 @@ public class AjaxAttributeNameTest
Set<String> jsonNames = new HashSet<String>();
for (AjaxAttributeName name : AjaxAttributeName.values())
{
- Assert.assertTrue("Attribute: " + name, jsonNames.add(name.jsonName()));
+ assertTrue("Attribute: " + name, jsonNames.add(name.jsonName()));
}
}
@@ -54,11 +53,11 @@ public class AjaxAttributeNameTest
for (AjaxAttributeName name : AjaxAttributeName.values())
{
sb.append(name.jsonName());
- sb.append("|");
+ sb.append('|');
}
- Assert.assertEquals("all known json parameter names",
- "tr|p|d|id|dt|wr|rt|ad|sp|ch|e|async|dep|ep|pre|coh|fh|sh|ah|bsh|bh|i|sc|mp|f|c|m|u|",
+ assertEquals("all known json parameter names",
+ "tr|p|d|id|dt|wr|rt|pd|sp|ch|e|async|dep|ep|pre|coh|fh|sh|ah|bsh|bh|i|sc|mp|f|c|m|u|",
sb.toString());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/548e63ef/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 4d71ee1..f9be3fb 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,7 +16,7 @@ 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({"f":"form1","u":"../page?0-1.IBehaviorListener.0-form-submit","e":"click","c":"submit2","sc":":submit","m":"POST"});;
+Wicket.Ajax.ajax({"pd":true,"f":"form1","u":"../page?0-1.IBehaviorListener.0-form-submit","e":"click","c":"submit2","sc":":submit","m":"POST"});;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/548e63ef/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 a6cb93f..35b2d6c 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,8 +16,8 @@ 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":"../page?0-1.IBehaviorListener.0-form-field","e":"inputchange change","c":"field1","ad":true,"m":"POST"});;
-Wicket.Ajax.ajax({"u":"../page?0-1.IBehaviorListener.0-form-dropDown","e":"inputchange change","c":"dropDown2","ad":true,"m":"POST"});;
+Wicket.Ajax.ajax({"u":"../page?0-1.IBehaviorListener.0-form-field","e":"inputchange change","c":"field1","m":"POST"});;
+Wicket.Ajax.ajax({"u":"../page?0-1.IBehaviorListener.0-form-dropDown","e":"inputchange change","c":"dropDown2","m":"POST"});;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/548e63ef/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByLink.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByLink.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByLink.java
index a546b2f..77870ba 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByLink.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByLink.java
@@ -137,6 +137,7 @@ public abstract class AjaxFallbackOrderByLink<S> extends OrderByLink<S> implemen
protected void updateAjaxAttributes(AjaxRequestAttributes attributes)
{
super.updateAjaxAttributes(attributes);
+ attributes.setPreventDefault(true);
if (ajaxCallListener != null) {
attributes.getAjaxCallListeners().add(ajaxCallListener);
}