You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by cm...@apache.org on 2014/08/25 07:57:48 UTC
[02/15] git commit: WICKET-5676 Double click causes internal error
using AjaxFallbackDefaultDataTable
WICKET-5676 Double click causes internal error using AjaxFallbackDefaultDataTable
Use the default channel name for Ajax navigation links
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7ff5623b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7ff5623b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7ff5623b
Branch: refs/heads/WICKET-5677
Commit: 7ff5623b9af4e4b1ddfd3dee8d5bfde775de09c0
Parents: 64c8567
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Aug 18 12:26:01 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Aug 18 12:26:01 2014 +0300
----------------------------------------------------------------------
.../main/java/org/apache/wicket/ajax/AjaxChannel.java | 12 +++++++++++-
.../paging/AjaxPagingNavigationIncrementLink.java | 4 +---
.../navigation/paging/AjaxPagingNavigationLink.java | 4 +---
3 files changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/7ff5623b/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxChannel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxChannel.java b/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxChannel.java
index e60a5c3..45b050c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxChannel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxChannel.java
@@ -58,9 +58,19 @@ public class AjaxChannel implements IClusterable
}
/**
+ * The name of the default channel
+ */
+ public static final String DEFAULT_NAME = "0";
+
+ /**
+ * The type of the default channel
+ */
+ public static final Type DEFAULT_TYPE = Type.QUEUE;
+
+ /**
* The default channel for all Ajax calls
*/
- public static final AjaxChannel DEFAULT = new AjaxChannel("0", Type.QUEUE);
+ public static final AjaxChannel DEFAULT = new AjaxChannel(DEFAULT_NAME, DEFAULT_TYPE);
private final String name;
http://git-wip-us.apache.org/repos/asf/wicket/blob/7ff5623b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationIncrementLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationIncrementLink.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationIncrementLink.java
index 6f47714..0dcd652 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationIncrementLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationIncrementLink.java
@@ -51,8 +51,6 @@ public class AjaxPagingNavigationIncrementLink extends PagingNavigationIncrement
{
private static final long serialVersionUID = 1L;
- public static final String PAGING_CHANNEL_NAME = "ajax-paging";
-
/**
* Constructor.
*
@@ -94,7 +92,7 @@ public class AjaxPagingNavigationIncrementLink extends PagingNavigationIncrement
protected void updateAjaxAttributes(AjaxRequestAttributes attributes)
{
super.updateAjaxAttributes(attributes);
- attributes.setChannel(new AjaxChannel(PAGING_CHANNEL_NAME, AjaxChannel.Type.ACTIVE));
+ attributes.setChannel(new AjaxChannel(AjaxChannel.DEFAULT_NAME, AjaxChannel.Type.ACTIVE));
AjaxPagingNavigationIncrementLink.this.updateAjaxAttributes(attributes);
}
};
http://git-wip-us.apache.org/repos/asf/wicket/blob/7ff5623b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationLink.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationLink.java
index c8bcb47..05e2f85 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationLink.java
@@ -16,8 +16,6 @@
*/
package org.apache.wicket.ajax.markup.html.navigation.paging;
-import static org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigationIncrementLink.PAGING_CHANNEL_NAME;
-
import org.apache.wicket.ajax.AjaxChannel;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
@@ -78,7 +76,7 @@ public class AjaxPagingNavigationLink extends PagingNavigationLink<Void> impleme
protected void updateAjaxAttributes(AjaxRequestAttributes attributes)
{
super.updateAjaxAttributes(attributes);
- attributes.setChannel(new AjaxChannel(PAGING_CHANNEL_NAME, AjaxChannel.Type.ACTIVE));
+ attributes.setChannel(new AjaxChannel(AjaxChannel.DEFAULT_NAME, AjaxChannel.Type.ACTIVE));
AjaxPagingNavigationLink.this.updateAjaxAttributes(attributes);
}
};