jdk-sandbox: comparison jaxp/src/com/sun/org/apache/xml/internal/serialize/XMLSerializer.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 problem with namespace handling. Contributed by
 //  David Blondeau <blondeau@intalio.com>
 // Sep 14, 2000:
 //  Fixed bug in startDocument not calling prepare.
 //  Reported by Mikael Staldal <d96-mst-ingen-reklam@d.kth.se>
 // Aug 21, 2000:
 //  Added ability to omit DOCTYPE declaration.
 package com.sun.org.apache.xml.internal.serialize;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.Writer;
-import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.Map;
 import com.sun.org.apache.xerces.internal.dom.DOMMessageFormatter;
 import com.sun.org.apache.xerces.internal.util.NamespaceSupport;
 import com.sun.org.apache.xerces.internal.util.SymbolTable;
 import com.sun.org.apache.xerces.internal.util.XMLChar;
 import com.sun.org.apache.xerces.internal.util.XMLSymbols;
 import com.sun.org.apache.xerces.internal.xni.NamespaceContext;
 import org.w3c.dom.Attr;
 import org.w3c.dom.DOMError;
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.traversal.NodeFilter;
 import org.xml.sax.AttributeList;
 * as specified in the output format.
 * <p>
 * The serializer supports both DOM and SAX. SAX serializing is done by firing
 * SAX events and using the serializer as a document handler. DOM serializing is done
 * by calling {@link #serialize(Document)} or by using DOM Level 3
-* {@link org.w3c.dom.ls.DOMSerializer} and
+* {@link org.w3c.dom.ls.LSSerializer} and
-* serializing with {@link org.w3c.dom.ls.DOMSerializer#write},
+* serializing with {@link org.w3c.dom.ls.LSSerializer#write},
-* {@link org.w3c.dom.ls.DOMSerializer#writeToString}.
+* {@link org.w3c.dom.ls.LSSerializer#writeToString}.
 * <p>
 * If an I/O exception occurs while serializing, the serializer
 * will not throw an exception directly, but only throw it
 * at the end of serializing (either DOM or SAX's {@link
 * org.xml.sax.DocumentHandler#endDocument}.
 /**
 * This methods turns on namespace fixup algorithm during
 * DOM serialization.
-* @see org.w3c.dom.ls.DOMSerializer
+* @see org.w3c.dom.ls.LSSerializer
 *
 * @param namespaces
 */
 public void setNamespaces (boolean namespaces){
 fNamespaces = namespaces;
 int          i;
 boolean      preserveSpace;
 ElementState state;
 String       name;
 String       value;
-boolean      addNSAttr = false;
 if (DEBUG) {
 System.out.println("==>startElement("+namespaceURI+","+localName+
 ","+rawName+")");
 }
 throw new SAXException(msg);
 }
 if (namespaceURI != null && ! namespaceURI.equals( "" )) {
 String prefix;
 prefix = getPrefix( namespaceURI );
-if (prefix != null && prefix.length() > 0)
+if (prefix != null && prefix.length() > 0) {
 rawName = prefix + ":" + localName;
-else
+}
+else {
 rawName = localName;
-} else
+}
+}
+else {
 rawName = localName;
-addNSAttr = true;
+}
 }
 _printer.printText( '<' );
 _printer.printText( rawName );
 _printer.indent();
 }
 }
 }
 if (_prefixes != null) {
-Enumeration keys;
+Iterator entries = _prefixes.entrySet().iterator();
+while (entries.hasNext()) {
-keys = _prefixes.keys();
-while (keys.hasMoreElements()) {
 _printer.printSpace();
-value = (String) keys.nextElement();
+Map.Entry entry = (Map.Entry) entries.next();
-name = (String) _prefixes.get( value );
+value = (String) entry.getKey();
+name = (String) entry.getValue();
 if (name.length() == 0) {
 _printer.printText( "xmlns=\"" );
 printEscaped( value );
 _printer.printText( '"' );
-} else {
+}
+else {
 _printer.printText( "xmlns:" );
 _printer.printText( name );
 _printer.printText( "=\"" );
 printEscaped( value );
 _printer.printText( '"' );
 } else {
 // REVISIT: issue error on invalid declarations
 //          xmlns:foo = ""
 }
 continue;
-} else { // xmlns
-// empty prefix is always bound ("" or some string)
-value = fSymbolTable.addSymbol(value);
-fNSBinder.declarePrefix(XMLSymbols.EMPTY_STRING, value);
-continue;
 }
+// xmlns --- empty prefix is always bound ("" or some string)
+value = fSymbolTable.addSymbol(value);
+fNSBinder.declarePrefix(XMLSymbols.EMPTY_STRING, value);
+continue;
 }  // end-else: valid declaration
 } // end-if: namespace declaration
 }  // end-for
 //-----------------------
 } else {
 // REVISIT: issue error on invalid declarations
 //          xmlns:foo = ""
 }
 continue;
-} else { // xmlns
+}
-// empty prefix is always bound ("" or some string)
+// xmlns --- empty prefix is always bound ("" or some string)
+uri = fNSBinder.getURI(XMLSymbols.EMPTY_STRING);
-uri = fNSBinder.getURI(XMLSymbols.EMPTY_STRING);
+localUri= fLocalNSBinder.getURI(XMLSymbols.EMPTY_STRING);
-localUri=fLocalNSBinder.getURI(XMLSymbols.EMPTY_STRING);
+value = fSymbolTable.addSymbol(value);
-value = fSymbolTable.addSymbol(value);
+if (localUri == null ) {
-if (localUri == null ){
+// declaration was not printed while fixing element namespace binding
-// declaration was not printed while fixing element namespace binding
+if (fNamespacePrefixes) {
-if (fNamespacePrefixes) {
+printNamespaceAttr(XMLSymbols.EMPTY_STRING, value);
-printNamespaceAttr(XMLSymbols.EMPTY_STRING, value);
-}
-// case 4 does not apply here since attributes can't use
-// default namespace
 }
-continue;
+// case 4 does not apply here since attributes can't use
+// default namespace
 }
+continue;
 }
 uri = fSymbolTable.addSymbol(uri);
 // find if for this prefix a URI was already declared
 throws SAXException
 {
 AttributesImpl attrsOnly;
 String         rawName;
 int            i;
-int            indexColon;
-String         prefix;
 int            length;
 if (attrs == null) {
 return null;
 }
 int length = source.length();
 for (int i = 0; i < length; ++i) {
 int ch = source.charAt(i);
 if (!XMLChar.isValid(ch)) {
 if (++i < length) {
-surrogates(ch, source.charAt(i));
+surrogates(ch, source.charAt(i), false);
 } else {
 fatalError("The character '" + (char) ch + "' is an invalid XML character");
 }
 continue;
 }
 for ( index = 0 ; index < length ; ++index ) {
 ch = text.charAt( index );
 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;
 }
 if ( unescaped ) {
 _printer.printText( ch );
-} else
+} else {
 printXMLChar( 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
 for ( index = 0 ; index < length ; ++index ) {
 ch = text.charAt( index );
 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;
 }
-if ( unescaped )
+if ( unescaped ) {
 _printer.printText( ch );
-else
+} else {
-printXMLChar( ch);
+printXMLChar( ch );
+}
 }
 }
 }
 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++];
 if (!XMLChar.isValid(ch)) {
 // check if it is surrogate
 if ( length-- > 0 ) {
-surrogates(ch, chars[start++]);
+surrogates(ch, chars[start++], true);
 } else {
-fatalError("The character '"+(char)ch+"' is an invalid XML character");
+fatalError("The character '"+ch+"' is an invalid XML character");
 }
 continue;
 }
 if ( unescaped )
 _printer.printText( ch );
 // 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++];
 if (!XMLChar.isValid(ch)) {
 // check if it is surrogate
 if ( length-- > 0 ) {
-surrogates(ch, chars[start++]);
+surrogates(ch, chars[start++], true);
 } else {
-fatalError("The character '"+(char)ch+"' is an invalid XML character");
+fatalError("The character '"+ch+"' is an invalid XML character");
 }
 continue;
 }
 if ( unescaped )
 _printer.printText( ch );

changeset 23777	ce87cedb71cf
parent 12457	c348e06f0e82
child 25834	aba3efbf4ec5