svn commit: r940164 - in /myfaces: core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java

[lu...@apache.org]

Author: lu4242
Date: Sun May  2 06:14:44 2010
New Revision: 940164

URL: http://svn.apache.org/viewvc?rev=940164&view=rev
Log:
MYFACES-2508 move code to shared, because it should be there

Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java
    myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java?rev=940164&r1=940163&r2=940164&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRenderer.java Sun May  2 06:14:44 2010
@@ -21,7 +21,6 @@ package org.apache.myfaces.renderkit.htm
 import java.io.IOException;
 
 import javax.faces.component.UIComponent;
-import javax.faces.component.UIViewRoot;
 import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
@@ -46,9 +45,7 @@ import org.apache.myfaces.shared_impl.re
     type="javax.faces.Form")
 public class HtmlFormRenderer
         extends HtmlFormRendererBase
-{
-    private static final String FORM_TARGET = HTML.FORM_ELEM;
-    
+{    
     //private static final Log log = LogFactory.getLog(HtmlFormRenderer.class);
     
     @Override
@@ -58,12 +55,6 @@ public class HtmlFormRenderer
         
         ResponseWriter writer = facesContext.getResponseWriter();
         ExternalContext extContext = facesContext.getExternalContext();
-        UIViewRoot root = facesContext.getViewRoot();
-        
-        for (UIComponent child : root.getComponentResources(facesContext,
-             FORM_TARGET)) {
-            child.encodeAll (facesContext);
-        }
         
         // If javascript viewstate is enabled write empty hidden input in forms 
         if (JavascriptUtils.isJavascriptAllowed(extContext) && MyfacesConfig.getCurrentInstance(extContext).isViewStateJavascript()) {

Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java?rev=940164&r1=940163&r2=940164&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java Sun May  2 06:14:44 2010
@@ -18,9 +18,11 @@
  */
 package org.apache.myfaces.shared.renderkit.html;
 
-import org.apache.myfaces.shared.config.MyfacesConfig;
-import org.apache.myfaces.shared.renderkit.JSFAttr;
-import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import javax.faces.application.ViewHandler;
 import javax.faces.component.UIComponent;
@@ -30,11 +32,10 @@ import javax.faces.component.behavior.Cl
 import javax.faces.component.html.HtmlForm;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+
+import org.apache.myfaces.shared.config.MyfacesConfig;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
 
 /**
  * @author Manfred Geiler (latest modification by $Author$)
@@ -46,7 +47,7 @@ public class HtmlFormRendererBase
         extends HtmlRenderer
 {
     //private static final Log log = LogFactory.getLog(HtmlFormRenderer.class);
-
+    private static final String FORM_TARGET = HTML.FORM_ELEM;
     private static final String HIDDEN_SUBMIT_INPUT_SUFFIX = "_SUBMIT";
     private static final String HIDDEN_SUBMIT_INPUT_VALUE = "1";
 
@@ -158,6 +159,13 @@ public class HtmlFormRendererBase
         viewHandler.writeState(facesContext);
 
         afterFormElementsEnd(facesContext, component);
+        
+        for (UIComponent child : facesContext.getViewRoot().getComponentResources(facesContext,
+            FORM_TARGET))
+        {
+           child.encodeAll (facesContext);
+        }
+        
         writer.endElement(HTML.FORM_ELEM);
     }