Author: markt Date: Wed Jun 29 20:36:22 2016 New Revision: 1750714 URL: http://svn.apache.org/viewvc?rev=1750714&view=rev Log: Remove / deprecate unnecessary code
Modified: tomcat/trunk/java/org/apache/catalina/util/DOMWriter.java tomcat/trunk/java/org/apache/catalina/util/MIME2Java.java Modified: tomcat/trunk/java/org/apache/catalina/util/DOMWriter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/DOMWriter.java?rev=1750714&r1=1750713&r2=1750714&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/util/DOMWriter.java (original) +++ tomcat/trunk/java/org/apache/catalina/util/DOMWriter.java Wed Jun 29 20:36:22 2016 @@ -34,10 +34,18 @@ public class DOMWriter { /** Default Encoding */ private static final String PRINTWRITER_ENCODING = "UTF8"; - /** Print writer. */ + /** Print writer. + * + * @deprecated Will be made private in Tomcat 9. + */ + @Deprecated protected final PrintWriter out; - /** Canonical output. */ + /** Canonical output. + * + * @deprecated Will be made private in Tomcat 9. + */ + @Deprecated protected final boolean canonical; @@ -47,6 +55,12 @@ public class DOMWriter { } + /** + * @deprecated Unused. Will be removed in Tomcat 9. + * + * @return Always <code>UTF-8</code> + */ + @Deprecated public static String getWriterEncoding() { return (PRINTWRITER_ENCODING); } @@ -68,16 +82,7 @@ public class DOMWriter { // print document case Node.DOCUMENT_NODE: if (!canonical) { - String Encoding = getWriterEncoding(); - if (Encoding.equalsIgnoreCase("DEFAULT")) - Encoding = "UTF-8"; - else if (Encoding.equalsIgnoreCase("Unicode")) - Encoding = "UTF-16"; - else - Encoding = MIME2Java.reverse(Encoding); - - out.println("<?xml version=\"1.0\" encoding=\"" + Encoding + - "\"?>"); + out.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); } print(((Document) node).getDocumentElement()); out.flush(); @@ -168,7 +173,10 @@ public class DOMWriter { * Returns a sorted list of attributes. * @param attrs The map to sort * @return a sorted attribute array + * + * @deprecated Will be made private in Tomcat 9. */ + @Deprecated protected Attr[] sortAttributes(NamedNodeMap attrs) { if (attrs == null) { return new Attr[0]; @@ -206,7 +214,10 @@ public class DOMWriter { * Normalizes the given string. * @param s The string to escape * @return the escaped string + * + * @deprecated Will be made private in Tomcat 9. */ + @Deprecated protected String normalize(String s) { if (s == null) { return ""; Modified: tomcat/trunk/java/org/apache/catalina/util/MIME2Java.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/MIME2Java.java?rev=1750714&r1=1750713&r2=1750714&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/util/MIME2Java.java (original) +++ tomcat/trunk/java/org/apache/catalina/util/MIME2Java.java Wed Jun 29 20:36:22 2016 @@ -469,7 +469,10 @@ import java.util.Map; * </TABLE> * * @author TAMURA Kent <k...@trl.ibm.co.jp> + * + * @deprecated Unused. Will be removed in Tomcat 9. */ +@Deprecated public class MIME2Java { private static final Map<String,String> s_enchash; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org