jdk-sandbox: comparison jaxp/src/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java

equal deleted inserted replaced

-:e517d680b5cf
+:ce87cedb71cf
 /*
 * reserved comment block
 * DO NOT REMOVE OR ALTER!
 */
 /*
-* Copyright 1999-2002,2004,2005 The Apache Software Foundation.
+* Licensed to the Apache Software Foundation (ASF) under one or more
-*
+* contributor license agreements.  See the NOTICE file distributed with
-* Licensed under the Apache License, Version 2.0 (the "License");
+* this work for additional information regarding copyright ownership.
-* you may not use this file except in compliance with the License.
+* The ASF licenses this file to You under the Apache License, Version 2.0
-* You may obtain a copy of the License at
+* (the "License"); you may not use this file except in compliance with
+* the License.  You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 // Sep 14, 2000:
 //  Fixed comments to preserve whitespaces and add a line break
 //  when indenting. Reported by Gervase Markham <gerv@gerv.net>
 // Sep 14, 2000:
 import com.sun.org.apache.xerces.internal.dom.DOMErrorImpl;
 import com.sun.org.apache.xerces.internal.dom.DOMLocatorImpl;
 import com.sun.org.apache.xerces.internal.dom.DOMMessageFormatter;
 import com.sun.org.apache.xerces.internal.util.XMLChar;
-import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.DOMError;
+import org.w3c.dom.DOMErrorHandler;
 import org.w3c.dom.Document;
 import org.w3c.dom.DocumentFragment;
 import org.w3c.dom.DocumentType;
-import org.w3c.dom.DOMError;
-import org.w3c.dom.DOMErrorHandler;
 import org.w3c.dom.Element;
-import org.w3c.dom.Entity;
-import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
-import org.w3c.dom.Notation;
 import org.w3c.dom.ls.LSException;
 import org.w3c.dom.ls.LSSerializerFilter;
 import org.w3c.dom.traversal.NodeFilter;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.DTDHandler;
 * @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a>
 * @author <a href="mailto:rahul.srivastava@sun.com">Rahul Srivastava</a>
 * @author Elena Litani, IBM
 * @author Sunitha Reddy, Sun Microsystems
 * @see Serializer
-* @see LSSerializer
+* @see org.w3c.dom.ls.LSSerializer
 */
 public abstract class BaseMarkupSerializer
 implements ContentHandler, DocumentHandler, LexicalHandler,
 DTDHandler, DeclHandler, DOMSerializer, Serializer
 {
 fCurrentNode = null;
 fStrBuffer.setLength(0);
 return true;
 }
+protected void cleanup() {
+fCurrentNode = null;
+}
 protected void prepare()
 throws IOException
 {
 if ( _prepared )
 throws IOException
 {
 reset();
 prepare();
 serializeNode( elem );
+cleanup();
 _printer.flush();
 if ( _printer.getException() != null )
 throw _printer.getException();
 }
 /**
 * Serializes the DOM document fragmnt using the previously specified
 * writer and output format. Throws an exception only if
 * an I/O exception occured while serializing.
 *
-* @param elem The element to serialize
+* @param frag The document fragment to serialize
 * @throws IOException An I/O exception occured while
 *   serializing
 */
 public void serialize( DocumentFragment frag )
 throws IOException
 {
 reset();
 prepare();
 serializeNode( frag );
+cleanup();
 _printer.flush();
 if ( _printer.getException() != null )
 throw _printer.getException();
 }
 {
 reset();
 prepare();
 serializeNode( doc );
 serializePreRoot();
+cleanup();
 _printer.flush();
 if ( _printer.getException() != null )
 throw _printer.getException();
 }
 continue;
 }
 if (!XMLChar.isValid(ch)) {
 // check if it is surrogate
 if (++index < end) {
-surrogates(ch, chars[index]);
+surrogates(ch, chars[index],true);
 }
 else {
-fatalError("The character '"+(char)ch+"' is an invalid XML character");
+fatalError("The character '"+ch+"' is an invalid XML character");
 }
 continue;
-} else {
+}
-if ( ( ch >= ' ' && _encodingInfo.isPrintable((char)ch) && ch != 0xF7 ) ||
+if ( ( ch >= ' ' && _encodingInfo.isPrintable(ch) && ch != 0x7F ) ||
 ch == '\n' || ch == '\r' || ch == '\t' ) {
-_printer.printText((char)ch);
+_printer.printText(ch);
-} else {
+}
-// The character is not printable -- split CDATA section
+else {
-_printer.printText("]]>&#x");
+// The character is not printable -- split CDATA section
-_printer.printText(Integer.toHexString(ch));
+_printer.printText("]]>&#x");
-_printer.printText(";<![CDATA[");
+_printer.printText(Integer.toHexString(ch));
-}
+_printer.printText(";<![CDATA[");
 }
 }
 _printer.setNextIndent( saveIndent );
 } else {
 serializeElement( (Element) node );
 break;
 }
 case Node.DOCUMENT_NODE : {
 DocumentType      docType;
-DOMImplementation domImpl;
-NamedNodeMap      map;
-Entity            entity;
-Notation          notation;
-int               i;
 serializeDocument();
 // If there is a document type, use the SAX events to
 // serialize it.
 docType = ( (Document) node ).getDoctype();
 if (docType != null) {
 // DOM Level 2 (or higher)
-domImpl = ( (Document) node ).getImplementation();
 try {
 String internal;
 _printer.enterDTD();
 _docTypePublicId = docType.getPublicId();
 * If the element was just opened, the opening tag is closed and
 * will be matched to a closing tag. Returns the current element
 * state with <tt>empty</tt> and <tt>afterElement</tt> set to false.
 *
 * @return The current element state
-* @throws IOException An I/O exception occured while
+* @throws IOException An I/O exception occurred while
 *   serializing
 */
 protected ElementState content()
 throws IOException
 {
 * for that purpose as well. White space handling is determined by the
 * current element state. In addition, the output format can dictate
 * whether the text is printed as CDATA or unescaped.
 *
 * @param text The text to print
-* @param unescaped True is should print unescaped
 * @throws IOException An I/O exception occured while
 *   serializing
 */
 protected void characters( String text )
 throws IOException
 // Check if text should be print as CDATA section or unescaped
 // based on elements listed in the output format (the element
 // state) or whether we are inside a CDATA section or entity.
 if ( state.inCData || state.doCData ) {
-int          index;
-int          saveIndent;
 // Print a CDATA section. The text is not escaped, but ']]>'
 // appearing in the code must be identified and dealt with.
 // The contents of a text node is considered space preserving.
 if ( ! state.inCData ) {
 _printer.printText("<![CDATA[");
 state.inCData = true;
 }
-saveIndent = _printer.getNextIndent();
+int saveIndent = _printer.getNextIndent();
 _printer.setNextIndent( 0 );
 printCDATAText( text);
 _printer.setNextIndent( saveIndent );
 } else {
 // issue fatal error
 modifyDOMError(msg, DOMError.SEVERITY_FATAL_ERROR, "wf-invalid-character", fCurrentNode);
 fDOMErrorHandler.handleError(fDOMError);
 throw new LSException(LSException.SERIALIZE_ERR, msg);
 }
-else {
+// issue error
-// issue error
+modifyDOMError(msg, DOMError.SEVERITY_ERROR, "cdata-section-not-splitted", fCurrentNode);
-modifyDOMError(msg, DOMError.SEVERITY_ERROR, "cdata-section-not-splitted", fCurrentNode);
+if (!fDOMErrorHandler.handleError(fDOMError)) {
-if (!fDOMErrorHandler.handleError(fDOMError)) {
+throw new LSException(LSException.SERIALIZE_ERR, msg);
-throw new LSException(LSException.SERIALIZE_ERR, msg);
-}
 }
 } else {
 // issue warning
 String msg =
 DOMMessageFormatter.formatMessage(
 }
 if (!XMLChar.isValid(ch)) {
 // check if it is surrogate
 if (++index <length) {
-surrogates(ch, text.charAt(index));
+surrogates(ch, text.charAt(index),true);
 }
 else {
-fatalError("The character '"+(char)ch+"' is an invalid XML character");
+fatalError("The character '"+ch+"' is an invalid XML character");
 }
 continue;
-} else {
+}
-if ( ( ch >= ' ' && _encodingInfo.isPrintable((char)ch) && ch != 0xF7 ) ||
+if ( ( ch >= ' ' && _encodingInfo.isPrintable(ch) && ch != 0x7F ) ||
 ch == '\n' || ch == '\r' || ch == '\t' ) {
-_printer.printText((char)ch);
+_printer.printText(ch);
-} else {
+}
+else {
-// The character is not printable -- split CDATA section
-_printer.printText("]]>&#x");
+// The character is not printable -- split CDATA section
-_printer.printText(Integer.toHexString(ch));
+_printer.printText("]]>&#x");
-_printer.printText(";<![CDATA[");
+_printer.printText(Integer.toHexString(ch));
-}
+_printer.printText(";<![CDATA[");
 }
 }
 }
-protected void surrogates(int high, int low) throws IOException{
+protected void surrogates(int high, int low, boolean inContent) throws IOException{
 if (XMLChar.isHighSurrogate(high)) {
 if (!XMLChar.isLowSurrogate(low)) {
 //Invalid XML
 fatalError("The character '"+(char)low+"' is an invalid XML character");
 }
 if (!XMLChar.isValid(supplemental)) {
 //Invalid XML
 fatalError("The character '"+(char)supplemental+"' is an invalid XML character");
 }
 else {
-if (content().inCData ) {
+if (inContent && content().inCData) {
 _printer.printText("]]>&#x");
 _printer.printText(Integer.toHexString(supplemental));
 _printer.printText(";<![CDATA[");
 }
 else {
 * for each new line. If spaces are not preserved, the text is
 * broken at space boundaries if longer than the line width;
 * Multiple spaces are printed as such, but spaces at beginning
 * of line are removed.
 *
-* @param text The text to print
+* @param chars The text to print
+* @param start The start offset
+* @param length The number of characters
 * @param preserveSpace Space preserving flag
 * @param unescaped Print unescaped
 */
 protected void printText( char[] chars, int start, int length,
 boolean preserveSpace, boolean unescaped )
 throws IOException
 {
-int index;
-char ch;
 if ( preserveSpace ) {
 // Preserving spaces: the text must print exactly as it is,
 // without breaking when spaces appear in the text and without
 // consolidating spaces. If a line terminator is used, a line
 // break will occur.
 while ( length-- > 0 ) {
-ch = chars[ start ];
+char ch = chars[ start ];
 ++start;
-if ( ch == '\n' || ch == '\r' || unescaped )
+if ( ch == '\n' || ch == '\r' || unescaped ) {
 _printer.printText( ch );
-else
+}
+else {
 printEscaped( ch );
+}
 }
 } else {
 // Not preserving spaces: print one part at a time, and
 // use spaces between parts to break them into different
 // lines. Spaces at beginning of line will be stripped
 // by printing mechanism. Line terminator is treated
 // no different than other text part.
 while ( length-- > 0 ) {
-ch = chars[ start ];
+char ch = chars[ start ];
 ++start;
-if ( ch == ' ' || ch == '\f' || ch == '\t' || ch == '\n' || ch == '\r' )
+if ( ch == ' ' || ch == '\f' || ch == '\t' || ch == '\n' || ch == '\r' ) {
 _printer.printSpace();
-else if ( unescaped )
+}
+else if ( unescaped ) {
 _printer.printText( ch );
-else
+}
+else {
 printEscaped( ch );
+}
 }
 }
 }
 // lines. Spaces at beginning of line will be stripped
 // by printing mechanism. Line terminator is treated
 // no different than other text part.
 for ( index = 0 ; index < text.length() ; ++index ) {
 ch = text.charAt( index );
-if ( ch == ' ' || ch == '\f' || ch == '\t' || ch == '\n' || ch == '\r' )
+if ( ch == ' ' || ch == '\f' || ch == '\t' || ch == '\n' || ch == '\r' ) {
 _printer.printSpace();
-else if ( unescaped )
+}
+else if ( unescaped ) {
 _printer.printText( ch );
-else
+}
+else {
 printEscaped( ch );
+}
 }
 }
 }
 charRef = getEntityRef( ch );
 if ( charRef != null ) {
 _printer.printText( '&' );
 _printer.printText( charRef );
 _printer.printText( ';' );
-} else if ( ( ch >= ' ' && _encodingInfo.isPrintable((char)ch) && ch != 0xF7 ) ||
+} else if ( ( ch >= ' ' && _encodingInfo.isPrintable((char)ch) && ch != 0x7F ) ||
 ch == '\n' || ch == '\r' || ch == '\t' ) {
 // Non printables are below ASCII space but not tab or line
 // terminator, ASCII delete, or above a certain Unicode threshold.
 if (ch < 0x10000) {
 _printer.printText((char)ch );
 */
 protected ElementState leaveElementState()
 {
 if ( _elementStateCount > 0 ) {
 /*Corrected by David Blondeau (blondeau@intalio.com)*/
 _prefixes = null;
 //_prefixes = _elementStates[ _elementStateCount ].prefixes;
 -- _elementStateCount;
 return _elementStates[ _elementStateCount ];
-} else {
+}
 String msg = DOMMessageFormatter.formatMessage(DOMMessageFormatter.SERIALIZER_DOMAIN, "Internal", null);
 throw new IllegalStateException(msg);
-}
 }
 /**
 * Returns true if in the state of the document.
 * Returns true before entering any element and after
 * leaving the root element.
 *
 * @return True if in the state of the document
 */
-protected boolean isDocumentState()
+protected boolean isDocumentState() {
-{
 return _elementStateCount == 0;
 }
+/** Clears document state. **/
+final void clearDocumentState() {
+_elementStateCount = 0;
+}
 /**
 * Returns the namespace prefix for the specified URI.
 * If the URI has been mapped to a prefix, returns the
 * prefix, otherwise returns null.
 if ( _prefixes != null ) {
 prefix = (String) _prefixes.get( namespaceURI );
 if ( prefix != null )
 return prefix;
 }
-if ( _elementStateCount == 0 )
+if ( _elementStateCount == 0 ) {
 return null;
-else {
+}
 for ( int i = _elementStateCount ; i > 0 ; --i ) {
 if ( _elementStates[ i ].prefixes != null ) {
 prefix = (String) _elementStates[ i ].prefixes.get( namespaceURI );
 if ( prefix != null )
 return prefix;
-}
 }
 }
 return null;
 }

changeset 23777	ce87cedb71cf
parent 12457	c348e06f0e82
child 25834	aba3efbf4ec5