You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2011/03/03 20:59:15 UTC
svn commit: r1076762 - in
/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom:
Element.java EndTagStyle.java
Author: hlship
Date: Thu Mar 3 19:59:14 2011
New Revision: 1076762
URL: http://svn.apache.org/viewvc?rev=1076762&view=rev
Log:
TAP5-1463: Remove EndTagStyle.OMIT
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/Element.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/EndTagStyle.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/Element.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/Element.java?rev=1076762&r1=1076761&r2=1076762&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/Element.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/Element.java Thu Mar 3 19:59:14 2011
@@ -382,12 +382,6 @@ public final class Element extends Node
if (hasChildren)
writeChildMarkup(document, writer, localNamespacePrefixToURI);
- // Dangerous -- perhaps it should be an error for a tag of type OMIT to even have children!
- // We'll certainly be writing out unbalanced markup in that case.
-
- if (style == EndTagStyle.OMIT)
- return;
-
if (hasChildren || style == EndTagStyle.REQUIRE)
{
// TAP5-471: Avoid use of printf().
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/EndTagStyle.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/EndTagStyle.java?rev=1076762&r1=1076761&r2=1076762&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/EndTagStyle.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/dom/EndTagStyle.java Thu Mar 3 19:59:14 2011
@@ -1,4 +1,4 @@
-// Copyright 2006, 2008 The Apache Software Foundation
+// Copyright 2006, 2008, 2011 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -20,14 +20,6 @@ package org.apache.tapestry5.dom;
*/
public enum EndTagStyle
{
-
- /**
- * Omit the end tag. Examples for HTML include the input, br and img elements.
- *
- * @deprecated Tapestry always renders well formed XML markup (even when a DOCTYPE is not present, or the content
- * type is traditional text/html).
- */
- OMIT,
/**
* Require an end tag always. This is the default for most elements in HTML.
*/