You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mm...@apache.org on 2002/06/27 16:48:35 UTC

cvs commit: xml-xalan/java/src/org/apache/xpath/compiler Compiler.java OpMap.java

mmidy       2002/06/27 07:48:35

  Modified:    java/src/org/apache/xpath/compiler Compiler.java OpMap.java
  Log:
  Pull out hard coded messages
  
  Revision  Changes    Path
  1.29      +4 -2      xml-xalan/java/src/org/apache/xpath/compiler/Compiler.java
  
  Index: Compiler.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/compiler/Compiler.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- Compiler.java	13 May 2002 21:07:44 -0000	1.28
  +++ Compiler.java	27 Jun 2002 14:48:35 -0000	1.29
  @@ -1074,8 +1074,10 @@
         {
           java.lang.String name = FunctionTable.m_functions[funcID].getName();
   
  -        m_errorHandler.fatalError( new TransformerException(name + " only allows " + wnae.getMessage()
  -                               + " arguments", m_locator));
  +        m_errorHandler.fatalError( new TransformerException(
  +                  XSLMessages.createXPATHMessage(XPATHErrorResources.ER_ONLY_ALLOWS, 
  +                      new Object[]{name, wnae.getMessage()}), m_locator)); 
  +              //"name + " only allows " + wnae.getMessage() + " arguments", m_locator));
         }
   
         return func;
  
  
  
  1.11      +4 -2      xml-xalan/java/src/org/apache/xpath/compiler/OpMap.java
  
  Index: OpMap.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/compiler/OpMap.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- OpMap.java	30 Jul 2001 17:32:32 -0000	1.10
  +++ OpMap.java	27 Jun 2002 14:48:35 -0000	1.11
  @@ -60,6 +60,8 @@
   
   import org.apache.xml.utils.QName;
   import org.apache.xpath.patterns.NodeTest;
  +import org.apache.xpath.res.XPATHErrorResources;
  +import org.apache.xalan.res.XSLMessages;
   
   /**
    * This class represents the data structure basics of the XPath
  @@ -275,8 +277,8 @@
       else
       {
         throw new RuntimeException(
  -        "Programmer's assertion in getNextStepPos: unknown stepType: "
  -        + stepType);
  +        XSLMessages.createXPATHMessage(XPATHErrorResources.ER_UNKNOWN_STEP, new Object[]{new Integer(stepType).toString()})); 
  +      //"Programmer's assertion in getNextStepPos: unknown stepType: " + stepType);
       }
     }
   
  
  
  

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