svn commit: r711979 - /tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/DefaultMarkupModel.java

[hl...@apache.org]

Author: hlship
Date: Thu Nov  6 13:13:26 2008
New Revision: 711979

URL: http://svn.apache.org/viewvc?rev=711979&view=rev
Log:
TAP5-333: Tapestry 5 renders an XHTML label element incorrectly

Modified:
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/DefaultMarkupModel.java

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/DefaultMarkupModel.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/DefaultMarkupModel.java?rev=711979&r1=711978&r2=711979&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/DefaultMarkupModel.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/DefaultMarkupModel.java Thu Nov  6 13:13:26 2008
@@ -21,8 +21,8 @@
 /**
  * Default implementation of {@link org.apache.tapestry5.dom.MarkupModel} that is appropriate for traditional (X)HTML
  * markup. Assumes that all tags are lower-case.  A certain set of tags will always be expanded (with seperate begin and
- * end tags) even if their content is empty: script, div, span, p, textarea, select; this is for compatibility with web
- * browsers, especially when the content type of a response indicates HTML, not true XML.
+ * end tags) even if their content is empty: script, div, span, p, textarea, select, label; this is for compatibility
+ * with web browsers, especially when the content type of a response indicates HTML, not true XML.
  */
 public class DefaultMarkupModel extends AbstractMarkupModel
 {
@@ -30,7 +30,7 @@
      * For these tags, use {@link org.apache.tapestry5.dom.EndTagStyle#REQUIRE}.
      */
     private final Set<String> REQUIRE_END_TAG =
-            CollectionFactory.newSet("script", "div", "span", "p", "textarea", "select");
+            CollectionFactory.newSet("script", "div", "span", "p", "textarea", "select", "label");
 
     public EndTagStyle getEndTagStyle(String element)
     {