svn commit: r1812494 - /tomcat/trunk/java/org/apache/catalina/util/DOMWriter.java

[markt]

Author: markt
Date: Wed Oct 18 10:48:57 2017
New Revision: 1812494

URL: http://svn.apache.org/viewvc?rev=1812494&view=rev
Log:
Remove deprecated / unused code.

Modified:
    tomcat/trunk/java/org/apache/catalina/util/DOMWriter.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=1812494&r1=1812493&r2=1812494&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/DOMWriter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/DOMWriter.java Wed Oct 18 
10:48:57 2017
@@ -27,24 +27,15 @@ import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 /**
- * A sample DOM writer. This sample program illustrates how to traverse a DOM
- * tree in order to print a document that is parsed.
+ * A DOM writer optimised for use by WebDAV.
  */
 public class DOMWriter {
 
     private final PrintWriter out;
-    private final boolean canonical;
 
 
     public DOMWriter(Writer writer) {
-        this (writer, true);
-    }
-
-
-    @Deprecated
-    public DOMWriter(Writer writer, boolean canonical) {
         out = new PrintWriter(writer);
-        this.canonical = canonical;
     }
 
 
@@ -63,9 +54,6 @@ public class DOMWriter {
         switch (type) {
             // print document
             case Node.DOCUMENT_NODE:
-                if (!canonical) {
-                    out.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-                }
                 print(((Document) node).getDocumentElement());
                 out.flush();
                 break;
@@ -81,7 +69,7 @@ public class DOMWriter {
                     out.print(attr.getLocalName());
 
                     out.print("=\"");
-                    out.print(Escape.xml("", canonical, attr.getNodeValue()));
+                    out.print(Escape.xml("", true, attr.getNodeValue()));
                     out.print('"');
                 }
                 out.print('>');
@@ -90,29 +78,17 @@ public class DOMWriter {
 
             // handle entity reference nodes
             case Node.ENTITY_REFERENCE_NODE:
-                if (canonical) {
-                    printChildren(node);
-                } else {
-                    out.print('&');
-                    out.print(node.getLocalName());
-                    out.print(';');
-                }
+                printChildren(node);
                 break;
 
             // print cdata sections
             case Node.CDATA_SECTION_NODE:
-                if (canonical) {
-                    out.print(Escape.xml("", canonical, node.getNodeValue()));
-                } else {
-                    out.print("<![CDATA[");
-                    out.print(node.getNodeValue());
-                    out.print("]]>");
-                }
+                out.print(Escape.xml("", true, node.getNodeValue()));
                 break;
 
             // print text
             case Node.TEXT_NODE:
-                out.print(Escape.xml("", canonical, node.getNodeValue()));
+                out.print(Escape.xml("", true, node.getNodeValue()));
                 break;
 
             // print processing instruction



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org