svn commit: r1199661 - in /wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax: AbstractDefaultAjaxBehavior.java AjaxChannel.java

[mgrigorov]

Author: mgrigorov
Date: Wed Nov  9 08:58:10 2011
New Revision: 1199661

URL: http://svn.apache.org/viewvc?rev=1199661&view=rev
Log:
Use the new non-deprecated method for AjaxChannel.


Modified:
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxChannel.java

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java?rev=1199661&r1=1199660&r2=1199661&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
 Wed Nov  9 08:58:10 2011
@@ -203,7 +203,7 @@ public abstract class AbstractDefaultAja
                        buff.append("}.bind(this)");
                }
 
-               String channel = getChannelName();
+               AjaxChannel channel = getChannel();
                if (channel != null)
                {
                        if (precondition == null)
@@ -211,7 +211,7 @@ public abstract class AbstractDefaultAja
                                buff.append(", null");
                        }
                        buff.append(", '");
-                       buff.append(channel);
+                       buff.append(channel.getChannelName());
                        buff.append("'");
                }
 
@@ -254,7 +254,7 @@ public abstract class AbstractDefaultAja
         *         side
         * @deprecated Use {@link #getChannel()} instead
         */
-       // TODO Wicket 1.6 - Remove this method
+       // TODO Wicket.next - Remove this method
        @Deprecated
        protected String getChannelName()
        {

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxChannel.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxChannel.java?rev=1199661&r1=1199660&r2=1199661&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxChannel.java 
(original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxChannel.java 
Wed Nov  9 08:58:10 2011
@@ -17,6 +17,7 @@
 package org.apache.wicket.ajax;
 
 import org.apache.wicket.IClusterable;
+import org.apache.wicket.util.lang.Args;
 
 /**
  * A Channel that used to process Ajax requests.
@@ -32,6 +33,7 @@ import org.apache.wicket.IClusterable;
  */
 public class AjaxChannel implements IClusterable
 {
+       private static final long serialVersionUID = 1L;
 
        /**
         * The type of an {@link AjaxChannel}
@@ -73,8 +75,8 @@ public class AjaxChannel implements IClu
         */
        public AjaxChannel(final String name, final Type type)
        {
-               this.name = name;
-               this.type = type;
+               this.name = Args.notNull(name, "name");
+               this.type = Args.notNull(type, "type");
        }
 
        /**