You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by il...@apache.org on 2003/03/25 20:47:24 UTC

cvs commit: xml-xalan/java/src/org/apache/xalan/res XSLTErrorResources.java XSLTErrorResources.properties

ilene       2003/03/25 11:47:24

  Modified:    java/src/org/apache/xalan/templates Tag: XSLTC_DTM
                        FuncDocument.java
               java/src/org/apache/xalan/res Tag: XSLTC_DTM
                        XSLTErrorResources.java
                        XSLTErrorResources.properties
  Log:
  Committing Christine Li's (jycli@ca.ibm.com) patch for bugzilla #18210.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.26.2.5  +8 -5      xml-xalan/java/src/org/apache/xalan/templates/FuncDocument.java
  
  Index: FuncDocument.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/FuncDocument.java,v
  retrieving revision 1.26.2.4
  retrieving revision 1.26.2.5
  diff -u -r1.26.2.4 -r1.26.2.5
  --- FuncDocument.java	30 Jan 2003 18:41:29 -0000	1.26.2.4
  +++ FuncDocument.java	25 Mar 2003 19:47:24 -0000	1.26.2.5
  @@ -130,11 +130,14 @@
           int baseNode = arg2.iter().nextNode();
   
           if (baseNode == DTM.NULL)
  -          warn(xctxt, XSLTErrorResources.WG_EMPTY_SECOND_ARG, null);
  -        
  -        DTM baseDTM = xctxt.getDTM(baseNode);
  -        base = baseDTM.getDocumentBaseURI();
  -
  +        {
  +          	warn(xctxt, XSLTErrorResources.WG_EMPTY_SECOND_ARG, null);
  +          	XNodeSet nodes = new XNodeSet(xctxt.getDTMManager());
  +   	        return nodes;
  +        }else{
  +	        DTM baseDTM = xctxt.getDTM(baseNode);
  +    	    base = baseDTM.getDocumentBaseURI();
  +        }
           // %REVIEW% This doesn't seem to be a problem with the conformance
           // suite, but maybe it's just not doing a good test?
   //        int baseDoc = baseDTM.getDocument();
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.23.10.7 +1 -1      xml-xalan/java/src/org/apache/xalan/res/XSLTErrorResources.java
  
  Index: XSLTErrorResources.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/res/XSLTErrorResources.java,v
  retrieving revision 1.23.10.6
  retrieving revision 1.23.10.7
  diff -u -r1.23.10.6 -r1.23.10.7
  --- XSLTErrorResources.java	30 Jan 2003 18:41:24 -0000	1.23.10.6
  +++ XSLTErrorResources.java	25 Mar 2003 19:47:24 -0000	1.23.10.7
  @@ -2277,7 +2277,7 @@
   //  public static final int WG_EMPTY_SECOND_ARG = 26;
   
       { WG_EMPTY_SECOND_ARG,
  -      "Resulting nodeset from second argument of document function is empty. The first agument will be used."},
  +      "Resulting nodeset from second argument of document function is empty. Return an empty node-set."},
   
     //Following are the new WARNING keys added in XALAN code base after Jdk 1.4 (Xalan 2.2-D11)
   
  
  
  
  1.15.4.1  +1 -1      xml-xalan/java/src/org/apache/xalan/res/XSLTErrorResources.properties
  
  Index: XSLTErrorResources.properties
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/res/XSLTErrorResources.properties,v
  retrieving revision 1.15
  retrieving revision 1.15.4.1
  diff -u -r1.15 -r1.15.4.1
  --- XSLTErrorResources.properties	1 Oct 2002 16:01:28 -0000	1.15
  +++ XSLTErrorResources.properties	25 Mar 2003 19:47:24 -0000	1.15.4.1
  @@ -655,7 +655,7 @@
   # WG_ILLEGAL_ATTRIBUTE_VALUE 
   WR0025=Illegal value used for attribute {0}\u003a {1}
   # WG_EMPTY_SECOND_ARG 
  -WR0026=Resulting nodeset from second argument of document function is empty. The first agument will be used.
  +WR0026=Resulting nodeset from second argument of document function is empty. Return an empty node-set.
   
   # Note to translators:  "name" and "xsl:processing-instruction" are keywords
   # and must not be translated.
  
  
  

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