--- old/src/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java 2014-06-04 13:56:00.391719729 -0700 +++ new/src/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java 2014-06-04 13:56:00.303719213 -0700 @@ -3,9 +3,11 @@ * DO NOT REMOVE OR ALTER! */ /* - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * @@ -349,84 +351,84 @@ // ---------------------------------------------- - elemDesc = (ElemDesc) m_elementFlags.get("A"); + elemDesc = (ElemDesc) m_elementFlags.get("a"); elemDesc.setAttr("HREF", ElemDesc.ATTRURL); elemDesc.setAttr("NAME", ElemDesc.ATTRURL); // ---------------------------------------------- - elemDesc = (ElemDesc) m_elementFlags.get("AREA"); + elemDesc = (ElemDesc) m_elementFlags.get("area"); elemDesc.setAttr("HREF", ElemDesc.ATTRURL); elemDesc.setAttr("NOHREF", ElemDesc.ATTREMPTY); // ---------------------------------------------- - elemDesc = (ElemDesc) m_elementFlags.get("BASE"); + elemDesc = (ElemDesc) m_elementFlags.get("base"); elemDesc.setAttr("HREF", ElemDesc.ATTRURL); // ---------------------------------------------- - elemDesc = (ElemDesc) m_elementFlags.get("BUTTON"); + elemDesc = (ElemDesc) m_elementFlags.get("button"); elemDesc.setAttr("DISABLED", ElemDesc.ATTREMPTY); // ---------------------------------------------- - elemDesc = (ElemDesc) m_elementFlags.get("BLOCKQUOTE"); + elemDesc = (ElemDesc) m_elementFlags.get("blockquote"); elemDesc.setAttr("CITE", ElemDesc.ATTRURL); // ---------------------------------------------- - elemDesc = (ElemDesc) m_elementFlags.get("DEL"); + elemDesc = (ElemDesc) m_elementFlags.get("del"); elemDesc.setAttr("CITE", ElemDesc.ATTRURL); // ---------------------------------------------- - elemDesc = (ElemDesc) m_elementFlags.get("DIR"); + elemDesc = (ElemDesc) m_elementFlags.get("dir"); elemDesc.setAttr("COMPACT", ElemDesc.ATTREMPTY); // ---------------------------------------------- - elemDesc = (ElemDesc) m_elementFlags.get("DIV"); + elemDesc = (ElemDesc) m_elementFlags.get("div"); elemDesc.setAttr("SRC", ElemDesc.ATTRURL); // Netscape 4 extension elemDesc.setAttr("NOWRAP", ElemDesc.ATTREMPTY); // Internet-Explorer extension // ---------------------------------------------- - elemDesc = (ElemDesc) m_elementFlags.get("DL"); + elemDesc = (ElemDesc) m_elementFlags.get("dl"); elemDesc.setAttr("COMPACT", ElemDesc.ATTREMPTY); // ---------------------------------------------- - elemDesc = (ElemDesc) m_elementFlags.get("FORM"); + elemDesc = (ElemDesc) m_elementFlags.get("form"); elemDesc.setAttr("ACTION", ElemDesc.ATTRURL); // ---------------------------------------------- // Attribution to: "Voytenko, Dimitry" - elemDesc = (ElemDesc) m_elementFlags.get("FRAME"); + elemDesc = (ElemDesc) m_elementFlags.get("frame"); elemDesc.setAttr("SRC", ElemDesc.ATTRURL); elemDesc.setAttr("LONGDESC", ElemDesc.ATTRURL); elemDesc.setAttr("NORESIZE",ElemDesc.ATTREMPTY); // ---------------------------------------------- - elemDesc = (ElemDesc) m_elementFlags.get("HEAD"); + elemDesc = (ElemDesc) m_elementFlags.get("head"); elemDesc.setAttr("PROFILE", ElemDesc.ATTRURL); // ---------------------------------------------- - elemDesc = (ElemDesc) m_elementFlags.get("HR"); + elemDesc = (ElemDesc) m_elementFlags.get("hr"); elemDesc.setAttr("NOSHADE", ElemDesc.ATTREMPTY); // ---------------------------------------------- // HTML 4.0, section 16.5 - elemDesc = (ElemDesc) m_elementFlags.get("IFRAME"); + elemDesc = (ElemDesc) m_elementFlags.get("iframe"); elemDesc.setAttr("SRC", ElemDesc.ATTRURL); elemDesc.setAttr("LONGDESC", ElemDesc.ATTRURL); // ---------------------------------------------- // Netscape 4 extension - elemDesc = (ElemDesc) m_elementFlags.get("ILAYER"); + elemDesc = (ElemDesc) m_elementFlags.get("ilayer"); elemDesc.setAttr("SRC", ElemDesc.ATTRURL); // ---------------------------------------------- - elemDesc = (ElemDesc) m_elementFlags.get("IMG"); + elemDesc = (ElemDesc) m_elementFlags.get("img"); elemDesc.setAttr("SRC", ElemDesc.ATTRURL); elemDesc.setAttr("LONGDESC", ElemDesc.ATTRURL); elemDesc.setAttr("USEMAP", ElemDesc.ATTRURL); elemDesc.setAttr("ISMAP", ElemDesc.ATTREMPTY); // ---------------------------------------------- - elemDesc = (ElemDesc) m_elementFlags.get("INPUT"); + elemDesc = (ElemDesc) m_elementFlags.get("input"); elemDesc.setAttr("SRC", ElemDesc.ATTRURL); elemDesc.setAttr("USEMAP", ElemDesc.ATTRURL); elemDesc.setAttr("CHECKED", ElemDesc.ATTREMPTY); @@ -435,24 +437,24 @@ elemDesc.setAttr("READONLY", ElemDesc.ATTREMPTY); // ---------------------------------------------- - elemDesc = (ElemDesc) m_elementFlags.get("INS"); + elemDesc = (ElemDesc) m_elementFlags.get("ins"); elemDesc.setAttr("CITE", ElemDesc.ATTRURL); // ---------------------------------------------- // Netscape 4 extension - elemDesc = (ElemDesc) m_elementFlags.get("LAYER"); + elemDesc = (ElemDesc) m_elementFlags.get("layer"); elemDesc.setAttr("SRC", ElemDesc.ATTRURL); // ---------------------------------------------- - elemDesc = (ElemDesc) m_elementFlags.get("LINK"); + elemDesc = (ElemDesc) m_elementFlags.get("link"); elemDesc.setAttr("HREF", ElemDesc.ATTRURL); // ---------------------------------------------- - elemDesc = (ElemDesc) m_elementFlags.get("MENU"); + elemDesc = (ElemDesc) m_elementFlags.get("menu"); elemDesc.setAttr("COMPACT", ElemDesc.ATTREMPTY); // ---------------------------------------------- - elemDesc = (ElemDesc) m_elementFlags.get("OBJECT"); + elemDesc = (ElemDesc) m_elementFlags.get("object"); elemDesc.setAttr("CLASSID", ElemDesc.ATTRURL); elemDesc.setAttr("CODEBASE", ElemDesc.ATTRURL); elemDesc.setAttr("DATA", ElemDesc.ATTRURL); @@ -461,58 +463,58 @@ elemDesc.setAttr("DECLARE", ElemDesc.ATTREMPTY); // ---------------------------------------------- - elemDesc = (ElemDesc) m_elementFlags.get("OL"); + elemDesc = (ElemDesc) m_elementFlags.get("ol"); elemDesc.setAttr("COMPACT", ElemDesc.ATTREMPTY); // ---------------------------------------------- - elemDesc = (ElemDesc) m_elementFlags.get("OPTGROUP"); + elemDesc = (ElemDesc) m_elementFlags.get("optgroup"); elemDesc.setAttr("DISABLED", ElemDesc.ATTREMPTY); // ---------------------------------------------- - elemDesc = (ElemDesc) m_elementFlags.get("OPTION"); + elemDesc = (ElemDesc) m_elementFlags.get("option"); elemDesc.setAttr("SELECTED", ElemDesc.ATTREMPTY); elemDesc.setAttr("DISABLED", ElemDesc.ATTREMPTY); // ---------------------------------------------- - elemDesc = (ElemDesc) m_elementFlags.get("Q"); + elemDesc = (ElemDesc) m_elementFlags.get("q"); elemDesc.setAttr("CITE", ElemDesc.ATTRURL); // ---------------------------------------------- - elemDesc = (ElemDesc) m_elementFlags.get("SCRIPT"); + elemDesc = (ElemDesc) m_elementFlags.get("script"); elemDesc.setAttr("SRC", ElemDesc.ATTRURL); elemDesc.setAttr("FOR", ElemDesc.ATTRURL); elemDesc.setAttr("DEFER", ElemDesc.ATTREMPTY); // ---------------------------------------------- - elemDesc = (ElemDesc) m_elementFlags.get("SELECT"); + elemDesc = (ElemDesc) m_elementFlags.get("select"); elemDesc.setAttr("DISABLED", ElemDesc.ATTREMPTY); elemDesc.setAttr("MULTIPLE", ElemDesc.ATTREMPTY); // ---------------------------------------------- - elemDesc = (ElemDesc) m_elementFlags.get("TABLE"); + elemDesc = (ElemDesc) m_elementFlags.get("table"); elemDesc.setAttr("NOWRAP", ElemDesc.ATTREMPTY); // Internet-Explorer extension // ---------------------------------------------- - elemDesc = (ElemDesc) m_elementFlags.get("TD"); + elemDesc = (ElemDesc) m_elementFlags.get("td"); elemDesc.setAttr("NOWRAP", ElemDesc.ATTREMPTY); // ---------------------------------------------- - elemDesc = (ElemDesc) m_elementFlags.get("TEXTAREA"); + elemDesc = (ElemDesc) m_elementFlags.get("textarea"); elemDesc.setAttr("DISABLED", ElemDesc.ATTREMPTY); elemDesc.setAttr("READONLY", ElemDesc.ATTREMPTY); // ---------------------------------------------- - elemDesc = (ElemDesc) m_elementFlags.get("TH"); + elemDesc = (ElemDesc) m_elementFlags.get("th"); elemDesc.setAttr("NOWRAP", ElemDesc.ATTREMPTY); // ---------------------------------------------- // The nowrap attribute of a tr element is both // a Netscape and Internet-Explorer extension - elemDesc = (ElemDesc) m_elementFlags.get("TR"); + elemDesc = (ElemDesc) m_elementFlags.get("tr"); elemDesc.setAttr("NOWRAP", ElemDesc.ATTREMPTY); // ---------------------------------------------- - elemDesc = (ElemDesc) m_elementFlags.get("UL"); + elemDesc = (ElemDesc) m_elementFlags.get("ul"); elemDesc.setAttr("COMPACT", ElemDesc.ATTREMPTY); } @@ -1762,7 +1764,7 @@ * lets determine if the current element is specified in the cdata- * section-elements list. */ - if (m_cdataSectionElements != null) + if (m_StringOfCDATASections != null) m_elemContext.m_isCdataSection = isCdataSection(); if (m_doIndent) { @@ -1776,54 +1778,7 @@ throw new SAXException(e); } } - /** - * Initialize the serializer with the specified output stream and output - * format. Must be called before calling any of the serialize methods. - * - * @param output The output stream to use - * @param format The output format - * @throws UnsupportedEncodingException The encoding specified in the - * output format is not supported - */ - protected synchronized void init(OutputStream output, Properties format) - throws UnsupportedEncodingException - { - if (null == format) - { - format = OutputPropertiesFactory.getDefaultMethodProperties(Method.HTML); - } - super.init(output,format, false); - } - - /** - * Specifies an output stream to which the document should be - * serialized. This method should not be called while the - * serializer is in the process of serializing a document. - *

- * The encoding specified in the output properties is used, or - * if no encoding was specified, the default for the selected - * output method. - * - * @param output The output stream - */ - public void setOutputStream(OutputStream output) - { - try - { - Properties format; - if (null == m_format) - format = OutputPropertiesFactory.getDefaultMethodProperties(Method.HTML); - else - format = m_format; - init(output, format, true); - } - catch (UnsupportedEncodingException uee) - { - - // Should have been warned in init, I guess... - } - } /** * This method is used when a prefix/uri namespace mapping * is indicated after the element was started with a