You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by bw...@apache.org on 2006/05/19 06:22:25 UTC

svn commit: r407703 - in /tapestry/tapestry4/trunk: contrib/src/java/org/apache/tapestry/contrib/link/FormLinkRenderer.java framework/src/java/org/apache/tapestry/engine/ILink.java

Author: bwallace
Date: Thu May 18 21:22:21 2006
New Revision: 407703

URL: http://svn.apache.org/viewvc?rev=407703&view=rev
Log:
[TAPESTRY-886] Ported fixes to 4.0 branch to tapestry4/trunk

Modified:
    tapestry/tapestry4/trunk/contrib/src/java/org/apache/tapestry/contrib/link/FormLinkRenderer.java
    tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/engine/ILink.java

Modified: tapestry/tapestry4/trunk/contrib/src/java/org/apache/tapestry/contrib/link/FormLinkRenderer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/contrib/src/java/org/apache/tapestry/contrib/link/FormLinkRenderer.java?rev=407703&r1=407702&r2=407703&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/contrib/src/java/org/apache/tapestry/contrib/link/FormLinkRenderer.java (original)
+++ tapestry/tapestry4/trunk/contrib/src/java/org/apache/tapestry/contrib/link/FormLinkRenderer.java Thu May 18 21:22:21 2006
@@ -18,6 +18,7 @@
 import org.apache.tapestry.IMarkupWriter;
 import org.apache.tapestry.IRequestCycle;
 import org.apache.tapestry.Tapestry;
+import org.apache.tapestry.TapestryUtils;
 import org.apache.tapestry.components.ILinkComponent;
 import org.apache.tapestry.engine.ILink;
 import org.apache.tapestry.html.Body;
@@ -83,12 +84,7 @@
             ILink l = linkComponent.getLink(cycle);
             String anchor = linkComponent.getAnchor();
 
-            Body body = Body.get(cycle);
-
-            if (body == null)
-                throw new ApplicationRuntimeException(Tapestry.format(
-                        "must-be-contained-by-body", "FormLinkRenderer"), this,
-                        null, null);
+            Body body = (Body) TapestryUtils.getPageRenderSupport(cycle, linkComponent);
 
             String function = generateFormFunction(formName, l, anchor);
             body.addBodyScript(linkComponent, function);
@@ -152,11 +148,11 @@
         {
             String parameter = parameterNames[i];
             String[] values = link.getParameterValues(parameter);
-            for(int j = 0; j < values.length; j++)
-            {
-                String value = values[j];
-                buf.append("  html += \"<input type='hidden' name='"
-                        + parameter + "' value='" + value + "'/>\";\n");
+            if (values != null) {               
+                for (int j = 0; j < values.length; j++) {
+                    String value = values[j];
+                    buf.append("  html += \"<input type='hidden' name='" + parameter + "' value='" + value + "'/>\";\n");
+                }
             }
         }
         buf.append("  html += \"<\" + \"/form>\";\n");

Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/engine/ILink.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/engine/ILink.java?rev=407703&r1=407702&r2=407703&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/engine/ILink.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/engine/ILink.java Thu May 18 21:22:21 2006
@@ -107,7 +107,7 @@
     String[] getParameterNames();
 
     /**
-     * Returns the values for the named parameter. Will return null if the no value is defined for
+     * Returns the values for the named parameter. Will return null if no value is defined for
      * the parameter.
      */