You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by dl...@locus.apache.org on 2000/02/25 23:06:57 UTC

cvs commit: xml-xalan/src/org/apache/xalan/xpath Dispatcher.java DispatcherFactory.java MutableNodeList.java Process.java XPathEnvSupport.java XPathSupport.java

dleslie     00/02/25 14:06:57

  Modified:    src/org/apache/xalan/xpath Dispatcher.java
                        DispatcherFactory.java MutableNodeList.java
                        Process.java XPathEnvSupport.java XPathSupport.java
  Log:
  javadoc cleanup
  
  Revision  Changes    Path
  1.2       +11 -14    xml-xalan/src/org/apache/xalan/xpath/Dispatcher.java
  
  Index: Dispatcher.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xpath/Dispatcher.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Dispatcher.java	1999/11/08 20:55:27	1.1
  +++ Dispatcher.java	2000/02/25 22:06:53	1.2
  @@ -2,7 +2,7 @@
    * The Apache Software License, Version 1.1
    *
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  + * Copyright (c) 1999 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -10,7 +10,7 @@
    * are met:
    *
    * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer. 
  + *    notice, this list of conditions and the following disclaimer.
    *
    * 2. Redistributions in binary form must reproduce the above copyright
    *    notice, this list of conditions and the following disclaimer in
  @@ -18,15 +18,15 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution,
  - *    if any, must include the following acknowledgment:  
  + *    if any, must include the following acknowledgment:
    *       "This product includes software developed by the
    *        Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowledgment may appear in the software itself,
    *    if and wherever such third-party acknowledgments normally appear.
    *
  - * 4. The names "XSLT4J" and "Apache Software Foundation" must
  + * 4. The names "Xalan" and "Apache Software Foundation" must
    *    not be used to endorse or promote products derived from this
  - *    software without prior written permission. For written 
  + *    software without prior written permission. For written
    *    permission, please contact apache@apache.org.
    *
    * 5. Products derived from this software may not be called "Apache",
  @@ -59,27 +59,25 @@
   import org.w3c.dom.*;
   
   /**
  - * This interface represents a dispatcher that can call an extension from 
  - * the expression language via the call(name, ...) function.
  + * Interface for a dispatcher to call an extension.
    */
   public interface Dispatcher
  -{      
  +{
     /**
      * Return an object from an extension.
      */
     Object call(String method, Object[] args);
   
     /**
  -   * Get the fallback element associated with this dispatcher.
  -   * (May return null)
  +   * Get the fallback element associated with this dispatcher (may return null).
      */
     Element getFallbackElement();
  -  
  +
     /**
  -   * Tells if a given function is available.
  +   * Determine whether a given function is available.
      */
     boolean isFunctionAvailable(String str);
  -  
  +
     // Atributes on the functions element
     public static final String ATTRNAME_NS = "ns";
     public static final String ATTRNAME_CLASSID = "classid";
  @@ -87,7 +85,6 @@
     public static final String ATTRNAME_CODETYPE = "type";
     public static final String ATTRNAME_CODEBASE = "codebase";
     public static final String ATTRNAME_METHOD = "calls";
  -
   
   }
   
  
  
  
  1.2       +8 -5      xml-xalan/src/org/apache/xalan/xpath/DispatcherFactory.java
  
  Index: DispatcherFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xpath/DispatcherFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DispatcherFactory.java	1999/11/08 20:55:28	1.1
  +++ DispatcherFactory.java	2000/02/25 22:06:54	1.2
  @@ -2,7 +2,7 @@
    * The Apache Software License, Version 1.1
    *
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  + * Copyright (c) 1999 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -10,7 +10,7 @@
    * are met:
    *
    * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer. 
  + *    notice, this list of conditions and the following disclaimer.
    *
    * 2. Redistributions in binary form must reproduce the above copyright
    *    notice, this list of conditions and the following disclaimer in
  @@ -18,15 +18,15 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution,
  - *    if any, must include the following acknowledgment:  
  + *    if any, must include the following acknowledgment:
    *       "This product includes software developed by the
    *        Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowledgment may appear in the software itself,
    *    if and wherever such third-party acknowledgments normally appear.
    *
  - * 4. The names "XSLT4J" and "Apache Software Foundation" must
  + * 4. The names "Xalan" and "Apache Software Foundation" must
    *    not be used to endorse or promote products derived from this
  - *    software without prior written permission. For written 
  + *    software without prior written permission. For written
    *    permission, please contact apache@apache.org.
    *
    * 5. Products derived from this software may not be called "Apache",
  @@ -57,6 +57,9 @@
   package org.apache.xalan.xpath;
   
   import org.w3c.dom.*;
  +/**
  + * Create a dispatcher for calling an extension.
  + */
   
   public interface DispatcherFactory
   {
  
  
  
  1.4       +14 -12    xml-xalan/src/org/apache/xalan/xpath/MutableNodeList.java
  
  Index: MutableNodeList.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xpath/MutableNodeList.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- MutableNodeList.java	2000/01/31 08:27:01	1.3
  +++ MutableNodeList.java	2000/02/25 22:06:54	1.4
  @@ -2,7 +2,7 @@
    * The Apache Software License, Version 1.1
    *
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  + * Copyright (c) 1999 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -10,7 +10,7 @@
    * are met:
    *
    * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer. 
  + *    notice, this list of conditions and the following disclaimer.
    *
    * 2. Redistributions in binary form must reproduce the above copyright
    *    notice, this list of conditions and the following disclaimer in
  @@ -18,15 +18,15 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution,
  - *    if any, must include the following acknowledgment:  
  + *    if any, must include the following acknowledgment:
    *       "This product includes software developed by the
    *        Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowledgment may appear in the software itself,
    *    if and wherever such third-party acknowledgments normally appear.
    *
  - * 4. The names "XSLT4J" and "Apache Software Foundation" must
  + * 4. The names "Xalan" and "Apache Software Foundation" must
    *    not be used to endorse or promote products derived from this
  - *    software without prior written permission. For written 
  + *    software without prior written permission. For written
    *    permission, please contact apache@apache.org.
    *
    * 5. Products derived from this software may not be called "Apache",
  @@ -58,14 +58,16 @@
   
   import org.w3c.dom.*;
   import java.util.*;
  -
  +/**
  + * Interface for a modifiable NodeList.
  + */
   public interface MutableNodeList extends NodeList
   {
     /**
      * Add a node.
      */
     void addNode(Node n);
  -  
  +
     /**
      * Insert a node at a given position.
      */
  @@ -83,19 +85,19 @@
     void setItemNull(int pos);
   
     /**
  -   * Copy NodeList members into this nodelist, adding in 
  +   * Copy NodeList members into this nodelist, adding in
      * document order.  If a node is null, don't add it.
      */
     public void addNodes(NodeList nodelist);
   
     /**
  -   * Copy NodeList members into this nodelist, adding in 
  +   * Copy NodeList members into this nodelist, adding in
      * document order.
      */
     void addNodesInDocOrder(NodeList nodelist, XPathSupport support);
  -  
  +
     /**
  -   * Add the node into a vector of nodes where it should occur in 
  +   * Add the node into a vector of nodes where it should occur in
      * document order.
      * @param v Vector of nodes, presumably containing Nodes
      * @param obj Node object.
  @@ -104,7 +106,7 @@
     int addNodeInDocOrder(Node node, boolean test, XPathSupport support);
   
     /**
  -   * Add the node into a vector of nodes where it should occur in 
  +   * Add the node into a vector of nodes where it should occur in
      * document order.
      * @param v Vector of nodes, presumably containing Nodes
      * @param obj Node object.
  
  
  
  1.4       +19 -16    xml-xalan/src/org/apache/xalan/xpath/Process.java
  
  Index: Process.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xpath/Process.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Process.java	2000/01/05 23:05:25	1.3
  +++ Process.java	2000/02/25 22:06:54	1.4
  @@ -2,7 +2,7 @@
    * The Apache Software License, Version 1.1
    *
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  + * Copyright (c) 1999 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -10,7 +10,7 @@
    * are met:
    *
    * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer. 
  + *    notice, this list of conditions and the following disclaimer.
    *
    * 2. Redistributions in binary form must reproduce the above copyright
    *    notice, this list of conditions and the following disclaimer in
  @@ -18,7 +18,7 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution,
  - *    if any, must include the following acknowledgment:  
  + *    if any, must include the following acknowledgment:
    *       "This product includes software developed by the
    *        Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowledgment may appear in the software itself,
  @@ -26,7 +26,7 @@
    *
    * 4. The names "XSLT4J" and "Apache Software Foundation" must
    *    not be used to endorse or promote products derived from this
  - *    software without prior written permission. For written 
  + *    software without prior written permission. For written
    *    permission, please contact apache@apache.org.
    *
    * 5. Products derived from this software may not be called "Apache",
  @@ -62,11 +62,14 @@
   import org.apache.xalan.xpath.res.XPATHErrorResources;
   import org.apache.xalan.xpath.xml.XSLMessages;
   
  +/**
  + * Provides command-line interface to the XPath processor
  + */
   public class Process
   {
     /**
      * Print argument options.
  -   */ 
  +   */
     protected static void printArgOptions(XPATHErrorResources resbundle)
     {
       System.out.println(resbundle.getString("xpath_option"));
  @@ -75,7 +78,7 @@
       System.out.println(resbundle.getString("optionMatch"));
       System.out.println(resbundle.getString("optionAnyExpr"));
     }
  -  
  +
     /**
      * Command line interface to the XPath processor.
      * <pre>
  @@ -83,10 +86,10 @@
      *    [xml doc]
      * </pre>
      */
  -  public static void main( String argv[] )    
  +  public static void main( String argv[] )
       throws org.xml.sax.SAXException
  -  {    
  -	XPATHErrorResources resbundle = (XPATHErrorResources)(XSLMessages.loadResourceBundle(XPATHErrorResources.ERROR_RESOURCES));  
  +  {
  +	XPATHErrorResources resbundle = (XPATHErrorResources)(XSLMessages.loadResourceBundle(XPATHErrorResources.ERROR_RESOURCES));
       if(argv.length > 1)
       {
         XPathSupport callbacks = null;
  @@ -94,9 +97,9 @@
         try
         {
           Class parserLiaisonClass = Class.forName(parserLiaisonClassName);
  -        
  +
           Constructor parserLiaisonCtor = parserLiaisonClass.getConstructor(null);
  -        callbacks 
  +        callbacks
             = (XPathSupport)parserLiaisonCtor.newInstance(null);
           // XPathSupport callbacks = new org.apache.xalan.xpath.xdom.XercesLiaison();
         }
  @@ -110,7 +113,7 @@
         String inputURI = null;
         String path = null;
         String match = null;
  -      for (int i = 0;  i < argv.length;  i ++) 
  +      for (int i = 0;  i < argv.length;  i ++)
         {
           if("-in".equalsIgnoreCase(argv[i]))
           {
  @@ -128,13 +131,13 @@
             match = argv[i];
           }
         }
  -      
  +
         if(null == path)
         {
           System.out.println(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_DIDNOT_FIND_XPATH_SELECT_EXP, null)); //"Error! Did not find xpath select expression (-select).");
           return;
         }
  -      
  +
         Document doc;
         if(null != inputURI)
         {
  @@ -151,14 +154,14 @@
         processor.pushTime(xpath);
         processor.initXPath(xpath, path, null);
         processor.displayDuration("Initialization of xpath ", xpath);
  -      
  +
         XPath matchPat = null;
         if(null != match)
         {
           matchPat = new XPath(callbacks, new org.apache.xalan.xpath.xml.ProblemListenerDefault());
           processor.initMatchPattern(matchPat, match, null);
         }
  -      
  +
         processor.pushTime(doc);
         // TODO: Do something about the prefix resolver.
         XObject result = xpath.execute(callbacks, doc, null);
  
  
  
  1.7       +30 -28    xml-xalan/src/org/apache/xalan/xpath/XPathEnvSupport.java
  
  Index: XPathEnvSupport.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xpath/XPathEnvSupport.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XPathEnvSupport.java	2000/02/24 21:24:52	1.6
  +++ XPathEnvSupport.java	2000/02/25 22:06:54	1.7
  @@ -2,7 +2,7 @@
    * The Apache Software License, Version 1.1
    *
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  + * Copyright (c) 1999 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -10,7 +10,7 @@
    * are met:
    *
    * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer. 
  + *    notice, this list of conditions and the following disclaimer.
    *
    * 2. Redistributions in binary form must reproduce the above copyright
    *    notice, this list of conditions and the following disclaimer in
  @@ -18,15 +18,15 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution,
  - *    if any, must include the following acknowledgment:  
  + *    if any, must include the following acknowledgment:
    *       "This product includes software developed by the
    *        Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowledgment may appear in the software itself,
    *    if and wherever such third-party acknowledgments normally appear.
    *
  - * 4. The names "XSLT4J" and "Apache Software Foundation" must
  + * 4. The names "Xalan" and "Apache Software Foundation" must
    *    not be used to endorse or promote products derived from this
  - *    software without prior written permission. For written 
  + *    software without prior written permission. For written
    *    permission, please contact apache@apache.org.
    *
    * 5. Products derived from this software may not be called "Apache",
  @@ -60,17 +60,20 @@
   import java.util.*;
   import org.apache.xalan.xpath.xml.QName;
   
  +/*
  + *
  + */
   public interface XPathEnvSupport
  -{  
  +{
     /**
      * Given a valid element key, return the corresponding node list.
      */
  -  NodeList getNodeSetByKey(Node doc, String name, 
  +  NodeList getNodeSetByKey(Node doc, String name,
                              String ref, org.apache.xalan.xpath.xml.PrefixResolver nscontext)
       throws org.xml.sax.SAXException;
  -  
  +
     /**
  -   * Given a name, locate a variable in the current context, and return 
  +   * Given a name, locate a variable in the current context, and return
      * the Object.
      */
     XObject getVariable(QName name)
  @@ -81,68 +84,67 @@
      * Document objects are keyed by URL string.
      */
     Hashtable getSourceDocsTable();
  -  
  +
     /**
      * Given a DOM Document, tell what URI was used to parse it.
      */
     String findURIFromDoc(Document owner);  // Needed for relative resolution
  -  
  +
     /**
  -   * Get the factory object required to create DOM nodes 
  +   * Get the factory object required to create DOM nodes
      * in the result tree.
      */
     public void setDOMFactory(Document domFactory);
   
     /**
  -   * Get a DOM document, primarily for creating result 
  +   * Get a DOM document, primarily for creating result
      * tree fragments.
      */
     Document getDOMFactory();
  -  
  +
     /**
      * Execute the function-available() function.
      */
  -  boolean functionAvailable(String namespace, 
  +  boolean functionAvailable(String namespace,
                               String extensionName);
   
     /**
      * Execute the element-available() function.
      */
  -  boolean elementAvailable(String namespace, 
  +  boolean elementAvailable(String namespace,
                               String extensionName);
   
   
     /**
      * Handle an extension function.
      */
  -  public Object extFunction(String namespace, String extensionName, 
  +  public Object extFunction(String namespace, String extensionName,
                                   Vector argVec, Object methodKey)
       throws org.xml.sax.SAXException;
  -  
  +
     /**
      * Get an XLocator provider keyed by node.  This get's
  -   * the association based on the root of the tree that the 
  +   * the association based on the root of the tree that the
      * node is parented by.
      */
     public XLocator getXLocatorFromNode(Node node);
  -  
  +
     /**
  -   * Associate an XLocator provider to a node.  This makes
  -   * the association based on the root of the tree that the 
  +   * Associate an XLocator provider to a node based on the root of the tree that the
      * node is parented by.
      */
     public void associateXLocatorToNode(Node node, XLocator xlocator);
  -  
  +
     /**
  -   * Tells, through the combination of the default-space attribute 
  -   * on xsl:stylesheet, xsl:strip-space, xsl:preserve-space, and the
  -   * xml:space attribute, whether or not extra whitespace should be stripped 
  -   * from the node.  Literal elements from template elements should 
  +   * Determine whether extra whitespace should be stripped from the node. The determination is based
  +   * on the combination of the default-space attribute on xsl:stylesheet, xsl:strip-space, xsl:preserve-space,
  +   * and the xml:space attribute.
  +   * Literal elements from template elements should
      * <em>not</em> be tested with this function.
      * @param textNode A text node from the source tree.
      * @return true if the text node should be stripped of extra whitespace.
      */
     public boolean shouldStripSourceNode(Node textNode)
       throws org.xml.sax.SAXException;
  -    
  +
   }
  
  
  
  1.8       +57 -54    xml-xalan/src/org/apache/xalan/xpath/XPathSupport.java
  
  Index: XPathSupport.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xpath/XPathSupport.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- XPathSupport.java	2000/02/13 16:42:41	1.7
  +++ XPathSupport.java	2000/02/25 22:06:54	1.8
  @@ -2,7 +2,7 @@
    * The Apache Software License, Version 1.1
    *
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  + * Copyright (c) 1999 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -10,7 +10,7 @@
    * are met:
    *
    * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer. 
  + *    notice, this list of conditions and the following disclaimer.
    *
    * 2. Redistributions in binary form must reproduce the above copyright
    *    notice, this list of conditions and the following disclaimer in
  @@ -18,15 +18,15 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution,
  - *    if any, must include the following acknowledgment:  
  + *    if any, must include the following acknowledgment:
    *       "This product includes software developed by the
    *        Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowledgment may appear in the software itself,
    *    if and wherever such third-party acknowledgments normally appear.
    *
  - * 4. The names "XSLT4J" and "Apache Software Foundation" must
  + * 4. The names "Xalan" and "Apache Software Foundation" must
    *    not be used to endorse or promote products derived from this
  - *    software without prior written permission. For written 
  + *    software without prior written permission. For written
    *    permission, please contact apache@apache.org.
    *
    * 5. Products derived from this software may not be called "Apache",
  @@ -62,33 +62,36 @@
   import org.xml.sax.*;
   import org.apache.xalan.xpath.xml.PrefixResolver;
   
  +/*
  + * Provides basic support for independent use of XPath.
  + */
   public interface XPathSupport extends XPathEnvSupport
   {
     /**
      * Get the current context node list.
      */
     NodeList getContextNodeList();
  -  
  +
     /**
      * Set the current context node list.
      */
     public void pushContextNodeList(NodeList nl);
  -  
  +
     /**
      * Pop the current context node list.
      */
     public void popContextNodeList();
  -  
  +
     /**
      * Get the current context node list.
      */
     int getContextNodePosition();
  -  
  +
     /**
      * Increment the current context node position.
      */
     void incrementContextNodePosition(Node node);
  -  
  +
     /**
      * Decrement the current context node position.
      */
  @@ -113,14 +116,14 @@
      * Set the current context node.
      */
     void setCurrentNode(Node n);
  -  
  +
     /**
  -   * Push the current XPath selection, 
  +   * Push the current XPath selection,
      * needed for support of the last() function.  Ugh.
      */
  -  void pushXPathContext(XPath xpath, XPathSupport execContext, Node contextNode, 
  +  void pushXPathContext(XPath xpath, XPathSupport execContext, Node contextNode,
                            PrefixResolver namespaceContext);
  -  
  +
     /**
      * Pop the current XPathContext.
      */
  @@ -131,13 +134,13 @@
      */
     XObject reExecuteXPathContext(XPath path, XPathSupport execContext, Node context)
       throws SAXException;
  -  
  +
     /**
  -   * Push a dummy XPathContext so we can tell that the top-level xpath isn't 
  +   * Push a dummy XPathContext so we can tell that the top-level xpath isn't
      * in effect.
      */
     public void pushDummyXPathContext();
  -  
  +
     /**
      * Get the current namespace context for the xpath.
      */
  @@ -151,77 +154,77 @@
     /**
      * Given a namespace, get the corrisponding prefix.
      */
  -  String getNamespaceForPrefix(String prefix, 
  +  String getNamespaceForPrefix(String prefix,
                                  Element namespaceContext);
  -  
  +
     /**
      * Returns the namespace of the given node.
      */
     String getNamespaceOfNode(Node n);
  -  
  +
     /**
      * Returns the local name of the given node.
      */
     String getLocalNameOfNode(Node n);
  -    
  +
     /**
      * Get node data recursively.
      * (Note whitespace issues.)
      */
     // String getNodeData(Node node);
  -  
  +
     /**
  -   * This function has to be implemented, 
  -   * because the DOM WG decided that attributes don't 
  +   * This function has to be implemented,
  +   * because the DOM WG decided that attributes don't
      * have parents.
      */
     Node getParentOfNode(Node node);
  -  
  +
     /**
      * Tell if the node is ignorable whitespace.
  -   * This should be in the DOM.  Return false if the 
  +   * This should be in the DOM.  Return false if the
      * parser doesn't handle this.
      */
     boolean isIgnorableWhitespace(Text node);
   
     /**
  -   * Take a user string and try and parse XML, and also return 
  +   * Take a user string and try and parse XML, and also return
      * the url.
      * the error condition is severe enough to halt processing.
      */
  -  Document parseXML(URL url, 
  -                           DocumentHandler docHandler, 
  +  Document parseXML(URL url,
  +                           DocumentHandler docHandler,
                              Document styleDoc)
       throws SAXException;
  -  
  +
     /**
  -   * Take a user string and try and parse XML, and also return 
  +   * Take a user string and try and parse XML, and also return
      * the url.
  -   * @exception XSLProcessorException thrown if the active ProblemListener and XMLParserLiaison decide 
  +   * @exception XSLProcessorException thrown if the active ProblemListener and XMLParserLiaison decide
      * the error condition is severe enough to halt processing.
      */
     URL getURLFromString(String urlString, String base)
       throws SAXException ;
  -  
  +
     /**
      * Get an element from an ID.
      */
     Element getElementByID(String id, Document doc);
   
     /**
  -   * The getUnparsedEntityURI function returns the URI of the unparsed 
  -   * entity with the specified name in the same document as the context 
  -   * node (see [3.3 Unparsed Entities]). It returns the empty string if 
  +   * The getUnparsedEntityURI function returns the URI of the unparsed
  +   * entity with the specified name in the same document as the context
  +   * node (see [3.3 Unparsed Entities]). It returns the empty string if
      * there is no such entity.
      */
     String getUnparsedEntityURI(String name, Document doc);
   
     /**
  -   * Set whether or not the liaison attempts to expand namespaces.  Used 
  +   * Set whether or not the liaison attempts to expand namespaces.  Used
      * for optimization.
      */
     public void setProcessNamespaces(boolean processNamespaces);
  -  
  +
     /**
      * Tells if namespaces should be supported.  For optimization purposes.
      */
  @@ -229,7 +232,7 @@
   
     /**
      * Register an extension namespace handler. This handler provides
  -   * functions for testing whether a function is known within the 
  +   * functions for testing whether a function is known within the
      * namespace and also for invoking the functions.
      *
      * @param uri the URI for the extension.
  @@ -237,37 +240,37 @@
      */
     public void addExtensionNamespace (String uri,
            ExtensionFunctionHandler extNS);
  -    
  +
     /**
  -   * ThrowFoundIndex tells if FoundIndex should be thrown 
  +   * ThrowFoundIndex tells if FoundIndex should be thrown
      * if index is found.
  -   * This is an optimization for match patterns, and 
  +   * This is an optimization for match patterns, and
      * is used internally by the XPath engine.
      */
     public boolean getThrowFoundIndex();
   
     /**
  -   * ThrowFoundIndex tells if FoundIndex should be thrown 
  +   * ThrowFoundIndex tells if FoundIndex should be thrown
      * if index is found.
  -   * This is an optimization for match patterns, and 
  +   * This is an optimization for match patterns, and
      * is used internally by the XPath engine.
      */
     public void setThrowFoundIndex(boolean b);
  -  
  +
     /**
      * Get the current error handler, if there is one.
      */
     public org.xml.sax.ErrorHandler getErrorHandler();
  -  
  +
     /**
      * getXLocatorHandler.
      */
     public XLocator createXLocatorHandler();
  +
   
  -  
     /**
      * Function that is called when a problem event occurs.
  -   * 
  +   *
      * @param   where             Either and XMLPARSER, XSLPROCESSOR, or QUERYENGINE.
      * @param   classification    Either ERROR or WARNING.
      * @param   styleNode         The style tree node where the problem
  @@ -275,19 +278,19 @@
      * @param   sourceNode        The source tree node where the problem
      *                            occurred.  May be null.
      * @param   msg               A string message explaining the problem.
  -   * @param   lineNo            The line number where the problem occurred,  
  +   * @param   lineNo            The line number where the problem occurred,
      *                            if it is known. May be zero.
  -   * @param   charOffset        The character offset where the problem,  
  +   * @param   charOffset        The character offset where the problem,
      *                            occurred if it is known. May be zero.
  -   * 
  +   *
      * @return  true if the return is an ERROR, in which case
  -   *          exception will be thrown.  Otherwise the processor will 
  +   *          exception will be thrown.  Otherwise the processor will
      *          continue to process.
      */
  -  public boolean problem(short where, short classification, 
  +  public boolean problem(short where, short classification,
                          Node styleNode, Node sourceNode,
                          String msg, int lineNo, int charOffset);
  -  
  +
     public static final short    WARNING         = 1;
     public static final short    ERROR           = 2;