svn commit: r1151566 - in /tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5: ajax/MultiZoneUpdate.java services/ajax/AjaxResponseRenderer.java

[hl...@apache.org]

Author: hlship
Date: Wed Jul 27 17:59:42 2011
New Revision: 1151566

URL: http://svn.apache.org/viewvc?rev=1151566&view=rev
Log:
TAP5-1476: Mark MultiZoneUpdate as deprecated

Modified:
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ajax/MultiZoneUpdate.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ajax/AjaxResponseRenderer.java

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ajax/MultiZoneUpdate.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ajax/MultiZoneUpdate.java?rev=1151566&r1=1151565&r2=1151566&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ajax/MultiZoneUpdate.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ajax/MultiZoneUpdate.java Wed Jul 27 17:59:42 2011
@@ -14,12 +14,12 @@
 
 package org.apache.tapestry5.ajax;
 
-import java.util.Map;
-
 import org.apache.tapestry5.ClientBodyElement;
 import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
 import org.apache.tapestry5.ioc.internal.util.InternalUtils;
 
+import java.util.Map;
+
 /**
  * A mapping from <em>client-side zone ids</em> to objects that can render the content for that zone on the client. An
  * event handler method may instantiate an instance and chain together a series of calls to {@link #add(String, Object)}
@@ -29,8 +29,10 @@ import org.apache.tapestry5.ioc.internal
  * mix. Because of this, it is highly recommended that the client-side logic gather the actual component ids and include
  * those in the Ajax request, to ensure that the server generates updates that the client can process. Better yet, use
  * the Zone's id parameter to lock down the zone's id to a known, predictable value.
- * 
+ *
  * @since 5.1.0.1
+ * @deprecated Deprecated in 5.3; use the {@link org.apache.tapestry5.services.ajax.AjaxResponseRenderer} service instead of
+ *             returning an instance of MultiZoneUpdate
  */
 public class MultiZoneUpdate
 {
@@ -45,8 +47,10 @@ public class MultiZoneUpdate
         this(zoneId, renderer, null);
     }
 
-    /** Alternate constructor that takes a ClientBodyElement (typically, a
-     * {@link org.apache.tapestry5.corelib.components.Zone}). */
+    /**
+     * Alternate constructor that takes a ClientBodyElement (typically, a
+     * {@link org.apache.tapestry5.corelib.components.Zone}).
+     */
     public MultiZoneUpdate(ClientBodyElement zone)
     {
         this(zone.getClientId(), zone.getBody());
@@ -64,7 +68,7 @@ public class MultiZoneUpdate
 
     /**
      * Adds the zone (represented by the {@link ClientBodyElement}) to the update.
-     * 
+     *
      * @since 5.2.3
      */
     public MultiZoneUpdate add(ClientBodyElement zone)
@@ -77,11 +81,9 @@ public class MultiZoneUpdate
     /**
      * Returns a <strong>new</strong> MultiZoneUpdate reflecting the mapping from the indicated zone to an object that
      * will render the content for that zone.
-     * 
-     * @param zoneId
-     *            client id of zone to update
-     * @param renderer
-     *            object that can provide the content for the zone
+     *
+     * @param zoneId   client id of zone to update
+     * @param renderer object that can provide the content for the zone
      * @return new MultiZoneUpdate
      */
     public MultiZoneUpdate add(String zoneId, Object renderer)
@@ -91,7 +93,7 @@ public class MultiZoneUpdate
 
     /**
      * Returns a mapping from client zone id to renderer object for that zone.
-     * 
+     *
      * @return string to renderer map
      */
     public Map<String, Object> getZoneToRenderMap()

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ajax/AjaxResponseRenderer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ajax/AjaxResponseRenderer.java?rev=1151566&r1=1151565&r2=1151566&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ajax/AjaxResponseRenderer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ajax/AjaxResponseRenderer.java Wed Jul 27 17:59:42 2011
@@ -18,7 +18,8 @@ import org.apache.tapestry5.ioc.ScopeCon
 import org.apache.tapestry5.ioc.annotations.Scope;
 
 /**
- * Manages the rendering of a partial page render as part of an Ajax response.
+ * Manages the rendering of a partial page render as part of an Ajax response. This replaces
+ * the {@link org.apache.tapestry5.ajax.MultiZoneUpdate}.
  */
 @Scope(ScopeConstants.PERTHREAD)
 public class AjaxResponseRenderer