You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mi...@apache.org on 2005/04/07 06:29:04 UTC

cvs commit: xml-xalan/java/src/org/apache/xml/serializer/utils SerializerMessages.java

minchau     2005/04/06 21:29:04

  Modified:    java/src/org/apache/xml/serializer NamespaceMappings.java
                        ToUnknownStream.java ElemDesc.java
                        SerializerFactory.java ToHTMLStream.java
                        Serializer.java ToTextStream.java
                        ToXMLSAXHandler.java ToSAXHandler.java
                        SerializationHandler.java EmptySerializer.java
                        SerializerBase.java OutputPropertyUtils.java
                        ToTextSAXHandler.java ToStream.java
                        OutputPropertiesFactory.java ToHTMLSAXHandler.java
                        ToXMLStream.java Method.java
               java/src/org/apache/xml/serializer/utils
                        SerializerMessages.java
  Log:
  Committing patch from XALANJ-2082 , mostly changing javadoc from:
    @see org.apache.xml.serializer.<ClassName>
  to
   @see <ClassName>.
  
  A few other javadoc clean ups.
  Just trying to make the serializer itself less dependant on its own
  high level qualifiers in its package name.
  
  Revision  Changes    Path
  1.9       +10 -5     xml-xalan/java/src/org/apache/xml/serializer/NamespaceMappings.java
  
  Index: NamespaceMappings.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/NamespaceMappings.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- NamespaceMappings.java	11 Feb 2005 06:18:13 -0000	1.8
  +++ NamespaceMappings.java	7 Apr 2005 04:29:03 -0000	1.9
  @@ -70,6 +70,11 @@
   
       /**
        * Each entry (prefix) in this hashtable points to a Stack of URIs
  +     * This table maps a prefix (String) to a Stack of prefix mappings.
  +     * All mappings in that retrieved stack have the same prefix,
  +     * though possibly different URI's or depths. Such a stack must have
  +     * mappings at deeper depths push later on such a stack.  Mappings pushed
  +     * earlier on the stack will have smaller values for MappingRecord.m_declarationDepth.
        */
       private Hashtable m_namespaces = new Hashtable();
   
  @@ -202,7 +207,7 @@
       }
   
       /**
  -     * Declare a prefix to point to a namespace URI
  +     * Declare a mapping of a prefix to namespace URI at the given element depth.
        * @param prefix a String with the prefix for a qualified name
        * @param uri a String with the uri to which the prefix is to map
        * @param elemDepth the depth of current declaration
  @@ -247,7 +252,7 @@
               if (m_nodeStack.isEmpty())
                   return;
               MappingRecord map = (MappingRecord)(m_nodeStack.peek());
  -            int depth = map.m_delarationDepth;
  +            int depth = map.m_declarationDepth;
               if (depth < elemDepth)
                   return;
               /* the depth of the declared mapping is elemDepth or deeper
  @@ -308,11 +313,11 @@
           final String m_prefix;  // the prefix
           final String m_uri;     // the uri
           // the depth of the element where declartion was made
  -        final int m_delarationDepth;
  +        final int m_declarationDepth;
           MappingRecord(String prefix, String uri, int depth) {
               m_prefix = prefix;
               m_uri = uri;
  -            m_delarationDepth = depth;
  +            m_declarationDepth = depth;
               
           }
       }
  
  
  
  1.12      +47 -47    xml-xalan/java/src/org/apache/xml/serializer/ToUnknownStream.java
  
  Index: ToUnknownStream.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/ToUnknownStream.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ToUnknownStream.java	11 Feb 2005 06:18:13 -0000	1.11
  +++ ToUnknownStream.java	7 Apr 2005 04:29:03 -0000	1.12
  @@ -140,7 +140,7 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.Serializer#asContentHandler()
  +     * @see Serializer#asContentHandler()
        * @return the wrapped XML or HTML handler
        */
       public ContentHandler asContentHandler() throws IOException
  @@ -154,7 +154,7 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.SerializationHandler#close()
  +     * @see SerializationHandler#close()
        */
       public void close()
       {
  @@ -162,7 +162,7 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.Serializer#getOutputFormat()
  +     * @see Serializer#getOutputFormat()
        * @return the properties of the underlying handler
        */
       public Properties getOutputFormat()
  @@ -171,7 +171,7 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.Serializer#getOutputStream()
  +     * @see Serializer#getOutputStream()
        * @return the OutputStream of the underlying XML or HTML handler
        */
       public OutputStream getOutputStream()
  @@ -180,7 +180,7 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.Serializer#getWriter()
  +     * @see Serializer#getWriter()
        * @return the Writer of the underlying XML or HTML handler
        */
       public Writer getWriter()
  @@ -190,7 +190,7 @@
   
       /**
        * passes the call on to the underlying HTML or XML handler
  -     * @see org.apache.xml.serializer.Serializer#reset()
  +     * @see Serializer#reset()
        * @return ???
        */
       public boolean reset()
  @@ -201,7 +201,7 @@
       /**
        * Converts the DOM node to output
        * @param node the DOM node to transform to output
  -     * @see org.apache.xml.serializer.DOMSerializer#serialize(Node)
  +     * @see DOMSerializer#serialize(Node)
        *
        */
       public void serialize(Node node) throws IOException
  @@ -214,7 +214,7 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.SerializationHandler#setEscaping(boolean)
  +     * @see SerializationHandler#setEscaping(boolean)
        */
       public boolean setEscaping(boolean escape) throws SAXException
       {
  @@ -224,7 +224,7 @@
       /**
        * Set the properties of the handler
        * @param format the output properties to set
  -     * @see org.apache.xml.serializer.Serializer#setOutputFormat(Properties)
  +     * @see Serializer#setOutputFormat(Properties)
        */
       public void setOutputFormat(Properties format)
       {
  @@ -234,7 +234,7 @@
       /**
        * Sets the output stream to write to
        * @param output the OutputStream to write to
  -     * @see org.apache.xml.serializer.Serializer#setOutputStream(OutputStream)
  +     * @see Serializer#setOutputStream(OutputStream)
        */
       public void setOutputStream(OutputStream output)
       {
  @@ -244,7 +244,7 @@
       /**
        * Sets the writer to write to
        * @param writer the writer to write to
  -     * @see org.apache.xml.serializer.Serializer#setWriter(Writer)
  +     * @see Serializer#setWriter(Writer)
        */
       public void setWriter(Writer writer)
       {
  @@ -259,7 +259,7 @@
        * @param type the type of the attribute, typically "CDATA"
        * @param value the value of the parameter
        * @param XSLAttribute true if this attribute is coming from an xsl:attribute element
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#addAttribute(String, String, String, String, String)
  +     * @see ExtendedContentHandler#addAttribute(String, String, String, String, String)
        */
       public void addAttribute(
           String uri,
  @@ -280,7 +280,7 @@
        * Adds an attribute to the currenly open tag
        * @param rawName the attribute name, with prefix (if any)
        * @param value the value of the parameter
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#addAttribute(String, String)
  +     * @see ExtendedContentHandler#addAttribute(String, String)
        */
       public void addAttribute(String rawName, String value)
       {
  @@ -310,7 +310,7 @@
        * Converts the String to a character array and calls the SAX method 
        * characters(char[],int,int);
        * 
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#characters(String)
  +     * @see ExtendedContentHandler#characters(String)
        */
       public void characters(String chars) throws SAXException
       {
  @@ -325,7 +325,7 @@
   
       /**
        * Pass the call on to the underlying handler
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#endElement(String)
  +     * @see ExtendedContentHandler#endElement(String)
        */
       public void endElement(String elementName) throws SAXException
       {
  @@ -356,7 +356,7 @@
        * @param uri the URI of the namespace
        * @param prefix the prefix associated with the given URI.
        *
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#namespaceAfterStartElement(String, String)
  +     * @see ExtendedContentHandler#namespaceAfterStartElement(String, String)
        */    
       public void namespaceAfterStartElement(String prefix, String uri)
           throws SAXException 
  @@ -520,7 +520,7 @@
   
       /**
        * Pass the call on to the underlying handler
  -     * @see org.apache.xml.serializer.ExtendedLexicalHandler#comment(String)
  +     * @see ExtendedLexicalHandler#comment(String)
        */
       public void comment(String comment) throws SAXException
       {
  @@ -539,7 +539,7 @@
   
       /**
        * Pass the call on to the underlying handler
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#getDoctypePublic()
  +     * @see XSLOutputAttributes#getDoctypePublic()
        */
       public String getDoctypePublic()
       {
  @@ -549,7 +549,7 @@
   
       /**
        * Pass the call on to the underlying handler
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#getDoctypeSystem()
  +     * @see XSLOutputAttributes#getDoctypeSystem()
        */
       public String getDoctypeSystem()
       {
  @@ -558,7 +558,7 @@
   
       /**
        * Pass the call on to the underlying handler
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#getEncoding()
  +     * @see XSLOutputAttributes#getEncoding()
        */
       public String getEncoding()
       {
  @@ -567,7 +567,7 @@
   
       /**
        * Pass the call on to the underlying handler
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#getIndent()
  +     * @see XSLOutputAttributes#getIndent()
        */
       public boolean getIndent()
       {
  @@ -576,7 +576,7 @@
   
       /**
        * Pass the call on to the underlying handler
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#getIndentAmount()
  +     * @see XSLOutputAttributes#getIndentAmount()
        */
       public int getIndentAmount()
       {
  @@ -585,7 +585,7 @@
   
       /**
        * Pass the call on to the underlying handler
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#getMediaType()
  +     * @see XSLOutputAttributes#getMediaType()
        */
       public String getMediaType()
       {
  @@ -594,7 +594,7 @@
   
       /**
        * Pass the call on to the underlying handler
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#getOmitXMLDeclaration()
  +     * @see XSLOutputAttributes#getOmitXMLDeclaration()
        */
       public boolean getOmitXMLDeclaration()
       {
  @@ -603,7 +603,7 @@
   
       /**
        * Pass the call on to the underlying handler
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#getStandalone()
  +     * @see XSLOutputAttributes#getStandalone()
        */
       public String getStandalone()
       {
  @@ -612,7 +612,7 @@
   
       /**
        * Pass the call on to the underlying handler
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#getVersion()
  +     * @see XSLOutputAttributes#getVersion()
        */
       public String getVersion()
       {
  @@ -620,7 +620,7 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#setDoctype(String, String)
  +     * @see XSLOutputAttributes#setDoctype(String, String)
        */
       public void setDoctype(String system, String pub)
       {
  @@ -632,7 +632,7 @@
        * Set the doctype in the underlying XML handler. Remember that this method
        * was called, just in case we need to transfer this doctype to an HTML handler
        * @param doctype the public doctype to set
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#setDoctypePublic(String)
  +     * @see XSLOutputAttributes#setDoctypePublic(String)
        */
       public void setDoctypePublic(String doctype)
       {
  @@ -644,7 +644,7 @@
        * Set the doctype in the underlying XML handler. Remember that this method
        * was called, just in case we need to transfer this doctype to an HTML handler
        * @param doctype the system doctype to set
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#setDoctypeSystem(String)
  +     * @see XSLOutputAttributes#setDoctypeSystem(String)
        */
       public void setDoctypeSystem(String doctype)
       {
  @@ -654,7 +654,7 @@
   
       /**
        * Pass the call on to the underlying handler
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#setEncoding(String)
  +     * @see XSLOutputAttributes#setEncoding(String)
        */
       public void setEncoding(String encoding)
       {
  @@ -663,7 +663,7 @@
   
       /**
        * Pass the call on to the underlying handler
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#setIndent(boolean)
  +     * @see XSLOutputAttributes#setIndent(boolean)
        */
       public void setIndent(boolean indent)
       {
  @@ -679,7 +679,7 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#setMediaType(String)
  +     * @see XSLOutputAttributes#setMediaType(String)
        */
       public void setMediaType(String mediaType)
       {
  @@ -689,7 +689,7 @@
   
       /**
        * Pass the call on to the underlying handler
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#setOmitXMLDeclaration(boolean)
  +     * @see XSLOutputAttributes#setOmitXMLDeclaration(boolean)
        */
       public void setOmitXMLDeclaration(boolean b)
       {
  @@ -698,7 +698,7 @@
   
       /**
        * Pass the call on to the underlying handler
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#setStandalone(String)
  +     * @see XSLOutputAttributes#setStandalone(String)
        */
       public void setStandalone(String standalone)
       {
  @@ -706,7 +706,7 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#setVersion(String)
  +     * @see XSLOutputAttributes#setVersion(String)
        */
   
       /**
  @@ -1150,7 +1150,7 @@
           return isHTML;
       }
       /**
  -     * @see org.apache.xml.serializer.Serializer#asDOMSerializer()
  +     * @see Serializer#asDOMSerializer()
        */
       public DOMSerializer asDOMSerializer() throws IOException
       {
  @@ -1159,15 +1159,15 @@
   
       /**
        * @param URI_and_localNames Vector a list of pairs of URI/localName
  -     * specified in the cdata-section-elements attribute
  -     * @see org.apache.xml.serializer.SerializationHandler#setCdataSectionElements(java.util.Vector)
  +     * specified in the cdata-section-elements attribute.
  +     * @see SerializationHandler#setCdataSectionElements(java.util.Vector)
        */
       public void setCdataSectionElements(Vector URI_and_localNames)
       {
           m_handler.setCdataSectionElements(URI_and_localNames);
       }
       /**
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#addAttributes(org.xml.sax.Attributes)
  +     * @see ExtendedContentHandler#addAttributes(org.xml.sax.Attributes)
        */
       public void addAttributes(Attributes atts) throws SAXException
       {
  @@ -1177,7 +1177,7 @@
       /**
        * Get the current namespace mappings.
        * Simply returns the mappings of the wrapped handler.
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#getNamespaceMappings()
  +     * @see ExtendedContentHandler#getNamespaceMappings()
        */
       public NamespaceMappings getNamespaceMappings()
       {
  @@ -1189,7 +1189,7 @@
           return mappings;
       }
       /**
  -     * @see org.apache.xml.serializer.SerializationHandler#flushPending()
  +     * @see SerializationHandler#flushPending()
        */
       public void flushPending() throws SAXException
       {
  @@ -1222,14 +1222,14 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#getPrefix
  +     * @see ExtendedContentHandler#getPrefix
        */
       public String getPrefix(String namespaceURI)
       {
           return m_handler.getPrefix(namespaceURI);
       }
       /**
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#entityReference(java.lang.String)
  +     * @see ExtendedContentHandler#entityReference(java.lang.String)
        */
       public void entityReference(String entityName) throws SAXException
       {
  @@ -1237,7 +1237,7 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#getNamespaceURI(java.lang.String, boolean)
  +     * @see ExtendedContentHandler#getNamespaceURI(java.lang.String, boolean)
        */
       public String getNamespaceURI(String qname, boolean isElement)
       {
  @@ -1265,7 +1265,7 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.SerializationHandler#setContentHandler(org.xml.sax.ContentHandler)
  +     * @see SerializationHandler#setContentHandler(org.xml.sax.ContentHandler)
        */
       public void setContentHandler(ContentHandler ch)
       {
  @@ -1276,7 +1276,7 @@
        * generated an error message.
        * @param locator the source locator
        *
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#setSourceLocator(javax.xml.transform.SourceLocator)
  +     * @see ExtendedContentHandler#setSourceLocator(javax.xml.transform.SourceLocator)
        */    
       public void setSourceLocator(SourceLocator locator)
       {
  
  
  
  1.7       +3 -3      xml-xalan/java/src/org/apache/xml/serializer/ElemDesc.java
  
  Index: ElemDesc.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/ElemDesc.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ElemDesc.java	14 Oct 2004 21:45:05 -0000	1.6
  +++ ElemDesc.java	7 Apr 2005 04:29:03 -0000	1.7
  @@ -50,7 +50,7 @@
       /** Bit position if this element type is a block form. */
       static final int BLOCKFORM = (1 << 4);
   
  -    /** Bit position if this element type is a block form field set (?? -sb). */
  +    /** Bit position if this element type is a block form field set. */
       static final int BLOCKFORMFIELDSET = (1 << 5);
   
       /** Bit position if this element type is CDATA. */
  @@ -65,7 +65,7 @@
       /** Bit position if this element type should be inlined. */
       private static final int INLINE = (1 << 9);
   
  -    /** Bit position if this element type is INLINEA (?? -sb). */
  +    /** Bit position if this element type is INLINEA. */
       private static final int INLINEA = (1 << 10);
   
       /** Bit position if this element type is an inline label. */
  
  
  
  1.10      +4 -4      xml-xalan/java/src/org/apache/xml/serializer/SerializerFactory.java
  
  Index: SerializerFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/SerializerFactory.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- SerializerFactory.java	7 Mar 2005 20:34:36 -0000	1.9
  +++ SerializerFactory.java	7 Apr 2005 04:29:03 -0000	1.10
  @@ -52,9 +52,9 @@
      * <p>
      * The non-standard property keys supported are defined in {@link OutputPropertiesFactory}.
      *
  -   * @see org.apache.xml.serializer.OutputPropertiesFactory
  -   * @see org.apache.xml.serializer.Method
  -   * @see org.apache.xml.serializer.Serializer
  +   * @see OutputPropertiesFactory
  +   * @see Method
  +   * @see Serializer
      */
   public final class SerializerFactory
   {
  
  
  
  1.37      +2 -2      xml-xalan/java/src/org/apache/xml/serializer/ToHTMLStream.java
  
  Index: ToHTMLStream.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/ToHTMLStream.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- ToHTMLStream.java	16 Mar 2005 20:41:27 -0000	1.36
  +++ ToHTMLStream.java	7 Apr 2005 04:29:03 -0000	1.37
  @@ -36,7 +36,7 @@
    * to the given stream.
    * 
    * This class is not a public API, it is public
  - * because it is used internally in Xalan.
  + * because it is used from another package.
    * 
    * @xsl.usage internal
    */
  
  
  
  1.5       +5 -5      xml-xalan/java/src/org/apache/xml/serializer/Serializer.java
  
  Index: Serializer.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/Serializer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Serializer.java	14 Oct 2004 21:45:05 -0000	1.4
  +++ Serializer.java	7 Apr 2005 04:29:03 -0000	1.5
  @@ -78,10 +78,10 @@
    * 
    * This interface is a public API.
    * 
  - * @see org.apache.xml.serializer.Method
  - * @see org.apache.xml.serializer.OutputPropertiesFactory
  - * @see org.apache.xml.serializer.SerializerFactory
  - * @see org.apache.xml.serializer.DOMSerializer
  + * @see Method
  + * @see OutputPropertiesFactory
  + * @see SerializerFactory
  + * @see DOMSerializer
    * @see ContentHandler
    * 
    * @xsl.usage general
  
  
  
  1.21      +7 -5      xml-xalan/java/src/org/apache/xml/serializer/ToTextStream.java
  
  Index: ToTextStream.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/ToTextStream.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- ToTextStream.java	11 Feb 2005 06:18:13 -0000	1.20
  +++ ToTextStream.java	7 Apr 2005 04:29:03 -0000	1.21
  @@ -26,8 +26,10 @@
   import org.xml.sax.SAXException;
   
   /**
  - * This class is not a public API, it is only public because it is used
  - * by Xalan.
  + * This class is not a public API.
  + * It is only public because it is used in other packages. 
  + * This class converts SAX or SAX-like calls to a 
  + * serialized document for xsl:output method of "text".
    * @xsl.usage internal
    */
   public final class ToTextStream extends ToStream 
  @@ -576,7 +578,7 @@
     }
     
       /**
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#addAttribute(String, String, String, String, String)
  +     * @see ExtendedContentHandler#addAttribute(String, String, String, String, String)
        */
       public void addAttribute(
           String uri,
  @@ -598,7 +600,7 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#endElement(String)
  +     * @see ExtendedContentHandler#endElement(String)
        */
       public void endElement(String elemName) throws SAXException
       {
  
  
  
  1.17      +13 -13    xml-xalan/java/src/org/apache/xml/serializer/ToXMLSAXHandler.java
  
  Index: ToXMLSAXHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/ToXMLSAXHandler.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ToXMLSAXHandler.java	11 Feb 2005 06:18:13 -0000	1.16
  +++ ToXMLSAXHandler.java	7 Apr 2005 04:29:03 -0000	1.17
  @@ -56,7 +56,7 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.Serializer#getOutputFormat()
  +     * @see Serializer#getOutputFormat()
        */
       public Properties getOutputFormat()
       {
  @@ -64,7 +64,7 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.Serializer#getOutputStream()
  +     * @see Serializer#getOutputStream()
        */
       public OutputStream getOutputStream()
       {
  @@ -72,7 +72,7 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.Serializer#getWriter()
  +     * @see Serializer#getWriter()
        */
       public Writer getWriter()
       {
  @@ -88,14 +88,14 @@
   
   
       /**
  -     * @see org.apache.xml.serializer.DOMSerializer#serialize(Node)
  +     * @see DOMSerializer#serialize(Node)
        */
       public void serialize(Node node) throws IOException
       {
       }
   
       /**
  -     * @see org.apache.xml.serializer.SerializationHandler#setEscaping(boolean)
  +     * @see SerializationHandler#setEscaping(boolean)
        */
       public boolean setEscaping(boolean escape) throws SAXException
       {
  @@ -112,21 +112,21 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.Serializer#setOutputFormat(Properties)
  +     * @see Serializer#setOutputFormat(Properties)
        */
       public void setOutputFormat(Properties format)
       {
       }
   
       /**
  -     * @see org.apache.xml.serializer.Serializer#setOutputStream(OutputStream)
  +     * @see Serializer#setOutputStream(OutputStream)
        */
       public void setOutputStream(OutputStream output)
       {
       }
   
       /**
  -     * @see org.apache.xml.serializer.Serializer#setWriter(Writer)
  +     * @see Serializer#setWriter(Writer)
        */
       public void setWriter(Writer writer)
       {
  @@ -453,7 +453,7 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#characters(String)
  +     * @see ExtendedContentHandler#characters(String)
        */
       public void characters(String chars) throws SAXException
       {
  @@ -547,7 +547,7 @@
       
   
       /**
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#endElement(String)
  +     * @see ExtendedContentHandler#endElement(String)
        */
       public void endElement(String elemName) throws SAXException
       {
  @@ -723,7 +723,7 @@
        * @param type the type of the attribute (probably CDATA)
        * @param value the value of the attribute
        * @param XSLAttribute true if this attribute is coming from an xsl:attribute element
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#addAttribute(String, String, String, String, String)
  +     * @see ExtendedContentHandler#addAttribute(String, String, String, String, String)
        */
       public void addAttribute(
           String uri,
  @@ -748,7 +748,7 @@
        * (mostly for performance reasons).
        * 
        * @return true if the class was successfuly reset.
  -     * @see org.apache.xml.serializer.Serializer#reset()
  +     * @see Serializer#reset()
        */
       public boolean reset()
       {
  
  
  
  1.16      +8 -8      xml-xalan/java/src/org/apache/xml/serializer/ToSAXHandler.java
  
  Index: ToSAXHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/ToSAXHandler.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ToSAXHandler.java	24 Jan 2005 04:04:40 -0000	1.15
  +++ ToSAXHandler.java	7 Apr 2005 04:29:03 -0000	1.16
  @@ -31,7 +31,7 @@
    * This class is used to provide a base behavior to be inherited
    * by other To...SAXHandler serializers.
    * 
  - * This class is not a public API, it is only public because it is used by Xalan.
  + * This class is not a public API.
    * 
    * @xsl.usage internal
    */
  @@ -113,7 +113,7 @@
        *
        * @throws org.xml.sax.SAXException
        *
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#characters(String)
  +     * @see ExtendedContentHandler#characters(String)
        */
       public void characters(String characters) throws SAXException
       {
  @@ -129,7 +129,7 @@
       /**
        * Receive notification of a comment.
        *
  -     * @see org.apache.xml.serializer.ExtendedLexicalHandler#comment(String)
  +     * @see ExtendedLexicalHandler#comment(String)
        */
       public void comment(String comment) throws SAXException
       {
  @@ -230,7 +230,7 @@
       /**
        * Does nothing. The setting of CDATA section elements has an impact on
        * stream serializers.
  -     * @see org.apache.xml.serializer.SerializationHandler#setCdataSectionElements(java.util.Vector)
  +     * @see SerializationHandler#setCdataSectionElements(java.util.Vector)
        */
       public void setCdataSectionElements(Vector URI_and_localNames)
       {
  @@ -306,7 +306,7 @@
        * @param localName the element name, but without prefix (optional)
        * @param qName the element name, with prefix, if any (required)
        *
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#startElement(String, String, String)
  +     * @see ExtendedContentHandler#startElement(String, String, String)
        */
       public void startElement(String uri, String localName, String qName)
           throws SAXException {
  @@ -325,7 +325,7 @@
        *
        * @param qName the element name, with prefix (if any).
   
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#startElement(String)
  +     * @see ExtendedContentHandler#startElement(String)
        */
       public void startElement(String qName) throws SAXException {
           if (m_state != null) {
  @@ -400,7 +400,7 @@
        * (mostly for performance reasons).
        * 
        * @return true if the class was successfuly reset.
  -     * @see org.apache.xml.serializer.Serializer#reset()
  +     * @see Serializer#reset()
        */
       public boolean reset()
       {
  
  
  
  1.9       +5 -4      xml-xalan/java/src/org/apache/xml/serializer/SerializationHandler.java
  
  Index: SerializationHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/SerializationHandler.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- SerializationHandler.java	21 Feb 2005 18:34:56 -0000	1.8
  +++ SerializationHandler.java	7 Apr 2005 04:29:03 -0000	1.9
  @@ -33,7 +33,8 @@
    * other interfaces, such as ExtendedContentHandler, ExtendedLexicalHandler etc.
    * In addition there are other methods, such as reset().
    * 
  - * This class is public only because it isused by Xalan, it is not a public API.
  + * This class is public only because it is used in another package,
  + * it is not a public API.
    * 
    * @xsl.usage internal
    */
  @@ -52,8 +53,8 @@
        * Set the SAX Content handler that the serializer sends its output to. This
        * method only applies to a ToSAXHandler, not to a ToStream serializer.
        * 
  -     * @see org.apache.xml.serializer.Serializer#asContentHandler()
  -     * @see org.apache.xml.serializer.ToSAXHandler
  +     * @see Serializer#asContentHandler()
  +     * @see ToSAXHandler
        */
       public void setContentHandler(ContentHandler ch);
       
  
  
  
  1.11      +64 -64    xml-xalan/java/src/org/apache/xml/serializer/EmptySerializer.java
  
  Index: EmptySerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/EmptySerializer.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- EmptySerializer.java	21 Feb 2005 18:34:56 -0000	1.10
  +++ EmptySerializer.java	7 Apr 2005 04:29:03 -0000	1.11
  @@ -39,8 +39,8 @@
    * This class is an adapter class. Its only purpose is to be extended and
    * for that extended class to over-ride all methods that are to be used. 
    * 
  - * This class is not a public API, it is only public because it is used by
  - * XSLTC.
  + * This class is not a public API, it is only public because it is used
  + * across package boundaries.
    * 
    * @xsl.usage internal
    */
  @@ -48,7 +48,7 @@
   {
       protected static final String ERR = "EmptySerializer method not over-ridden";
       /**
  -     * @see org.apache.xml.serializer.SerializationHandler#asContentHandler()
  +     * @see SerializationHandler#asContentHandler()
        */
       
       protected void couldThrowIOException() throws IOException
  @@ -85,7 +85,7 @@
     
       
       /**
  -     * @see org.apache.xml.serializer.SerializationHandler#asContentHandler()
  +     * @see SerializationHandler#asContentHandler()
        */
       public ContentHandler asContentHandler() throws IOException
       {
  @@ -93,21 +93,21 @@
           return null;
       }
       /**
  -     * @see org.apache.xml.serializer.SerializationHandler#setContentHandler(org.xml.sax.ContentHandler)
  +     * @see SerializationHandler#setContentHandler(org.xml.sax.ContentHandler)
        */
       public void setContentHandler(ContentHandler ch)
       {
           aMethodIsCalled();
       }
       /**
  -     * @see org.apache.xml.serializer.SerializationHandler#close()
  +     * @see SerializationHandler#close()
        */
       public void close()
       {
           aMethodIsCalled();
       }
       /**
  -     * @see org.apache.xml.serializer.SerializationHandler#getOutputFormat()
  +     * @see SerializationHandler#getOutputFormat()
        */
       public Properties getOutputFormat()
       {
  @@ -115,7 +115,7 @@
           return null;
       }
       /**
  -     * @see org.apache.xml.serializer.SerializationHandler#getOutputStream()
  +     * @see SerializationHandler#getOutputStream()
        */
       public OutputStream getOutputStream()
       {
  @@ -123,7 +123,7 @@
           return null;
       }
       /**
  -     * @see org.apache.xml.serializer.SerializationHandler#getWriter()
  +     * @see SerializationHandler#getWriter()
        */
       public Writer getWriter()
       {
  @@ -131,7 +131,7 @@
           return null;
       }
       /**
  -     * @see org.apache.xml.serializer.SerializationHandler#reset()
  +     * @see SerializationHandler#reset()
        */
       public boolean reset()
       {
  @@ -139,21 +139,21 @@
           return false;
       }
       /**
  -     * @see org.apache.xml.serializer.SerializationHandler#serialize(org.w3c.dom.Node)
  +     * @see SerializationHandler#serialize(org.w3c.dom.Node)
        */
       public void serialize(Node node) throws IOException
       {
           couldThrowIOException();
       }
       /**
  -     * @see org.apache.xml.serializer.SerializationHandler#setCdataSectionElements(java.util.Vector)
  +     * @see SerializationHandler#setCdataSectionElements(java.util.Vector)
        */
       public void setCdataSectionElements(Vector URI_and_localNames)
       {
           aMethodIsCalled();
       }
       /**
  -     * @see org.apache.xml.serializer.SerializationHandler#setEscaping(boolean)
  +     * @see SerializationHandler#setEscaping(boolean)
        */
       public boolean setEscaping(boolean escape) throws SAXException
       {
  @@ -161,56 +161,56 @@
           return false;
       }
       /**
  -     * @see org.apache.xml.serializer.SerializationHandler#setIndent(boolean)
  +     * @see SerializationHandler#setIndent(boolean)
        */
       public void setIndent(boolean indent)
       {
           aMethodIsCalled();
       }
       /**
  -     * @see org.apache.xml.serializer.SerializationHandler#setIndentAmount(int)
  +     * @see SerializationHandler#setIndentAmount(int)
        */
       public void setIndentAmount(int spaces)
       {
           aMethodIsCalled();
       }
       /**
  -     * @see org.apache.xml.serializer.SerializationHandler#setOutputFormat(java.util.Properties)
  +     * @see SerializationHandler#setOutputFormat(java.util.Properties)
        */
       public void setOutputFormat(Properties format)
       {
           aMethodIsCalled();
       }
       /**
  -     * @see org.apache.xml.serializer.SerializationHandler#setOutputStream(java.io.OutputStream)
  +     * @see SerializationHandler#setOutputStream(java.io.OutputStream)
        */
       public void setOutputStream(OutputStream output)
       {
           aMethodIsCalled();
       }
       /**
  -     * @see org.apache.xml.serializer.SerializationHandler#setVersion(java.lang.String)
  +     * @see SerializationHandler#setVersion(java.lang.String)
        */
       public void setVersion(String version)
       {
           aMethodIsCalled();
       }
       /**
  -     * @see org.apache.xml.serializer.SerializationHandler#setWriter(java.io.Writer)
  +     * @see SerializationHandler#setWriter(java.io.Writer)
        */
       public void setWriter(Writer writer)
       {
           aMethodIsCalled();
       }
       /**
  -     * @see org.apache.xml.serializer.SerializationHandler#setTransformer(javax.xml.transform.Transformer)
  +     * @see SerializationHandler#setTransformer(javax.xml.transform.Transformer)
        */
       public void setTransformer(Transformer transformer)
       {
           aMethodIsCalled();
       }
       /**
  -     * @see org.apache.xml.serializer.SerializationHandler#getTransformer()
  +     * @see SerializationHandler#getTransformer()
        */
       public Transformer getTransformer()
       {
  @@ -218,14 +218,14 @@
           return null;
       }
       /**
  -     * @see org.apache.xml.serializer.SerializationHandler#flushPending()
  +     * @see SerializationHandler#flushPending()
        */
       public void flushPending() throws SAXException
       {
           couldThrowSAXException();
       }
       /**
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#addAttribute(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
  +     * @see ExtendedContentHandler#addAttribute(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
        */
       public void addAttribute(
           String uri,
  @@ -239,14 +239,14 @@
           couldThrowSAXException();
       }
       /**
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#addAttributes(org.xml.sax.Attributes)
  +     * @see ExtendedContentHandler#addAttributes(org.xml.sax.Attributes)
        */
       public void addAttributes(Attributes atts) throws SAXException
       {
           couldThrowSAXException();
       }
       /**
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#addAttribute(java.lang.String, java.lang.String)
  +     * @see ExtendedContentHandler#addAttribute(java.lang.String, java.lang.String)
        */
       public void addAttribute(String name, String value)
       {
  @@ -254,28 +254,28 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#characters(java.lang.String)
  +     * @see ExtendedContentHandler#characters(java.lang.String)
        */
       public void characters(String chars) throws SAXException
       {
           couldThrowSAXException();
       }
       /**
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#endElement(java.lang.String)
  +     * @see ExtendedContentHandler#endElement(java.lang.String)
        */
       public void endElement(String elemName) throws SAXException
       {
           couldThrowSAXException();
       }
       /**
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#startDocument()
  +     * @see ExtendedContentHandler#startDocument()
        */
       public void startDocument() throws SAXException
       {
           couldThrowSAXException();
       }
       /**
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#startElement(java.lang.String, java.lang.String, java.lang.String)
  +     * @see ExtendedContentHandler#startElement(java.lang.String, java.lang.String, java.lang.String)
        */
       public void startElement(String uri, String localName, String qName)
           throws SAXException
  @@ -283,14 +283,14 @@
           couldThrowSAXException(qName);
       }
       /**
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#startElement(java.lang.String)
  +     * @see ExtendedContentHandler#startElement(java.lang.String)
        */
       public void startElement(String qName) throws SAXException
       {
           couldThrowSAXException(qName);
       }
       /**
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#namespaceAfterStartElement(java.lang.String, java.lang.String)
  +     * @see ExtendedContentHandler#namespaceAfterStartElement(java.lang.String, java.lang.String)
        */
       public void namespaceAfterStartElement(String uri, String prefix)
           throws SAXException
  @@ -298,7 +298,7 @@
           couldThrowSAXException();
       }
       /**
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#startPrefixMapping(java.lang.String, java.lang.String, boolean)
  +     * @see ExtendedContentHandler#startPrefixMapping(java.lang.String, java.lang.String, boolean)
        */
       public boolean startPrefixMapping(
           String prefix,
  @@ -310,14 +310,14 @@
           return false;
       }
       /**
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#entityReference(java.lang.String)
  +     * @see ExtendedContentHandler#entityReference(java.lang.String)
        */
       public void entityReference(String entityName) throws SAXException
       {
           couldThrowSAXException();
       }
       /**
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#getNamespaceMappings()
  +     * @see ExtendedContentHandler#getNamespaceMappings()
        */
       public NamespaceMappings getNamespaceMappings()
       {
  @@ -325,7 +325,7 @@
           return null;
       }
       /**
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#getPrefix(java.lang.String)
  +     * @see ExtendedContentHandler#getPrefix(java.lang.String)
        */
       public String getPrefix(String uri)
       {
  @@ -333,7 +333,7 @@
           return null;
       }
       /**
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#getNamespaceURI(java.lang.String, boolean)
  +     * @see ExtendedContentHandler#getNamespaceURI(java.lang.String, boolean)
        */
       public String getNamespaceURI(String name, boolean isElement)
       {
  @@ -341,7 +341,7 @@
           return null;
       }
       /**
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#getNamespaceURIFromPrefix(java.lang.String)
  +     * @see ExtendedContentHandler#getNamespaceURIFromPrefix(java.lang.String)
        */
       public String getNamespaceURIFromPrefix(String prefix)
       {
  @@ -428,7 +428,7 @@
           couldThrowSAXException();
       }
       /**
  -     * @see org.apache.xml.serializer.ExtendedLexicalHandler#comment(java.lang.String)
  +     * @see ExtendedLexicalHandler#comment(java.lang.String)
        */
       public void comment(String comment) throws SAXException
       {
  @@ -485,7 +485,7 @@
           couldThrowSAXException();
       }
       /**
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#getDoctypePublic()
  +     * @see XSLOutputAttributes#getDoctypePublic()
        */
       public String getDoctypePublic()
       {
  @@ -493,7 +493,7 @@
           return null;
       }
       /**
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#getDoctypeSystem()
  +     * @see XSLOutputAttributes#getDoctypeSystem()
        */
       public String getDoctypeSystem()
       {
  @@ -501,7 +501,7 @@
           return null;
       }
       /**
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#getEncoding()
  +     * @see XSLOutputAttributes#getEncoding()
        */
       public String getEncoding()
       {
  @@ -509,7 +509,7 @@
           return null;
       }
       /**
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#getIndent()
  +     * @see XSLOutputAttributes#getIndent()
        */
       public boolean getIndent()
       {
  @@ -517,7 +517,7 @@
           return false;
       }
       /**
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#getIndentAmount()
  +     * @see XSLOutputAttributes#getIndentAmount()
        */
       public int getIndentAmount()
       {
  @@ -525,7 +525,7 @@
           return 0;
       }
       /**
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#getMediaType()
  +     * @see XSLOutputAttributes#getMediaType()
        */
       public String getMediaType()
       {
  @@ -533,7 +533,7 @@
           return null;
       }
       /**
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#getOmitXMLDeclaration()
  +     * @see XSLOutputAttributes#getOmitXMLDeclaration()
        */
       public boolean getOmitXMLDeclaration()
       {
  @@ -541,7 +541,7 @@
           return false;
       }
       /**
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#getStandalone()
  +     * @see XSLOutputAttributes#getStandalone()
        */
       public String getStandalone()
       {
  @@ -549,7 +549,7 @@
           return null;
       }
       /**
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#getVersion()
  +     * @see XSLOutputAttributes#getVersion()
        */
       public String getVersion()
       {
  @@ -557,56 +557,56 @@
           return null;
       }
       /**
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#setCdataSectionElements
  +     * @see XSLOutputAttributes#setCdataSectionElements
        */
       public void setCdataSectionElements(Hashtable h) throws Exception
       {
           couldThrowException();
       }
       /**
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#setDoctype(java.lang.String, java.lang.String)
  +     * @see XSLOutputAttributes#setDoctype(java.lang.String, java.lang.String)
        */
       public void setDoctype(String system, String pub)
       {
           aMethodIsCalled();
       }
       /**
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#setDoctypePublic(java.lang.String)
  +     * @see XSLOutputAttributes#setDoctypePublic(java.lang.String)
        */
       public void setDoctypePublic(String doctype)
       {
           aMethodIsCalled();
       }
       /**
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#setDoctypeSystem(java.lang.String)
  +     * @see XSLOutputAttributes#setDoctypeSystem(java.lang.String)
        */
       public void setDoctypeSystem(String doctype)
       {
           aMethodIsCalled();
       }
       /**
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#setEncoding(java.lang.String)
  +     * @see XSLOutputAttributes#setEncoding(java.lang.String)
        */
       public void setEncoding(String encoding)
       {
           aMethodIsCalled();
       }
       /**
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#setMediaType(java.lang.String)
  +     * @see XSLOutputAttributes#setMediaType(java.lang.String)
        */
       public void setMediaType(String mediatype)
       {
           aMethodIsCalled();
       }
       /**
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#setOmitXMLDeclaration(boolean)
  +     * @see XSLOutputAttributes#setOmitXMLDeclaration(boolean)
        */
       public void setOmitXMLDeclaration(boolean b)
       {
           aMethodIsCalled();
       }
       /**
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#setStandalone(java.lang.String)
  +     * @see XSLOutputAttributes#setStandalone(java.lang.String)
        */
       public void setStandalone(String standalone)
       {
  @@ -670,7 +670,7 @@
           couldThrowSAXException();
       }
       /**
  -     * @see org.apache.xml.serializer.Serializer#asDOMSerializer()
  +     * @see Serializer#asDOMSerializer()
        */
       public DOMSerializer asDOMSerializer() throws IOException
       {
  @@ -679,14 +679,14 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.SerializationHandler#setNamespaceMappings(NamespaceMappings)
  +     * @see SerializationHandler#setNamespaceMappings(NamespaceMappings)
        */
       public void setNamespaceMappings(NamespaceMappings mappings) {
           aMethodIsCalled();
       }
       
       /**
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#setSourceLocator(javax.xml.transform.SourceLocator)
  +     * @see ExtendedContentHandler#setSourceLocator(javax.xml.transform.SourceLocator)
        */
       public void setSourceLocator(SourceLocator locator)
       {
  @@ -694,7 +694,7 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#addUniqueAttribute(java.lang.String, java.lang.String, int)
  +     * @see ExtendedContentHandler#addUniqueAttribute(java.lang.String, java.lang.String, int)
        */
       public void addUniqueAttribute(String name, String value, int flags)
           throws SAXException
  @@ -703,7 +703,7 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#characters(org.w3c.dom.Node)
  +     * @see ExtendedContentHandler#characters(org.w3c.dom.Node)
        */
       public void characters(Node node) throws SAXException
       {
  @@ -711,7 +711,7 @@
       }
       
       /**
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#addXSLAttribute(java.lang.String, java.lang.String, java.lang.String)
  +     * @see ExtendedContentHandler#addXSLAttribute(java.lang.String, java.lang.String, java.lang.String)
        */
       public void addXSLAttribute(String qName, String value, String uri)
       {
  @@ -719,7 +719,7 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#addAttribute(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
  +     * @see ExtendedContentHandler#addAttribute(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
        */
       public void addAttribute(String uri, String localName, String rawName, String type, String value) throws SAXException 
       {
  @@ -746,7 +746,7 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.SerializationHandler#setDTDEntityExpansion(boolean)
  +     * @see SerializationHandler#setDTDEntityExpansion(boolean)
        */
       public void setDTDEntityExpansion(boolean expand) {
           aMethodIsCalled();
  
  
  
  1.20      +34 -39    xml-xalan/java/src/org/apache/xml/serializer/SerializerBase.java
  
  Index: SerializerBase.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/SerializerBase.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- SerializerBase.java	21 Feb 2005 18:34:56 -0000	1.19
  +++ SerializerBase.java	7 Apr 2005 04:29:03 -0000	1.20
  @@ -37,8 +37,8 @@
    * This class acts as a base class for the XML "serializers"
    * and the stream serializers.
    * It contains a number of common fields and methods.
  - * @author Santiago Pericas-Geertsen
  - * @author G. Todd Miller 
  + * 
  + * @xsl.usage internal
    */
   public abstract class SerializerBase
       implements SerializationHandler, SerializerConstants
  @@ -219,7 +219,7 @@
       /**
        * Receive notification of a comment.
        * 
  -     * @see org.apache.xml.serializer.ExtendedLexicalHandler#comment(String)
  +     * @see ExtendedLexicalHandler#comment(String)
        */
       public void comment(String data) throws SAXException
       {
  @@ -233,13 +233,15 @@
       }
   
       /**
  -      * TODO: This method is a HACK! Since XSLTC does not have access to the
  -      * XML file, it sometimes generates a NS prefix of the form "ns?" for
  -      * an attribute. If at runtime, when the qname of the attribute is
  -      * known, another prefix is specified for the attribute, then we can get
  -      * a qname of the form "ns?:otherprefix:name". This function patches the
  -      * qname by simply ignoring "otherprefix".
  -      */
  +     * If at runtime, when the qname of the attribute is
  +     * known, another prefix is specified for the attribute, then we can
  +     * patch or hack the name with this method. For
  +     * a qname of the form "ns?:otherprefix:name", this function patches the
  +     * qname by simply ignoring "otherprefix".
  +     * TODO: This method is a HACK! We do not have access to the
  +     * XML file, it sometimes generates a NS prefix of the form "ns?" for
  +     * an attribute.
  +     */
       protected String patchName(String qname)
       {
   
  @@ -324,7 +326,7 @@
        * @param type the type of the attribute (probably CDATA)
        * @param value the value of the attribute
        * @param XSLAttribute true if this attribute is coming from an xsl:attriute element
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#addAttribute(String, String, String, String, String)
  +     * @see ExtendedContentHandler#addAttribute(String, String, String, String, String)
        */
       public void addAttribute(
           String uri,
  @@ -402,8 +404,7 @@
   
       /**
        *  Adds  the given attribute to the set of collected attributes, 
  -     * but only if there is a currently open element.  This method is only
  -     * called by XSLTC.
  +     * but only if there is a currently open element.
        *
        * @param name the attribute's qualified name
        * @param value the value of the attribute
  @@ -422,8 +423,7 @@
   
       /**
        * Adds the given xsl:attribute to the set of collected attributes, 
  -     * but only if there is a currently open element.  This method is only
  -     * called by XSLTC.
  +     * but only if there is a currently open element.
        *
        * @param name the attribute's qualified name (prefix:localName)
        * @param value the value of the attribute
  @@ -503,7 +503,7 @@
       /**
        * Flush and close the underlying java.io.Writer. This method applies to
        * ToStream serializers, not ToSAXHandler serializers.
  -     * @see org.apache.xml.serializer.ToStream
  +     * @see ToStream
        */
       public void close()
       {
  @@ -646,7 +646,7 @@
        * Gets the XSL standalone attribute
        * @return a value of "yes" if the <code>standalone</code> delaration is to
        * be included in the output document.
  -     *  @see   org.apache.xml.serializer.XSLOutputAttributes#getStandalone()
  +     *  @see XSLOutputAttributes#getStandalone()
        */
       public String getStandalone()
       {
  @@ -684,7 +684,7 @@
       /**
        * Sets the value coming from the xsl:output version attribute.
        * @param version the version of the output format.
  -     * @see org.apache.xml.serializer.SerializationHandler#setVersion(String)
  +     * @see SerializationHandler#setVersion(String)
        */
       public void setVersion(String version)
       {
  @@ -696,7 +696,7 @@
        * @param mediaType the non-null media-type or MIME type associated with the
        * output document.
        * @see javax.xml.transform.OutputKeys#MEDIA_TYPE
  -     * @see org.apache.xml.serializer.SerializationHandler#setMediaType(String)
  +     * @see SerializationHandler#setMediaType(String)
        */
       public void setMediaType(String mediaType)
       {
  @@ -725,7 +725,7 @@
        * attribute.
        * @param doIndent true if the output document should be indented to
        * visually indicate its structure.
  -     * @see org.apache.xml.serializer.XSLOutputAttributes#setIndent(boolean)
  +     * @see XSLOutputAttributes#setIndent(boolean)
        */
       public void setIndent(boolean doIndent)
       {
  @@ -741,7 +741,7 @@
        * @param uri the URI of the namespace
        * @param prefix the prefix associated with the given URI.
        * 
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#namespaceAfterStartElement(String, String)
  +     * @see ExtendedContentHandler#namespaceAfterStartElement(String, String)
        */
       public void namespaceAfterStartElement(String uri, String prefix)
           throws SAXException
  @@ -757,7 +757,7 @@
        * @return A {@link DOMSerializer} interface into this serializer,  or null
        * if the serializer is not DOM capable
        * @throws IOException An I/O exception occured
  -     * @see org.apache.xml.serializer.Serializer#asDOMSerializer()
  +     * @see Serializer#asDOMSerializer()
        */
       public DOMSerializer asDOMSerializer() throws IOException
       { 
  @@ -765,15 +765,10 @@
       }
   
       /**
  -     * Push a boolean state based on if the name of the element
  +     * Push a boolean state based on if the name of the current element
        * is found in the list of qnames.  A state is only pushed if
        * there were some cdata-section-names were specified.
  -     *
  -     * @param namespaceURI Should be a non-null reference to the namespace URL
  -     *        of the element that owns the state, or empty string.
  -     * @param localName Should be a non-null reference to the local name
  -     *        of the element that owns the state.
  -     *
  +     * <p>
        * Hidden parameters are the vector of qualified elements specified in
        * cdata-section-names attribute, and the m_cdataSectionStates stack
        * onto which whether the current element is in the list is pushed (true or
  @@ -854,7 +849,7 @@
       /**
        * Some users of the serializer may need the current namespace mappings
        * @return the current namespace mappings (prefix/uri)
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#getNamespaceMappings()
  +     * @see ExtendedContentHandler#getNamespaceMappings()
        */
       public NamespaceMappings getNamespaceMappings()
       {
  @@ -865,7 +860,7 @@
        * Returns the prefix currently pointing to the given URI (if any).
        * @param namespaceURI the uri of the namespace in question
        * @return a prefix pointing to the given URI (if any).
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#getPrefix(String)
  +     * @see ExtendedContentHandler#getPrefix(String)
        */
       public String getPrefix(String namespaceURI)
       {
  @@ -941,7 +936,7 @@
       /**
        * Sets the transformer associated with this serializer
        * @param t the transformer associated with this serializer.
  -     * @see org.apache.xml.serializer.SerializationHandler#setTransformer(Transformer)
  +     * @see SerializationHandler#setTransformer(Transformer)
        */
       public void setTransformer(Transformer t)
       {
  @@ -960,7 +955,7 @@
       /**
        * Gets the transformer associated with this serializer
        * @return returns the transformer associated with this serializer.
  -     * @see org.apache.xml.serializer.SerializationHandler#getTransformer()
  +     * @see SerializationHandler#getTransformer()
        */
       public Transformer getTransformer()
       {
  @@ -1223,9 +1218,9 @@
       /**
        * This method handles what needs to be done at a startDocument() call,
        * whether from an external caller, or internally called in the 
  -     * serializer.  Historically Xalan has not always called a startDocument()
  -     * although it always calls endDocument() on the serializer.
  -     * So the serializer must be flexible for that. Even if no external call is
  +     * serializer.  For historical reasons the serializer is flexible to
  +     * startDocument() not always being called.
  +     * Even if no external call is
        * made into startDocument() this method will always be called as a self
        * generated internal startDocument, it handles what needs to be done at a
        * startDocument() call.
  @@ -1246,7 +1241,7 @@
        * generated an error message.
        * @param locator the source locator
        *
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#setSourceLocator(javax.xml.transform.SourceLocator)
  +     * @see ExtendedContentHandler#setSourceLocator(javax.xml.transform.SourceLocator)
        */
       public void setSourceLocator(SourceLocator locator)
       {
  @@ -1323,7 +1318,7 @@
       /**
        * This method adds an attribute the the current element,
        * but should not be used for an xsl:attribute child.
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#addAttribute(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
  +     * @see ExtendedContentHandler#addAttribute(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
        */
       public void addAttribute(String uri, String localName, String rawName, String type, String value) throws SAXException 
       {
  
  
  
  1.4       +3 -2      xml-xalan/java/src/org/apache/xml/serializer/OutputPropertyUtils.java
  
  Index: OutputPropertyUtils.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/OutputPropertyUtils.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- OutputPropertyUtils.java	14 Oct 2004 21:45:05 -0000	1.3
  +++ OutputPropertyUtils.java	7 Apr 2005 04:29:03 -0000	1.4
  @@ -24,7 +24,8 @@
    * This class contains some static methods that act as helpers when parsing a
    * Java Property object.
    * 
  - * This class is not a public API. It is only public because it is used by Xalan.
  + * This class is not a public API. 
  + * It is only public because it is used outside of this package.
    * 
    * @see java.util.Properties
    * @xsl.usage internal
  
  
  
  1.8       +19 -19    xml-xalan/java/src/org/apache/xml/serializer/ToTextSAXHandler.java
  
  Index: ToTextSAXHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/ToTextSAXHandler.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ToTextSAXHandler.java	11 Feb 2005 06:18:13 -0000	1.7
  +++ ToTextSAXHandler.java	7 Apr 2005 04:29:03 -0000	1.8
  @@ -31,18 +31,18 @@
   import org.xml.sax.ext.LexicalHandler;
   
   /**
  - * This class receives notification of SAX-like events, and with gathered
  - * information over these calls it will convert them to the equivalent SAX methods
  - * on a handler, the ultimate xsl:output method is known to be "text".
  + * This class converts SAX-like event to SAX events for
  + * xsl:output method "text". 
  + * 
  + * This class is only to be used internally. This class is not a public API.
    * 
  - * This class is not a public API, it is only public because it is used by Xalan.
    * @xsl.usage internal
    */
   public final class ToTextSAXHandler extends ToSAXHandler 
   {
       /**
        * From XSLTC
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#endElement(String)
  +     * @see ExtendedContentHandler#endElement(String)
        */
       public void endElement(String elemName) throws SAXException
       {
  @@ -92,7 +92,7 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.Serializer#getOutputFormat()
  +     * @see Serializer#getOutputFormat()
        */
       public Properties getOutputFormat()
       {
  @@ -100,7 +100,7 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.Serializer#getOutputStream()
  +     * @see Serializer#getOutputStream()
        */
       public OutputStream getOutputStream()
       {
  @@ -108,7 +108,7 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.Serializer#getWriter()
  +     * @see Serializer#getWriter()
        */
       public Writer getWriter()
       {
  @@ -125,7 +125,7 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.Serializer#reset()
  +     * @see Serializer#reset()
        */
       public boolean reset()
       {
  @@ -133,14 +133,14 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.DOMSerializer#serialize(Node)
  +     * @see DOMSerializer#serialize(Node)
        */
       public void serialize(Node node) throws IOException
       {
       }
   
       /**
  -     * @see org.apache.xml.serializer.SerializationHandler#setEscaping(boolean)
  +     * @see SerializationHandler#setEscaping(boolean)
        */
       public boolean setEscaping(boolean escape)
       {
  @@ -148,35 +148,35 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.SerializationHandler#setIndent(boolean)
  +     * @see SerializationHandler#setIndent(boolean)
        */
       public void setIndent(boolean indent)
       {
       }
   
       /**
  -     * @see org.apache.xml.serializer.Serializer#setOutputFormat(Properties)
  +     * @see Serializer#setOutputFormat(Properties)
        */
       public void setOutputFormat(Properties format)
       {
       }
   
       /**
  -     * @see org.apache.xml.serializer.Serializer#setOutputStream(OutputStream)
  +     * @see Serializer#setOutputStream(OutputStream)
        */
       public void setOutputStream(OutputStream output)
       {
       }
   
       /**
  -     * @see org.apache.xml.serializer.Serializer#setWriter(Writer)
  +     * @see Serializer#setWriter(Writer)
        */
       public void setWriter(Writer writer)
       {
       }
   
       /**
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#addAttribute(String, String, String, String, String)
  +     * @see ExtendedContentHandler#addAttribute(String, String, String, String, String)
        */
       public void addAttribute(
           String uri,
  @@ -310,7 +310,7 @@
   
       /**
        * From XSLTC
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#startElement(String)
  +     * @see ExtendedContentHandler#startElement(String)
        */
       public void startElement(
       String elementNamespaceURI,
  @@ -342,7 +342,7 @@
    
       /**
   	 *	
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#characters(String)
  +     * @see ExtendedContentHandler#characters(String)
        */
       public void characters(String characters) 
       throws SAXException 
  
  
  
  1.42      +10 -8     xml-xalan/java/src/org/apache/xml/serializer/ToStream.java
  
  Index: ToStream.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/ToStream.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- ToStream.java	10 Mar 2005 23:24:10 -0000	1.41
  +++ ToStream.java	7 Apr 2005 04:29:03 -0000	1.42
  @@ -415,6 +415,8 @@
       /**
        * Initialize the serializer with the specified writer and output format.
        * Must be called before calling any of the serialize methods.
  +     * This method can be called multiple times and the xsl:output properties
  +     * passed in the 'format' parameter are accumulated across calls.
        *
        * @param writer The writer to use
        * @param format The output format
  @@ -702,7 +704,7 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.SerializationHandler#setEscaping(boolean)
  +     * @see SerializationHandler#setEscaping(boolean)
        */
       public boolean setEscaping(boolean escape)
       {
  @@ -1050,11 +1052,11 @@
               // or if this is a character from attribute value and a special one of those
               if ((fromTextNode && m_charInfo.isSpecialTextChar(ch)) || (!fromTextNode && m_charInfo.isSpecialAttrChar(ch)))
               {
  -                String entityRef = m_charInfo.getOutputStringForChar(ch);
  +                String outputStringForChar = m_charInfo.getOutputStringForChar(ch);
   
  -                if (null != entityRef)
  +                if (null != outputStringForChar)
                   {
  -                    writer.write(entityRef);
  +                    writer.write(outputStringForChar);
                   }
                   else
                       return i;
  @@ -2111,7 +2113,7 @@
        * that is soon to follow. Need to close any open start tag to make
        * sure than any name space attributes due to this event are associated wih
        * the up comming element, not the current one.
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#startPrefixMapping
  +     * @see ExtendedContentHandler#startPrefixMapping
        *
        * @param prefix The Namespace prefix being declared.
        * @param uri The Namespace URI the prefix is mapped to.
  @@ -2832,7 +2834,7 @@
                        * is the prefix for it (foo) already mapped at the current depth?
                        */
                       if (existing_mapping != null 
  -                    && existing_mapping.m_delarationDepth == m_elemContext.m_currentElemDepth
  +                    && existing_mapping.m_declarationDepth == m_elemContext.m_currentElemDepth
                       && !existing_mapping.m_uri.equals(uri))
                       {
                           /*
  @@ -2989,7 +2991,7 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.SerializationHandler#setTransformer(Transformer)
  +     * @see SerializationHandler#setTransformer(Transformer)
        */
       public void setTransformer(Transformer transformer) {
           super.setTransformer(transformer);
  
  
  
  1.10      +21 -12    xml-xalan/java/src/org/apache/xml/serializer/OutputPropertiesFactory.java
  
  Index: OutputPropertiesFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/OutputPropertiesFactory.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- OutputPropertiesFactory.java	16 Dec 2004 19:24:08 -0000	1.9
  +++ OutputPropertiesFactory.java	7 Apr 2005 04:29:03 -0000	1.10
  @@ -35,14 +35,14 @@
   /**
    * This class is a factory to generate a set of default properties
    * of key/value pairs that are used to create a serializer through the
  - * factory {@link org.apache.xml.serializer.SerializerFactory SerilizerFactory}. 
  + * factory {@link SerializerFactory SerilizerFactory}. 
    * The properties generated by this factory
    * may be modified to non-default values before the SerializerFactory is used to
    * create a Serializer.
    * <p>
    * The given output types supported are "xml", "text", and "html". 
    * These type strings can be obtained from the 
  - * org.apache.xml.serializer.Method class.
  + * {@link Method Method} class in this package.
    * <p>
    * Other constants defined in this class are the non-standard property keys
    * that can be used to set non-standard property values on a java.util.Properties object
  @@ -75,9 +75,9 @@
    *  otherwise be supplied.
    * </ul>
    * 
  - * @see org.apache.xml.serializer.SerializerFactory
  - * @see org.apache.xml.serializer.Method
  - * @see org.apache.xml.serializer.Serializer
  + * @see SerializerFactory
  + * @see Method
  + * @see Serializer
    */
   public final class OutputPropertiesFactory
   {
  @@ -100,21 +100,30 @@
       //*  PUBLIC CONSTANTS
       //************************************************************
       /** 
  -     * This is not a public API, it is public only because it is used
  -     * by Xalan.
  +     * This is not a public API.
  +     * This is the built-in extensions namespace, 
  +     * reexpressed in {namespaceURI} syntax
  +     * suitable for prepending to a localname to produce a "universal
  +     * name".
        */
       public static final String S_BUILTIN_EXTENSIONS_UNIVERSAL =
           "{" + S_BUILTIN_EXTENSIONS_URL + "}";
   
       // Some special Xalan keys.
   
  -    /** The non-standard property key to use to set the indentation amount.
  +    /** 
  +     * The non-standard property key to use to set the
  +     * number of whitepaces to indent by, per indentation level,
  +     * if indent="yes".
        */
       public static final String S_KEY_INDENT_AMOUNT =
           S_BUILTIN_EXTENSIONS_UNIVERSAL + "indent-amount";
   
       /** This non-standard property key is used to set the name of the fully qualified 
        * Java class that implements the ContentHandler interface. 
  +     * Fully qualified name of class with a default constructor that
  +     *  implements the ContentHandler interface, where the result tree events
  +     *  will be sent to.
        */
   
       public static final String S_KEY_CONTENT_HANDLER =
  @@ -141,15 +150,15 @@
           S_BUILTIN_EXTENSIONS_UNIVERSAL + "omit-meta-tag";
   
       /**
  -     * The old built-in extension namespace, this is not a public API, it is
  -     * public only because it is used by Xalan.
  +     * The old built-in extension namespace, this is not a public API.
        */
       public static final String S_BUILTIN_OLD_EXTENSIONS_UNIVERSAL =
           "{" + S_BUILTIN_OLD_EXTENSIONS_URL + "}";
   
       /**
        * This is not a public API, it is only public because it is used
  -     * by Xalan, it is the length of the old built-in extension namespace
  +     * by outside of this package,
  +     * it is the length of the old built-in extension namespace.
        */
       public static final int S_BUILTIN_OLD_EXTENSIONS_UNIVERSAL_LEN =
           S_BUILTIN_OLD_EXTENSIONS_UNIVERSAL.length();
  
  
  
  1.13      +31 -25    xml-xalan/java/src/org/apache/xml/serializer/ToHTMLSAXHandler.java
  
  Index: ToHTMLSAXHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/ToHTMLSAXHandler.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ToHTMLSAXHandler.java	23 Jan 2005 00:52:41 -0000	1.12
  +++ ToHTMLSAXHandler.java	7 Apr 2005 04:29:03 -0000	1.13
  @@ -34,11 +34,11 @@
   import org.xml.sax.ext.LexicalHandler;
   
   /**
  - * This class receives notification of SAX-like events, and with gathered
  - * information over these calls it will convert them to the equivalent SAX methods
  - * on a handler, the ultimate xsl:output method is known to be "html".
  + * This class accepts SAX-like calls, then sends true SAX calls to a
  + * wrapped SAX handler.  There is optimization done knowing that the ultimate
  + * output is HTML.
    * 
  - * This class is not a public API, it is only public because it is used by Xalan.
  + * This class is not a public API.
    * 
    * @xsl.usage internal
    */
  @@ -57,7 +57,7 @@
       /**
        * Returns null.
        * @return null
  -     * @see org.apache.xml.serializer.Serializer#getOutputFormat()
  +     * @see Serializer#getOutputFormat()
        */
       public Properties getOutputFormat()
       {
  @@ -67,7 +67,7 @@
       /**
        * Reurns null
        * @return null
  -     * @see org.apache.xml.serializer.Serializer#getOutputStream()
  +     * @see Serializer#getOutputStream()
        */
       public OutputStream getOutputStream()
       {
  @@ -77,7 +77,7 @@
       /**
        * Returns null
        * @return null
  -     * @see org.apache.xml.serializer.Serializer#getWriter()
  +     * @see Serializer#getWriter()
        */
       public Writer getWriter()
       {
  @@ -94,7 +94,7 @@
   
       /**
        * Does nothing.
  -     * @see org.apache.xml.serializer.DOMSerializer#serialize(Node)
  +     * @see DOMSerializer#serialize(Node)
        */
       public void serialize(Node node) throws IOException
       {
  @@ -107,7 +107,7 @@
        *
        * @param escape true if escaping is to be set on.
        *
  -     * @see org.apache.xml.serializer.SerializationHandler#setEscaping(boolean)
  +     * @see SerializationHandler#setEscaping(boolean)
        */
       public boolean setEscaping(boolean escape) throws SAXException
       {
  @@ -127,7 +127,7 @@
        * Does nothing
        * @param indent the number of spaces to indent per indentation level
        * (ignored)
  -     * @see org.apache.xml.serializer.SerializationHandler#setIndent(boolean)
  +     * @see SerializationHandler#setIndent(boolean)
        */
       public void setIndent(boolean indent)
       {
  @@ -136,7 +136,7 @@
       /**
        * Does nothing.
        * @param format this parameter is not used
  -     * @see org.apache.xml.serializer.Serializer#setOutputFormat(Properties)
  +     * @see Serializer#setOutputFormat(Properties)
        */
       public void setOutputFormat(Properties format)
       {
  @@ -145,7 +145,7 @@
       /**
        * Does nothing.
        * @param output this parameter is ignored
  -     * @see org.apache.xml.serializer.Serializer#setOutputStream(OutputStream)
  +     * @see Serializer#setOutputStream(OutputStream)
        */
       public void setOutputStream(OutputStream output)
       {
  @@ -155,7 +155,7 @@
       /**
        * Does nothing.
        * @param writer this parameter is ignored.
  -     * @see org.apache.xml.serializer.Serializer#setWriter(Writer)
  +     * @see Serializer#setWriter(Writer)
        */
       public void setWriter(Writer writer)
       {
  @@ -274,19 +274,25 @@
        * section 2.8) or a text declaration (XML 1.0, section 4.3.1)
        * using this method.</p>
        *
  +     * @param target The processing instruction target.
  +     * @param data The processing instruction data, or null if
  +     *        none was supplied.
  +     * @throws org.xml.sax.SAXException Any SAX exception, possibly
  +     *            wrapping another exception.
  +     *
        * @throws org.xml.sax.SAXException
        * @see org.xml.sax.ContentHandler#processingInstruction(String, String)
        */
  -    public void processingInstruction(String arg0, String arg1)
  +    public void processingInstruction(String target, String data)
           throws SAXException
       {
           flushPending();
  -        m_saxHandler.processingInstruction(arg0,arg1);
  +        m_saxHandler.processingInstruction(target,data);
   
   		// time to fire off processing instruction event
   		
           if (m_tracer != null)		
  -		    super.fireEscapingEvent(arg0,arg1);        
  +		    super.fireEscapingEvent(target,data);        
       }
   
       /**
  @@ -445,7 +451,7 @@
   
       /**
        * Do nothing.
  -     * @see org.apache.xml.serializer.SerializationHandler#close()
  +     * @see SerializationHandler#close()
        */
       public void close()
       {
  @@ -459,7 +465,7 @@
        *
        * @throws org.xml.sax.SAXException
        *
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#characters(String)
  +     * @see ExtendedContentHandler#characters(String)
        */
       public void characters(final String chars) throws SAXException
       {
  @@ -505,7 +511,7 @@
        * (optional)
        * @param elementName the element name, with prefix, if any (required)
        *
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#startElement(String)
  +     * @see ExtendedContentHandler#startElement(String)
        */
       public void startElement(
           String elementNamespaceURI,
  @@ -536,7 +542,7 @@
        *
        * @param elementName the element name, with prefix, if any
        *
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#startElement(String)
  +     * @see ExtendedContentHandler#startElement(String)
        */
       public void startElement(String elementName) throws SAXException
       {
  @@ -549,7 +555,7 @@
        * @throws org.xml.sax.SAXException Any SAX exception, possibly
        *     wrapping another exception.
        *
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#endElement(String)
  +     * @see ExtendedContentHandler#endElement(String)
        */
       public void endElement(String elementName) throws SAXException
       {
  @@ -624,7 +630,7 @@
        * that is soon to follow. Need to close any open start tag to make
        * sure than any name space attributes due to this event are associated wih
        * the up comming element, not the current one.
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#startPrefixMapping
  +     * @see ExtendedContentHandler#startPrefixMapping
        *
        * @param prefix The Namespace prefix being declared.
        * @param uri The Namespace URI the prefix is mapped to.
  @@ -681,7 +687,7 @@
        * @param prefix the prefix associated with the given URI.
        * @param uri the URI of the namespace
        *
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#namespaceAfterStartElement(String, String)
  +     * @see ExtendedContentHandler#namespaceAfterStartElement(String, String)
        */
       public void namespaceAfterStartElement(
           final String prefix,
  @@ -710,7 +716,7 @@
        * (mostly for performance reasons).
        * 
        * @return true if the class was successfuly reset.
  -     * @see org.apache.xml.serializer.Serializer#reset()
  +     * @see Serializer#reset()
        */
       public boolean reset()
       {
  
  
  
  1.20      +2 -2      xml-xalan/java/src/org/apache/xml/serializer/ToXMLStream.java
  
  Index: ToXMLStream.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/ToXMLStream.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- ToXMLStream.java	2 Mar 2005 23:08:08 -0000	1.19
  +++ ToXMLStream.java	7 Apr 2005 04:29:03 -0000	1.20
  @@ -492,7 +492,7 @@
       }
   
       /**
  -     * @see org.apache.xml.serializer.ExtendedContentHandler#endElement(String)
  +     * @see ExtendedContentHandler#endElement(String)
        */
       public void endElement(String elemName) throws SAXException
       {
  
  
  
  1.4       +3 -3      xml-xalan/java/src/org/apache/xml/serializer/Method.java
  
  Index: Method.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/Method.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Method.java	14 Oct 2004 21:45:05 -0000	1.3
  +++ Method.java	7 Apr 2005 04:29:03 -0000	1.4
  @@ -29,8 +29,8 @@
    * 
    * This class is a public API.
    * 
  - * @see org.apache.xml.serializer.OutputPropertiesFactory
  - * @see org.apache.xml.serializer.Serializer
  + * @see OutputPropertiesFactory
  + * @see Serializer
    * 
    * @xsl.usage general
    */
  
  
  
  1.8       +2 -2      xml-xalan/java/src/org/apache/xml/serializer/utils/SerializerMessages.java
  
  Index: SerializerMessages.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/utils/SerializerMessages.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- SerializerMessages.java	7 Mar 2005 20:34:36 -0000	1.7
  +++ SerializerMessages.java	7 Apr 2005 04:29:04 -0000	1.8
  @@ -42,7 +42,7 @@
   public class SerializerMessages extends ListResourceBundle {
   
       /*
  -     * This file contains error and warning messages related to Xalan
  +     * This file contains error and warning messages related to
        * Serializer Error Handling.
        *
        *  General notes to translators:
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org