Author: mgrigorov
Date: Wed Sep 7 15:27:14 2011
New Revision: 1166225
URL: http://svn.apache.org/viewvc?rev=1166225&view=rev
Log:
WICKET-4023 Please Allow AjaxLink to use getChannelName
Added possibility to override AbstractDefaultAjaxBehavior#getChannel() to all
IAjaxLink impls which have getAjaxCallDecorator()
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByLink.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.java?rev=1166225&r1=1166224&r2=1166225&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.java
Wed Sep 7 15:27:14 2011
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.ajax.markup.html;
+import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
+import org.apache.wicket.ajax.AjaxChannel;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.IAjaxCallDecorator;
@@ -113,10 +115,25 @@ public abstract class AjaxFallbackLink<T
super.onComponentTag(tag);
}
}
+
+ @Override
+ protected AjaxChannel getChannel()
+ {
+ return AjaxFallbackLink.this.getChannel();
+ }
};
}
/**
+ * @return the channel that manages how Ajax calls are executed
+ * @see AbstractDefaultAjaxBehavior#getChannel()
+ */
+ protected AjaxChannel getChannel()
+ {
+ return null;
+ }
+
+ /**
*
* @return call decorator to use or null if none
*/
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java?rev=1166225&r1=1166224&r2=1166225&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java
Wed Sep 7 15:27:14 2011
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.ajax.markup.html;
+import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
+import org.apache.wicket.ajax.AjaxChannel;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.IAjaxCallDecorator;
@@ -99,9 +101,24 @@ public abstract class AjaxLink<T> extend
super.onComponentTag(tag);
}
}
+
+ @Override
+ protected AjaxChannel getChannel()
+ {
+ return AjaxLink.this.getChannel();
+ }
};
}
+ /**
+ * @return the channel that manages how Ajax calls are executed
+ * @see AbstractDefaultAjaxBehavior#getChannel()
+ */
+ protected AjaxChannel getChannel()
+ {
+ return null;
+ }
+
@Override
protected void onComponentTag(ComponentTag tag)
{
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java?rev=1166225&r1=1166224&r2=1166225&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
Wed Sep 7 15:27:14 2011
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.ajax.markup.html.form;
+import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
+import org.apache.wicket.ajax.AjaxChannel;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.IAjaxCallDecorator;
import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;
@@ -143,6 +145,12 @@ public abstract class AjaxButton extends
}
@Override
+ protected AjaxChannel getChannel()
+ {
+ return AjaxButton.this.getChannel();
+ }
+
+ @Override
public boolean getDefaultProcessing()
{
return
AjaxButton.this.getDefaultFormProcessing();
@@ -182,6 +190,15 @@ public abstract class AjaxButton extends
}
/**
+ * @return the channel that manages how Ajax calls are executed
+ * @see AbstractDefaultAjaxBehavior#getChannel()
+ */
+ protected AjaxChannel getChannel()
+ {
+ return null;
+ }
+
+ /**
* Listener method invoked on form submit with no errors
*
* @param target
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java?rev=1166225&r1=1166224&r2=1166225&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxFallbackButton.java
Wed Sep 7 15:27:14 2011
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.ajax.markup.html.form;
+import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
+import org.apache.wicket.ajax.AjaxChannel;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.IAjaxCallDecorator;
import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;
@@ -93,6 +95,12 @@ public abstract class AjaxFallbackButton
}
@Override
+ protected AjaxChannel getChannel()
+ {
+ return AjaxFallbackButton.this.getChannel();
+ }
+
+ @Override
public boolean getDefaultProcessing()
{
return
AjaxFallbackButton.this.getDefaultFormProcessing();
@@ -150,6 +158,15 @@ public abstract class AjaxFallbackButton
}
/**
+ * @return the channel that manages how Ajax calls are executed
+ * @see AbstractDefaultAjaxBehavior#getChannel()
+ */
+ protected AjaxChannel getChannel()
+ {
+ return null;
+ }
+
+ /**
* Helper methods that both checks whether the link is enabled and
whether the action ENABLE is
* allowed.
*
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByLink.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByLink.java?rev=1166225&r1=1166224&r2=1166225&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByLink.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByLink.java
Wed Sep 7 15:27:14 2011
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.extensions.ajax.markup.html.repeater.data.sort;
+import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
+import org.apache.wicket.ajax.AjaxChannel;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.IAjaxCallDecorator;
@@ -134,11 +136,26 @@ public abstract class AjaxFallbackOrderB
{
return new
CancelEventIfNoAjaxDecorator(decorator);
}
+
+ @Override
+ protected AjaxChannel getChannel()
+ {
+ return
AjaxFallbackOrderByLink.this.getChannel();
+ }
};
}
/**
+ * @return the channel that manages how Ajax calls are executed
+ * @see AbstractDefaultAjaxBehavior#getChannel()
+ */
+ protected AjaxChannel getChannel()
+ {
+ return null;
+ }
+
+ /**
* Callback method when an ajax click occurs. All the behavior of
changing the sort, etc is
* already performed before this is called so this method should
primarily be used to configure
* the target.
