mmidy       00/03/16 09:33:41

  Modified:    src/org/apache/xalan/xpath EmptyNodeListImpl.java XPath.java
                        XPathSupportDefault.java
               src/org/apache/xalan/xpath/dtm DTM.java DTMLiaison.java
               src/org/apache/xalan/xpath/res XPATHErrorResources.java
               src/org/apache/xalan/xpath/xdom XercesLiaison.java
               src/org/apache/xalan/xpath/xml FormatterToDOM.java
                        FormatterToHTML.java FormatterToText.java
                        FormatterToXML.java QName.java
                        XMLParserLiaisonDefault.java
               src/org/apache/xalan/xslt ElemAttributeSet.java
                        ElemExtensionCall.java ElemTemplateElement.java
                        StylesheetRoot.java XSLTEngineImpl.java
               src/org/apache/xalan/xslt/client XSLTProcessorApplet.java
               src/org/apache/xalan/xslt/res XSLTErrorResources.java
  Log:
  Resource error messages and messages for exceptions.
  
  Revision  Changes    Path
  1.5       +10 -8     
xml-xalan/src/org/apache/xalan/xpath/EmptyNodeListImpl.java
  
  Index: EmptyNodeListImpl.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/src/org/apache/xalan/xpath/EmptyNodeListImpl.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- EmptyNodeListImpl.java    2000/03/06 20:13:25     1.4
  +++ EmptyNodeListImpl.java    2000/03/16 17:33:33     1.5
  @@ -56,6 +56,8 @@
    */
   package org.apache.xalan.xpath;
   
  +import org.apache.xalan.xpath.xml.XSLMessages;
  +import org.apache.xalan.xpath.res.XPATHErrorResources;
   import org.w3c.dom.Node;
   import org.w3c.dom.NodeList;
   
  @@ -73,7 +75,7 @@
     public void addNode(Node n)
     {
       // checkDups(n);
  -    throw new RuntimeException("Programmer's error: EmptyNodeListImpl can 
not be written to.");
  +    throw new 
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_CANNOT_WRITE_TO_EMPTYNODELISTIMPL,
 null)); //"Programmer's error: EmptyNodeListImpl can not be written to.");
     }
   
     /**
  @@ -82,7 +84,7 @@
     public void insertNode(Node n, int pos)
     {
       // checkDups(n);
  -    throw new RuntimeException("Programmer's error: EmptyNodeListImpl can 
not be written to.");
  +    throw new 
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_CANNOT_WRITE_TO_EMPTYNODELISTIMPL,
 null)); //"Programmer's error: EmptyNodeListImpl can not be written to.");
     }
   
   
  @@ -91,7 +93,7 @@
      */
     public void removeNode(Node n)
     {
  -    throw new RuntimeException("Programmer's error: EmptyNodeListImpl can 
not be written to.");
  +    throw new 
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_CANNOT_WRITE_TO_EMPTYNODELISTIMPL,
 null)); //"Programmer's error: EmptyNodeListImpl can not be written to.");
     }
   
     /**
  @@ -100,7 +102,7 @@
      */
     public void setItemNull(int pos)
     {
  -    throw new RuntimeException("Programmer's error: EmptyNodeListImpl can 
not be written to.");
  +    throw new 
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_CANNOT_WRITE_TO_EMPTYNODELISTIMPL,
 null)); //"Programmer's error: EmptyNodeListImpl can not be written to.");
     }
     
     /**
  @@ -109,7 +111,7 @@
      */
     public void addNodes(NodeList nodelist)
     {
  -    throw new RuntimeException("Programmer's error: EmptyNodeListImpl can 
not be written to.");
  +    throw new 
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_CANNOT_WRITE_TO_EMPTYNODELISTIMPL,
 null)); //"Programmer's error: EmptyNodeListImpl can not be written to.");
     }
   
     /**
  @@ -118,7 +120,7 @@
      */
     public void addNodesInDocOrder(NodeList nodelist, XPathSupport support)
     {
  -    throw new RuntimeException("Programmer's error: EmptyNodeListImpl can 
not be written to.");
  +    throw new 
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_CANNOT_WRITE_TO_EMPTYNODELISTIMPL,
 null)); //"Programmer's error: EmptyNodeListImpl can not be written to.");
     }
     
     /**
  @@ -131,7 +133,7 @@
      */
     public int addNodeInDocOrder(Node node, boolean test, XPathSupport support)
     {
  -    throw new RuntimeException("Programmer's error: EmptyNodeListImpl can 
not be written to.");
  +    throw new 
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_CANNOT_WRITE_TO_EMPTYNODELISTIMPL,
 null)); //"Programmer's error: EmptyNodeListImpl can not be written to.");
   
     } // end addNodeInDocOrder(Vector v, Object obj)
   
  @@ -143,6 +145,6 @@
      */
     public int addNodeInDocOrder(Node node, XPathSupport support)
     {
  -    throw new RuntimeException("Programmer's error: EmptyNodeListImpl can 
not be written to.");
  +    throw new 
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_CANNOT_WRITE_TO_EMPTYNODELISTIMPL,
 null)); //"Programmer's error: EmptyNodeListImpl can not be written to.");
     } // end addNodeInDocOrder(Vector v, Object obj)
   }
  
  
  
  1.23      +1 -1      xml-xalan/src/org/apache/xalan/xpath/XPath.java
  
  Index: XPath.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xpath/XPath.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- XPath.java        2000/03/06 20:13:29     1.22
  +++ XPath.java        2000/03/16 17:33:33     1.23
  @@ -253,7 +253,7 @@
       }
       catch(ClassNotFoundException cnfe)
       {
  -      throw new RuntimeException("In XPath.readObject: "+cnfe.getMessage());
  +      throw new 
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_XPATH_READOBJECT,
 new Object[]{cnfe.getMessage()})); //"In XPath.readObject: 
"+cnfe.getMessage());
       }
     }
     
  
  
  
  1.18      +4 -1      
xml-xalan/src/org/apache/xalan/xpath/XPathSupportDefault.java
  
  Index: XPathSupportDefault.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/src/org/apache/xalan/xpath/XPathSupportDefault.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- XPathSupportDefault.java  2000/03/06 20:13:29     1.17
  +++ XPathSupportDefault.java  2000/03/16 17:33:33     1.18
  @@ -64,7 +64,10 @@
   import org.xml.sax.SAXException;
   import org.xml.sax.DocumentHandler;
   import org.apache.xalan.xpath.xml.IntStack;
  +import org.apache.xalan.xpath.xml.XSLMessages;
  +import org.apache.xalan.xpath.res.XPATHErrorResources;
   
  +
   /**
    * <meta name="usage" content="advanced"/>
    * Default class for execution context when XPath is used by itself. Many 
  @@ -530,7 +533,7 @@
      */
     public void setDOMFactory(Document domFactory)
     {
  -    throw new RuntimeException("setDOMFactory is not supported by 
XPathSupportDefault!");
  +    throw new 
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_SETDOMFACTORY_NOT_SUPPORTED,
 null)); //"setDOMFactory is not supported by XPathSupportDefault!");
     }
   
     /**
  
  
  
  1.16      +13 -8     xml-xalan/src/org/apache/xalan/xpath/dtm/DTM.java
  
  Index: DTM.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xpath/dtm/DTM.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- DTM.java  2000/03/06 20:13:40     1.15
  +++ DTM.java  2000/03/16 17:33:34     1.16
  @@ -75,7 +75,12 @@
   import org.apache.xalan.xpath.xml.StringToStringTable;
   import org.apache.xalan.xpath.xml.StringVector;
   import org.apache.xalan.xpath.xml.StringToStringTableVector;
  +import org.apache.xalan.xpath.xml.XSLMessages;
  +import org.apache.xalan.xpath.res.XPATHErrorResources;
   
  +
  +
  +
   /**
    * <meta name="usage" content="internal"/>
    * <code>DTM</code> is an XML document model expressed as a table rather than
  @@ -601,7 +606,7 @@
     public final void characters(char ch[], int start, int length) 
       throws org.xml.sax.SAXException
     {
  -    throw new SAXException("SAX API characters(char ch[]... not handled by 
the DTM!");
  +    throw new 
SAXException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_SAX_API_NOT_HANDLED,
 null)); //"SAX API characters(char ch[]... not handled by the DTM!");
     }
   
     /**
  @@ -676,7 +681,7 @@
     public final void ignorableWhitespace(char ch[], int start, int length) 
       throws org.xml.sax.SAXException
     {
  -    throw new SAXException("ignorableWhitespace(char ch[]... not handled by 
the DTM!");
  +    throw new 
SAXException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_IGNORABLE_WHITESPACE_NOT_HANDLED,
 null)); //"ignorableWhitespace(char ch[]... not handled by the DTM!");
     }
     
     /**
  @@ -698,7 +703,7 @@
     public final void ignorableWhitespace(char ch[], int start, int length, 
boolean cdataSection) 
       throws org.xml.sax.SAXException
     {
  -    throw new SAXException("ignorableWhitespace(char ch[]... not handled by 
the DTM!");
  +    throw new 
SAXException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_IGNORABLE_WHITESPACE_NOT_HANDLED,
 null)); //"ignorableWhitespace(char ch[]... not handled by the DTM!");
     }
     
     /**
  @@ -1399,7 +1404,7 @@
           }
         }
       }
  -    throw new RuntimeException("Error occured!");
  +    throw new 
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_ERROR_OCCURED,
 null)); //"Error occured!");
     }
   
     /**
  @@ -1505,11 +1510,11 @@
       if(false)
       {
       if(m_throwNewError)
  -      throw new RuntimeException("Error occured!");
  +      throw new 
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_ERROR_OCCURED,
 null)); //"Error occured!");
       }
       else
       {
  -      m_problemListener.message("Problem occured in DTM in getNextSibling... 
trying to recover");
  +      
m_problemListener.message(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_PROBLEM_IN_DTM_NEXTSIBLING,
 null)); //"Problem occured in DTM in getNextSibling... trying to recover");
       }
       return -1;
     }
  @@ -1601,7 +1606,7 @@
           position++;
         }
       }
  -    throw new RuntimeException("Error occured!");
  +    throw new 
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_ERROR_OCCURED,
 null)); //"Error occured!");
     }
   
     /**
  @@ -1668,7 +1673,7 @@
           position+=nextOffset;
         }
       }
  -    throw new RuntimeException("Error occured!");
  +    throw new 
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_ERROR_OCCURED,
 null)); //"Error occured!");
     }
     
     /**
  
  
  
  1.14      +3 -2      xml-xalan/src/org/apache/xalan/xpath/dtm/DTMLiaison.java
  
  Index: DTMLiaison.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xpath/dtm/DTMLiaison.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- DTMLiaison.java   2000/03/06 20:13:41     1.13
  +++ DTMLiaison.java   2000/03/16 17:33:34     1.14
  @@ -70,6 +70,7 @@
   import org.apache.xalan.xpath.XPathFactory;
   import org.apache.xalan.xpath.XLocator;
   import org.apache.xalan.xpath.res.XPATHErrorResources;
  +import org.apache.xalan.xpath.xml.XSLMessages;
   
   /**
    * <meta name="usage" content="internal"/>
  @@ -157,8 +158,8 @@
       throws SAXException
     {
       if(!(node instanceof DTMProxy))
  -       throw new SAXException("DTMLiaison can not handle nodes of type"
  -        +((Object)node).getClass());
  +      throw new 
SAXException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_DTM_CANNOT_HANDLE_NODES,
 new Object[]{((Object)node).getClass()})); //"DTMLiaison can not handle nodes 
of type"
  +        //+((Object)node).getClass());
     }
   
     /**
  
  
  
  1.18      +140 -1    
xml-xalan/src/org/apache/xalan/xpath/res/XPATHErrorResources.java
  
  Index: XPATHErrorResources.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/src/org/apache/xalan/xpath/res/XPATHErrorResources.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- XPATHErrorResources.java  2000/03/08 20:11:24     1.17
  +++ XPATHErrorResources.java  2000/03/16 17:33:35     1.18
  @@ -76,7 +76,7 @@
     public static final String ERROR_SUFFIX = "ER";  
     public static final String WARNING_SUFFIX = "WR";
   
  -  public static final int MAX_CODE = 48;                // this is needed to 
keep track of the number of messages          
  +  public static final int MAX_CODE = 68;                // this is needed to 
keep track of the number of messages          
     public static final int MAX_WARNING = 10;             // this is needed to 
keep track of the number of warnings
     public static final int MAX_OTHERS = 20;
     public static final int MAX_MESSAGES = MAX_CODE + MAX_WARNING +1;
  @@ -454,7 +454,146 @@
       contents[ER_UNSUPPORTED_ENCODING ][1] 
       = "Unsupported encoding: {0}";
     }
  +  
  +  public static final int ER_PROBLEM_IN_DTM_NEXTSIBLING  = 49;
  +  static 
  +  {
  +    contents[ER_PROBLEM_IN_DTM_NEXTSIBLING ][1] 
  +    = "Problem occured in DTM in getNextSibling... trying to recover";
  +  }
  +  
  +  public static final int ER_CANNOT_WRITE_TO_EMPTYNODELISTIMPL  = 50;
  +  static 
  +  {
  +    contents[ER_CANNOT_WRITE_TO_EMPTYNODELISTIMPL ][1] 
  +    = "Programmer error: EmptyNodeListImpl can not be written to.";
  +  }
  +  
  +  public static final int ER_SETDOMFACTORY_NOT_SUPPORTED  = 51;
  +  static 
  +  {
  +    contents[ER_SETDOMFACTORY_NOT_SUPPORTED ][1] 
  +    = "setDOMFactory is not supported by XPathSupportDefault!";
  +  }
  +  
  +  public static final int ER_PREFIX_MUST_RESOLVE  = 52;
  +  static 
  +  {
  +    contents[ER_PREFIX_MUST_RESOLVE ][1] 
  +      = "Prefix must resolve to a namespace: {0}";
  +  }
  +  
  +  public static final int ER_PARSE_NOT_SUPPORTED  = 53;
  +  static 
  +  {
  +    contents[ER_PARSE_NOT_SUPPORTED ][1] 
  +      = "parse (InputSource source) not supported in 
XMLParserLiaisonDefault! Can not open {0}";
  +  }
  +  
  +  public static final int ER_CREATEDOCUMENT_NOT_SUPPORTED  = 54;
  +  static 
  +  {
  +    contents[ER_CREATEDOCUMENT_NOT_SUPPORTED ][1] 
  +      = "createDocument() not supported in XMLParserLiaisonDefault!";
  +  }
  +  
  +  public static final int ER_CHILD_HAS_NO_OWNER_DOCUMENT  = 55;
  +  static 
  +  {
  +    contents[ER_CHILD_HAS_NO_OWNER_DOCUMENT ][1] 
  +      = "Attribute child does not have an owner document!";
  +  }
   
  +  public static final int ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT  = 56;
  +  static 
  +  {
  +    contents[ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT ][1] 
  +      = "Attribute child does not have an owner document element!";
  +  }
  +  
  +  public static final int ER_SAX_API_NOT_HANDLED  = 57;
  +  static 
  +  {
  +    contents[ER_SAX_API_NOT_HANDLED ][1] 
  +      = "SAX API characters(char ch[]... not handled by the DTM!";
  +  }
  +  
  +  public static final int ER_IGNORABLE_WHITESPACE_NOT_HANDLED  = 58;
  +  static 
  +  {
  +    contents[ER_IGNORABLE_WHITESPACE_NOT_HANDLED ][1] 
  +      = "ignorableWhitespace(char ch[]... not handled by the DTM!";
  +  }
  +  
  +  public static final int ER_DTM_CANNOT_HANDLE_NODES  = 59;
  +  static 
  +  {
  +    contents[ER_DTM_CANNOT_HANDLE_NODES ][1] 
  +      = "DTMLiaison can not handle nodes of type {0}";
  +  }
  +  
  +  public static final int ER_XERCES_CANNOT_HANDLE_NODES  = 60;
  +  static 
  +  {
  +    contents[ER_XERCES_CANNOT_HANDLE_NODES ][1] 
  +      = "XercesLiaison can not handle nodes of type {0}";
  +  }
  +  
  +  public static final int ER_XERCES_PARSE_ERROR_DETAILS  = 61;
  +  static 
  +  {
  +    contents[ER_XERCES_PARSE_ERROR_DETAILS ][1] 
  +      = "XercesLiaison.parse error: SystemID - {0} line - {1}";
  +  }
  +  
  +  public static final int ER_XERCES_PARSE_ERROR  = 62;
  +  static 
  +  {
  +    contents[ER_XERCES_PARSE_ERROR ][1] 
  +      = "XercesLiaison.parse error";
  +  }
  +  
  +  public static final int ER_CANT_OUTPUT_TEXT_BEFORE_DOC  = 63;
  +  static 
  +  {
  +    contents[ER_CANT_OUTPUT_TEXT_BEFORE_DOC ][1] 
  +      = "Warning: can't output text before document element!  Ignoring...";
  +  }
  +  
  +  public static final int ER_CANT_HAVE_MORE_THAN_ONE_ROOT  = 64;
  +  static 
  +  {
  +    contents[ER_CANT_HAVE_MORE_THAN_ONE_ROOT ][1] 
  +      = "Can't have more than one root on a DOM!";
  +  }
  +  
  +  public static final int ER_INVALID_UTF16_SURROGATE  = 65;
  +  static 
  +  {
  +    contents[ER_INVALID_UTF16_SURROGATE ][1] 
  +      = "Invalid UTF-16 surrogate detected: {0} ?";
  +  }
  +  
  +  public static final int ER_OIERROR  = 66;
  +  static 
  +  {
  +    contents[ER_OIERROR ][1] 
  +      = "IO error";
  +  }
  +  
  +  public static final int ER_CANNOT_CREATE_URL  = 67;
  +  static 
  +  {
  +    contents[ER_CANNOT_CREATE_URL ][1] 
  +      = "Cannot create url for: {0}";
  +  }
  +  
  +  public static final int ER_XPATH_READOBJECT  = 68;
  +  static 
  +  {
  +    contents[ER_XPATH_READOBJECT ][1] 
  +      = "In XPath.readObject: {0}";
  +  }
   
     // Warnings...
   
  
  
  
  1.18      +7 -5      
xml-xalan/src/org/apache/xalan/xpath/xdom/XercesLiaison.java
  
  Index: XercesLiaison.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/src/org/apache/xalan/xpath/xdom/XercesLiaison.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- XercesLiaison.java        2000/03/06 21:08:14     1.17
  +++ XercesLiaison.java        2000/03/16 17:33:35     1.18
  @@ -66,7 +66,9 @@
   import org.w3c.dom.*;
   import org.apache.xalan.xpath.xml.*;
   import org.apache.xalan.xpath.*;
  +import org.apache.xalan.xpath.res.XPATHErrorResources;
   
  +
   /**
    * <meta name="usage" content="general"/>
    * Provides XSLTProcessor an interface to the Xerces XML parser.  This 
  @@ -120,8 +122,8 @@
       throws SAXException
     {
       if(!(node instanceof org.apache.xerces.dom.NodeImpl))
  -      throw new SAXException("XercesLiaison can not handle nodes of type"
  -        +((Object)node).getClass());
  +      throw new 
SAXException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_XERCES_CANNOT_HANDLE_NODES,
 new Object[]{((Object)node).getClass()})); //"XercesLiaison can not handle 
nodes of type"
  +        //+((Object)node).getClass());
     }
   
     /**
  @@ -280,10 +282,10 @@
       catch(SAXException e)
       {
         if(null != parser)
  -        throw new SAXException("XercesLiaison.parse error: SystemID - "+
  -          parser.getSystemId()+" line - "+parser.getLineNumber(), e);
  +        throw new 
SAXException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_XERCES_PARSE_ERROR_DETAILS,
 new Object[]{parser.getSystemId(), Integer.toString(parser.getLineNumber())}), 
e); //"XercesLiaison.parse error: SystemID - "+
  +          //parser.getSystemId()+" line - "+parser.getLineNumber(), e);
         else
  -        throw new SAXException("XercesLiaison.parse error", e);
  +        throw new 
SAXException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_XERCES_PARSE_ERROR,
 null), e); //"XercesLiaison.parse error", e);
       }
     }
   
  
  
  
  1.9       +3 -2      
xml-xalan/src/org/apache/xalan/xpath/xml/FormatterToDOM.java
  
  Index: FormatterToDOM.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/src/org/apache/xalan/xpath/xml/FormatterToDOM.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- FormatterToDOM.java       2000/03/06 20:13:44     1.8
  +++ FormatterToDOM.java       2000/03/16 17:33:36     1.9
  @@ -59,6 +59,7 @@
   import org.w3c.dom.*;
   import java.util.*;
   import org.xml.sax.ext.LexicalHandler;
  +import org.apache.xalan.xpath.res.XPATHErrorResources;
   
   /**
    * <meta name="usage" content="general"/>
  @@ -143,7 +144,7 @@
           String data = newNode.getNodeValue();
           if((null != data) && (data.trim().length() > 0))
           {
  -          throw new SAXException("Warning: can't output text before document 
element!  Ignoring...");
  +          throw new 
SAXException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_CANT_OUTPUT_TEXT_BEFORE_DOC,
 null)); //"Warning: can't output text before document element!  Ignoring...");
           }
           ok = false;
         }
  @@ -151,7 +152,7 @@
         {
           if(m_doc.getDocumentElement() != null)
           {
  -          throw new SAXException("Can't have more than one root on a DOM!");
  +          throw new 
SAXException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_CANT_HAVE_MORE_THAN_ONE_ROOT,
 null)); //"Can't have more than one root on a DOM!");
           }
         }
         if(ok)
  
  
  
  1.30      +12 -11    
xml-xalan/src/org/apache/xalan/xpath/xml/FormatterToHTML.java
  
  Index: FormatterToHTML.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/src/org/apache/xalan/xpath/xml/FormatterToHTML.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- FormatterToHTML.java      2000/03/06 20:13:44     1.29
  +++ FormatterToHTML.java      2000/03/16 17:33:36     1.30
  @@ -62,6 +62,7 @@
   import java.util.Hashtable;
   import java.util.Vector;
   import org.xml.sax.*;
  +import org.apache.xalan.xpath.res.XPATHErrorResources;
   
   /**
    * <meta name="usage" content="general"/>
  @@ -698,15 +699,15 @@
             int next;
             if (i+1 >= strLen) 
             {
  -            throw new SAXException("Invalid UTF-16 surrogate detected: "
  -              +Integer.toHexString(ch)+ " ?");
  +            throw new 
SAXException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_INVALID_UTF16_SURROGATE,
 new Object[]{Integer.toHexString(ch)})); //"Invalid UTF-16 surrogate detected: 
"
  +              //+Integer.toHexString(ch)+ " ?");
             }
             else 
             {
               next = chars[++i];
               if (!(0xdc00 <= next && next < 0xe000))
  -              throw new SAXException("Invalid UTF-16 surrogate detected: "
  -                +Integer.toHexString(ch)+" "+Integer.toHexString(next));
  +              throw new 
SAXException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_INVALID_UTF16_SURROGATE,
 new Object[]{Integer.toHexString(ch)+" "+Integer.toHexString(next)})); 
//"Invalid UTF-16 surrogate detected: "
  +                //+Integer.toHexString(ch)+" "+Integer.toHexString(next));
               next = ((ch-0xd800)<<10)+next-0xdc00+0x00010000;
             }
             accum("&#x");
  @@ -821,7 +822,7 @@
         }
         catch(IOException ioe)
         {
  -        throw new SAXException("IO error", ioe);
  +        throw new 
SAXException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_OIERROR, 
null),ioe); //"IO error", ioe);
         }
       }
       
  @@ -895,15 +896,15 @@
           int next;
           if (i+1 >= length) 
           {
  -          throw new SAXException("Invalid UTF-16 surrogate detected: "
  -            +Integer.toHexString(ch)+ " ?");
  +          throw new 
SAXException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_INVALID_UTF16_SURROGATE,
 new Object[]{Integer.toHexString(ch)})); //"Invalid UTF-16 surrogate detected: 
"
  +            //+Integer.toHexString(ch)+ " ?");
           }
           else 
           {
             next = chars[++i];
             if (!(0xdc00 <= next && next < 0xe000))
  -            throw new SAXException("Invalid UTF-16 surrogate detected: "
  -              +Integer.toHexString(ch)+" "+Integer.toHexString(next));
  +            throw new 
SAXException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_INVALID_UTF16_SURROGATE,
 new Object[]{Integer.toHexString(ch)+" "+Integer.toHexString(next)})); 
//"Invalid UTF-16 surrogate detected: "
  +              //+Integer.toHexString(ch)+" "+Integer.toHexString(next));
             next = ((ch-0xd800)<<10)+next-0xdc00+0x00010000;
           }
           accum('&');
  @@ -980,7 +981,7 @@
         }
         catch(IOException ioe)
         {
  -        throw new SAXException("IO error", ioe);
  +        throw new 
SAXException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_OIERROR, 
null),ioe); //"IO error", ioe);
         }
       }
       /*
  @@ -998,7 +999,7 @@
         }
         catch(IOException ioe)
         {
  -        throw new SAXException("IO error", ioe);
  +        throw new 
SAXException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_OIERROR, 
null),ioe); //"IO error", ioe);
         }
       }
       */
  
  
  
  1.5       +5 -4      
xml-xalan/src/org/apache/xalan/xpath/xml/FormatterToText.java
  
  Index: FormatterToText.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/src/org/apache/xalan/xpath/xml/FormatterToText.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FormatterToText.java      2000/03/06 20:13:44     1.4
  +++ FormatterToText.java      2000/03/16 17:33:37     1.5
  @@ -58,6 +58,7 @@
   import org.xml.sax.*;
   import java.util.*;
   import java.io.*;
  +import org.apache.xalan.xpath.res.XPATHErrorResources;
   
   /**
    * <meta name="usage" content="general"/>
  @@ -151,7 +152,7 @@
       }
       catch(IOException ioe)
       {
  -      throw new SAXException("IO error", ioe);
  +      throw new 
SAXException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_OIERROR, 
null),ioe); //"IO error", ioe);
       }
     }
   
  @@ -241,7 +242,7 @@
       }
       catch(IOException ioe)
       {
  -      throw new SAXException("IO error", ioe);
  +      throw new 
SAXException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_OIERROR, 
null),ioe); //"IO error", ioe);
       }
     }
   
  @@ -259,7 +260,7 @@
       }
       catch(IOException ioe)
       {
  -      throw new SAXException("IO error", ioe);
  +      throw new 
SAXException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_OIERROR, 
null),ioe); //"IO error", ioe);
       }
     }
   
  @@ -298,7 +299,7 @@
       }
       catch(IOException ioe)
       {
  -      throw new SAXException("IO error", ioe);
  +      throw new 
SAXException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_OIERROR, 
null),ioe); //"IO error", ioe);
       }
     }
   
  
  
  
  1.32      +13 -13    
xml-xalan/src/org/apache/xalan/xpath/xml/FormatterToXML.java
  
  Index: FormatterToXML.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/src/org/apache/xalan/xpath/xml/FormatterToXML.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- FormatterToXML.java       2000/03/08 20:11:24     1.31
  +++ FormatterToXML.java       2000/03/16 17:33:37     1.32
  @@ -928,7 +928,7 @@
       }
       catch(IOException ioe) 
       { 
  -      throw new SAXException("IO error", ioe);
  +      throw new 
SAXException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_OIERROR, 
null),ioe); //"IO error", ioe);
       }
     }
     
  @@ -1209,15 +1209,15 @@
             int next;
             if (i+1 >= end) 
             {
  -            throw new SAXException("Invalid UTF-16 surrogate detected: "
  -              +Integer.toHexString((int)c)+ " ?");
  +            throw new 
SAXException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_INVALID_UTF16_SURROGATE,
 new Object[]{Integer.toHexString((int)c)})); //"Invalid UTF-16 surrogate 
detected: "
  +              //+Integer.toHexString((int)c)+ " ?");
             }
             else 
             {
               next = ch[++i];
               if (!(0xdc00 <= next && next < 0xe000))
  -              throw new SAXException("Invalid UTF-16 surrogate detected: "
  -                +Integer.toHexString((int)c)+" "+Integer.toHexString(next));
  +              throw new 
SAXException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_INVALID_UTF16_SURROGATE,
 new Object[]{Integer.toHexString((int)c)+" "+Integer.toHexString(next)})); 
//"Invalid UTF-16 surrogate detected: "
  +                //+Integer.toHexString((int)c)+" 
"+Integer.toHexString(next));
               next = ((c-0xd800)<<10)+next-0xdc00+0x00010000;
             }
             accum('&');
  @@ -1255,15 +1255,15 @@
             int next;
             if (i+1 >= end) 
             {
  -            throw new SAXException("Invalid UTF-16 surrogate detected: "
  -              +Integer.toHexString((int)c)+ " ?");
  +            throw new 
SAXException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_INVALID_UTF16_SURROGATE,
 new Object[]{Integer.toHexString((int)c)})); //"Invalid UTF-16 surrogate 
detected: "
  +              //+Integer.toHexString((int)c)+ " ?");
             }
             else 
             {
               next = ch[++i];
               if (!(0xdc00 <= next && next < 0xe000))
  -              throw new SAXException("Invalid UTF-16 surrogate detected: "
  -                +Integer.toHexString((int)c)+" "+Integer.toHexString(next));
  +              throw new 
SAXException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_INVALID_UTF16_SURROGATE,
 new Object[]{Integer.toHexString((int)c)+" "+Integer.toHexString(next)})); 
//"Invalid UTF-16 surrogate detected: "
  +                //+Integer.toHexString((int)c)+" 
"+Integer.toHexString(next));
               next = ((c-0xd800)<<10)+next-0xdc00+0x00010000;
             }
             accum("&#x");
  @@ -1438,15 +1438,15 @@
           int next;
           if (i+1 >= len) 
           {
  -          throw new SAXException("Invalid UTF-16 surrogate detected: "
  -            +Integer.toHexString(ch)+ " ?");
  +          throw new 
SAXException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_INVALID_UTF16_SURROGATE,
 new Object[]{Integer.toHexString(ch)})); //"Invalid UTF-16 surrogate detected: 
"
  +            //+Integer.toHexString(ch)+ " ?");
           }
           else 
           {
             next = chars[++i];
             if (!(0xdc00 <= next && next < 0xe000))
  -            throw new SAXException("Invalid UTF-16 surrogate detected: "
  -              +Integer.toHexString(ch)+" "+Integer.toHexString(next));
  +            throw new 
SAXException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_INVALID_UTF16_SURROGATE,
 new Object[]{Integer.toHexString(ch)+" "+Integer.toHexString(next)})); 
//"Invalid UTF-16 surrogate detected: "
  +              //+Integer.toHexString(ch)+" "+Integer.toHexString(next));
             next = ((ch-0xd800)<<10)+next-0xdc00+0x00010000;
           }
           accum("&#x");
  
  
  
  1.5       +4 -3      xml-xalan/src/org/apache/xalan/xpath/xml/QName.java
  
  Index: QName.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xpath/xml/QName.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- QName.java        2000/03/06 20:13:45     1.4
  +++ QName.java        2000/03/16 17:33:37     1.5
  @@ -59,6 +59,7 @@
   import java.util.Stack;
   
   import org.w3c.dom.Element;
  +import org.apache.xalan.xpath.res.XPATHErrorResources;
   
   /**
    * <meta name="usage" content="general"/>
  @@ -202,7 +203,7 @@
         }  
         if(null == m_namespace)
         {
  -        throw new RuntimeException("Prefix must resolve to a namespace: 
"+prefix);
  +        throw new 
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_PREFIX_MUST_RESOLVE,
 new Object[]{prefix})); //"Prefix must resolve to a namespace: "+prefix);
         }
       }
       m_localpart = (indexOfNSSep < 0) ? qname : 
qname.substring(indexOfNSSep+1);
  @@ -242,7 +243,7 @@
           }  
           if(null == m_namespace)
           {
  -          throw new RuntimeException("Prefix must resolve to a namespace: 
"+prefix);
  +          throw new 
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_PREFIX_MUST_RESOLVE,
 new Object[]{prefix})); //"Prefix must resolve to a namespace: "+prefix);
           }
         }
         else
  @@ -286,7 +287,7 @@
         }  
         if(null == m_namespace)
         {
  -        throw new RuntimeException("Prefix must resolve to a namespace: 
"+prefix);
  +        throw new 
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_PREFIX_MUST_RESOLVE,
 new Object[]{prefix})); //"Prefix must resolve to a namespace: "+prefix);
         }
       }
       
  
  
  
  1.33      +6 -6      
xml-xalan/src/org/apache/xalan/xpath/xml/XMLParserLiaisonDefault.java
  
  Index: XMLParserLiaisonDefault.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/src/org/apache/xalan/xpath/xml/XMLParserLiaisonDefault.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- XMLParserLiaisonDefault.java      2000/03/06 20:13:45     1.32
  +++ XMLParserLiaisonDefault.java      2000/03/16 17:33:37     1.33
  @@ -472,8 +472,8 @@
     public void parse (InputSource source)
       throws SAXException, IOException
     {
  -    throw new RuntimeException("parse (InputSource source) not supported in 
XMLParserLiaisonDefault! "+
  -      "Can not open "+source.getSystemId());
  +    throw new 
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_PARSE_NOT_SUPPORTED,
 new Object[]{source.getSystemId()})); //"parse (InputSource source) not 
supported in XMLParserLiaisonDefault! "+
  +      //"Can not open "+source.getSystemId());
     }
   
     /**
  @@ -948,7 +948,7 @@
             }
             catch (MalformedURLException e2)
             {
  -            throw new SAXException( "Cannot create url for: " + urlString, 
e2 );
  +            throw new SAXException( 
XSLMessages.createXPATHMessage(XPATHErrorResources.ER_CANNOT_CREATE_URL, new 
Object[]{urlString}),e2); //"Cannot create url for: " + urlString, e2 );
             }
           }
         }
  @@ -976,7 +976,7 @@
      */
     public Document createDocument()
     {
  -    throw new RuntimeException("createDocument() not supported in 
XMLParserLiaisonDefault!");
  +    throw new 
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_CREATEDOCUMENT_NOT_SUPPORTED,
 null));//"createDocument() not supported in XMLParserLiaisonDefault!");
       // return null;
     }
     
  @@ -1273,14 +1273,14 @@
         
         if(null == doc)
         {
  -        throw new RuntimeException("Attribute child does not have an owner 
document!");
  +        throw new 
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_CHILD_HAS_NO_OWNER_DOCUMENT,
 null));//"Attribute child does not have an owner document!");
         }
         
         Element rootElem = doc.getDocumentElement();
         
         if(null == rootElem)
         {
  -        throw new RuntimeException("Attribute child does not have an owner 
document element!");
  +        throw new 
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_CHILD_HAS_NO_OWNER_DOCUMENT_ELEMENT,
 null));//"Attribute child does not have an owner document element!");
         }
         
         parent = locateAttrParent(rootElem, node);
  
  
  
  1.7       +3 -2      xml-xalan/src/org/apache/xalan/xslt/ElemAttributeSet.java
  
  Index: ElemAttributeSet.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/src/org/apache/xalan/xslt/ElemAttributeSet.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ElemAttributeSet.java     2000/03/02 10:23:00     1.6
  +++ ElemAttributeSet.java     2000/03/16 17:33:38     1.7
  @@ -61,6 +61,7 @@
   import org.apache.xalan.xpath.*;
   import org.apache.xalan.xpath.xml.QName;
   import org.apache.xalan.xslt.res.XSLTErrorResources;
  +import org.apache.xalan.xpath.xml.XSLMessages;
   import java.util.Stack;
   
   /**
  @@ -123,8 +124,8 @@
         int loc = processor.m_attrSetStack.search(this);
         if(loc > -1)
         {
  -        throw new SAXException("xsl:attribute-set '"+m_qname.m_localpart+
  -          "' used itself, which will cause an infinite loop.");
  +        throw new 
SAXException(XSLMessages.createMessage(XSLTErrorResources.ER_XSLATTRSET_USED_ITSELF,
 new Object[]{m_qname.m_localpart})); //"xsl:attribute-set 
'"+m_qname.m_localpart+
  +          //"' used itself, which will cause an infinite loop.");
         }
       }
       
  
  
  
  1.10      +3 -1      
xml-xalan/src/org/apache/xalan/xslt/ElemExtensionCall.java
  
  Index: ElemExtensionCall.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/src/org/apache/xalan/xslt/ElemExtensionCall.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ElemExtensionCall.java    2000/03/02 10:23:01     1.9
  +++ ElemExtensionCall.java    2000/03/16 17:33:39     1.10
  @@ -65,7 +65,9 @@
   import org.apache.xalan.xpath.xml.StringToStringTable;
   import org.apache.xalan.xpath.xml.XMLParserLiaisonDefault;
   import org.apache.xalan.xpath.xml.MutableAttrListImpl;
  +import org.apache.xalan.xpath.xml.XSLMessages;
   import org.apache.xalan.xpath.XPathSupport;
  +import org.apache.xalan.xslt.res.XSLTErrorResources;
   
   import java.io.*;
   import java.util.*;
  @@ -188,7 +190,7 @@
           {
             msg = msg.substring("Stopping after fatal error:".length());
           }
  -        processor.message("Call to extension element failed: "+msg);
  +        
processor.message(XSLMessages.createMessage(XSLTErrorResources.ER_CALL_TO_EXT_FAILED,
 new Object[]{msg})); //"Call to extension element failed: "+msg);
           // e.printStackTrace();
           // System.exit(-1);
         }
  
  
  
  1.28      +1 -1      
xml-xalan/src/org/apache/xalan/xslt/ElemTemplateElement.java
  
  Index: ElemTemplateElement.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/src/org/apache/xalan/xslt/ElemTemplateElement.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- ElemTemplateElement.java  2000/03/03 20:22:35     1.27
  +++ ElemTemplateElement.java  2000/03/16 17:33:39     1.28
  @@ -235,7 +235,7 @@
       }
       catch(ClassNotFoundException cnfe)
       {
  -      throw new RuntimeException("In ElemTemplateElement.readObject: 
"+cnfe.getMessage());
  +      throw new 
RuntimeException(XSLMessages.createMessage(XSLTErrorResources.ER_IN_ELEMTEMPLATEELEM_READOBJECT,
 new Object[]{cnfe.getMessage()}));//"In ElemTemplateElement.readObject: 
"+cnfe.getMessage());
       }
       // System.out.println("Done reading ElemTemplateElement: "+m_elemName);
     }
  
  
  
  1.33      +1 -1      xml-xalan/src/org/apache/xalan/xslt/StylesheetRoot.java
  
  Index: StylesheetRoot.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/StylesheetRoot.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- StylesheetRoot.java       2000/03/03 20:22:36     1.32
  +++ StylesheetRoot.java       2000/03/16 17:33:39     1.33
  @@ -389,7 +389,7 @@
           else if(null != outputTarget.getNode())
           {
             if(processor.getXMLProcessorLiaison() instanceof 
org.apache.xalan.xpath.dtm.DTMLiaison)
  -            processor.error("Can't use a DTMLiaison for an output DOM 
node... pass a org.apache.xalan.xpath.xdom.XercesLiaison instead!");
  +            processor.error(XSLTErrorResources.ER_CANT_USE_DTM_FOR_OUTPUT); 
//"Can't use a DTMLiaison for an output DOM node... pass a 
org.apache.xalan.xpath.xdom.XercesLiaison instead!");
             switch(outputTarget.getNode().getNodeType())
             {
             case Node.DOCUMENT_NODE:
  
  
  
  1.58      +5 -5      xml-xalan/src/org/apache/xalan/xslt/XSLTEngineImpl.java
  
  Index: XSLTEngineImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/XSLTEngineImpl.java,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- XSLTEngineImpl.java       2000/03/13 22:44:02     1.57
  +++ XSLTEngineImpl.java       2000/03/16 17:33:39     1.58
  @@ -498,7 +498,7 @@
         if((null != sourceNode) 
            && (!(sourceNode instanceof org.apache.xerces.dom.NodeImpl)))
         {
  -        throw new SAXException("Can not mix non Xerces-DOM input with 
Xerces-DOM output!");
  +        throw new 
SAXException(XSLMessages.createMessage(XSLTErrorResources.ER_CANNOT_MIX_XERCESDOM,
 null)); //"Can not mix non Xerces-DOM input with Xerces-DOM output!");
         }
         
         XMLParserLiaison newLiaison = new 
org.apache.xalan.xpath.xdom.XercesLiaison();
  @@ -823,7 +823,7 @@
       if(null != inputSource.getNode())
       {
         if(getXMLProcessorLiaison() instanceof 
org.apache.xalan.xpath.dtm.DTMLiaison)
  -        error("Can't use a DTMLiaison for a input DOM node... pass a 
org.apache.xalan.xpath.xdom.XercesLiaison instead!");
  +        error(XSLTErrorResources.ER_CANT_USE_DTM_FOR_INPUT); //"Can't use a 
DTMLiaison for a input DOM node... pass a 
org.apache.xalan.xpath.xdom.XercesLiaison instead!");
   
         sourceTree = inputSource.getNode();
       }
  @@ -1392,7 +1392,7 @@
       }
       catch(TooManyListenersException tmle)
       {
  -      throw new SAXException("addTraceListenersToStylesheet - 
TooManyListenersException", tmle);
  +      throw new 
SAXException(XSLMessages.createMessage(XSLTErrorResources.ER_TOO_MANY_LISTENERS,
 null),tmle ); //"addTraceListenersToStylesheet - TooManyListenersException", 
tmle);
       }
     }
   
  @@ -2199,7 +2199,7 @@
           }
           if(null == elemNS)
           {
  -          throw new RuntimeException("Prefix must resolve to a namespace: 
"+prefix);
  +          throw new 
RuntimeException(XSLMessages.createMessage(XSLTErrorResources.ER_PREFIX_MUST_RESOLVE,
 new Object[]{prefix}));//"Prefix must resolve to a namespace: "+prefix);
           }
         }
         elemLocalName = (indexOfNSSep < 0) ? elementName : 
elementName.substring(indexOfNSSep+1);
  @@ -2237,7 +2237,7 @@
         }
         if(null == elemNS)
         {
  -        throw new RuntimeException("Prefix must resolve to a namespace: 
"+prefix);
  +        throw new 
RuntimeException(XSLMessages.createMessage(XSLTErrorResources.ER_PREFIX_MUST_RESOLVE,
 new Object[]{prefix}));//"Prefix must resolve to a namespace: "+prefix);
         }
       }
       elemLocalName = (indexOfNSSep < 0) ? elementName : 
elementName.substring(indexOfNSSep+1);
  
  
  
  1.14      +5 -4      
xml-xalan/src/org/apache/xalan/xslt/client/XSLTProcessorApplet.java
  
  Index: XSLTProcessorApplet.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/src/org/apache/xalan/xslt/client/XSLTProcessorApplet.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- XSLTProcessorApplet.java  2000/03/06 20:13:51     1.13
  +++ XSLTProcessorApplet.java  2000/03/16 17:33:40     1.14
  @@ -63,6 +63,7 @@
   import java.lang.reflect.Constructor;
   import org.apache.xalan.xslt.*;
   import org.apache.xalan.xpath.xml.*;
  +import org.apache.xalan.xslt.res.XSLTErrorResources;
   // import org.apache.xalan.xpath.xml.xml4j.*;
   
   import org.w3c.dom.*;
  @@ -453,15 +454,15 @@
           int next;
           if (i+1 >= length)
           {
  -          throw new RuntimeException("Invalid UTF-16 surrogate detected: "
  -            +Integer.toHexString(ch)+ " ?");
  +          throw new 
RuntimeException(XSLMessages.createMessage(XSLTErrorResources.ER_INVALID_UTF16_SURROGATE,
 new Object[]{Integer.toHexString(ch)}));//"Invalid UTF-16 surrogate detected: "
  +            //+Integer.toHexString(ch)+ " ?");
           }
           else
           {
             next = s.charAt(++i);
             if (!(0xdc00 <= next && next < 0xe000))
  -            throw new RuntimeException("Invalid UTF-16 surrogate detected: "
  -              +Integer.toHexString(ch)+" "+Integer.toHexString(next));
  +            throw new 
RuntimeException(XSLMessages.createMessage(XSLTErrorResources.ER_INVALID_UTF16_SURROGATE,
 new Object[]{Integer.toHexString(ch)+" 
"+Integer.toHexString(next)}));//"Invalid UTF-16 surrogate detected: "
  +              //+Integer.toHexString(ch)+" "+Integer.toHexString(next));
             next = ((ch-0xd800)<<10)+next-0xdc00+0x00010000;
           }
           sb.append("&#x");
  
  
  
  1.21      +46 -1     
xml-xalan/src/org/apache/xalan/xslt/res/XSLTErrorResources.java
  
  Index: XSLTErrorResources.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/src/org/apache/xalan/xslt/res/XSLTErrorResources.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- XSLTErrorResources.java   2000/03/13 21:56:01     1.20
  +++ XSLTErrorResources.java   2000/03/16 17:33:40     1.21
  @@ -76,7 +76,7 @@
   public static final String ERROR_SUFFIX = "ER";  
   public static final String WARNING_SUFFIX = "WR";
   
  -public static final int MAX_CODE = 95;                  // this is needed to 
keep track of the number of messages          
  +public static final int MAX_CODE = 104;                  // this is needed 
to keep track of the number of messages          
   public static final int MAX_WARNING = 25;             // this is needed to 
keep track of the number of warnings
   public static final int MAX_OTHERS = 41;
   public static final int MAX_MESSAGES = MAX_CODE + MAX_WARNING +1;
  @@ -590,6 +590,51 @@
   public static final int ER_NO_APPLY_IMPORT_IN_FOR_EACH = 95;
   static {contents[ER_NO_APPLY_IMPORT_IN_FOR_EACH][1] 
                        = "xsl:apply-imports not allowed in a xsl:for-each";
  +}
  +
  +public static final int ER_CANT_USE_DTM_FOR_OUTPUT = 96;
  +static {contents[ER_CANT_USE_DTM_FOR_OUTPUT][1] 
  +                     = "Cannot use a DTMLiaison for an output DOM node... 
pass a org.apache.xalan.xpath.xdom.XercesLiaison instead!";
  +}
  +
  +public static final int ER_CANT_USE_DTM_FOR_INPUT = 97;
  +static {contents[ER_CANT_USE_DTM_FOR_INPUT][1] 
  +                     = "Cannot use a DTMLiaison for a input DOM node... pass 
a org.apache.xalan.xpath.xdom.XercesLiaison instead!";
  +}
  +
  +public static final int ER_CALL_TO_EXT_FAILED = 98;
  +static {contents[ER_CALL_TO_EXT_FAILED][1] 
  +          = "Call to extension element failed: {0}";
  +}
  +
  +public static final int ER_PREFIX_MUST_RESOLVE = 99;
  +static {contents[ER_PREFIX_MUST_RESOLVE][1] 
  +          = "Prefix must resolve to a namespace: {0}";
  +}
  +
  +public static final int ER_INVALID_UTF16_SURROGATE = 100;
  +static {contents[ER_INVALID_UTF16_SURROGATE][1] 
  +          = "Invalid UTF-16 surrogate detected: {0} ?";
  +}
  +
  +public static final int ER_XSLATTRSET_USED_ITSELF = 101;
  +static {contents[ER_XSLATTRSET_USED_ITSELF][1] 
  +          = "xsl:attribute-set {0} used itself, which will cause an infinite 
loop.";
  +}
  +
  +public static final int ER_CANNOT_MIX_XERCESDOM = 102;
  +static {contents[ER_CANNOT_MIX_XERCESDOM][1] 
  +          = "Can not mix non Xerces-DOM input with Xerces-DOM output!";      
  +}
  +
  +public static final int ER_TOO_MANY_LISTENERS = 103;
  +static {contents[ER_TOO_MANY_LISTENERS][1] 
  +          = "addTraceListenersToStylesheet - TooManyListenersException";     
 
  +}
  +
  +public static final int ER_IN_ELEMTEMPLATEELEM_READOBJECT = 104;
  +static {contents[ER_IN_ELEMTEMPLATEELEM_READOBJECT][1] 
  +          = "In ElemTemplateElement.readObject: {0}";      
   }
   
   // Warnings...
  
  
  

Reply via email to