Author: dolander
Date: Fri Mar 18 11:38:13 2005
New Revision: 158128
URL: http://svn.apache.org/viewcvs?view=rev&rev=158128
Log:
Updated the configuration XSD for the DocumentType to use an Enum instead of
just accepting a string
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java
incubator/beehive/trunk/netui/src/util/schema/netui-config/netui-config.xsd
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java?view=diff&r1=158127&r2=158128
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java
Fri Mar 18 11:38:13 2005
@@ -71,7 +71,7 @@
_defaultDocType = HTML_RENDERING_QUIRKS;
JspTagConfig tagConfig = ConfigUtil.getConfig().getJspTagConfig();
if (tagConfig != null) {
- String docType = tagConfig.getDoctype();
+ JspTagConfig.Doctype.Enum docType = tagConfig.getDoctype();
setDefaultDocType(docType);
}
}
@@ -81,14 +81,14 @@
return _defaultDocType;
}
- public static void setDefaultDocType(String docType)
+ public static void setDefaultDocType(JspTagConfig.Doctype.Enum docType)
{
if (docType != null) {
- if (docType.equals(Html.HTML_401))
+ if (docType == JspTagConfig.Doctype.HTML_4_LOOSE)
_defaultDocType = TagRenderingBase.HTML_RENDERING;
- else if (docType.equals(Html.HTML_401_QUIRKS))
+ else if (docType == JspTagConfig.Doctype.HTML_4_LOOSE_QUIRKS)
_defaultDocType = TagRenderingBase.HTML_RENDERING_QUIRKS;
- else if (docType.equals(Html.XHTML_10))
+ else if (docType== JspTagConfig.Doctype.XHTML_1_TRANSITIONAL)
_defaultDocType = TagRenderingBase.XHTML_RENDERING;
}
}
Modified:
incubator/beehive/trunk/netui/src/util/schema/netui-config/netui-config.xsd
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/schema/netui-config/netui-config.xsd?view=diff&r1=158127&r2=158128
==============================================================================
--- incubator/beehive/trunk/netui/src/util/schema/netui-config/netui-config.xsd
(original)
+++ incubator/beehive/trunk/netui/src/util/schema/netui-config/netui-config.xsd
Fri Mar 18 11:38:13 2005
@@ -147,7 +147,15 @@
<xsd:complexType name="jsp-tag-config">
<xsd:sequence>
- <xsd:element name="doctype" type="xsd:string" minOccurs="0"
maxOccurs="1"/>
+ <xsd:element name="doctype" minOccurs="0" maxOccurs="1"
default="html4-loose-quirks">
+ <xsd:simpleType>
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="html4-loose"/>
+ <xsd:enumeration value="html4-loose-quirks"/>
+ <xsd:enumeration value="xhtml1-transitional"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+ </xsd:element>
<xsd:element name="id-javascript" minOccurs="0" maxOccurs="1"
default="default">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
