svn commit: r727752 - in /struts/sandbox/trunk/struts2-javatemplates-plugin/src: main/java/org/apache/struts2/views/java/simple/ test/java/org/apache/struts2/views/java/simple/

[musachy]

Author: musachy
Date: Thu Dec 18 07:47:56 2008
New Revision: 727752

URL: http://svn.apache.org/viewvc?rev=727752&view=rev
Log:
Fix closing of textarea

Modified:
    
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/SimpleTheme.java
    
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/TextAreaHandler.java
    
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/TextAreaTest.java

Modified: 
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/SimpleTheme.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/SimpleTheme.java?rev=727752&r1=727751&r2=727752&view=diff
==============================================================================
--- 
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/SimpleTheme.java
 (original)
+++ 
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/SimpleTheme.java
 Thu Dec 18 07:47:56 2008
@@ -48,6 +48,7 @@
             put("submit", new FactoryList(SubmitHandler.class, 
ScriptingEventsHandler.class, CommonAttributesHandler.class));
             put("submit-close", new 
FactoryList(SubmitHandler.CloseHandler.class));
             put("textarea", new FactoryList(TextAreaHandler.class, 
ScriptingEventsHandler.class, CommonAttributesHandler.class));
+            put("textarea-close", new 
FactoryList(TextAreaHandler.CloseHandler.class));
             put("actionerror", new FactoryList(ActionErrorHandler.class));
             put("token", new FactoryList(TokenHandler.class));
             put("actionmessage", new FactoryList(ActionMessageHandler.class));

Modified: 
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/TextAreaHandler.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/TextAreaHandler.java?rev=727752&r1=727751&r2=727752&view=diff
==============================================================================
--- 
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/TextAreaHandler.java
 (original)
+++ 
struts/sandbox/trunk/struts2-javatemplates-plugin/src/main/java/org/apache/struts2/views/java/simple/TextAreaHandler.java
 Thu Dec 18 07:47:56 2008
@@ -45,10 +45,17 @@
                 .addIfExists("class", params.get("cssClass"))
                 .addIfExists("style", params.get("cssStyle"))
                 .addIfExists("title", params.get("title"));
-        super.start("textarea", attrs);
-        String value = (String) params.get("nameValue");
-        if (TextUtils.stringSet(value))
-            characters(value);
-        super.end("textarea");
+        start("textarea", attrs);
+    }
+
+    public static class CloseHandler extends AbstractTagHandler implements 
TagGenerator {
+        @Override
+        public void generate() throws IOException {
+            Map<String, Object> params = context.getParameters();
+            String value = (String) params.get("nameValue");
+            if (TextUtils.stringSet(value))
+                characters(value);
+            end("textarea");
+        }
     }
 }
\ No newline at end of file

Modified: 
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/TextAreaTest.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/TextAreaTest.java?rev=727752&r1=727751&r2=727752&view=diff
==============================================================================
--- 
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/TextAreaTest.java
 (original)
+++ 
struts/sandbox/trunk/struts2-javatemplates-plugin/src/test/java/org/apache/struts2/views/java/simple/TextAreaTest.java
 Thu Dec 18 07:47:56 2008
@@ -44,12 +44,13 @@
         tag.evaluateParams();
         map.putAll(tag.getParameters());
         theme.renderTag(getTagName(), context);
+        theme.renderTag(getTagName() + "-close", context);
         String output = writer.getBuffer().toString();
         String expected = s("<textarea name='name' cols='2' rows='1' 
tabindex='1' id='id1' class='class1' style='style1' 
title='title'>val1</textarea>");
         assertEquals(expected, output);
     }
 
-     public void testRenderTextAreaDefaults() {
+    public void testRenderTextAreaDefaults() {
         tag.setValue("val1");
         tag.setDisabled("true");
         tag.setReadonly("true");
@@ -63,6 +64,7 @@
         tag.evaluateParams();
         map.putAll(tag.getParameters());
         theme.renderTag(getTagName(), context);
+        theme.renderTag(getTagName() + "-close", context);
         String output = writer.getBuffer().toString();
         String expected = s("<textarea name='' cols='' rows='' tabindex='1' 
id='id1' class='class1' style='style1' title='title'>val1</textarea>");
         assertEquals(expected, output);