Modified: tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java?rev=1724812&r1=1724811&r2=1724812&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java (original) +++ tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java Fri Jan 15 14:13:28 2016 @@ -93,6 +93,8 @@ public class Util { * Returns <tt>true</tt> if our current URL is absolute, * <tt>false</tt> otherwise. * taken from org.apache.taglibs.standard.tag.common.core.ImportSupport + * @param url The URL + * @return <tt>true</tt> if the URL is absolute */ public static boolean isAbsoluteUrl(String url){ if(url == null){ @@ -117,6 +119,9 @@ public class Util { * Get the value associated with a content-type attribute. * Syntax defined in RFC 2045, section 5.1. * taken from org.apache.taglibs.standard.tag.common.core.Util + * @param input The attribute string + * @param name The attribute name + * @return the attribute value */ public static String getContentTypeAttribute(String input, String name) { int begin; @@ -150,6 +155,8 @@ public class Util { * and either EOS or a subsequent ';' (exclusive). * * taken from org.apache.taglibs.standard.tag.common.core.ImportSupport + * @param url The URL + * @return the URL without a user submitted session id parameter */ public static String stripSession(String url) { StringBuilder u = new StringBuilder(url); @@ -179,6 +186,8 @@ public class Util { * See also OutSupport.writeEscapedXml(). * * taken from org.apache.taglibs.standard.tag.common.core.Util + * @param buffer Data to escape + * @return escaped data */ public static String escapeXml(String buffer) { String result = escapeXml(buffer.toCharArray(), buffer.length()); @@ -224,8 +233,14 @@ public class Util { return escapedBuffer.toString(); } - /** Utility methods + /** + * Utility methods * taken from org.apache.taglibs.standard.tag.common.core.UrlSupport + * @param url The URL + * @param context The context + * @param pageContext The page context + * @return the absolute URL + * @throws JspException If the URL doesn't start with '/' */ public static String resolveUrl( String url, String context, PageContext pageContext) @@ -293,7 +308,6 @@ public class Util { public ImportResponseWrapper(HttpServletResponse arg0) { super(arg0); - // TODO Auto-generated constructor stub } @Override @@ -314,13 +328,11 @@ public class Util { return sos; } - /** Has no effect. */ @Override public void setContentType(String x) { // ignore } - /** Has no effect. */ @Override public void setLocale(Locale x) { // ignore
Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java?rev=1724812&r1=1724811&r2=1724812&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java (original) +++ tomcat/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java Fri Jan 15 14:13:28 2016 @@ -33,440 +33,440 @@ import java.util.Hashtable; * 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. - * <TABLE BORDER="0" WIDTH="100%"> + * <TABLE WIDTH="100%"> * <caption>Mapping of IANA encoding names and Java encoding names</caption> * <TR> - * <TD WIDTH="33%"> - * <P ALIGN="CENTER"><B>Common Name</B> + * <TD> + * <P><B>Common Name</B> * </TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER"><B>Use this name in XML files</B> + * <TD> + * <P><B>Use this name in XML files</B> * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER"><B>Name Type</B> + * <TD> + * <P><B>Name Type</B> * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER"><B>Xerces converts to this Java Encoder Name</B> + * <TD> + * <P><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>8 bit Unicode</TD> + * <TD> + * <P>UTF-8 * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">IANA + * <TD> + * <P>IANA * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">UTF8 + * <TD> + * <P>UTF8 * </TD> * </TR> * <TR> - * <TD WIDTH="33%">ISO Latin 1</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">ISO-8859-1 + * <TD>ISO Latin 1</TD> + * <TD> + * <P>ISO-8859-1 * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">MIME + * <TD> + * <P>MIME * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">ISO-8859-1 + * <TD> + * <P>ISO-8859-1 * </TD> * </TR> * <TR> - * <TD WIDTH="33%">ISO Latin 2</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">ISO-8859-2 + * <TD>ISO Latin 2</TD> + * <TD> + * <P>ISO-8859-2 * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">MIME + * <TD> + * <P>MIME * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">ISO-8859-2 + * <TD> + * <P>ISO-8859-2 * </TD> * </TR> * <TR> - * <TD WIDTH="33%">ISO Latin 3</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">ISO-8859-3 + * <TD>ISO Latin 3</TD> + * <TD> + * <P>ISO-8859-3 * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">MIME + * <TD> + * <P>MIME * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">ISO-8859-3 + * <TD> + * <P>ISO-8859-3 * </TD> * </TR> * <TR> - * <TD WIDTH="33%">ISO Latin 4</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">ISO-8859-4 + * <TD>ISO Latin 4</TD> + * <TD> + * <P>ISO-8859-4 * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">MIME + * <TD> + * <P>MIME * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">ISO-8859-4 + * <TD> + * <P>ISO-8859-4 * </TD> * </TR> * <TR> - * <TD WIDTH="33%">ISO Latin Cyrillic</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">ISO-8859-5 + * <TD>ISO Latin Cyrillic</TD> + * <TD> + * <P>ISO-8859-5 * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">MIME + * <TD> + * <P>MIME * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">ISO-8859-5 + * <TD> + * <P>ISO-8859-5 * </TD> * </TR> * <TR> - * <TD WIDTH="33%">ISO Latin Arabic</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">ISO-8859-6 + * <TD>ISO Latin Arabic</TD> + * <TD> + * <P>ISO-8859-6 * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">MIME + * <TD> + * <P>MIME * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">ISO-8859-6 + * <TD> + * <P>ISO-8859-6 * </TD> * </TR> * <TR> - * <TD WIDTH="33%">ISO Latin Greek</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">ISO-8859-7 + * <TD>ISO Latin Greek</TD> + * <TD> + * <P>ISO-8859-7 * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">MIME + * <TD> + * <P>MIME * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">ISO-8859-7 + * <TD> + * <P>ISO-8859-7 * </TD> * </TR> * <TR> - * <TD WIDTH="33%">ISO Latin Hebrew</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">ISO-8859-8 + * <TD>ISO Latin Hebrew</TD> + * <TD> + * <P>ISO-8859-8 * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">MIME + * <TD> + * <P>MIME * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">ISO-8859-8 + * <TD> + * <P>ISO-8859-8 * </TD> * </TR> * <TR> - * <TD WIDTH="33%">ISO Latin 5</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">ISO-8859-9 + * <TD>ISO Latin 5</TD> + * <TD> + * <P>ISO-8859-9 * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">MIME + * <TD> + * <P>MIME * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">ISO-8859-9 + * <TD> + * <P>ISO-8859-9 * </TD> * </TR> * <TR> - * <TD WIDTH="33%">EBCDIC: US</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">ebcdic-cp-us + * <TD>EBCDIC: US</TD> + * <TD> + * <P>ebcdic-cp-us * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">IANA + * <TD> + * <P>IANA * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">cp037 + * <TD> + * <P>cp037 * </TD> * </TR> * <TR> - * <TD WIDTH="33%">EBCDIC: Canada</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">ebcdic-cp-ca + * <TD>EBCDIC: Canada</TD> + * <TD> + * <P>ebcdic-cp-ca * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">IANA + * <TD> + * <P>IANA * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">cp037 + * <TD> + * <P>cp037 * </TD> * </TR> * <TR> - * <TD WIDTH="33%">EBCDIC: Netherlands</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">ebcdic-cp-nl + * <TD>EBCDIC: Netherlands</TD> + * <TD> + * <P>ebcdic-cp-nl * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">IANA + * <TD> + * <P>IANA * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">cp037 + * <TD> + * <P>cp037 * </TD> * </TR> * <TR> - * <TD WIDTH="33%">EBCDIC: Denmark</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">ebcdic-cp-dk + * <TD>EBCDIC: Denmark</TD> + * <TD> + * <P>ebcdic-cp-dk * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">IANA + * <TD> + * <P>IANA * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">cp277 + * <TD> + * <P>cp277 * </TD> * </TR> * <TR> - * <TD WIDTH="33%">EBCDIC: Norway</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">ebcdic-cp-no + * <TD>EBCDIC: Norway</TD> + * <TD> + * <P>ebcdic-cp-no * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">IANA + * <TD> + * <P>IANA * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">cp277 + * <TD> + * <P>cp277 * </TD> * </TR> * <TR> - * <TD WIDTH="33%">EBCDIC: Finland</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">ebcdic-cp-fi + * <TD>EBCDIC: Finland</TD> + * <TD> + * <P>ebcdic-cp-fi * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">IANA + * <TD> + * <P>IANA * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">cp278 + * <TD> + * <P>cp278 * </TD> * </TR> * <TR> - * <TD WIDTH="33%">EBCDIC: Sweden</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">ebcdic-cp-se + * <TD>EBCDIC: Sweden</TD> + * <TD> + * <P>ebcdic-cp-se * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">IANA + * <TD> + * <P>IANA * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">cp278 + * <TD> + * <P>cp278 * </TD> * </TR> * <TR> - * <TD WIDTH="33%">EBCDIC: Italy</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">ebcdic-cp-it + * <TD>EBCDIC: Italy</TD> + * <TD> + * <P>ebcdic-cp-it * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">IANA + * <TD> + * <P>IANA * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">cp280 + * <TD> + * <P>cp280 * </TD> * </TR> * <TR> - * <TD WIDTH="33%">EBCDIC: Spain, Latin America</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">ebcdic-cp-es + * <TD>EBCDIC: Spain, Latin America</TD> + * <TD> + * <P>ebcdic-cp-es * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">IANA + * <TD> + * <P>IANA * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">cp284 + * <TD> + * <P>cp284 * </TD> * </TR> * <TR> - * <TD WIDTH="33%">EBCDIC: Great Britain</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">ebcdic-cp-gb + * <TD>EBCDIC: Great Britain</TD> + * <TD> + * <P>ebcdic-cp-gb * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">IANA + * <TD> + * <P>IANA * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">cp285 + * <TD> + * <P>cp285 * </TD> * </TR> * <TR> - * <TD WIDTH="33%">EBCDIC: France</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">ebcdic-cp-fr + * <TD>EBCDIC: France</TD> + * <TD> + * <P>ebcdic-cp-fr * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">IANA + * <TD> + * <P>IANA * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">cp297 + * <TD> + * <P>cp297 * </TD> * </TR> * <TR> - * <TD WIDTH="33%">EBCDIC: Arabic</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">ebcdic-cp-ar1 + * <TD>EBCDIC: Arabic</TD> + * <TD> + * <P>ebcdic-cp-ar1 * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">IANA + * <TD> + * <P>IANA * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">cp420 + * <TD> + * <P>cp420 * </TD> * </TR> * <TR> - * <TD WIDTH="33%">EBCDIC: Hebrew</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">ebcdic-cp-he + * <TD>EBCDIC: Hebrew</TD> + * <TD> + * <P>ebcdic-cp-he * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">IANA + * <TD> + * <P>IANA * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">cp424 + * <TD> + * <P>cp424 * </TD> * </TR> * <TR> - * <TD WIDTH="33%">EBCDIC: Switzerland</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">ebcdic-cp-ch + * <TD>EBCDIC: Switzerland</TD> + * <TD> + * <P>ebcdic-cp-ch * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">IANA + * <TD> + * <P>IANA * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">cp500 + * <TD> + * <P>cp500 * </TD> * </TR> * <TR> - * <TD WIDTH="33%">EBCDIC: Roece</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">ebcdic-cp-roece + * <TD>EBCDIC: Roece</TD> + * <TD> + * <P>ebcdic-cp-roece * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">IANA + * <TD> + * <P>IANA * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">cp870 + * <TD> + * <P>cp870 * </TD> * </TR> * <TR> - * <TD WIDTH="33%">EBCDIC: Yugoslavia</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">ebcdic-cp-yu + * <TD>EBCDIC: Yugoslavia</TD> + * <TD> + * <P>ebcdic-cp-yu * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">IANA + * <TD> + * <P>IANA * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">cp870 + * <TD> + * <P>cp870 * </TD> * </TR> * <TR> - * <TD WIDTH="33%">EBCDIC: Iceland</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">ebcdic-cp-is + * <TD>EBCDIC: Iceland</TD> + * <TD> + * <P>ebcdic-cp-is * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">IANA + * <TD> + * <P>IANA * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">cp871 + * <TD> + * <P>cp871 * </TD> * </TR> * <TR> - * <TD WIDTH="33%">EBCDIC: Urdu</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">ebcdic-cp-ar2 + * <TD>EBCDIC: Urdu</TD> + * <TD> + * <P>ebcdic-cp-ar2 * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">IANA + * <TD> + * <P>IANA * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">cp918 + * <TD> + * <P>cp918 * </TD> * </TR> * <TR> - * <TD WIDTH="33%">Chinese for PRC, mixed 1/2 byte</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">gb2312 + * <TD>Chinese for PRC, mixed 1/2 byte</TD> + * <TD> + * <P>gb2312 * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">MIME + * <TD> + * <P>MIME * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">GB2312 + * <TD> + * <P>GB2312 * </TD> * </TR> * <TR> - * <TD WIDTH="33%">Extended Unix Code, packed for Japanese</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">euc-jp + * <TD>Extended Unix Code, packed for Japanese</TD> + * <TD> + * <P>euc-jp * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">MIME + * <TD> + * <P>MIME * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">eucjis + * <TD> + * <P>eucjis * </TD> * </TR> * <TR> - * <TD WIDTH="33%">Japanese: iso-2022-jp</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">iso-2020-jp + * <TD>Japanese: iso-2022-jp</TD> + * <TD> + * <P>iso-2020-jp * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">MIME + * <TD> + * <P>MIME * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">JIS + * <TD> + * <P>JIS * </TD> * </TR> * <TR> - * <TD WIDTH="33%">Japanese: Shift JIS</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">Shift_JIS + * <TD>Japanese: Shift JIS</TD> + * <TD> + * <P>Shift_JIS * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">MIME + * <TD> + * <P>MIME * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">SJIS + * <TD> + * <P>SJIS * </TD> * </TR> * <TR> - * <TD WIDTH="33%">Chinese: Big5</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">Big5 + * <TD>Chinese: Big5</TD> + * <TD> + * <P>Big5 * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">MIME + * <TD> + * <P>MIME * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">Big5 + * <TD> + * <P>Big5 * </TD> * </TR> * <TR> - * <TD WIDTH="33%">Extended Unix Code, packed for Korean</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">euc-kr + * <TD>Extended Unix Code, packed for Korean</TD> + * <TD> + * <P>euc-kr * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">MIME + * <TD> + * <P>MIME * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">iso2022kr + * <TD> + * <P>iso2022kr * </TD> * </TR> * <TR> - * <TD WIDTH="33%">Cyrillic</TD> - * <TD WIDTH="15%"> - * <P ALIGN="CENTER">koi8-r + * <TD>Cyrillic</TD> + * <TD> + * <P>koi8-r * </TD> - * <TD WIDTH="12%"> - * <P ALIGN="CENTER">MIME + * <TD> + * <P>MIME * </TD> - * <TD WIDTH="31%"> - * <P ALIGN="CENTER">koi8-r + * <TD> + * <P>koi8-r * </TD> * </TR> * </TABLE> @@ -866,7 +866,9 @@ public class EncodingMap { // Constructors // - /** Default constructor. */ + /** + * Default constructor. + */ public EncodingMap() {} // @@ -877,6 +879,7 @@ public class EncodingMap { * Returns the Java encoding name for the specified IANA encoding name. * * @param ianaEncoding The IANA encoding name. + * @return the Java encoding */ public static String getIANA2JavaMapping(String ianaEncoding) { return fIANA2JavaMap.get(ianaEncoding); Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/SymbolTable.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/SymbolTable.java?rev=1724812&r1=1724811&r2=1724812&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/xmlparser/SymbolTable.java (original) +++ tomcat/trunk/java/org/apache/jasper/xmlparser/SymbolTable.java Fri Jan 15 14:13:28 2016 @@ -56,14 +56,18 @@ public class SymbolTable { // Constants // - /** Default table size. */ + /** + * Default table size. + */ private static final int TABLE_SIZE = 101; // // Data // - /** Buckets. */ + /** + * Buckets. + */ private final Entry[] fBuckets; // actual table size @@ -73,12 +77,17 @@ public class SymbolTable { // Constructors // - /** Constructs a symbol table with a default number of buckets. */ + /** + * Constructs a symbol table with a default number of buckets. + */ public 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 (default is 101) + */ public SymbolTable(int tableSize) { fTableSize = tableSize; fBuckets = new Entry[fTableSize]; @@ -97,6 +106,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 the symbol added */ public String addSymbol(char[] buffer, int offset, int length) { @@ -130,6 +140,7 @@ public class SymbolTable { * @param offset The offset into the character buffer of the start * of the symbol. * @param length The length of the symbol. + * @return the hash value */ public int hash(char[] buffer, int offset, int length) { @@ -155,7 +166,9 @@ public class SymbolTable { // Data // - /** Symbol. */ + /** + * Symbol. + */ private final String symbol; /** @@ -164,7 +177,9 @@ public class SymbolTable { */ private final char[] characters; - /** The next entry. */ + /** + * The next entry. + */ private final Entry next; // Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/XMLChar.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/XMLChar.java?rev=1724812&r1=1724811&r2=1724812&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/xmlparser/XMLChar.java (original) +++ tomcat/trunk/java/org/apache/jasper/xmlparser/XMLChar.java Fri Jan 15 14:13:28 2016 @@ -716,11 +716,12 @@ public class XMLChar { // /** - * Returns true the supplemental character corresponding to the given + * Returns the supplemental character corresponding to the given * surrogates. * * @param h The high surrogate. * @param l The low surrogate. + * @return the supplemental character */ public static int supplemental(char h, char l) { return (h - 0xD800) * 0x400 + (l - 0xDC00) + 0x10000; @@ -730,6 +731,7 @@ public class XMLChar { * Returns whether the given character is a high surrogate * * @param c The character to check. + * @return <code>true</code> if the character is a surrogate */ public static boolean isHighSurrogate(int c) { return (0xD800 <= c && c <= 0xDBFF); @@ -739,6 +741,7 @@ public class XMLChar { * Returns whether the given character is a low surrogate * * @param c The character to check. + * @return <code>true</code> if the character is a surrogate */ public static boolean isLowSurrogate(int c) { return (0xDC00 <= c && c <= 0xDFFF); @@ -754,6 +757,7 @@ public class XMLChar { * the surrogate character range. * * @param c The character to check. + * @return <code>true</code> if the character is valid */ public static boolean isValid(int c) { return (c < 0x10000 && (CHARS[c] & MASK_VALID) != 0) || @@ -764,6 +768,7 @@ public class XMLChar { * Returns true if the specified character is invalid. * * @param c The character to check. + * @return <code>true</code> if the character is invalid */ public static boolean isInvalid(int c) { return !isValid(c); @@ -773,6 +778,7 @@ public class XMLChar { * Returns true if the specified character can be considered content. * * @param c The character to check. + * @return <code>true</code> if the character is content */ public static boolean isContent(int c) { return (c < 0x10000 && (CHARS[c] & MASK_CONTENT) != 0) || @@ -784,6 +790,7 @@ public class XMLChar { * as defined by production [3] in the XML 1.0 specification. * * @param c The character to check. + * @return <code>true</code> if the character is space */ public static boolean isSpace(int c) { return c <= 0x20 && (CHARS[c] & MASK_SPACE) != 0; @@ -795,6 +802,7 @@ public class XMLChar { * specification. * * @param c The character to check. + * @return <code>true</code> if the character is a valid start name */ public static boolean isNameStart(int c) { return c < 0x10000 && (CHARS[c] & MASK_NAME_START) != 0; @@ -806,6 +814,7 @@ public class XMLChar { * specification. * * @param c The character to check. + * @return <code>true</code> if the character is valid in a name */ public static boolean isName(int c) { return c < 0x10000 && (CHARS[c] & MASK_NAME) != 0; @@ -820,6 +829,7 @@ public class XMLChar { * IANA encoding name. * * @param ianaEncoding The IANA encoding name. + * @return <code>true</code> if the character is valid encoding */ public static boolean isValidIANAEncoding(String ianaEncoding) { if (ianaEncoding != null) { Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java?rev=1724812&r1=1724811&r2=1724812&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java (original) +++ tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java Fri Jan 15 14:13:28 2016 @@ -87,12 +87,17 @@ public class XMLEncodingDetector { * * Encoding autodetection is done according to the XML 1.0 specification, * Appendix F.1: Detection Without External Encoding Information. - * + * @param fname The file name + * @param jar The containing jar + * @param ctxt The compilation context + * @param err The error dispatcher * @return Two-element array, where the first element (of type * java.lang.String) contains the name of the (auto)detected encoding, and * the second element (of type java.lang.Boolean) specifies whether the * encoding was specified using the 'encoding' attribute of an XML prolog * (TRUE) or autodetected (FALSE). + * @throws IOException Error reading resource + * @throws JasperException Other error, usually a bad encoding */ public static Object[] getEncoding(String fname, Jar jar, JspCompilationContext ctxt, @@ -194,6 +199,8 @@ public class XMLEncodingDetector { * is bigEndian. null means unknown or not relevant. * * @return Returns a reader. + * @throws IOException Error reading resource + * @throws JasperException Other error, usually a bad encoding */ private Reader createReader(InputStream inputStream, String encoding, Boolean isBigEndian) @@ -359,7 +366,9 @@ public class XMLEncodingDetector { // Adapted from: // org.apache.xerces.impl.XMLEntityManager.EntityScanner.isExternal - /** Returns true if the current entity being scanned is external. */ + /** + * @return <code>true</code> if the current entity being scanned is external. + */ public boolean isExternal() { return true; } @@ -370,7 +379,7 @@ public class XMLEncodingDetector { * Returns the next character on the input. * <p> * <strong>Note:</strong> The character is <em>not</em> consumed. - * + * @return the next char * @throws IOException Thrown if i/o error occurs. * @throws EOFException Thrown on end of file. */ @@ -400,7 +409,7 @@ public class XMLEncodingDetector { * Returns the next character on the input. * <p> * <strong>Note:</strong> The character is consumed. - * + * @return the next char * @throws IOException Thrown if i/o error occurs. * @throws EOFException Thrown on end of file. */ @@ -443,7 +452,7 @@ public class XMLEncodingDetector { * <p> * <strong>Note:</strong> The string returned must be a symbol. The * SymbolTable can be used for this purpose. - * + * @return the name * @throws IOException Thrown if i/o error occurs. * @throws EOFException Thrown on end of file. * @@ -650,7 +659,8 @@ public class XMLEncodingDetector { * data to be scanned. * @param buffer The data structure to fill. * - * @return Returns true if there is more data to scan, false otherwise. + * @return <code>true</code> if there is more data to scan, + * <code>false</code> otherwise. * * @throws IOException Thrown if i/o error occurs. * @throws EOFException Thrown on end of file. @@ -792,7 +802,7 @@ public class XMLEncodingDetector { * * @param c The character to skip. * - * @return Returns true if the character was skipped. + * @return <code>true</code> if the character was skipped. * * @throws IOException Thrown if i/o error occurs. * @throws EOFException Thrown on end of file. @@ -835,7 +845,7 @@ public class XMLEncodingDetector { * <strong>Note:</strong> The characters are consumed only if they are * space characters. * - * @return Returns true if at least one space character was skipped. + * @return <code>true</code> if at least one space character was skipped. * * @throws IOException Thrown if i/o error occurs. * @throws EOFException Thrown on end of file. @@ -904,7 +914,7 @@ public class XMLEncodingDetector { * * @param s The string to skip. * - * @return Returns true if the string was skipped. + * @return <code>true</code> if the string was skipped. * * @throws IOException Thrown if i/o error occurs. * @throws EOFException Thrown on end of file. @@ -951,8 +961,9 @@ public class XMLEncodingDetector { * boundary will be signaled by the return * value. * - * @return Returns true if the entity changed as a result of this + * @return <code>true</code> if the entity changed as a result of this * load operation. + * @throws IOException Error reading data */ final boolean load(int offset, boolean changeEntity) throws IOException { @@ -1202,6 +1213,8 @@ public class XMLEncodingDetector { * @param scanningTextDecl True if a text declaration is to * be scanned instead of an XML * declaration. + * @throws IOException Error reading data + * @throws JasperException Other error */ private void scanXMLDeclOrTextDecl(boolean scanningTextDecl) throws IOException, JasperException { @@ -1235,6 +1248,8 @@ public class XMLEncodingDetector { * [77] TextDecl ::= '<?xml' VersionInfo? EncodingDecl S? '?>' * </pre> * + * <strong>Note:</strong> This method uses fString, anything in it + * at the time of calling is lost. * @param scanningTextDecl True if a text declaration is to * be scanned instead of an XML * declaration. @@ -1242,8 +1257,8 @@ public class XMLEncodingDetector { * encoding and standalone pseudo attribute values * (in that order). * - * <strong>Note:</strong> This method uses fString, anything in it - * at the time of calling is lost. + * @throws IOException Error reading data + * @throws JasperException Other error */ private void scanXMLDeclOrTextDecl(boolean scanningTextDecl, String[] pseudoAttributeValues) @@ -1390,6 +1405,8 @@ public class XMLEncodingDetector { /** * Scans a pseudo attribute. * + * <strong>Note:</strong> This method uses fStringBuffer2, anything in it + * at the time of calling is lost. * @param scanningTextDecl True if scanning this pseudo-attribute for a * TextDecl; false if scanning XMLDecl. This * flag is needed to report the correct type of @@ -1398,9 +1415,8 @@ public class XMLEncodingDetector { * value. * * @return The name of the attribute - * - * <strong>Note:</strong> This method uses fStringBuffer2, anything in it - * at the time of calling is lost. + * @throws IOException Error reading data + * @throws JasperException Other error */ public String scanPseudoAttribute(boolean scanningTextDecl, XMLString value) @@ -1475,6 +1491,8 @@ public class XMLEncodingDetector { * * @param target The PI target * @param data The string to fill in with the data + * @throws IOException Error reading data + * @throws JasperException Other error */ private void scanPIData(String target, XMLString data) throws IOException, JasperException { @@ -1531,7 +1549,9 @@ public class XMLEncodingDetector { * identified as a high surrogate. * * @param buf The StringBuffer to append the read surrogates to. - * @return True if it succeeded. + * @return <code>true</code> if it succeeded. + * @throws IOException Error reading data + * @throws JasperException Other error */ private boolean scanSurrogates(XMLStringBuffer buf) throws IOException, JasperException { @@ -1567,6 +1587,9 @@ public class XMLEncodingDetector { // org.apache.xerces.impl.XMLScanner.reportFatalError /** * Convenience function used in all XML scanners. + * @param msgId The message key + * @param arg The argument + * @throws JasperException The created exception */ private void reportFatalError(String msgId, String arg) throws JasperException { Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/XMLString.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/XMLString.java?rev=1724812&r1=1724811&r2=1724812&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/xmlparser/XMLString.java (original) +++ tomcat/trunk/java/org/apache/jasper/xmlparser/XMLString.java Fri Jan 15 14:13:28 2016 @@ -53,20 +53,28 @@ public class XMLString { // Data // - /** The character array. */ + /** + * The character array. + */ public char[] ch; - /** The offset into the character array. */ + /** + * The offset into the character array. + */ public int offset; - /** The length of characters from the offset. */ + /** + * The length of characters from the offset. + */ public int length; // // Constructors // - /** Default constructor. */ + /** + * Default constructor. + */ public XMLString() { } // <init>() @@ -95,13 +103,15 @@ public class XMLString { * <strong>Note:</strong> This does not copy the character array; * only the reference to the array is copied. * - * @param s + * @param s The string */ public void setValues(XMLString s) { setValues(s.ch, s.offset, s.length); } // setValues(XMLString) - /** Resets all of the values to their defaults. */ + /** + * Resets all of the values to their defaults. + */ public void clear() { this.ch = null; this.offset = 0; @@ -114,6 +124,7 @@ public class XMLString { * the specified string are equal. * * @param s The string to compare. + * @return <code>true</code> if equal */ public boolean equals(String s) { if (s == null) { @@ -139,7 +150,6 @@ public class XMLString { // Object methods // - /** Returns a string representation of this object. */ @Override public String toString() { return length > 0 ? new String(ch, offset, length) : ""; Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/XMLStringBuffer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/XMLStringBuffer.java?rev=1724812&r1=1724811&r2=1724812&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/xmlparser/XMLStringBuffer.java (original) +++ tomcat/trunk/java/org/apache/jasper/xmlparser/XMLStringBuffer.java Fri Jan 15 14:13:28 2016 @@ -51,7 +51,9 @@ public class XMLStringBuffer // Constants // - /** Default buffer size (32). */ + /** + * Default buffer size (32). + */ private static final int DEFAULT_SIZE = 32; // @@ -59,16 +61,15 @@ public class XMLStringBuffer // /** - * + * Build a string buffer with the default size (32). */ public XMLStringBuffer() { this(DEFAULT_SIZE); } // <init>() /** - * - * - * @param size + * Build a string buffer with the specified size. + * @param size The backing array size */ public XMLStringBuffer(int size) { ch = new char[size]; @@ -78,7 +79,9 @@ public class XMLStringBuffer // Public methods // - /** Clears the string buffer. */ + /** + * Clears the string buffer. + */ @Override public void clear() { offset = 0; @@ -86,9 +89,9 @@ public class XMLStringBuffer } /** - * append + * Append character. * - * @param c + * @param c The character to append */ public void append(char c) { if (this.length + 1 > this.ch.length) { @@ -104,9 +107,9 @@ public class XMLStringBuffer } // append(char) /** - * append + * Append string. * - * @param s + * @param s The string to append */ public void append(String s) { int length = s.length(); @@ -123,11 +126,11 @@ public class XMLStringBuffer } // append(String) /** - * append + * Append characters. * - * @param ch - * @param offset - * @param length + * @param ch The character array + * @param offset The offset + * @param length The length */ public void append(char[] ch, int offset, int length) { if (this.length + length > this.ch.length) { @@ -140,9 +143,9 @@ public class XMLStringBuffer } // append(char[],int,int) /** - * append + * Append XML string * - * @param s + * @param s The string */ public void append(XMLString s) { append(s.ch, s.offset, s.length); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
