Return-Path: Delivered-To: apmail-xml-xalan-cvs-archive@xml.apache.org Received: (qmail 15612 invoked by uid 500); 13 May 2002 21:20:18 -0000 Mailing-List: contact xalan-cvs-help@xml.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: Delivered-To: mailing list xalan-cvs@xml.apache.org Received: (qmail 15600 invoked from network); 13 May 2002 21:20:18 -0000 Date: 13 May 2002 21:20:17 -0000 Message-ID: <20020513212017.9585.qmail@icarus.apache.org> From: mmidy@apache.org To: xml-xalan-cvs@apache.org Subject: cvs commit: xml-xalan/java/src/org/apache/xpath/res XPATHErrorResources.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N mmidy 02/05/13 14:20:17 Modified: java/src/org/apache/xalan/res XSLMessages.java XSLTErrorResources.java java/src/org/apache/xalan/templates ElemTemplateElement.java java/src/org/apache/xpath/res XPATHErrorResources.java Log: Add a null constructor for resource files and fix XSLMessages to use the correct error resource file Revision Changes Path 1.7 +2 -2 xml-xalan/java/src/org/apache/xalan/res/XSLMessages.java Index: XSLMessages.java =================================================================== RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/res/XSLMessages.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- XSLMessages.java 12 May 2002 18:34:03 -0000 1.6 +++ XSLMessages.java 13 May 2002 21:20:17 -0000 1.7 @@ -135,7 +135,7 @@ if (fResourceBundle != null) { - String msgKey = XSLTErrorResources.getWarningKey(errorCode); + String msgKey = XPATHErrorResources.getWarningKey(errorCode); return createXPATHMsg(fResourceBundle, msgKey, args); } @@ -164,7 +164,7 @@ if (fResourceBundle != null) { - String msgKey = XSLTErrorResources.getMessageKey(errorCode); + String msgKey = XPATHErrorResources.getMessageKey(errorCode); return createXPATHMsg(fResourceBundle, msgKey, args); } 1.25 +6 -0 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.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- XSLTErrorResources.java 12 May 2002 18:34:03 -0000 1.24 +++ XSLTErrorResources.java 13 May 2002 21:20:17 -0000 1.25 @@ -76,6 +76,12 @@ */ public class XSLTErrorResources extends PropertyResourceBundle { + public XSLTErrorResources() + throws java.io.IOException + { + super(null); + } + public XSLTErrorResources(InputStream is) throws java.io.IOException { 1.49 +1 -1 xml-xalan/java/src/org/apache/xalan/templates/ElemTemplateElement.java Index: ElemTemplateElement.java =================================================================== RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemTemplateElement.java,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- ElemTemplateElement.java 28 Mar 2002 16:34:34 -0000 1.48 +++ ElemTemplateElement.java 13 May 2002 21:20:17 -0000 1.49 @@ -791,7 +791,7 @@ */ public String getSystemId() { - return this.getStylesheet().getHref(); + return (null != m_parentNode) ? this.getStylesheet().getHref() : null; } /** 1.12 +7 -0 xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources.java Index: XPATHErrorResources.java =================================================================== RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- XPATHErrorResources.java 12 May 2002 18:34:03 -0000 1.11 +++ XPATHErrorResources.java 13 May 2002 21:20:17 -0000 1.12 @@ -77,6 +77,13 @@ */ public class XPATHErrorResources extends PropertyResourceBundle { + + public XPATHErrorResources() + throws java.io.IOException + { + super(null); + } + public XPATHErrorResources(InputStream is) throws java.io.IOException { --------------------------------------------------------------------- To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org For additional commands, e-mail: xalan-cvs-help@xml.apache.org