mmidy 00/03/01 08:47:07
Modified: src/org/apache/xalan/xpath FuncLoader.java
XPathProcessorImpl.java
src/org/apache/xalan/xpath/res XPATHErrorResources.java
Log:
Change warning to error if function not found.
Revision Changes Path
1.3 +3 -3 xml-xalan/src/org/apache/xalan/xpath/FuncLoader.java
Index: FuncLoader.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xpath/FuncLoader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FuncLoader.java 2000/01/05 23:05:25 1.2
+++ FuncLoader.java 2000/03/01 16:47:06 1.3
@@ -109,19 +109,19 @@
catch(ClassNotFoundException e)
{
e.printStackTrace();
- path.warn(XPATHErrorResources.WG_COULDNOT_FIND_FUNCTION, new Object[]
{m_funcName});
+ path.error(XPATHErrorResources.ER_COULDNOT_FIND_FUNCTION, new Object[]
{m_funcName});
return null;
}
catch(IllegalAccessException e)
{
e.printStackTrace();
- path.warn(XPATHErrorResources.WG_COULDNOT_FIND_FUNCTION, new Object[]
{m_funcName});
+ path.error(XPATHErrorResources.ER_COULDNOT_FIND_FUNCTION, new Object[]
{m_funcName});
return null;
}
catch(InstantiationException e)
{
e.printStackTrace();
- path.warn(XPATHErrorResources.WG_COULDNOT_FIND_FUNCTION, new Object[]
{m_funcName});
+ path.error(XPATHErrorResources.ER_COULDNOT_FIND_FUNCTION, new Object[]
{m_funcName});
return null;
}
}
1.25 +1 -1
xml-xalan/src/org/apache/xalan/xpath/XPathProcessorImpl.java
Index: XPathProcessorImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/src/org/apache/xalan/xpath/XPathProcessorImpl.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- XPathProcessorImpl.java 2000/03/01 02:54:15 1.24
+++ XPathProcessorImpl.java 2000/03/01 16:47:06 1.25
@@ -2018,7 +2018,7 @@
int funcTok = getFunctionToken(m_token);
if(-1 == funcTok)
{
- warn(XPATHErrorResources.WG_COULDNOT_FIND_FUNCTION, new
Object[] {m_token}); //"Could not find function: "+m_token+"()");
+ error(XPATHErrorResources.ER_COULDNOT_FIND_FUNCTION, new
Object[] {m_token}); //"Could not find function: "+m_token+"()");
}
switch(funcTok)
{
1.13 +6 -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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XPATHErrorResources.java 2000/02/29 15:32:20 1.12
+++ XPATHErrorResources.java 2000/03/01 16:47:07 1.13
@@ -19,7 +19,7 @@
public static final String ERROR_SUFFIX = "ER";
public static final String WARNING_SUFFIX = "WR";
-public static final int MAX_CODE = 46; // this is needed to
keep track of the number of messages
+public static final int MAX_CODE = 47; // 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;
@@ -288,6 +288,11 @@
public static final int ER_COUNT_TAKES_1_ARG = 46;
static {contents[ER_COUNT_TAKES_1_ARG ][1]
= "The count function should take one argument!";
+}
+
+public static final int ER_COULDNOT_FIND_FUNCTION = 47;
+static {contents[ER_COULDNOT_FIND_FUNCTION ][1]
+ = "Could not find function: {0}";
}
