You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by jo...@apache.org on 2015/07/24 20:27:48 UTC
[03/15] struts git commit: WW-4531- Improve javadoc to be compatible
with more strict JDK8 javadoc standard
http://git-wip-us.apache.org/repos/asf/struts/blob/775c82a7/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/EncodingMap.java
----------------------------------------------------------------------
diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/EncodingMap.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/EncodingMap.java
index 20d3628..bcf5641 100644
--- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/EncodingMap.java
+++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/EncodingMap.java
@@ -28,445 +28,447 @@ package org.apache.struts2.jasper.xmlparser;
import java.util.Hashtable;
/**
+ * <p>
* EncodingMap is a convenience class which handles conversions between
* IANA encoding names and Java encoding names, and vice versa. The
* encoding names used in XML instance documents <strong>must</strong>
* be the IANA encoding names specified or one of the aliases for those names
* which IANA defines.
- * <p>
- * <TABLE BORDER="0" WIDTH="100%">
+ * </p>
+ *
+ * <TABLE summary="">
* <TR>
- * <TD WIDTH="33%">
- * <P ALIGN="CENTER"><B>Common Name</B>
+ * <TD style="width: 33%;">
+ * <P style="text-align: center;"><B>Common Name</B>
* </TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER"><B>Use this name in XML files</B>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;"><B>Use this name in XML files</B>
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER"><B>Name Type</B>
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;"><B>Name Type</B>
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER"><B>Xerces converts to this Java Encoder Name</B>
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;"><B>Xerces converts to this Java Encoder Name</B>
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">8 bit Unicode</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">UTF-8
+ * <TD style="width: 33%;">8 bit Unicode</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">UTF-8
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">UTF8
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">UTF8
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">ISO Latin 1</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ISO-8859-1
+ * <TD style="width: 33%;">ISO Latin 1</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">ISO-8859-1
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">ISO-8859-1
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">ISO-8859-1
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">ISO Latin 2</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ISO-8859-2
+ * <TD style="width: 33%;">ISO Latin 2</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">ISO-8859-2
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">ISO-8859-2
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">ISO-8859-2
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">ISO Latin 3</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ISO-8859-3
+ * <TD style="width: 33%;">ISO Latin 3</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">ISO-8859-3
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">ISO-8859-3
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">ISO-8859-3
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">ISO Latin 4</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ISO-8859-4
+ * <TD style="width: 33%;">ISO Latin 4</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">ISO-8859-4
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">ISO-8859-4
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">ISO-8859-4
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">ISO Latin Cyrillic</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ISO-8859-5
+ * <TD style="width: 33%;">ISO Latin Cyrillic</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">ISO-8859-5
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">ISO-8859-5
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">ISO-8859-5
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">ISO Latin Arabic</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ISO-8859-6
+ * <TD style="width: 33%;">ISO Latin Arabic</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">ISO-8859-6
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">ISO-8859-6
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">ISO-8859-6
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">ISO Latin Greek</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ISO-8859-7
+ * <TD style="width: 33%;">ISO Latin Greek</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">ISO-8859-7
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">ISO-8859-7
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">ISO-8859-7
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">ISO Latin Hebrew</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ISO-8859-8
+ * <TD style="width: 33%;">ISO Latin Hebrew</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">ISO-8859-8
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">ISO-8859-8
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">ISO-8859-8
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">ISO Latin 5</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ISO-8859-9
+ * <TD style="width: 33%;">ISO Latin 5</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">ISO-8859-9
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">ISO-8859-9
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">ISO-8859-9
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: US</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-us
+ * <TD style="width: 33%;">EBCDIC: US</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">ebcdic-cp-us
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp037
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">cp037
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Canada</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-ca
+ * <TD style="width: 33%;">EBCDIC: Canada</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">ebcdic-cp-ca
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp037
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">cp037
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Netherlands</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-nl
+ * <TD style="width: 33%;">EBCDIC: Netherlands</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">ebcdic-cp-nl
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp037
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">cp037
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Denmark</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-dk
+ * <TD style="width: 33%;">EBCDIC: Denmark</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">ebcdic-cp-dk
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp277
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">cp277
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Norway</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-no
+ * <TD style="width: 33%;">EBCDIC: Norway</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">ebcdic-cp-no
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp277
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">cp277
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Finland</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-fi
+ * <TD style="width: 33%;">EBCDIC: Finland</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">ebcdic-cp-fi
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp278
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">cp278
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Sweden</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-se
+ * <TD style="width: 33%;">EBCDIC: Sweden</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">ebcdic-cp-se
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp278
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">cp278
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Italy</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-it
+ * <TD style="width: 33%;">EBCDIC: Italy</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">ebcdic-cp-it
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp280
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">cp280
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Spain, Latin America</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-es
+ * <TD style="width: 33%;">EBCDIC: Spain, Latin America</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">ebcdic-cp-es
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp284
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">cp284
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Great Britain</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-gb
+ * <TD style="width: 33%;">EBCDIC: Great Britain</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">ebcdic-cp-gb
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp285
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">cp285
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: France</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-fr
+ * <TD style="width: 33%;">EBCDIC: France</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">ebcdic-cp-fr
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp297
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">cp297
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Arabic</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-ar1
+ * <TD style="width: 33%;">EBCDIC: Arabic</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">ebcdic-cp-ar1
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp420
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">cp420
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Hebrew</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-he
+ * <TD style="width: 33%;">EBCDIC: Hebrew</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">ebcdic-cp-he
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp424
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">cp424
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Switzerland</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-ch
+ * <TD style="width: 33%;">EBCDIC: Switzerland</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">ebcdic-cp-ch
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp500
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">cp500
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Roece</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-roece
+ * <TD style="width: 33%;">EBCDIC: Roece</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">ebcdic-cp-roece
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp870
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">cp870
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Yugoslavia</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-yu
+ * <TD style="width: 33%;">EBCDIC: Yugoslavia</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">ebcdic-cp-yu
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp870
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">cp870
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Iceland</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-is
+ * <TD style="width: 33%;">EBCDIC: Iceland</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">ebcdic-cp-is
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp871
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">cp871
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">EBCDIC: Urdu</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">ebcdic-cp-ar2
+ * <TD style="width: 33%;">EBCDIC: Urdu</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">ebcdic-cp-ar2
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">IANA
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">IANA
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">cp918
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">cp918
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">Chinese for PRC, mixed 1/2 byte</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">gb2312
+ * <TD style="width: 33%;">Chinese for PRC, mixed 1/2 byte</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">gb2312
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">GB2312
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">GB2312
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">Extended Unix Code, packed for Japanese</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">euc-jp
+ * <TD style="width: 33%;">Extended Unix Code, packed for Japanese</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">euc-jp
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">eucjis
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">eucjis
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">Japanese: iso-2022-jp</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">iso-2020-jp
+ * <TD style="width: 33%;">Japanese: iso-2022-jp</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">iso-2020-jp
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">JIS
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">JIS
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">Japanese: Shift JIS</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">Shift_JIS
+ * <TD style="width: 33%;">Japanese: Shift JIS</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">Shift_JIS
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">SJIS
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">SJIS
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">Chinese: Big5</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">Big5
+ * <TD style="width: 33%;">Chinese: Big5</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">Big5
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">Big5
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">Big5
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">Extended Unix Code, packed for Korean</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">euc-kr
+ * <TD style="width: 33%;">Extended Unix Code, packed for Korean</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">euc-kr
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">iso2022kr
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">iso2022kr
* </TD>
* </TR>
* <TR>
- * <TD WIDTH="33%">Cyrillic</TD>
- * <TD WIDTH="15%">
- * <P ALIGN="CENTER">koi8-r
+ * <TD style="width: 33%;">Cyrillic</TD>
+ * <TD style="width: 15%;">
+ * <P style="text-align: center;">koi8-r
* </TD>
- * <TD WIDTH="12%">
- * <P ALIGN="CENTER">MIME
+ * <TD style="width: 12%;">
+ * <P style="text-align: center;">MIME
* </TD>
- * <TD WIDTH="31%">
- * <P ALIGN="CENTER">koi8-r
+ * <TD style="width: 31%;">
+ * <P style="text-align: center;">koi8-r
* </TD>
* </TR>
* </TABLE>
@@ -971,7 +973,7 @@ public class EncodingMap {
} // putIANA2JavaMapping(String,String)
/**
- * Returns the Java encoding name for the specified IANA encoding name.
+ * @return the Java encoding name for the specified IANA encoding name.
*
* @param ianaEncoding The IANA encoding name.
*/
@@ -980,7 +982,7 @@ public class EncodingMap {
} // getIANA2JavaMapping(String):String
/**
- * Removes an IANA to Java encoding name mapping.
+ * @return Removes an IANA to Java encoding name mapping.
*
* @param ianaEncoding The IANA encoding name.
*/
@@ -1000,7 +1002,7 @@ public class EncodingMap {
} // putJava2IANAMapping(String,String)
/**
- * Returns the IANA encoding name for the specified Java encoding name.
+ * @return the IANA encoding name for the specified Java encoding name.
*
* @param javaEncoding The Java encoding name.
*/
@@ -1009,7 +1011,7 @@ public class EncodingMap {
} // getJava2IANAMapping(String):String
/**
- * Removes a Java to IANA encoding name mapping.
+ * @return Removes a Java to IANA encoding name mapping.
*
* @param javaEncoding The Java encoding name.
*/
http://git-wip-us.apache.org/repos/asf/struts/blob/775c82a7/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/ParserUtils.java
----------------------------------------------------------------------
diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/ParserUtils.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/ParserUtils.java
index d58ee79..633c334 100644
--- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/ParserUtils.java
+++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/ParserUtils.java
@@ -76,8 +76,9 @@ public class ParserUtils {
* @param uri URI of the XML document being parsed
* @param is Input source containing the deployment descriptor
*
- * @exception JasperException if an input/output error occurs
- * @exception JasperException if a parsing error occurs
+ * @return the tree node
+ *
+ * @throws JasperException if an input/output error occurs or parsing error occurs
*/
public TreeNode parseXMLDocument(String uri, InputSource is)
throws JasperException {
@@ -124,8 +125,9 @@ public class ParserUtils {
* @param uri URI of the XML document being parsed
* @param is Input stream containing the deployment descriptor
*
- * @exception JasperException if an input/output error occurs
- * @exception JasperException if a parsing error occurs
+ * @return the tree node
+ *
+ * @throws JasperException if an input/output error occurs or parsing error occurs
*/
public TreeNode parseXMLDocument(String uri, InputStream is)
throws JasperException {
@@ -143,6 +145,8 @@ public class ParserUtils {
*
* @param parent The parent TreeNode (if any) for the new TreeNode
* @param node The XML document Node to be converted
+ *
+ * @return the tree node
*/
protected TreeNode convert(TreeNode parent, Node node) {
http://git-wip-us.apache.org/repos/asf/struts/blob/775c82a7/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/SymbolTable.java
----------------------------------------------------------------------
diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/SymbolTable.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/SymbolTable.java
index 627745b..baa6021 100644
--- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/SymbolTable.java
+++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/SymbolTable.java
@@ -26,13 +26,18 @@
package org.apache.struts2.jasper.xmlparser;
/**
+ * <p>
* This class is a symbol table implementation that guarantees that
* strings used as identifiers are unique references. Multiple calls
* to <code>addSymbol</code> will always return the same string
* reference.
+ * </p>
+ *
* <p>
* The symbol table performs the same task as <code>String.intern()</code>
* with the following differences:
+ * </p>
+ *
* <ul>
* <li>
* A new string object does not need to be created in order to
@@ -79,7 +84,9 @@ public class SymbolTable {
this(TABLE_SIZE);
}
- /** Constructs a symbol table with a specified number of buckets. */
+ /** Constructs a symbol table with a specified number of buckets.
+ * @param tableSize the table size
+ */
public SymbolTable(int tableSize) {
fTableSize = tableSize;
fBuckets = new Entry[fTableSize];
@@ -96,6 +103,7 @@ public class SymbolTable {
* guarantee that symbol references remain unique.
*
* @param symbol The new symbol.
+ * @return reference to the unique symbol
*/
public String addSymbol(String symbol) {
@@ -129,6 +137,7 @@ public class SymbolTable {
* @param buffer The buffer containing the new symbol.
* @param offset The offset into the buffer of the new symbol.
* @param length The length of the new symbol in the buffer.
+ * @return reference to the unique symbol
*/
public String addSymbol(char[] buffer, int offset, int length) {
@@ -153,7 +162,7 @@ public class SymbolTable {
} // addSymbol(char[],int,int):String
/**
- * Returns a hashcode value for the specified symbol. The value
+ * @return a hashcode value for the specified symbol. The value
* returned by this method must be identical to the value returned
* by the <code>hash(char[],int,int)</code> method when called
* with the character array that comprises the symbol string.
@@ -172,7 +181,7 @@ public class SymbolTable {
} // hash(String):int
/**
- * Returns a hashcode value for the specified symbol information.
+ * @return a hashcode value for the specified symbol information.
* The value returned by this method must be identical to the value
* returned by the <code>hash(String)</code> method when called
* with the string object created from the symbol information.
@@ -193,7 +202,7 @@ public class SymbolTable {
} // hash(char[],int,int):int
/**
- * Returns true if the symbol table already contains the specified
+ * @return true if the symbol table already contains the specified
* symbol.
*
* @param symbol The symbol to look for.
@@ -219,7 +228,7 @@ public class SymbolTable {
} // containsSymbol(String):boolean
/**
- * Returns true if the symbol table already contains the specified
+ * @return true if the symbol table already contains the specified
* symbol.
*
* @param buffer The buffer containing the symbol to look for.
@@ -278,6 +287,9 @@ public class SymbolTable {
/**
* Constructs a new entry from the specified symbol and next entry
* reference.
+ *
+ * @param symbol symbol
+ * @param next next entry
*/
public Entry(String symbol, Entry next) {
this.symbol = symbol.intern();
@@ -289,6 +301,11 @@ public class SymbolTable {
/**
* Constructs a new entry from the specified symbol information and
* next entry reference.
+ *
+ * @param ch char array
+ * @param offset offset
+ * @param length length
+ * @param next next entry
*/
public Entry(char[] ch, int offset, int length, Entry next) {
characters = new char[length];
http://git-wip-us.apache.org/repos/asf/struts/blob/775c82a7/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/TreeNode.java
----------------------------------------------------------------------
diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/TreeNode.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/TreeNode.java
index 025adbb..965a18e 100644
--- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/TreeNode.java
+++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/TreeNode.java
@@ -24,14 +24,18 @@ import java.util.Iterator;
/**
+ * <p>
* Simplified implementation of a Node from a Document Object Model (DOM)
* parse of an XML document. This class is used to represent a DOM tree
* so that the XML parser's implementation of <code>org.w3c.dom</code> need
* not be visible to the remainder of Jasper.
+ * </p>
+ *
* <p>
* <strong>WARNING</strong> - Construction of a new tree, or modifications
* to an existing one, are not thread-safe and such accesses must be
* synchronized.
+ * </p>
*
* @author Craig R. McClanahan
* @version $Revision: 467222 $ $Date: 2006-10-24 05:17:11 +0200 (Tue, 24 Oct 2006) $
@@ -140,7 +144,7 @@ public class TreeNode {
/**
- * Return the value of the specified node attribute if it exists, or
+ * @return the value of the specified node attribute if it exists, or
* <code>null</code> otherwise.
*
* @param name Name of the requested attribute
@@ -156,7 +160,7 @@ public class TreeNode {
/**
- * Return an Iterator of the attribute names of this node. If there are
+ * @return an Iterator of the attribute names of this node. If there are
* no attributes, an empty Iterator is returned.
*/
public Iterator findAttributes() {
@@ -170,7 +174,7 @@ public class TreeNode {
/**
- * Return the first child node of this node with the specified name,
+ * @return the first child node of this node with the specified name,
* if there is one; otherwise, return <code>null</code>.
*
* @param name Name of the desired child element
@@ -191,7 +195,7 @@ public class TreeNode {
/**
- * Return an Iterator of all children of this node. If there are no
+ * @return an Iterator of all children of this node. If there are no
* children, an empty Iterator is returned.
*/
public Iterator findChildren() {
@@ -205,7 +209,7 @@ public class TreeNode {
/**
- * Return an Iterator over all children of this node that have the
+ * @return an Iterator over all children of this node that have the
* specified name. If there are no such children, an empty Iterator
* is returned.
*
@@ -229,7 +233,7 @@ public class TreeNode {
/**
- * Return the body text associated with this node (if any).
+ * @return the body text associated with this node (if any).
*/
public String getBody() {
@@ -239,7 +243,7 @@ public class TreeNode {
/**
- * Return the name of this node.
+ * @return the name of this node.
*/
public String getName() {
@@ -287,7 +291,7 @@ public class TreeNode {
/**
- * Return a String representation of this TreeNode.
+ * @return a String representation of this TreeNode.
*/
public String toString() {
http://git-wip-us.apache.org/repos/asf/struts/blob/775c82a7/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/XMLChar.java
----------------------------------------------------------------------
diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/XMLChar.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/XMLChar.java
index 1cb67ef..12464d5 100644
--- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/XMLChar.java
+++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/XMLChar.java
@@ -28,10 +28,13 @@ package org.apache.struts2.jasper.xmlparser;
import java.util.Arrays;
/**
+ * <p>
* This class defines the basic XML character properties. The data
* in this class can be used to verify that a character is a valid
* XML character or if the character is a space, name start, or name
* character.
+ * </p>
+ *
* <p>
* A series of convenience methods are supplied to ease the burden
* of the developer. Because inlining the checks can improve per
@@ -41,6 +44,7 @@ import java.util.Arrays;
* <code>MASK_VALID</code>), yields the same results as calling the
* convenience methods. There is one exception: check the comments
* for the <code>isValid</code> method for details.
+ * </p>
*
* @author Glenn Marcy, IBM
* @author Andy Clark, IBM
@@ -75,13 +79,16 @@ public class XMLChar {
/** Pubid character mask. */
public static final int MASK_PUBID = 0x10;
- /**
+ /**
+ * <p>
* Content character mask. Special characters are those that can
* be considered the start of markup, such as '<' and '&'.
* The various newline characters are considered special as well.
* All other valid XML characters can be considered content.
+ * </p>
* <p>
* This is an optimization for the inner loop of character scanning.
+ * </p>
*/
public static final int MASK_CONTENT = 0x20;
@@ -727,7 +734,7 @@ public class XMLChar {
//
/**
- * Returns true if the specified character is a supplemental character.
+ * @return true if the specified character is a supplemental character.
*
* @param c The character to check.
*/
@@ -736,7 +743,7 @@ public class XMLChar {
}
/**
- * Returns true the supplemental character corresponding to the given
+ * @return true the supplemental character corresponding to the given
* surrogates.
*
* @param h The high surrogate.
@@ -747,7 +754,7 @@ public class XMLChar {
}
/**
- * Returns the high surrogate of a supplemental character
+ * @return the high surrogate of a supplemental character
*
* @param c The supplemental character to "split".
*/
@@ -756,7 +763,7 @@ public class XMLChar {
}
/**
- * Returns the low surrogate of a supplemental character
+ * @return the low surrogate of a supplemental character
*
* @param c The supplemental character to "split".
*/
@@ -765,7 +772,7 @@ public class XMLChar {
}
/**
- * Returns whether the given character is a high surrogate
+ * @return whether the given character is a high surrogate
*
* @param c The character to check.
*/
@@ -774,7 +781,7 @@ public class XMLChar {
}
/**
- * Returns whether the given character is a low surrogate
+ * @return whether the given character is a low surrogate
*
* @param c The character to check.
*/
@@ -784,7 +791,7 @@ public class XMLChar {
/**
- * Returns true if the specified character is valid. This method
+ * @return true if the specified character is valid. This method
* also checks the surrogate character range from 0x10000 to 0x10FFFF.
* <p>
* If the program chooses to apply the mask directly to the
@@ -799,7 +806,7 @@ public class XMLChar {
} // isValid(int):boolean
/**
- * Returns true if the specified character is invalid.
+ * @return true if the specified character is invalid.
*
* @param c The character to check.
*/
@@ -808,7 +815,7 @@ public class XMLChar {
} // isInvalid(int):boolean
/**
- * Returns true if the specified character can be considered content.
+ * @return true if the specified character can be considered content.
*
* @param c The character to check.
*/
@@ -818,7 +825,7 @@ public class XMLChar {
} // isContent(int):boolean
/**
- * Returns true if the specified character can be considered markup.
+ * @return true if the specified character can be considered markup.
* Markup characters include '<', '&', and '%'.
*
* @param c The character to check.
@@ -828,7 +835,7 @@ public class XMLChar {
} // isMarkup(int):boolean
/**
- * Returns true if the specified character is a space character
+ * @return true if the specified character is a space character
* as defined by production [3] in the XML 1.0 specification.
*
* @param c The character to check.
@@ -838,7 +845,7 @@ public class XMLChar {
} // isSpace(int):boolean
/**
- * Returns true if the specified character is a valid name start
+ * @return true if the specified character is a valid name start
* character as defined by production [5] in the XML 1.0
* specification.
*
@@ -849,7 +856,7 @@ public class XMLChar {
} // isNameStart(int):boolean
/**
- * Returns true if the specified character is a valid name
+ * @return true if the specified character is a valid name
* character as defined by production [4] in the XML 1.0
* specification.
*
@@ -860,7 +867,7 @@ public class XMLChar {
} // isName(int):boolean
/**
- * Returns true if the specified character is a valid NCName start
+ * @return true if the specified character is a valid NCName start
* character as defined by production [4] in Namespaces in XML
* recommendation.
*
@@ -871,7 +878,7 @@ public class XMLChar {
} // isNCNameStart(int):boolean
/**
- * Returns true if the specified character is a valid NCName
+ * @return true if the specified character is a valid NCName
* character as defined by production [5] in Namespaces in XML
* recommendation.
*
@@ -882,7 +889,7 @@ public class XMLChar {
} // isNCName(int):boolean
/**
- * Returns true if the specified character is a valid Pubid
+ * @return true if the specified character is a valid Pubid
* character as defined by production [13] in the XML 1.0
* specification.
*
@@ -973,7 +980,7 @@ public class XMLChar {
// encodings
/**
- * Returns true if the encoding name is a valid IANA encoding.
+ * @return true if the encoding name is a valid IANA encoding.
* This method does not verify that there is a decoder available
* for this encoding, only that the characters are valid for an
* IANA encoding name.
@@ -1002,7 +1009,7 @@ public class XMLChar {
} // isValidIANAEncoding(String):boolean
/**
- * Returns true if the encoding name is a valid Java encoding.
+ * @return true if the encoding name is a valid Java encoding.
* This method does not verify that there is a decoder available
* for this encoding, only that the characters are valid for an
* Java encoding name.