You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by me...@apache.org on 2022/04/30 12:15:24 UTC

[myfaces] branch 3.0.x updated: MYFACES-4434 - HtmlTextareaRendererBase separate encode end and begin (#262)

This is an automated email from the ASF dual-hosted git repository.

melloware pushed a commit to branch 3.0.x
in repository https://gitbox.apache.org/repos/asf/myfaces.git


The following commit(s) were added to refs/heads/3.0.x by this push:
     new aedd6bda3 MYFACES-4434 - HtmlTextareaRendererBase separate encode end and begin (#262)
aedd6bda3 is described below

commit aedd6bda395d8d2d33456d7976826aa8a56a886c
Author: Melloware <me...@gmail.com>
AuthorDate: Sat Apr 30 08:15:20 2022 -0400

    MYFACES-4434 - HtmlTextareaRendererBase separate encode end and begin (#262)
---
 .../myfaces/renderkit/html/HtmlTextareaRendererTest.java |  2 ++
 .../shared/renderkit/html/HtmlTextareaRendererBase.java  | 16 +++++++---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextareaRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextareaRendererTest.java
index a4272b178..f14bc21fc 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextareaRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextareaRendererTest.java
@@ -76,6 +76,7 @@ public class HtmlTextareaRendererTest extends AbstractJsfTestCase
 
     public void testRenderDefault() throws Exception
     {
+        inputTextarea.encodeBegin(facesContext);
         inputTextarea.encodeEnd(facesContext);
         facesContext.renderResponse();
 
@@ -87,6 +88,7 @@ public class HtmlTextareaRendererTest extends AbstractJsfTestCase
     {
         inputTextarea.setCols(5);
         inputTextarea.setRows(10);
+        inputTextarea.encodeBegin(facesContext);
         inputTextarea.encodeEnd(facesContext);
         facesContext.renderResponse();
 
diff --git a/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextareaRendererBase.java b/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextareaRendererBase.java
index 03fd54c38..60964e056 100644
--- a/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextareaRendererBase.java
+++ b/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextareaRendererBase.java
@@ -41,7 +41,8 @@ public class HtmlTextareaRendererBase
 {
     private static final String ADD_NEW_LINE_AT_START_ATTR = "org.apache.myfaces.addNewLineAtStart";
     
-    public void encodeEnd(FacesContext facesContext, UIComponent uiComponent)
+    @Override
+    public void encodeBegin(FacesContext facesContext, UIComponent uiComponent)
             throws IOException
     {
         RendererUtils.checkParamValidity(facesContext, uiComponent, UIInput.class);
@@ -52,23 +53,20 @@ public class HtmlTextareaRendererBase
             behaviors = ((ClientBehaviorHolder) uiComponent).getClientBehaviors();
             if (!behaviors.isEmpty())
             {
-                ResourceUtils.renderDefaultJsfJsInlineIfNecessary(facesContext, 
+                ResourceUtils.renderDefaultJsfJsInlineIfNecessary(facesContext,
                         facesContext.getResponseWriter());
             }
         }
-        
-        encodeTextArea(facesContext, uiComponent);
 
+        renderTextAreaBegin(facesContext, uiComponent);
     }
 
-    protected void encodeTextArea(FacesContext facesContext, UIComponent uiComponent) 
-        throws IOException
+    @Override
+    public void encodeEnd(FacesContext facesContext, UIComponent uiComponent)
+            throws IOException
     {
-       //allow subclasses to render custom attributes by separating rendering begin and end
-        renderTextAreaBegin(facesContext, uiComponent);
         renderTextAreaValue(facesContext, uiComponent);
         renderTextAreaEnd(facesContext, uiComponent);
-        
     }
 
     //Subclasses can set the value of an attribute before, or can render a custom attribute after calling this method