mmidy 01/07/27 17:26:00
Modified: java/src/org/apache/xalan/extensions
ExtensionHandlerGeneral.java
ExtensionHandlerJavaPackage.java
ExtensionsTable.java MethodResolver.java
java/src/org/apache/xalan/lib Extensions.java
java/src/org/apache/xalan/lib/sql ConnectionPoolManager.java
java/src/org/apache/xalan/processor ProcessorLRE.java
ProcessorTemplateElem.java StylesheetHandler.java
TransformerFactoryImpl.java XSLTAttributeDef.java
XSLTElementProcessor.java
java/src/org/apache/xalan/res XSLTErrorResources.java
java/src/org/apache/xalan/serialize CharInfo.java
WriterToUTF8Buffered.java
java/src/org/apache/xalan/templates ElemExtensionCall.java
ElemExtensionDecl.java ElemMessage.java
FuncDocument.java FuncFormatNumb.java
OutputProperties.java StylesheetRoot.java
java/src/org/apache/xalan/transformer TrAXFilter.java
TransformerHandlerImpl.java
TransformerIdentityImpl.java TransformerImpl.java
java/src/org/apache/xalan/xslt Process.java
java/src/org/apache/xml/dtm DTMException.java
DTMManager.java
java/src/org/apache/xml/dtm/ref ChunkedIntArray.java
CoroutineManager.java CoroutineSAXParser.java
CoroutineSAXParser_Xerces.java DTMBuilder.java
DTMDefaultBase.java DTMDefaultBaseIterators.java
DTMDefaultBaseTraversers.java
DTMManagerDefault.java
IncrementalSAXSource_Filter.java
IncrementalSAXSource_Xerces.java
java/src/org/apache/xml/dtm/ref/sax2dtm SAX2DTM.java
java/src/org/apache/xml/utils ObjectPool.java QName.java
URI.java
java/src/org/apache/xpath NodeSet.java NodeSetDTM.java
VariableStack.java XPath.java XPathContext.java
java/src/org/apache/xpath/axes WalkerFactory.java
java/src/org/apache/xpath/functions FuncSubstring.java
FunctionDef1Arg.java
java/src/org/apache/xpath/objects
XRTreeFragSelectWrapper.java XStringForChars.java
java/src/org/apache/xpath/operations Variable.java
java/src/org/apache/xpath/res XPATHErrorResources.java
Log:
Getting all (almost all) error message strings into the resource bundle
Revision Changes Path
1.14 +8 -6
xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandlerGeneral.java
Index: ExtensionHandlerGeneral.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandlerGeneral.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ExtensionHandlerGeneral.java 2001/06/15 05:13:46 1.13
+++ ExtensionHandlerGeneral.java 2001/07/28 00:25:57 1.14
@@ -68,6 +68,8 @@
import org.apache.xalan.transformer.TransformerImpl;
import org.apache.xalan.templates.Stylesheet;
import org.apache.xalan.templates.ElemTemplateElement;
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xml.utils.QName;
import javax.xml.transform.TransformerException;
@@ -225,12 +227,12 @@
if (m_scriptSrcURL != null)
{
- throw new TransformerException("src attribute not yet supported for "
- + scriptLang);
+ throw new
TransformerException(XSLMessages.createMessage(XSLTErrorResources.ER_SRC_ATTRIB_NOT_SUPPORTED,
new Object[]{scriptLang})); //"src attribute not yet supported for "
+ //+ scriptLang);
}
if (null == managerClass)
- throw new TransformerException("Could not initialize BSF manager");
+ throw new
TransformerException(XSLMessages.createMessage(XSLTErrorResources.ER_CANNOT_INIT_BSFMGR,
null)); //"Could not initialize BSF manager");
try
{
@@ -246,7 +248,7 @@
{
e.printStackTrace();
- throw new TransformerException("Could not compile extension", e);
+ throw new
TransformerException(XSLMessages.createMessage(XSLTErrorResources.ER_CANNOT_CMPL_EXTENSN,
null), e); //"Could not compile extension", e);
}
}
@@ -330,8 +332,8 @@
{
// Should probably make a TRaX Extension Exception.
- throw new TransformerException("Could not create extension: " +
funcName
- + " because of: " + e);
+ throw new
TransformerException(XSLMessages.createMessage(XSLTErrorResources.ER_CANNOT_CREATE_EXTENSN,
new Object[]{funcName, e })); //"Could not create extension: " + funcName
+ //+ " because of: " + e);
}
}
}
1.11 +6 -4
xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandlerJavaPackage.java
Index: ExtensionHandlerJavaPackage.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandlerJavaPackage.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ExtensionHandlerJavaPackage.java 2001/06/12 19:14:33 1.10
+++ ExtensionHandlerJavaPackage.java 2001/07/28 00:25:57 1.11
@@ -72,6 +72,8 @@
import org.apache.xalan.transformer.TransformerImpl;
import org.apache.xalan.templates.Stylesheet;
import org.apache.xalan.templates.ElemTemplateElement;
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xml.utils.QName;
import org.apache.xpath.objects.XObject;
@@ -342,8 +344,8 @@
if (args.size() < 1)
{
- throw new TransformerException("Instance method call to method " +
funcName
- + " requires an Object instance as first
argument");
+ throw new
TransformerException(XSLMessages.createMessage(XSLTErrorResources.ER_INSTANCE_MTHD_CALL_REQUIRES,
new Object[]{funcName })); //"Instance method call to method " + funcName
+ //+ " requires an Object instance as
first argument");
}
targetObject = args.elementAt(0);
if (targetObject instanceof XObject) // Next level down for
XObjects
@@ -432,7 +434,7 @@
String fullName = m_className + localPart;
int lastDot = fullName.lastIndexOf(".");
if (lastDot < 0)
- throw new TransformerException("Invalid element name specified " +
fullName);
+ throw new
TransformerException(XSLMessages.createMessage(XSLTErrorResources.ER_INVALID_ELEMENT_NAME,
new Object[]{fullName })); //"Invalid element name specified " + fullName);
try
{
classObj = getClassForName(fullName.substring(0, lastDot));
@@ -444,7 +446,7 @@
localPart = fullName.substring(lastDot + 1);
m = MethodResolver.getElementMethod(classObj, localPart);
if (!Modifier.isStatic(m.getModifiers()))
- throw new TransformerException("Element name method must be static
" + fullName);
+ throw new
TransformerException(XSLMessages.createMessage(XSLTErrorResources.ER_ELEMENT_NAME_METHOD_STATIC,
new Object[]{fullName })); //"Element name method must be static " + fullName);
}
catch (Exception e)
{
1.17 +5 -2
xml-xalan/java/src/org/apache/xalan/extensions/ExtensionsTable.java
Index: ExtensionsTable.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/ExtensionsTable.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ExtensionsTable.java 2001/06/12 19:14:33 1.16
+++ ExtensionsTable.java 2001/07/28 00:25:57 1.17
@@ -62,6 +62,9 @@
import org.apache.xpath.objects.XNull;
import org.apache.xpath.XPathProcessorException;
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.res.XSLTErrorResources;
+
/**
* <meta name="usage" content="internal"/>
* Class holding a table registered extension namespace handlers
@@ -265,8 +268,8 @@
}
else
{
- throw new XPathProcessorException("Extension function '" + ns + ":"
- + funcName + "' is unknown");
+ throw new
XPathProcessorException(XSLMessages.createMessage(XSLTErrorResources.ER_EXTENSION_FUNC_UNKNOWN,
new Object[]{ns, funcName })); //"Extension function '" + ns + ":"
+ // + funcName + "' is unknown");
}
}
1.26 +6 -3
xml-xalan/java/src/org/apache/xalan/extensions/MethodResolver.java
Index: MethodResolver.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/MethodResolver.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- MethodResolver.java 2001/06/15 21:18:34 1.25
+++ MethodResolver.java 2001/07/28 00:25:57 1.26
@@ -73,6 +73,9 @@
import org.apache.xml.dtm.ref.DTMNodeList;
import org.apache.xml.dtm.ref.DTMNodeProxy;
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.res.XSLTErrorResources;
+
import javax.xml.transform.TransformerException;
/**
@@ -186,7 +189,7 @@
}
/*** This is commented out until we can do a better object -> object
scoring
else if (bestScoreCount > 1)
- throw new TransformerException("More than one best match for
constructor for "
+ throw new
TransformerException(XSLMessages.createMessage(XSLTErrorResources.ER_MORE_MATCH_CONSTRUCTOR,
new Object[]{classObj.getName()})); //"More than one best match for
constructor for "
+
classObj.getName());
***/
else
@@ -313,7 +316,7 @@
}
/*** This is commented out until we can do a better object -> object
scoring
else if (bestScoreCount > 1)
- throw new TransformerException("More than one best match for method "
+ name);
+ throw new
TransformerException(XSLMessages.createMessage(XSLTErrorResources.ER_MORE_MATCH_METHOD,
new Object[]{name})); //"More than one best match for method " + name);
***/
else
convertParams(argsIn, argsOut, bestParamTypes, exprContext);
@@ -368,7 +371,7 @@
name, 0, null));
}
else if (bestScoreCount > 1)
- throw new TransformerException("More than one best match for element
method " + name);
+ throw new
TransformerException(XSLMessages.createMessage(XSLTErrorResources.ER_MORE_MATCH_ELEMENT,
new Object[]{name})); //"More than one best match for element method " + name);
return bestMethod;
}
1.14 +4 -2 xml-xalan/java/src/org/apache/xalan/lib/Extensions.java
Index: Extensions.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/lib/Extensions.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Extensions.java 2001/07/10 23:23:49 1.13
+++ Extensions.java 2001/07/28 00:25:57 1.14
@@ -80,6 +80,8 @@
import java.util.StringTokenizer;
import org.apache.xalan.extensions.ExpressionContext;
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.res.XSLTErrorResources;
import javax.xml.parsers.*;
@@ -342,8 +344,8 @@
}
}
else
- throw new SAXNotSupportedException("Invalid context passed to evaluate
"
- + myContext);
+ throw new
SAXNotSupportedException(XSLMessages.createMessage(XSLTErrorResources.ER_INVALID_CONTEXT_PASSED,
new Object[]{myContext })); //"Invalid context passed to evaluate "
+ //+ myContext);
}
/**
1.2 +4 -1
xml-xalan/java/src/org/apache/xalan/lib/sql/ConnectionPoolManager.java
Index: ConnectionPoolManager.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/lib/sql/ConnectionPoolManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConnectionPoolManager.java 2001/07/12 05:01:44 1.1
+++ ConnectionPoolManager.java 2001/07/28 00:25:57 1.2
@@ -61,6 +61,9 @@
import java.util.Hashtable;
import java.lang.IllegalArgumentException;
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.res.XSLTErrorResources;
+
/**
*/
public class ConnectionPoolManager
@@ -118,7 +121,7 @@
{
if ( m_poolTable.containsKey(name) )
{
- throw new IllegalArgumentException("Pool already exists");
+ throw new
IllegalArgumentException(XSLMessages.createMessage(XSLTErrorResources.ER_POOL_EXISTS,
null)); //"Pool already exists");
}
m_poolTable.put(name, pool);
1.18 +2 -2
xml-xalan/java/src/org/apache/xalan/processor/ProcessorLRE.java
Index: ProcessorLRE.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/ProcessorLRE.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ProcessorLRE.java 2001/03/13 19:54:55 1.17
+++ ProcessorLRE.java 2001/07/28 00:25:57 1.18
@@ -305,11 +305,11 @@
}
catch (InstantiationException ie)
{
- handler.error("Failed creating ElemLiteralResult instance!", ie);
+ handler.error(XSLTErrorResources.ER_FAILED_CREATING_ELEMLITRSLT,
null, ie);//"Failed creating ElemLiteralResult instance!", ie);
}
catch (IllegalAccessException iae)
{
- handler.error("Failed creating ElemLiteralResult instance!", iae);
+ handler.error(XSLTErrorResources.ER_FAILED_CREATING_ELEMLITRSLT,
null, iae);//"Failed creating ElemLiteralResult instance!", iae);
}
setPropertiesFromAttributes(handler, rawName, attributes, elem);
1.9 +3 -2
xml-xalan/java/src/org/apache/xalan/processor/ProcessorTemplateElem.java
Index: ProcessorTemplateElem.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/ProcessorTemplateElem.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ProcessorTemplateElem.java 2001/06/12 19:14:47 1.8
+++ ProcessorTemplateElem.java 2001/07/28 00:25:57 1.9
@@ -57,6 +57,7 @@
package org.apache.xalan.processor;
import org.apache.xalan.templates.ElemTemplateElement;
+import org.apache.xalan.res.XSLTErrorResources;
import javax.xml.transform.TransformerException;
import org.xml.sax.Attributes;
@@ -111,11 +112,11 @@
}
catch (InstantiationException ie)
{
- handler.error("Failed creating ElemTemplateElement instance!", ie);
+ handler.error(XSLTErrorResources.ER_FAILED_CREATING_ELEMTMPL, null,
ie);//"Failed creating ElemTemplateElement instance!", ie);
}
catch (IllegalAccessException iae)
{
- handler.error("Failed creating ElemTemplateElement instance!", iae);
+ handler.error(XSLTErrorResources.ER_FAILED_CREATING_ELEMTMPL, null,
iae);//"Failed creating ElemTemplateElement instance!", iae);
}
setPropertiesFromAttributes(handler, rawName, attributes, elem);
1.43 +3 -2
xml-xalan/java/src/org/apache/xalan/processor/StylesheetHandler.java
Index: StylesheetHandler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/StylesheetHandler.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- StylesheetHandler.java 2001/06/15 08:12:48 1.42
+++ StylesheetHandler.java 2001/07/28 00:25:57 1.43
@@ -68,6 +68,7 @@
import java.util.Stack;
import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xalan.templates.Constants;
import org.apache.xalan.templates.ElemTemplateElement;
import org.apache.xalan.templates.ElemUnknown;
@@ -497,7 +498,7 @@
getStylesheetRoot().recompose();
}
else
- throw new TransformerException("Did not find the stylesheet root!");
+ throw new
TransformerException(XSLMessages.createMessage(XSLTErrorResources.ER_NO_STYLESHEETROOT,
null)); //"Did not find the stylesheet root!");
XSLTElementProcessor elemProcessor = getCurrentProcessor();
@@ -1601,7 +1602,7 @@
try
{
- handler.error(new TransformerException("Illegal value for
xml:space", locator));
+ handler.error(new
TransformerException(XSLMessages.createMessage(XSLTErrorResources.ER_ILLEGAL_XMLSPACE_VALUE,
null), locator)); //"Illegal value for xml:space", locator));
}
catch (TransformerException te)
{
1.38 +10 -10
xml-xalan/java/src/org/apache/xalan/processor/TransformerFactoryImpl.java
Index: TransformerFactoryImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/TransformerFactoryImpl.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- TransformerFactoryImpl.java 2001/06/25 20:06:16 1.37
+++ TransformerFactoryImpl.java 2001/07/28 00:25:57 1.38
@@ -246,8 +246,8 @@
// Should remove this later... but right now diagnostics from
// TransformerConfigurationException are not good.
// se.printStackTrace();
- throw new TransformerConfigurationException("processFromNode failed",
- se);
+ throw new
TransformerConfigurationException(XSLMessages.createMessage(XSLTErrorResources.ER_PROCESSFROMNODE_FAILED,
null), se); //"processFromNode failed",
+ //se);
}
catch (TransformerConfigurationException tce)
{
@@ -279,8 +279,8 @@
// Should remove this later... but right now diagnostics from
// TransformerConfigurationException are not good.
// se.printStackTrace();
- throw new TransformerConfigurationException("processFromNode failed",
- e);
+ throw new
TransformerConfigurationException(XSLMessages.createMessage(XSLTErrorResources.ER_PROCESSFROMNODE_FAILED,
null), e); //"processFromNode failed",
+ //e);
}
}
@@ -532,7 +532,7 @@
else
{
// Give a more meaningful error message
- throw new IllegalArgumentException(name + " bad value " + value);
+ throw new
IllegalArgumentException(XSLMessages.createMessage(XSLTErrorResources.ER_BAD_VALUE,
new Object[]{name, value})); //name + " bad value " + value);
}
}
else if (name.equals(FEATURE_OPTIMIZE))
@@ -550,12 +550,12 @@
else
{
// Give a more meaningful error message
- throw new IllegalArgumentException(name + " bad value " + value);
+ throw new
IllegalArgumentException(XSLMessages.createMessage(XSLTErrorResources.ER_BAD_VALUE,
new Object[]{name, value})); //name + " bad value " + value);
}
}
else
{
- throw new IllegalArgumentException(name + "not supported");
+ throw new
IllegalArgumentException(XSLMessages.createMessage(XSLTErrorResources.ER_NOT_SUPPORTED,
new Object[]{name})); //name + "not supported");
}
}
@@ -573,11 +573,11 @@
{
// Please implement this method for testing purposes 25-Jun-01 -sc
if (name.equals(FEATURE_INCREMENTAL))
- throw new IllegalArgumentException(name + " attribute value not
found");
+ throw new
IllegalArgumentException(XSLMessages.createMessage(XSLTErrorResources.ER_ATTRIB_VALUE_NOT_FOUND,
new Object[]{name})); //name + " attribute value not found");
else if (name.equals(FEATURE_OPTIMIZE))
- throw new IllegalArgumentException(name + " attribute value not
found");
+ throw new
IllegalArgumentException(XSLMessages.createMessage(XSLTErrorResources.ER_ATTRIB_VALUE_NOT_FOUND,
new Object[]{name})); //name + " attribute value not found");
else
- throw new IllegalArgumentException(name + " attribute not recognized");
+ throw new
IllegalArgumentException(XSLMessages.createMessage(XSLTErrorResources.ER_ATTRIB_VALUE_NOT_RECOGNIZED,
new Object[]{name})); //name + " attribute not recognized");
}
/**
1.19 +9 -7
xml-xalan/java/src/org/apache/xalan/processor/XSLTAttributeDef.java
Index: XSLTAttributeDef.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/XSLTAttributeDef.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- XSLTAttributeDef.java 2001/01/07 06:24:39 1.18
+++ XSLTAttributeDef.java 2001/07/28 00:25:57 1.19
@@ -72,6 +72,8 @@
import org.apache.xalan.templates.AVT;
import org.apache.xalan.templates.ElemTemplateElement;
import org.apache.xalan.templates.Constants;
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xml.utils.QName;
import org.apache.xml.utils.SystemIDResolver;
import org.apache.xml.utils.StringVector;
@@ -659,8 +661,8 @@
}
catch (NumberFormatException nfe)
{
- handler.error("Priority value does not contain a parsable number.",
- nfe);
+ handler.error(XSLTErrorResources.ER_PRIORITY_NOT_PARSABLE, null,
nfe);//"Priority value does not contain a parsable number.",
+ //nfe);
return new Double(0.0);
}
@@ -872,8 +874,8 @@
// Is this already checked somewhere else? -sb
if (!(value.equals("yes") || value.equals("no")))
- handler.error("Value for " + name + " should equal 'yes' or 'no'",
- null);
+ handler.error(XSLTErrorResources.ER_VALUE_SHOULD_EQUAL, new
Object[]{name}, null);//"Value for " + name + " should equal 'yes' or 'no'",
+ //null);
return new Boolean(value.equals("yes") ? true : false);
}
@@ -1099,15 +1101,15 @@
catch (NoSuchMethodException nsme)
{
if (!setterString.equals(S_FOREIGNATTR_SETTER))
- handler.error("Failed calling " + setterString + " method!", nsme);
+ handler.error(XSLTErrorResources.ER_FAILED_CALLING_METHOD, new
Object[]{setterString}, nsme);//"Failed calling " + setterString + " method!",
nsme);
}
catch (IllegalAccessException iae)
{
- handler.error("Failed calling " + setterString + " method!", iae);
+ handler.error(XSLTErrorResources.ER_FAILED_CALLING_METHOD, new
Object[]{setterString}, iae);//"Failed calling " + setterString + " method!",
iae);
}
catch (InvocationTargetException nsme)
{
- handler.error("Failed calling " + setterString + " method!", nsme);
+ handler.error(XSLTErrorResources.ER_FAILED_CALLING_METHOD, new
Object[]{setterString}, nsme);//"Failed calling " + setterString + " method!",
nsme);
}
}
}
1.12 +5 -5
xml-xalan/java/src/org/apache/xalan/processor/XSLTElementProcessor.java
Index: XSLTElementProcessor.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/XSLTElementProcessor.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XSLTElementProcessor.java 2001/04/10 18:49:36 1.11
+++ XSLTElementProcessor.java 2001/07/28 00:25:57 1.12
@@ -242,8 +242,8 @@
StylesheetHandler handler, char ch[], int start, int length)
throws org.xml.sax.SAXException
{
- handler.error("Characters are not allowed at this point in the
document!",
- null);
+ handler.error(XSLTErrorResources.ER_CHARS_NOT_ALLOWED, null,
null);//"Characters are not allowed at this point in the document!",
+ //null);
}
/**
@@ -357,9 +357,9 @@
{
// Then barf, because this element does not allow this attribute.
- handler.error("\""+attributes.getQName(i)+"\""
- + " attribute is not allowed on the " + rawName
- + " element!", null);
+ handler.error(XSLTErrorResources.ER_ATTR_NOT_ALLOWED, new
Object[]{attributes.getQName(i), rawName},
null);//"\""+attributes.getQName(i)+"\""
+ //+ " attribute is not allowed on the " + rawName
+ // + " element!", null);
}
else
{
1.20 +1044 -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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- XSLTErrorResources.java 2001/07/11 04:00:09 1.19
+++ XSLTErrorResources.java 2001/07/28 00:25:58 1.20
@@ -86,7 +86,7 @@
public static final String WARNING_SUFFIX = "WR";
/** Maximum error messages, this is needed to keep track of the number of
messages. */
- public static final int MAX_CODE = 110;
+ public static final int MAX_CODE = 215;
/** Maximum warnings, this is needed to keep track of the number of
warnings. */
public static final int MAX_WARNING = 26;
@@ -1101,6 +1101,1049 @@
contents[ER_REQUIRED_ELEM_NOT_FOUND][1] =
"Required Element not found: {0}";
}
+
+ /** InputStream cannot be null */
+ public static final int ER_INPUT_CANNOT_BE_NULL = 111;
+
+ static
+ {
+ contents[ER_INPUT_CANNOT_BE_NULL][1] =
+ "InputStream cannot be null";
+ }
+
+ /** URI cannot be null */
+ public static final int ER_URI_CANNOT_BE_NULL = 112;
+
+ static
+ {
+ contents[ER_URI_CANNOT_BE_NULL][1] =
+ "URI cannot be null";
+ }
+
+ /** File cannot be null */
+ public static final int ER_FILE_CANNOT_BE_NULL = 113;
+
+ static
+ {
+ contents[ER_FILE_CANNOT_BE_NULL][1] =
+ "File cannot be null";
+ }
+
+ /** InputSource cannot be null */
+ public static final int ER_SOURCE_CANNOT_BE_NULL = 114;
+
+ static
+ {
+ contents[ER_SOURCE_CANNOT_BE_NULL][1] =
+ "InputSource cannot be null";
+ }
+
+ /** Can't overwrite cause */
+ public static final int ER_CANNOT_OVERWRITE_CAUSE = 115;
+
+ static
+ {
+ contents[ER_CANNOT_OVERWRITE_CAUSE][1] =
+ "Cannot overwrite cause";
+ }
+
+ /** Could not initialize BSF Manager */
+ public static final int ER_CANNOT_INIT_BSFMGR = 116;
+
+ static
+ {
+ contents[ER_CANNOT_INIT_BSFMGR][1] =
+ "Could not initialize BSF Manager";
+ }
+
+ /** Could not compile extension */
+ public static final int ER_CANNOT_CMPL_EXTENSN = 117;
+
+ static
+ {
+ contents[ER_CANNOT_CMPL_EXTENSN][1] =
+ "Could not compile extension";
+ }
+
+ /** Could not create extension */
+ public static final int ER_CANNOT_CREATE_EXTENSN = 118;
+
+ static
+ {
+ contents[ER_CANNOT_CREATE_EXTENSN][1] =
+ "Could not create extension: {0} because of: {1}";
+ }
+
+ /** Instance method call to method {0} requires an Object instance as
first argument */
+ public static final int ER_INSTANCE_MTHD_CALL_REQUIRES = 119;
+
+ static
+ {
+ contents[ER_INSTANCE_MTHD_CALL_REQUIRES][1] =
+ "Instance method call to method {0} requires an Object instance as
first argument";
+ }
+
+ /** Invalid element name specified */
+ public static final int ER_INVALID_ELEMENT_NAME = 120;
+
+ static
+ {
+ contents[ER_INVALID_ELEMENT_NAME][1] =
+ "Invalid element name specified {0}";
+ }
+
+ /** Element name method must be static */
+ public static final int ER_ELEMENT_NAME_METHOD_STATIC = 121;
+
+ static
+ {
+ contents[ER_ELEMENT_NAME_METHOD_STATIC][1] =
+ "Element name method must be static {0}";
+ }
+
+ /** Extension function {0} : {1} is unknown */
+ public static final int ER_EXTENSION_FUNC_UNKNOWN = 122;
+
+ static
+ {
+ contents[ER_EXTENSION_FUNC_UNKNOWN][1] =
+ "Extension function {0} : {1} is unknown";
+ }
+
+ /** More than one best match for constructor for */
+ public static final int ER_MORE_MATCH_CONSTRUCTOR = 123;
+
+ static
+ {
+ contents[ER_MORE_MATCH_CONSTRUCTOR][1] =
+ "More than one best match for constructor for {0}";
+ }
+
+ /** More than one best match for method */
+ public static final int ER_MORE_MATCH_METHOD = 124;
+
+ static
+ {
+ contents[ER_MORE_MATCH_METHOD][1] =
+ "More than one best match for method {0}";
+ }
+
+ /** More than one best match for element method */
+ public static final int ER_MORE_MATCH_ELEMENT = 125;
+
+ static
+ {
+ contents[ER_MORE_MATCH_ELEMENT][1] =
+ "More than one best match for element method {0}";
+ }
+
+ /** Invalid context passed to evaluate */
+ public static final int ER_INVALID_CONTEXT_PASSED = 126;
+
+ static
+ {
+ contents[ER_INVALID_CONTEXT_PASSED][1] =
+ "Invalid context passed to evaluate {0}";
+ }
+
+ /** Pool already exists */
+ public static final int ER_POOL_EXISTS = 127;
+
+ static
+ {
+ contents[ER_POOL_EXISTS][1] =
+ "Pool already exists";
+ }
+
+ /** No driver Name specified */
+ public static final int ER_NO_DRIVER_NAME = 128;
+
+ static
+ {
+ contents[ER_NO_DRIVER_NAME][1] =
+ "No driver Name specified";
+ }
+
+ /** No URL specified */
+ public static final int ER_NO_URL = 129;
+
+ static
+ {
+ contents[ER_NO_URL][1] =
+ "No URL specified";
+ }
+
+ /** Pool size is less than one */
+ public static final int ER_POOL_SIZE_LESSTHAN_ONE = 130;
+
+ static
+ {
+ contents[ER_POOL_SIZE_LESSTHAN_ONE][1] =
+ "Pool size is less than one!";
+ }
+
+ /** Invalid driver name specified */
+ public static final int ER_INVALID_DRIVER = 131;
+
+ static
+ {
+ contents[ER_INVALID_DRIVER][1] =
+ "Invalid driver name specified!";
+ }
+
+ /** Did not find the stylesheet root */
+ public static final int ER_NO_STYLESHEETROOT = 132;
+
+ static
+ {
+ contents[ER_NO_STYLESHEETROOT][1] =
+ "Did not find the stylesheet root!";
+ }
+
+ /** Illegal value for xml:space */
+ public static final int ER_ILLEGAL_XMLSPACE_VALUE = 133;
+
+ static
+ {
+ contents[ER_ILLEGAL_XMLSPACE_VALUE][1] =
+ "Illegal value for xml:space";
+ }
+
+ /** processFromNode failed */
+ public static final int ER_PROCESSFROMNODE_FAILED = 134;
+
+ static
+ {
+ contents[ER_PROCESSFROMNODE_FAILED][1] =
+ "processFromNode failed";
+ }
+
+ /** The resource [] could not load: */
+ public static final int ER_RESOURCE_COULD_NOT_LOAD = 135;
+
+ static
+ {
+ contents[ER_RESOURCE_COULD_NOT_LOAD][1] =
+ "The resource [ {0} ] could not load: {1} \n {2} \t {3}";
+ }
+
+
+ /** Buffer size <=0 */
+ public static final int ER_BUFFER_SIZE_LESSTHAN_ZERO = 136;
+
+ static
+ {
+ contents[ER_BUFFER_SIZE_LESSTHAN_ZERO][1] =
+ "Buffer size <=0";
+ }
+
+ /** Unknown error when calling extension */
+ public static final int ER_UNKNOWN_ERROR_CALLING_EXTENSION = 137;
+
+ static
+ {
+ contents[ER_UNKNOWN_ERROR_CALLING_EXTENSION][1] =
+ "Unknown error when calling extension";
+ }
+
+ /** Prefix {0} does not have a corresponding namespace declaration */
+ public static final int ER_NO_NAMESPACE_DECL = 138;
+
+ static
+ {
+ contents[ER_NO_NAMESPACE_DECL][1] =
+ "Prefix {0} does not have a corresponding namespace declaration";
+ }
+
+ /** Element content not allowed for lang=javaclass */
+ public static final int ER_ELEM_CONTENT_NOT_ALLOWED = 139;
+
+ static
+ {
+ contents[ER_ELEM_CONTENT_NOT_ALLOWED][1] =
+ "Element content not allowed for lang=javaclass {0}";
+ }
+
+ /** Stylesheet directed termination */
+ public static final int ER_STYLESHEET_DIRECTED_TERMINATION = 140;
+
+ static
+ {
+ contents[ER_STYLESHEET_DIRECTED_TERMINATION][1] =
+ "Stylesheet directed termination";
+ }
+
+ /** 1 or 2 */
+ public static final int ER_ONE_OR_TWO = 141;
+
+ static
+ {
+ contents[ER_ONE_OR_TWO][1] =
+ "1 or 2";
+ }
+
+ /** 2 or 3 */
+ public static final int ER_TWO_OR_THREE = 142;
+
+ static
+ {
+ contents[ER_TWO_OR_THREE][1] =
+ "2 or 3";
+ }
+
+ /** Could not load {0} (check CLASSPATH), now using just the defaults */
+ public static final int ER_COULD_NOT_LOAD_RESOURCE = 143;
+
+ static
+ {
+ contents[ER_COULD_NOT_LOAD_RESOURCE][1] =
+ "Could not load {0} (check CLASSPATH), now using just the defaults";
+ }
+
+ /** Cannot initialize default templates */
+ public static final int ER_CANNOT_INIT_DEFAULT_TEMPLATES = 144;
+
+ static
+ {
+ contents[ER_CANNOT_INIT_DEFAULT_TEMPLATES][1] =
+ "Cannot initialize default templates";
+ }
+
+ /** Result should not be null */
+ public static final int ER_RESULT_NULL = 145;
+
+ static
+ {
+ contents[ER_RESULT_NULL][1] =
+ "Result should not be null";
+ }
+
+ /** Result could not be set */
+ public static final int ER_RESULT_COULD_NOT_BE_SET = 146;
+
+ static
+ {
+ contents[ER_RESULT_COULD_NOT_BE_SET][1] =
+ "Result could not be set";
+ }
+
+ /** No output specified */
+ public static final int ER_NO_OUTPUT_SPECIFIED = 147;
+
+ static
+ {
+ contents[ER_NO_OUTPUT_SPECIFIED][1] =
+ "No output specified";
+ }
+
+ /** Can't transform to a Result of type */
+ public static final int ER_CANNOT_TRANSFORM_TO_RESULT_TYPE = 148;
+
+ static
+ {
+ contents[ER_CANNOT_TRANSFORM_TO_RESULT_TYPE][1] =
+ "Can't transform to a Result of type {0}";
+ }
+
+ /** Can't transform to a Source of type */
+ public static final int ER_CANNOT_TRANSFORM_SOURCE_TYPE = 149;
+
+ static
+ {
+ contents[ER_CANNOT_TRANSFORM_SOURCE_TYPE][1] =
+ "Can't transform a Source of type {0}";
+ }
+
+ /** Null content handler */
+ public static final int ER_NULL_CONTENT_HANDLER = 150;
+
+ static
+ {
+ contents[ER_NULL_CONTENT_HANDLER][1] =
+ "Null content handler";
+ }
+
+ /** Null error handler */
+ public static final int ER_NULL_ERROR_HANDLER = 151;
+
+ static
+ {
+ contents[ER_NULL_ERROR_HANDLER][1] =
+ "Null error handler";
+ }
+
+ /** parse can not be called if the ContentHandler has not been set */
+ public static final int ER_CANNOT_CALL_PARSE = 152;
+
+ static
+ {
+ contents[ER_CANNOT_CALL_PARSE][1] =
+ "parse can not be called if the ContentHandler has not been set";
+ }
+
+ /** No parent for filter */
+ public static final int ER_NO_PARENT_FOR_FILTER = 153;
+
+ static
+ {
+ contents[ER_NO_PARENT_FOR_FILTER][1] =
+ "No parent for filter";
+ }
+
+
+ /** No stylesheet found in: {0}, media */
+ public static final int ER_NO_STYLESHEET_IN_MEDIA = 154;
+
+ static
+ {
+ contents[ER_NO_STYLESHEET_IN_MEDIA][1] =
+ "No stylesheet found in: {0}, media= {1}";
+ }
+
+ /** No xml-stylesheet PI found in */
+ public static final int ER_NO_STYLESHEET_PI = 155;
+
+ static
+ {
+ contents[ER_NO_STYLESHEET_PI][1] =
+ "No xml-stylesheet PI found in: {0}";
+ }
+
+ /** No default implementation found */
+ public static final int ER_NO_DEFAULT_IMPL = 156;
+
+ static
+ {
+ contents[ER_NO_DEFAULT_IMPL][1] =
+ "No default implementation found ";
+ }
+
+ /** ChunkedIntArray({0}) not currently supported */
+ public static final int ER_CHUNKEDINTARRAY_NOT_SUPPORTED = 157;
+
+ static
+ {
+ contents[ER_CHUNKEDINTARRAY_NOT_SUPPORTED][1] =
+ "ChunkedIntArray({0}) not currently supported";
+ }
+
+ /** Offset bigger than slot */
+ public static final int ER_OFFSET_BIGGER_THAN_SLOT = 158;
+
+ static
+ {
+ contents[ER_OFFSET_BIGGER_THAN_SLOT][1] =
+ "Offset bigger than slot";
+ }
+
+ /** Coroutine not available, id= */
+ public static final int ER_COROUTINE_NOT_AVAIL = 159;
+
+ static
+ {
+ contents[ER_COROUTINE_NOT_AVAIL][1] =
+ "Coroutine not available, id={0}";
+ }
+
+ /** CoroutineManager recieved co_exit() request */
+ public static final int ER_COROUTINE_CO_EXIT = 160;
+
+ static
+ {
+ contents[ER_COROUTINE_CO_EXIT][1] =
+ "CoroutineManager received co_exit() request";
+ }
+
+ /** co_joinCoroutineSet() failed */
+ public static final int ER_COJOINROUTINESET_FAILED = 161;
+
+ static
+ {
+ contents[ER_COJOINROUTINESET_FAILED][1] =
+ "co_joinCoroutineSet() failed";
+ }
+
+ /** Coroutine parameter error () */
+ public static final int ER_COROUTINE_PARAM = 162;
+
+ static
+ {
+ contents[ER_COROUTINE_PARAM][1] =
+ "Coroutine parameter error ({0})";
+ }
+
+ /** UNEXPECTED: Parser doTerminate answers */
+ public static final int ER_PARSER_DOTERMINATE_ANSWERS = 163;
+
+ static
+ {
+ contents[ER_PARSER_DOTERMINATE_ANSWERS][1] =
+ "\nUNEXPECTED: Parser doTerminate answers {0}";
+ }
+
+ /** parse may not be called while parsing */
+ public static final int ER_NO_PARSE_CALL_WHILE_PARSING = 164;
+
+ static
+ {
+ contents[ER_NO_PARSE_CALL_WHILE_PARSING][1] =
+ "parse may not be called while parsing";
+ }
+
+ /** Error: typed iterator for axis {0} not implemented */
+ public static final int ER_TYPED_ITERATOR_AXIS_NOT_IMPLEMENTED = 165;
+
+ static
+ {
+ contents[ER_TYPED_ITERATOR_AXIS_NOT_IMPLEMENTED][1] =
+ "Error: typed iterator for axis {0} not implemented";
+ }
+
+ /** Error: iterator for axis {0} not implemented */
+ public static final int ER_ITERATOR_AXIS_NOT_IMPLEMENTED = 166;
+
+ static
+ {
+ contents[ER_ITERATOR_AXIS_NOT_IMPLEMENTED][1] =
+ "Error: iterator for axis {0} not implemented ";
+ }
+
+ /** Iterator clone not supported */
+ public static final int ER_ITERATOR_CLONE_NOT_SUPPORTED = 167;
+
+ static
+ {
+ contents[ER_ITERATOR_CLONE_NOT_SUPPORTED][1] =
+ "Iterator clone not supported";
+ }
+
+ /** Unknown axis traversal type */
+ public static final int ER_UNKNOWN_AXIS_TYPE = 168;
+
+ static
+ {
+ contents[ER_UNKNOWN_AXIS_TYPE][1] =
+ "Unknown axis traversal type: {0}";
+ }
+
+ /** Axis traverser not supported */
+ public static final int ER_AXIS_NOT_SUPPORTED = 169;
+
+ static
+ {
+ contents[ER_AXIS_NOT_SUPPORTED][1] =
+ "Axis traverser not supported: {0}";
+ }
+
+ /** No more DTM IDs are available */
+ public static final int ER_NO_DTMIDS_AVAIL = 170;
+
+ static
+ {
+ contents[ER_NO_DTMIDS_AVAIL][1] =
+ "No more DTM IDs are available";
+ }
+
+ /** Not supported */
+ public static final int ER_NOT_SUPPORTED = 171;
+
+ static
+ {
+ contents[ER_NOT_SUPPORTED][1] =
+ "Not supported: {0}";
+ }
+
+ /** node must be non-null for getDTMHandleFromNode */
+ public static final int ER_NODE_NON_NULL = 172;
+
+ static
+ {
+ contents[ER_NODE_NON_NULL][1] =
+ "Node must be non-null for getDTMHandleFromNode";
+ }
+
+ /** Could not resolve the node to a handle */
+ public static final int ER_COULD_NOT_RESOLVE_NODE = 173;
+
+ static
+ {
+ contents[ER_COULD_NOT_RESOLVE_NODE][1] =
+ "Could not resolve the node to a handle";
+ }
+
+ /** startParse may not be called while parsing */
+ public static final int ER_STARTPARSE_WHILE_PARSING = 174;
+
+ static
+ {
+ contents[ER_STARTPARSE_WHILE_PARSING][1] =
+ "startParse may not be called while parsing";
+ }
+
+ /** startParse needs a non-null SAXParser */
+ public static final int ER_STARTPARSE_NEEDS_SAXPARSER = 175;
+
+ static
+ {
+ contents[ER_STARTPARSE_NEEDS_SAXPARSER][1] =
+ "startParse needs a non-null SAXParser";
+ }
+
+ /** could not initialize parser with */
+ public static final int ER_COULD_NOT_INIT_PARSER = 176;
+
+ static
+ {
+ contents[ER_COULD_NOT_INIT_PARSER][1] =
+ "could not initialize parser with";
+ }
+
+ /** Value for property {0} should be a Boolean instance */
+ public static final int ER_PROPERTY_VALUE_BOOLEAN = 177;
+
+ static
+ {
+ contents[ER_PROPERTY_VALUE_BOOLEAN][1] =
+ "Value for property {0} should be a Boolean instance";
+ }
+
+ /** exception creating new instance for pool */
+ public static final int ER_EXCEPTION_CREATING_POOL = 178;
+
+ static
+ {
+ contents[ER_EXCEPTION_CREATING_POOL][1] =
+ "exception creating new instance for pool";
+ }
+
+ /** Path contains invalid escape sequence */
+ public static final int ER_PATH_CONTAINS_INVALID_ESCAPE_SEQUENCE = 179;
+
+ static
+ {
+ contents[ER_PATH_CONTAINS_INVALID_ESCAPE_SEQUENCE][1] =
+ "Path contains invalid escape sequence";
+ }
+
+ /** Scheme is required! */
+ public static final int ER_SCHEME_REQUIRED = 180;
+
+ static
+ {
+ contents[ER_SCHEME_REQUIRED][1] =
+ "Scheme is required!";
+ }
+
+ /** No scheme found in URI */
+ public static final int ER_NO_SCHEME_IN_URI = 181;
+
+ static
+ {
+ contents[ER_NO_SCHEME_IN_URI][1] =
+ "No scheme found in URI: {0}";
+ }
+
+ /** No scheme found in URI */
+ public static final int ER_NO_SCHEME_INURI = 182;
+
+ static
+ {
+ contents[ER_NO_SCHEME_INURI][1] =
+ "No scheme found in URI";
+ }
+
+ /** Path contains invalid character: */
+ public static final int ER_PATH_INVALID_CHAR = 183;
+
+ static
+ {
+ contents[ER_PATH_INVALID_CHAR][1] =
+ "Path contains invalid character: {0}";
+ }
+
+ /** Cannot set scheme from null string */
+ public static final int ER_SCHEME_FROM_NULL_STRING = 184;
+
+ static
+ {
+ contents[ER_SCHEME_FROM_NULL_STRING][1] =
+ "Cannot set scheme from null string";
+ }
+
+ /** The scheme is not conformant. */
+ public static final int ER_SCHEME_NOT_CONFORMANT = 185;
+
+ static
+ {
+ contents[ER_SCHEME_NOT_CONFORMANT][1] =
+ "The scheme is not conformant.";
+ }
+
+ /** Host is not a well formed address */
+ public static final int ER_HOST_ADDRESS_NOT_WELLFORMED = 186;
+
+ static
+ {
+ contents[ER_HOST_ADDRESS_NOT_WELLFORMED][1] =
+ "Host is not a well formed address";
+ }
+
+ /** Port cannot be set when host is null */
+ public static final int ER_PORT_WHEN_HOST_NULL = 187;
+
+ static
+ {
+ contents[ER_PORT_WHEN_HOST_NULL][1] =
+ "Port cannot be set when host is null";
+ }
+
+ /** Invalid port number */
+ public static final int ER_INVALID_PORT = 188;
+
+ static
+ {
+ contents[ER_INVALID_PORT][1] =
+ "Invalid port number";
+ }
+
+ /** Fragment can only be set for a generic URI */
+ public static final int ER_FRAG_FOR_GENERIC_URI = 189;
+
+ static
+ {
+ contents[ER_FRAG_FOR_GENERIC_URI][1] =
+ "Fragment can only be set for a generic URI";
+ }
+
+ /** Fragment cannot be set when path is null */
+ public static final int ER_FRAG_WHEN_PATH_NULL = 190;
+
+ static
+ {
+ contents[ER_FRAG_WHEN_PATH_NULL][1] =
+ "Fragment cannot be set when path is null";
+ }
+
+ /** Fragment contains invalid character */
+ public static final int ER_FRAG_INVALID_CHAR = 191;
+
+ static
+ {
+ contents[ER_FRAG_INVALID_CHAR][1] =
+ "Fragment contains invalid character";
+ }
+
+
+
+ /** Parser is already in use */
+ public static final int ER_PARSER_IN_USE = 192;
+
+ static
+ {
+ contents[ER_PARSER_IN_USE][1] =
+ "Parser is already in use";
+ }
+
+ /** Parser is already in use */
+ public static final int ER_CANNOT_CHANGE_WHILE_PARSING = 193;
+
+ static
+ {
+ contents[ER_CANNOT_CHANGE_WHILE_PARSING][1] =
+ "Cannot change {0} {1} while parsing";
+ }
+
+ /** Self-causation not permitted */
+ public static final int ER_SELF_CAUSATION_NOT_PERMITTED = 194;
+
+ static
+ {
+ contents[ER_SELF_CAUSATION_NOT_PERMITTED][1] =
+ "Self-causation not permitted";
+ }
+
+ /** src attribute not yet supported for */
+ public static final int ER_SRC_ATTRIB_NOT_SUPPORTED = 195;
+
+ static
+ {
+ contents[ER_SRC_ATTRIB_NOT_SUPPORTED][1] =
+ "src attribute not yet supported for {0}";
+ }
+
+ /** The resource [] could not be found */
+ public static final int ER_RESOURCE_COULD_NOT_FIND = 196;
+
+ static
+ {
+ contents[ER_RESOURCE_COULD_NOT_FIND][1] =
+ "The resource [ {0} ] could not be found.\n {1}";
+ }
+
+ /** output property not recognized: */
+ public static final int ER_OUTPUT_PROPERTY_NOT_RECOGNIZED = 197;
+
+ static
+ {
+ contents[ER_OUTPUT_PROPERTY_NOT_RECOGNIZED][1] =
+ "Output property not recognized: {0}";
+ }
+
+ /** Userinfo may not be specified if host is not specified */
+ public static final int ER_NO_USERINFO_IF_NO_HOST = 198;
+
+ static
+ {
+ contents[ER_NO_USERINFO_IF_NO_HOST][1] =
+ "Userinfo may not be specified if host is not specified";
+ }
+
+ /** Port may not be specified if host is not specified */
+ public static final int ER_NO_PORT_IF_NO_HOST = 199;
+
+ static
+ {
+ contents[ER_NO_PORT_IF_NO_HOST][1] =
+ "Port may not be specified if host is not specified";
+ }
+
+ /** Query string cannot be specified in path and query string */
+ public static final int ER_NO_QUERY_STRING_IN_PATH = 200;
+
+ static
+ {
+ contents[ER_NO_QUERY_STRING_IN_PATH][1] =
+ "Query string cannot be specified in path and query string";
+ }
+
+ /** Fragment cannot be specified in both the path and fragment */
+ public static final int ER_NO_FRAGMENT_STRING_IN_PATH = 201;
+
+ static
+ {
+ contents[ER_NO_FRAGMENT_STRING_IN_PATH][1] =
+ "Fragment cannot be specified in both the path and fragment";
+ }
+
+ /** Cannot initialize URI with empty parameters */
+ public static final int ER_CANNOT_INIT_URI_EMPTY_PARMS = 202;
+
+ static
+ {
+ contents[ER_CANNOT_INIT_URI_EMPTY_PARMS][1] =
+ "Cannot initialize URI with empty parameters";
+ }
+
+ /** Failed creating ElemLiteralResult instance */
+ public static final int ER_FAILED_CREATING_ELEMLITRSLT = 203;
+
+ static
+ {
+ contents[ER_FAILED_CREATING_ELEMLITRSLT][1] =
+ "Failed creating ElemLiteralResult instance";
+ }
+
+ /** Priority value does not contain a parsable number */
+ public static final int ER_PRIORITY_NOT_PARSABLE = 204;
+
+ static
+ {
+ contents[ER_PRIORITY_NOT_PARSABLE][1] =
+ "Priority value does not contain a parsable number";
+ }
+
+ /** Value for {0} should equal 'yes' or 'no' */
+ public static final int ER_VALUE_SHOULD_EQUAL = 205;
+
+ static
+ {
+ contents[ER_VALUE_SHOULD_EQUAL][1] =
+ " Value for {0} should equal yes or no";
+ }
+
+ /** Failed calling {0} method */
+ public static final int ER_FAILED_CALLING_METHOD = 206;
+
+ static
+ {
+ contents[ER_FAILED_CALLING_METHOD][1] =
+ " Failed calling {0} method";
+ }
+
+ /** Failed creating ElemLiteralResult instance */
+ public static final int ER_FAILED_CREATING_ELEMTMPL = 207;
+
+ static
+ {
+ contents[ER_FAILED_CREATING_ELEMTMPL][1] =
+ "Failed creating ElemTemplateElement instance";
+ }
+
+ /** Characters are not allowed at this point in the document */
+ public static final int ER_CHARS_NOT_ALLOWED = 208;
+
+ static
+ {
+ contents[ER_CHARS_NOT_ALLOWED][1] =
+ "Characters are not allowed at this point in the document";
+ }
+
+ /** attribute is not allowed on the element */
+ public static final int ER_ATTR_NOT_ALLOWED = 209;
+
+ static
+ {
+ contents[ER_ATTR_NOT_ALLOWED][1] =
+ "\"{0}\" attribute is not allowed on the {1} element!";
+ }
+
+ /** Method not yet supported */
+ public static final int ER_METHOD_NOT_SUPPORTED = 210;
+
+ static
+ {
+ contents[ER_METHOD_NOT_SUPPORTED][1] =
+ "Method not yet supported ";
+ }
+
+ /** Bad value */
+ public static final int ER_BAD_VALUE = 211;
+
+ static
+ {
+ contents[ER_BAD_VALUE][1] =
+ "{0} bad value {1} ";
+ }
+
+ /** attribute value not found */
+ public static final int ER_ATTRIB_VALUE_NOT_FOUND = 212;
+
+ static
+ {
+ contents[ER_ATTRIB_VALUE_NOT_FOUND][1] =
+ "{0} attribute value not found ";
+ }
+
+ /** attribute value not recognized */
+ public static final int ER_ATTRIB_VALUE_NOT_RECOGNIZED = 213;
+
+ static
+ {
+ contents[ER_ATTRIB_VALUE_NOT_RECOGNIZED][1] =
+ "{0} attribute value not recognized ";
+ }
+
+ /** IncrementalSAXSource_Filter not currently restartable */
+ public static final int ER_INCRSAXSRCFILTER_NOT_RESTARTABLE = 214;
+
+ static
+ {
+ contents[ER_INCRSAXSRCFILTER_NOT_RESTARTABLE][1] =
+ "IncrementalSAXSource_Filter not currently restartable";
+ }
+
+ /** IncrementalSAXSource_Filter not currently restartable */
+ public static final int ER_XMLRDR_NOT_BEFORE_STARTPARSE = 215;
+
+ static
+ {
+ contents[ER_XMLRDR_NOT_BEFORE_STARTPARSE][1] =
+ "XMLReader not before startParse request";
+ }
+
+
+ /*
+ /** Cannot find SAX1 driver class *
+ public static final int ER_CANNOT_FIND_SAX1_DRIVER = 190;
+
+ static
+ {
+ contents[ER_CANNOT_FIND_SAX1_DRIVER][1] =
+ "Cannot find SAX1 driver class {0}";
+ }
+
+ /** SAX1 driver class {0} found but cannot be loaded *
+ public static final int ER_SAX1_DRIVER_NOT_LOADED = 191;
+
+ static
+ {
+ contents[ER_SAX1_DRIVER_NOT_LOADED][1] =
+ "SAX1 driver class {0} found but cannot be loaded";
+ }
+
+ /** SAX1 driver class {0} found but cannot be instantiated *
+ public static final int ER_SAX1_DRIVER_NOT_INSTANTIATED = 192;
+
+ static
+ {
+ contents[ER_SAX1_DRIVER_NOT_INSTANTIATED][1] =
+ "SAX1 driver class {0} loaded but cannot be instantiated";
+ }
+
+ /** SAX1 driver class {0} does not implement org.xml.sax.Parser *
+ public static final int ER_SAX1_DRIVER_NOT_IMPLEMENT_PARSER = 193;
+
+ static
+ {
+ contents[ER_SAX1_DRIVER_NOT_IMPLEMENT_PARSER][1] =
+ "SAX1 driver class {0} does not implement org.xml.sax.Parser";
+ }
+
+ /** System property org.xml.sax.parser not specified *
+ public static final int ER_PARSER_PROPERTY_NOT_SPECIFIED = 194;
+
+ static
+ {
+ contents[ER_PARSER_PROPERTY_NOT_SPECIFIED][1] =
+ "System property org.xml.sax.parser not specified";
+ }
+
+ /** Parser argument must not be null *
+ public static final int ER_PARSER_ARG_CANNOT_BE_NULL = 195;
+
+ static
+ {
+ contents[ER_PARSER_ARG_CANNOT_BE_NULL][1] =
+ "Parser argument must not be null";
+ }
+
+ /** Feature: *
+ public static final int ER_FEATURE = 196;
+
+ static
+ {
+ contents[ER_FEATURE][1] =
+ "Feature: {0}";
+ }
+
+ /** Property: *
+ public static final int ER_PROPERTY = 197;
+
+ static
+ {
+ contents[ER_PROPERTY][1] =
+ "Property: {0}";
+ }
+
+ /** Null Entity Resolver *
+ public static final int ER_NULL_ENTITY_RESOLVER = 198;
+
+ static
+ {
+ contents[ER_NULL_ENTITY_RESOLVER][1] =
+ "Null entity resolver";
+ }
+
+ /** Null DTD handler *
+ public static final int ER_NULL_DTD_HANDLER = 199;
+
+ static
+ {
+ contents[ER_NULL_DTD_HANDLER][1] =
+ "Null DTD handler";
+ }
+
+ */
// Warnings...
1.7 +10 -7
xml-xalan/java/src/org/apache/xalan/serialize/CharInfo.java
Index: CharInfo.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/serialize/CharInfo.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CharInfo.java 2001/06/12 19:14:53 1.6
+++ CharInfo.java 2001/07/28 00:25:58 1.7
@@ -68,6 +68,9 @@
import org.apache.xml.utils.CharKey;
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.res.XSLTErrorResources;
+
/**
* This class provides services that tell if a character should have
* special treatement, such as entity reference substitution or normalization
@@ -149,9 +152,9 @@
}
if (is == null)
- throw new RuntimeException("The resource [" + entitiesResource
- + "] could not be found.\n"
- + entitiesResource);
+ throw new
RuntimeException(XSLMessages.createMessage(XSLTErrorResources.ER_RESOURCE_COULD_NOT_FIND,
new Object[]{entitiesResource, entitiesResource })); //"The resource [" +
entitiesResource
+ // + "] could not be found.\n"
+ // + entitiesResource);
reader = new BufferedReader(new InputStreamReader(is));
line = reader.readLine();
@@ -196,10 +199,10 @@
}
catch (Exception except)
{
- throw new RuntimeException("The resource [" + entitiesResource
- + "] could not load: " + except.toString()
- + "\n" + entitiesResource + "\t"
- + except.toString());
+ throw new
RuntimeException(XSLMessages.createMessage(XSLTErrorResources.ER_RESOURCE_COULD_NOT_LOAD,
new Object[]{entitiesResource, except.toString(), entitiesResource,
except.toString() })); //"The resource [" + entitiesResource
+ //+ "] could not load: " + except.toString()
+ //+ "\n" + entitiesResource + "\t"
+ //+ except.toString());
}
finally
{
1.4 +5 -3
xml-xalan/java/src/org/apache/xalan/serialize/WriterToUTF8Buffered.java
Index: WriterToUTF8Buffered.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/serialize/WriterToUTF8Buffered.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WriterToUTF8Buffered.java 2001/07/26 06:28:55 1.3
+++ WriterToUTF8Buffered.java 2001/07/28 00:25:58 1.4
@@ -58,6 +58,9 @@
import java.io.*;
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.res.XSLTErrorResources;
+
/**
* This class writes ASCII to a byte stream as quickly as possible. For the
* moment it does not do buffering, though I reserve the right to do some
@@ -114,7 +117,7 @@
if (size <= 0)
{
- throw new IllegalArgumentException("Buffer size <= 0");
+ throw new
IllegalArgumentException(XSLMessages.createMessage(XSLTErrorResources.ER_BUFFER_SIZE_LESSTHAN_ZERO,
null)); //"Buffer size <= 0");
}
buf = new byte[size];
@@ -134,8 +137,7 @@
*/
public void write(final int c) throws IOException
{
-
-
+
if (c < 0x80)
{
if (count >= buf.length)
1.26 +1 -1
xml-xalan/java/src/org/apache/xalan/templates/ElemExtensionCall.java
Index: ElemExtensionCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemExtensionCall.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ElemExtensionCall.java 2001/06/12 19:15:09 1.25
+++ ElemExtensionCall.java 2001/07/28 00:25:58 1.26
@@ -324,7 +324,7 @@
if(null != msg)
te = new TransformerException(e);
else
- te = new TransformerException("Unknown error when calling
extension!", e);
+ te = new
TransformerException(XSLMessages.createMessage(XSLTErrorResources.ER_UNKNOWN_ERROR_CALLING_EXTENSION,
null), e); //"Unknown error when calling extension!", e);
}
if(null == te.getLocator())
te.setLocator(this);
1.15 +6 -5
xml-xalan/java/src/org/apache/xalan/templates/ElemExtensionDecl.java
Index: ElemExtensionDecl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemExtensionDecl.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ElemExtensionDecl.java 2001/01/02 03:36:46 1.14
+++ ElemExtensionDecl.java 2001/07/28 00:25:58 1.15
@@ -71,6 +71,7 @@
import org.apache.xpath.XPathContext;
import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.res.XSLMessages;
/**
* <meta name="usage" content="internal"/>
@@ -256,9 +257,9 @@
String declNamespace = getNamespaceForPrefix(prefix);
if (null == declNamespace)
- throw new TransformerException("Prefix " + prefix
- + " does not have a corresponding "
- + "namespace declaration");
+ throw new
TransformerException(XSLMessages.createMessage(XSLTErrorResources.ER_NO_NAMESPACE_DECL,
new Object[]{prefix})); //"Prefix " + prefix
+ //+ " does not have a corresponding "
+ //+ "namespace declaration");
for (ElemTemplateElement child = getFirstChildElem(); child != null;
child = child.getNextSiblingElem())
@@ -293,8 +294,8 @@
lang = "javaclass";
if (lang.equals("javaclass") && (scriptSrc != null))
- throw new TransformerException("Element content not allowed for
lang=javaclass "
- + scriptSrc);
+ throw new
TransformerException(XSLMessages.createMessage(XSLTErrorResources.ER_ELEM_CONTENT_NOT_ALLOWED,
new Object[]{scriptSrc})); //"Element content not allowed for lang=javaclass "
+ //+ scriptSrc);
XPathContext liaison = ((XPathContext) transformer.getXPathContext());
ExtensionsTable etable = liaison.getExtensionsTable();
1.12 +2 -1
xml-xalan/java/src/org/apache/xalan/templates/ElemMessage.java
Index: ElemMessage.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemMessage.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElemMessage.java 2001/06/12 19:15:10 1.11
+++ ElemMessage.java 2001/07/28 00:25:58 1.12
@@ -63,6 +63,7 @@
import org.apache.xpath.*;
import org.apache.xml.utils.QName;
import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.res.XSLMessages;
import org.apache.xalan.transformer.TransformerImpl;
import javax.xml.transform.TransformerException;
@@ -164,6 +165,6 @@
transformer.getMsgMgr().message(this, data, m_terminate);
if(m_terminate)
- transformer.getErrorListener().fatalError(new
TransformerException("Stylesheet directed termination"));
+ transformer.getErrorListener().fatalError(new
TransformerException(XSLMessages.createMessage(XSLTErrorResources.ER_STYLESHEET_DIRECTED_TERMINATION,
null))); //"Stylesheet directed termination"));
}
}
1.23 +1 -1
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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- FuncDocument.java 2001/06/15 17:54:03 1.22
+++ FuncDocument.java 2001/07/28 00:25:58 1.23
@@ -465,7 +465,7 @@
public void checkNumberArgs(int argNum) throws WrongNumberArgsException
{
if ((argNum < 1) || (argNum > 2))
- throw new WrongNumberArgsException("1 or 2");
+ throw new
WrongNumberArgsException(XSLMessages.createMessage(XSLTErrorResources.ER_ONE_OR_TWO,
null)); //"1 or 2");
}
/**
1.15 +1 -1
xml-xalan/java/src/org/apache/xalan/templates/FuncFormatNumb.java
Index: FuncFormatNumb.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/FuncFormatNumb.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- FuncFormatNumb.java 2001/03/13 17:49:54 1.14
+++ FuncFormatNumb.java 2001/07/28 00:25:58 1.15
@@ -215,6 +215,6 @@
public void checkNumberArgs(int argNum) throws WrongNumberArgsException
{
if ((argNum > 3) || (argNum < 2))
- throw new WrongNumberArgsException("2 or 3");
+ throw new
WrongNumberArgsException(XSLMessages.createMessage(XSLTErrorResources.ER_TWO_OR_THREE,
null)); //"2 or 3");
}
}
1.20 +5 -2
xml-xalan/java/src/org/apache/xalan/templates/OutputProperties.java
Index: OutputProperties.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/OutputProperties.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- OutputProperties.java 2001/06/15 06:18:16 1.19
+++ OutputProperties.java 2001/07/28 00:25:58 1.20
@@ -74,7 +74,10 @@
import org.apache.xml.utils.WrappedRuntimeException;
import org.apache.xalan.serialize.Method;
import org.apache.xalan.extensions.ExtensionHandler;
+import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.res.XSLMessages;
+
import javax.xml.transform.TransformerException;
import javax.xml.transform.OutputKeys;
@@ -213,7 +216,7 @@
throw ioe;
}
else {
- throw new WrappedRuntimeException("Could not load '"+resourceName+"'
(check CLASSPATH), now using just the defaults ", ioe);
+ throw new
WrappedRuntimeException(XSLMessages.createMessage(XSLTErrorResources.ER_COULD_NOT_LOAD_RESOURCE,
new Object[]{resourceName}), ioe); //"Could not load '"+resourceName+"' (check
CLASSPATH), now using just the defaults ", ioe);
}
}
catch (SecurityException se) {
@@ -222,7 +225,7 @@
throw se;
}
else {
- throw new WrappedRuntimeException("Could not load '"+resourceName+"'
(check CLASSPATH, applet security), now using just the defaults ", se);
+ throw new
WrappedRuntimeException(XSLMessages.createMessage(XSLTErrorResources.ER_COULD_NOT_LOAD_RESOURCE,
new Object[]{resourceName}), se); //"Could not load '"+resourceName+"' (check
CLASSPATH, applet security), now using just the defaults ", se);
}
}
finally {
1.45 +1 -1
xml-xalan/java/src/org/apache/xalan/templates/StylesheetRoot.java
Index: StylesheetRoot.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/StylesheetRoot.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- StylesheetRoot.java 2001/07/11 09:54:22 1.44
+++ StylesheetRoot.java 2001/07/28 00:25:58 1.45
@@ -117,7 +117,7 @@
}
catch (TransformerException se)
{
- throw new TransformerConfigurationException("Can't init default
templates!", se);
+ throw new
TransformerConfigurationException(XSLMessages.createMessage(XSLTErrorResources.ER_CANNOT_INIT_DEFAULT_TEMPLATES,
null), se); //"Can't init default templates!", se);
}
}
1.9 +6 -2
xml-xalan/java/src/org/apache/xalan/transformer/TrAXFilter.java
Index: TrAXFilter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/TrAXFilter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TrAXFilter.java 2001/06/20 14:02:19 1.8
+++ TrAXFilter.java 2001/07/28 00:25:58 1.9
@@ -17,6 +17,10 @@
import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.ErrorListener;
+import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.res.XSLMessages;
+
+
public class TrAXFilter extends XMLFilterImpl
{
private Templates m_templates;
@@ -124,7 +128,7 @@
}
if(null == m_transformer.getContentHandler())
{
- throw new org.xml.sax.SAXException("parse can not be called if the
ContentHandler has not been set!");
+ throw new
org.xml.sax.SAXException(XSLMessages.createMessage(XSLTErrorResources.ER_CANNOT_CALL_PARSE,
null)); //"parse can not be called if the ContentHandler has not been set!");
}
getParent().parse(input);
@@ -167,7 +171,7 @@
{
XMLReader p = getParent();
if (p == null) {
- throw new NullPointerException("No parent for filter");
+ throw new
NullPointerException(XSLMessages.createMessage(XSLTErrorResources.ER_NO_PARENT_FOR_FILTER,
null)); //"No parent for filter");
}
ContentHandler ch = m_transformer.getInputContentHandler();
1.11 +6 -2
xml-xalan/java/src/org/apache/xalan/transformer/TransformerHandlerImpl.java
Index: TransformerHandlerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/TransformerHandlerImpl.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TransformerHandlerImpl.java 2001/07/20 18:48:10 1.10
+++ TransformerHandlerImpl.java 2001/07/28 00:25:58 1.11
@@ -88,6 +88,10 @@
import org.apache.xml.dtm.ref.IncrementalSAXSource_Filter;
import org.apache.xml.dtm.ref.sax2dtm.SAX2DTM;
+import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.res.XSLMessages;
+
+
/**
* A TransformerHandler
* listens for SAX ContentHandler parse events and transforms
@@ -190,7 +194,7 @@
{
if (null == result)
- throw new IllegalArgumentException("result should not be null");
+ throw new
IllegalArgumentException(XSLMessages.createMessage(XSLTErrorResources.ER_RESULT_NULL,
null)); //"result should not be null");
try
{
@@ -201,7 +205,7 @@
}
catch (javax.xml.transform.TransformerException te)
{
- throw new IllegalArgumentException("result could not be set");
+ throw new
IllegalArgumentException(XSLMessages.createMessage(XSLTErrorResources.ER_RESULT_COULD_NOT_BE_SET,
null)); //"result could not be set");
}
m_result = result;
1.17 +11 -11
xml-xalan/java/src/org/apache/xalan/transformer/TransformerIdentityImpl.java
Index: TransformerIdentityImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/TransformerIdentityImpl.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- TransformerIdentityImpl.java 2001/07/24 18:32:18 1.16
+++ TransformerIdentityImpl.java 2001/07/28 00:25:58 1.17
@@ -115,7 +115,7 @@
public void setResult(Result result) throws IllegalArgumentException
{
if(null == result)
- throw new IllegalArgumentException("Result should not be null");
+ throw new
IllegalArgumentException(XSLMessages.createMessage(XSLTErrorResources.ER_RESULT_NULL,
null)); //"Result should not be null");
m_result = result;
}
@@ -251,7 +251,7 @@
serializer.setOutputStream(m_outputStream);
}
else
- throw new TransformerException("No output specified!");
+ throw new
TransformerException(XSLMessages.createMessage(XSLTErrorResources.ER_NO_OUTPUT_SPECIFIED,
null)); //"No output specified!");
m_resultContentHandler = serializer.asContentHandler();
}
@@ -262,9 +262,9 @@
}
else
{
- throw new TransformerException("Can't transform to a Result of type "
- + outputTarget.getClass().getName()
- + "!");
+ throw new
TransformerException(XSLMessages.createMessage(XSLTErrorResources.ER_CANNOT_TRANSFORM_TO_RESULT_TYPE,
new Object[]{outputTarget.getClass().getName()})); //"Can't transform to a
Result of type "
+ // + outputTarget.getClass().getName()
+ // + "!");
}
if (m_resultContentHandler instanceof DTDHandler)
@@ -348,8 +348,8 @@
if (null == xmlSource)
{
- throw new TransformerException("Can't transform a Source of type "
- + source.getClass().getName() + "!");
+ throw new
TransformerException(XSLMessages.createMessage(XSLTErrorResources.ER_CANNOT_TRANSFORM_SOURCE_TYPE,
new Object[]{source.getClass().getName()})); //"Can't transform a Source of
type "
+ //+ source.getClass().getName() +
"!");
}
if (null != xmlSource.getSystemId())
@@ -692,8 +692,8 @@
{
if (!m_outputFormat.isLegalPropertyKey(name))
- throw new IllegalArgumentException("output property not recognized: "
- + name);
+ throw new
IllegalArgumentException(XSLMessages.createMessage(XSLTErrorResources.ER_OUTPUT_PROPERTY_NOT_RECOGNIZED,
new Object[]{name})); //"output property not recognized: "
+ //+ name);
m_outputFormat.setProperty(name, value);
}
@@ -725,8 +725,8 @@
if (null == value)
{
if (!props.isLegalPropertyKey(name))
- throw new IllegalArgumentException("output property not recognized: "
- + name);
+ throw new
IllegalArgumentException(XSLMessages.createMessage(XSLTErrorResources.ER_OUTPUT_PROPERTY_NOT_RECOGNIZED,
new Object[]{name})); //"output property not recognized: "
+ // + name);
}
return value;
1.109 +15 -15
xml-xalan/java/src/org/apache/xalan/transformer/TransformerImpl.java
Index: TransformerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/TransformerImpl.java,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- TransformerImpl.java 2001/07/23 12:53:01 1.108
+++ TransformerImpl.java 2001/07/28 00:25:58 1.109
@@ -522,9 +522,9 @@
{
if (property.equals(XalanProperties.SOURCE_LOCATION)) {
if (!(value instanceof Boolean))
- throw new RuntimeException("Value for property "
- + XalanProperties.SOURCE_LOCATION
- + " should be a Boolean instance");
+ throw new
RuntimeException(XSLMessages.createMessage(XSLTErrorResources.ER_PROPERTY_VALUE_BOOLEAN,
new Object[]{XalanProperties.SOURCE_LOCATION})); //"Value for property "
+ //+ XalanProperties.SOURCE_LOCATION
+ //+ " should be a Boolean instance");
m_useSourceLocationProperty = ((Boolean)value).booleanValue();
}
}
@@ -777,8 +777,8 @@
if (null == value)
{
if (!props.isLegalPropertyKey(qnameString))
- throw new IllegalArgumentException("output property not recognized: "
- + qnameString);
+ throw new
IllegalArgumentException(XSLMessages.createMessage(XSLTErrorResources.ER_OUTPUT_PROPERTY_NOT_RECOGNIZED,
new Object[]{qnameString})); //"output property not recognized: "
+ //+ qnameString);
}
return value;
@@ -810,8 +810,8 @@
if (null == value)
{
if (!props.isLegalPropertyKey(qnameString))
- throw new IllegalArgumentException("output property not recognized: "
- + qnameString);
+ throw new
IllegalArgumentException(XSLMessages.createMessage(XSLTErrorResources.ER_OUTPUT_PROPERTY_NOT_RECOGNIZED,
new Object[]{qnameString})); //"output property not recognized: "
+ // + qnameString);
}
return value;
@@ -844,8 +844,8 @@
}
if (!m_outputFormat.isLegalPropertyKey(name))
- throw new IllegalArgumentException("output property not recognized: "
- + name);
+ throw new
IllegalArgumentException(XSLMessages.createMessage(XSLTErrorResources.ER_OUTPUT_PROPERTY_NOT_RECOGNIZED,
new Object[]{name})); //"output property not recognized: "
+ //+ name);
m_outputFormat.setProperty(name, value);
}
@@ -1019,7 +1019,7 @@
serializer.setOutputStream(m_outputStream);
}
else
- throw new TransformerException("No output specified!");
+ throw new
TransformerException(XSLMessages.createMessage(XSLTErrorResources.ER_NO_OUTPUT_SPECIFIED,
null)); //"No output specified!");
handler = serializer.asContentHandler();
@@ -1036,9 +1036,9 @@
}
else
{
- throw new TransformerException("Can't transform to a Result of type "
- + outputTarget.getClass().getName()
- + "!");
+ throw new
TransformerException(XSLMessages.createMessage(XSLTErrorResources.ER_CANNOT_TRANSFORM_TO_RESULT_TYPE,
new Object[]{outputTarget.getClass().getName()})); //"Can't transform to a
Result of type "
+ //+ outputTarget.getClass().getName()
+ //+ "!");
}
return handler;
@@ -1625,7 +1625,7 @@
if (handler == null)
{
- throw new NullPointerException("Null content handler");
+ throw new
NullPointerException(XSLMessages.createMessage(XSLTErrorResources.ER_NULL_CONTENT_HANDLER,
null)); //"Null content handler");
}
else
{
@@ -2678,7 +2678,7 @@
synchronized (m_reentryGuard)
{
if (listener == null)
- throw new IllegalArgumentException("Null error handler");
+ throw new
IllegalArgumentException(XSLMessages.createMessage(XSLTErrorResources.ER_NULL_ERROR_HANDLER,
null)); //"Null error handler");
m_errorHandler = listener;
}
1.40 +5 -5 xml-xalan/java/src/org/apache/xalan/xslt/Process.java
Index: Process.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xslt/Process.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- Process.java 2001/07/27 17:29:50 1.39
+++ Process.java 2001/07/28 00:25:59 1.40
@@ -611,12 +611,12 @@
else
{
if (null != media)
- throw new TransformerException("No stylesheet found in: "
- + inFileName + ", media="
- + media);
+ throw new
TransformerException(XSLMessages.createMessage(XSLTErrorResources.ER_NO_STYLESHEET_IN_MEDIA,
new Object[]{inFileName, media})); //"No stylesheet found in: "
+ // + inFileName + ", media="
+ // + media);
else
- throw new TransformerException("No xml-stylesheet PI found in:
"
- + inFileName);
+ throw new
TransformerException(XSLMessages.createMessage(XSLTErrorResources.ER_NO_STYLESHEET_PI,
new Object[]{inFileName})); //"No xml-stylesheet PI found in: "
+ //+ inFileName);
}
}
1.3 +6 -2 xml-xalan/java/src/org/apache/xml/dtm/DTMException.java
Index: DTMException.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/dtm/DTMException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DTMException.java 2001/06/12 19:15:39 1.2
+++ DTMException.java 2001/07/28 00:25:59 1.3
@@ -7,7 +7,11 @@
import javax.xml.transform.SourceLocator;
+import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.res.XSLMessages;
+
+
/**
* This class specifies an exceptional condition that occured
* in the DTM module.
@@ -91,12 +95,12 @@
public synchronized Throwable initCause(Throwable cause) {
if ((this.containedException == null) && (cause != null)) {
- throw new IllegalStateException("Can't overwrite cause");
+ throw new
IllegalStateException(XSLMessages.createMessage(XSLTErrorResources.ER_CANNOT_OVERWRITE_CAUSE,
null)); //"Can't overwrite cause");
}
if (cause == this) {
throw new IllegalArgumentException(
- "Self-causation not permitted");
+
XSLMessages.createMessage(XSLTErrorResources.ER_SELF_CAUSATION_NOT_PERMITTED,
null)); //"Self-causation not permitted");
}
this.containedException = cause;
1.4 +4 -1 xml-xalan/java/src/org/apache/xml/dtm/DTMManager.java
Index: DTMManager.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/dtm/DTMManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DTMManager.java 2001/06/27 01:03:16 1.3
+++ DTMManager.java 2001/07/28 00:25:59 1.4
@@ -70,6 +70,9 @@
import org.apache.xml.utils.XMLString;
import org.apache.xml.utils.XMLStringFactory;
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.res.XSLTErrorResources;
+
/**
* A DTMManager instance can be used to create DTM and
* DTMIterator objects, and manage the DTM objects in the system.
@@ -177,7 +180,7 @@
if (classname == null)
{
- throw new DTMConfigurationException("No default implementation found");
+ throw new
DTMConfigurationException(XSLMessages.createMessage(XSLTErrorResources.ER_NO_DEFAULT_IMPL,
null)); //"No default implementation found");
}
DTMManager factoryImpl;
1.3 +6 -3
xml-xalan/java/src/org/apache/xml/dtm/ref/ChunkedIntArray.java
Index: ChunkedIntArray.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/ChunkedIntArray.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChunkedIntArray.java 2001/06/12 19:15:43 1.2
+++ ChunkedIntArray.java 2001/07/28 00:25:59 1.3
@@ -59,6 +59,9 @@
import org.w3c.dom.*;
import org.apache.xml.dtm.*;
+import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.res.XSLMessages;
+
/**
* <code>ChunkedIntArray</code> is an extensible array of blocks of integers.
* (I'd consider Vector, but it's unable to handle integers except by
@@ -93,7 +96,7 @@
ChunkedIntArray(int slotsize)
{
if(this.slotsize<slotsize)
- throw new
ArrayIndexOutOfBoundsException("ChunkedIntArray("+slotsize+") not currently
supported");
+ throw new
ArrayIndexOutOfBoundsException(XSLMessages.createMessage(XSLTErrorResources.ER_CHUNKEDINTARRAY_NOT_SUPPORTED,
new Object[]{Integer.toString(slotsize)})); //"ChunkedIntArray("+slotsize+")
not currently supported");
else if (this.slotsize>slotsize)
System.out.println("*****WARNING: ChunkedIntArray("+slotsize+")
wasting "+(this.slotsize-slotsize)+" words per slot");
chunks.addElement(fastArray);
@@ -155,7 +158,7 @@
{
// System.out.println("Using slow read (1)");
if (offset>=slotsize)
- throw new ArrayIndexOutOfBoundsException("Offset bigger than slot");
+ throw new
ArrayIndexOutOfBoundsException(XSLMessages.createMessage(XSLTErrorResources.ER_OFFSET_BIGGER_THAN_SLOT,
null)); //"Offset bigger than slot");
position*=slotsize;
int chunkpos = position >> lowbits;
int slotpos = position & lowmask;
@@ -236,7 +239,7 @@
*/
{
if (offset >= slotsize)
- throw new ArrayIndexOutOfBoundsException("Offset bigger than slot");
+ throw new
ArrayIndexOutOfBoundsException(XSLMessages.createMessage(XSLTErrorResources.ER_OFFSET_BIGGER_THAN_SLOT,
null)); //"Offset bigger than slot");
position*=slotsize;
int chunkpos = position >> lowbits;
int slotpos = position & lowmask;
1.5 +7 -3
xml-xalan/java/src/org/apache/xml/dtm/ref/CoroutineManager.java
Index: CoroutineManager.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/CoroutineManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CoroutineManager.java 2001/07/18 13:11:04 1.4
+++ CoroutineManager.java 2001/07/28 00:25:59 1.5
@@ -59,6 +59,10 @@
import java.util.*;
import org.apache.xml.dtm.*;
+import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.res.XSLMessages;
+
+
/**
* <meta name="usage" content="internal"/>
* <p>Support the coroutine design pattern.</p>
@@ -294,7 +298,7 @@
public synchronized Object co_resume(Object arg_object,int
thisCoroutine,int toCoroutine) throws java.lang.NoSuchMethodException
{
if(!m_activeIDs.get(toCoroutine))
- throw new java.lang.NoSuchMethodException("Coroutine not available,
id="+toCoroutine);
+ throw new
java.lang.NoSuchMethodException(XSLMessages.createMessage(XSLTErrorResources.ER_COROUTINE_NOT_AVAIL,
new Object[]{Integer.toString(toCoroutine)})); //"Coroutine not available,
id="+toCoroutine);
// We expect these values to be overwritten during the notify()/wait()
// periods, as other coroutines in this set get their opportunity to run.
@@ -322,7 +326,7 @@
co_exit(thisCoroutine);
// And inform this coroutine that its partners are Going Away
// %REVIEW% Should this throw/return something more useful?
- throw new java.lang.NoSuchMethodException("CoroutineManager recieved
co_exit() request");
+ throw new
java.lang.NoSuchMethodException(XSLMessages.createMessage(XSLTErrorResources.ER_COROUTINE_CO_EXIT,
null)); //"CoroutineManager recieved co_exit() request");
}
return m_yield;
@@ -363,7 +367,7 @@
public synchronized void co_exit_to(Object arg_object,int
thisCoroutine,int toCoroutine) throws java.lang.NoSuchMethodException
{
if(!m_activeIDs.get(toCoroutine))
- throw new java.lang.NoSuchMethodException("Coroutine not available,
id="+toCoroutine);
+ throw new
java.lang.NoSuchMethodException(XSLMessages.createMessage(XSLTErrorResources.ER_COROUTINE_NOT_AVAIL,
new Object[]{Integer.toString(toCoroutine)})); //"Coroutine not available,
id="+toCoroutine);
// We expect these values to be overwritten during the notify()/wait()
// periods, as other coroutines in this set get their opportunity to run.
1.9 +7 -3
xml-xalan/java/src/org/apache/xml/dtm/ref/CoroutineSAXParser.java
Index: CoroutineSAXParser.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/CoroutineSAXParser.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CoroutineSAXParser.java 2001/07/18 13:11:04 1.8
+++ CoroutineSAXParser.java 2001/07/28 00:25:59 1.9
@@ -71,6 +71,10 @@
import java.io.IOException;
import org.apache.xml.dtm.ref.CoroutineManager;
+import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.res.XSLMessages;
+
+
/** <p>CoroutineSAXParser runs a SAX2 parser in a coroutine to achieve
* incremental parsing. Output from the parser will still be issued
* via callbacks, which will need to be recieved and acted upon by an
@@ -160,7 +164,7 @@
fAppCoroutineID = appCoroutineID;
fParserCoroutineID = co.co_joinCoroutineSet(-1);
if (fParserCoroutineID == -1)
- throw new RuntimeException("co_joinCoroutineSet() failed");
+ throw new
RuntimeException(XSLMessages.createMessage(XSLTErrorResources.ER_COJOINROUTINESET_FAILED,
null)); //"co_joinCoroutineSet() failed");
fRunningInThread=false; // Unless overridden by the other constructor
@@ -741,7 +745,7 @@
+arg.getClass
()+" with value=\""+arg+'"');
System.err.println("\tStopping parser rather than risk
deadlock");
- throw new RuntimeException("Coroutine parameter error
("+arg+')');
+ throw new
RuntimeException(XSLMessages.createMessage(XSLTErrorResources.ER_COROUTINE_PARAM,
new Object[]{arg})); //"Coroutine parameter error ("+arg+')');
}
}
@@ -1012,7 +1016,7 @@
// Debugging; shouldn't arise in normal operation
if(result!=null)
{
- RuntimeException re = new RuntimeException("\nUNEXPECTED: Parser
doTerminate answers "+result);
+ RuntimeException re = new
RuntimeException(XSLMessages.createMessage(XSLTErrorResources.ER_PARSER_DOTERMINATE_ANSWERS,
new Object[]{result})); //"\nUNEXPECTED: Parser doTerminate answers "+result);
// System.out.println("\nUNEXPECTED: Parser doTerminate answers
"+result);
re.printStackTrace();
// throw re;
1.6 +5 -1
xml-xalan/java/src/org/apache/xml/dtm/ref/CoroutineSAXParser_Xerces.java
Index: CoroutineSAXParser_Xerces.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/CoroutineSAXParser_Xerces.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CoroutineSAXParser_Xerces.java 2001/07/18 13:11:04 1.5
+++ CoroutineSAXParser_Xerces.java 2001/07/28 00:25:59 1.6
@@ -65,6 +65,10 @@
import org.apache.xerces.parsers.SAXParser;
import org.xml.sax.XMLReader;
+import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.res.XSLMessages;
+
+
/** <p>CoroutineSAXParser_Xerces takes advantage of the fact that Xerces
* incremental mode is already a coroutine of sorts, and just wraps our
* CoroutineParser API around it.</p>
@@ -199,7 +203,7 @@
if (fParseInProgress) {
// %review% -- We never set this flag in the previous version of
// this class, we still don't set it here... Discard, or fix?
- return new SAXException("parse may not be called while parsing.");
+ return new
SAXException(XSLMessages.createMessage(XSLTErrorResources.ER_NO_PARSE_CALL_WHILE_PARSING,
null)); //"parse may not be called while parsing.");
}
Object arg;
1.4 +4 -1
xml-xalan/java/src/org/apache/xml/dtm/ref/Attic/DTMBuilder.java
1.13 +8 -5
xml-xalan/java/src/org/apache/xml/dtm/ref/DTMDefaultBase.java
Index: DTMDefaultBase.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/DTMDefaultBase.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DTMDefaultBase.java 2001/07/20 18:48:10 1.12
+++ DTMDefaultBase.java 2001/07/28 00:25:59 1.13
@@ -78,6 +78,9 @@
import org.apache.xml.utils.XMLString;
import org.apache.xml.utils.XMLStringFactory;
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.res.XSLTErrorResources;
+
import java.io.*; // for dumpDTM
/**
@@ -1319,7 +1322,7 @@
{
// %TBD%
- error("getStringValueChunkCount not yet supported!");
+
error(XSLMessages.createMessage(XSLTErrorResources.ER_METHOD_NOT_SUPPORTED,
null));//("getStringValueChunkCount not yet supported!");
return 0;
}
@@ -1342,7 +1345,7 @@
{
// %TBD%
- error("getStringValueChunk not yet supported!");
+
error(XSLMessages.createMessage(XSLTErrorResources.ER_METHOD_NOT_SUPPORTED,
null));//"getStringValueChunk not yet supported!");
return null;
}
@@ -1445,7 +1448,7 @@
{
/** @todo: implement this org.apache.xml.dtm.DTMDefaultBase abstract
method */
- error("Not yet supported!");
+
error(XSLMessages.createMessage(XSLTErrorResources.ER_METHOD_NOT_SUPPORTED,
null));//"Not yet supported!");
return null;
}
@@ -1882,7 +1885,7 @@
*/
public void appendChild(int newChild, boolean clone, boolean cloneDepth)
{
- error("appendChild not yet supported!");
+
error(XSLMessages.createMessage(XSLTErrorResources.ER_METHOD_NOT_SUPPORTED,
null));//"appendChild not yet supported!");
}
/**
@@ -1896,7 +1899,7 @@
*/
public void appendTextChild(String str)
{
- error("appendTextChild not yet supported!");
+
error(XSLMessages.createMessage(XSLTErrorResources.ER_METHOD_NOT_SUPPORTED,
null));//"appendTextChild not yet supported!");
}
/**
1.3 +10 -6
xml-xalan/java/src/org/apache/xml/dtm/ref/DTMDefaultBaseIterators.java
Index: DTMDefaultBaseIterators.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/DTMDefaultBaseIterators.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DTMDefaultBaseIterators.java 2001/06/12 19:15:45 1.2
+++ DTMDefaultBaseIterators.java 2001/07/28 00:25:59 1.3
@@ -62,6 +62,10 @@
import org.apache.xml.utils.XMLStringFactory;
+import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.res.XSLMessages;
+
+
/**
* This class implements the traversers for DTMDefaultBase.
*/
@@ -162,8 +166,8 @@
iterator = new TypedRootIterator(type);
break;
default :
- throw new DTMException("Error: typed iterator for axis "
- + Axis.names[axis] + "not implemented");
+ throw new
DTMException(XSLMessages.createMessage(XSLTErrorResources.ER_TYPED_ITERATOR_AXIS_NOT_IMPLEMENTED,
new Object[]{Axis.names[axis]})); //"Error: typed iterator for axis "
+ //+ Axis.names[axis] + "not implemented");
}
}
@@ -226,8 +230,8 @@
iterator = new RootIterator();
break;
default :
- throw new DTMException("Error: iterator for axis '" + Axis.names[axis]
- + "' not implemented");
+ throw new
DTMException(XSLMessages.createMessage(XSLTErrorResources.ER_ITERATOR_AXIS_NOT_IMPLEMENTED,
new Object[]{Axis.names[axis]})); //"Error: iterator for axis '" +
Axis.names[axis]
+ //+ "' not implemented");
}
return (iterator);
@@ -1164,7 +1168,7 @@
}
catch (CloneNotSupportedException e)
{
- throw new DTMException("Iterator clone not supported.");
+ throw new
DTMException(XSLMessages.createMessage(XSLTErrorResources.ER_ITERATOR_CLONE_NOT_SUPPORTED,
null)); //"Iterator clone not supported.");
}
}
@@ -1443,7 +1447,7 @@
}
catch (CloneNotSupportedException e)
{
- throw new DTMException("Iterator clone not supported.");
+ throw new
DTMException(XSLMessages.createMessage(XSLTErrorResources.ER_ITERATOR_CLONE_NOT_SUPPORTED,
null)); //"Iterator clone not supported.");
}
}
1.5 +5 -1
xml-xalan/java/src/org/apache/xml/dtm/ref/DTMDefaultBaseTraversers.java
Index: DTMDefaultBaseTraversers.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/DTMDefaultBaseTraversers.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DTMDefaultBaseTraversers.java 2001/06/24 17:23:30 1.4
+++ DTMDefaultBaseTraversers.java 2001/07/28 00:25:59 1.5
@@ -62,6 +62,10 @@
import org.apache.xml.utils.XMLStringFactory;
+import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.res.XSLMessages;
+
+
/**
* This class implements the traversers for DTMDefaultBase.
*/
@@ -182,7 +186,7 @@
case Axis.FILTEREDLIST :
return null; // Don't want to throw an exception for this one.
default :
- throw new DTMException("Unknown axis traversal type: "+axis);
+ throw new
DTMException(XSLMessages.createMessage(XSLTErrorResources.ER_UNKNOWN_AXIS_TYPE,
new Object[]{Integer.toString(axis)})); //"Unknown axis traversal type: "+axis);
}
if (null == traverser)
1.18 +7 -4
xml-xalan/java/src/org/apache/xml/dtm/ref/DTMManagerDefault.java
Index: DTMManagerDefault.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/DTMManagerDefault.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- DTMManagerDefault.java 2001/07/20 18:48:11 1.17
+++ DTMManagerDefault.java 2001/07/28 00:25:59 1.18
@@ -93,6 +93,9 @@
import org.apache.xml.utils.XMLString;
import org.apache.xml.utils.XMLStringFactory;
+import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.res.XSLMessages;
+
/**
* The default implementation for the DTMManager.
*/
@@ -127,7 +130,7 @@
return i;
}
}
- throw new DTMException("No more DTM IDs are available!");
+ throw new
DTMException(XSLMessages.createMessage(XSLTErrorResources.ER_NO_DTMIDS_AVAIL,
null)); //"No more DTM IDs are available!");
}
/**
@@ -373,7 +376,7 @@
// It should have been handled by a derived class or the caller
// made a mistake.
- throw new DTMException("Not supported: " + source);
+ throw new
DTMException(XSLMessages.createMessage(XSLTErrorResources.ER_NOT_SUPPORTED, new
Object[]{source})); //"Not supported: " + source);
}
}
}
@@ -390,7 +393,7 @@
public int getDTMHandleFromNode(org.w3c.dom.Node node)
{
if(null == node)
- throw new IllegalArgumentException("node must be non-null for
getDTMHandleFromNode!");
+ throw new
IllegalArgumentException(XSLMessages.createMessage(XSLTErrorResources.ER_NODE_NON_NULL,
null)); //"node must be non-null for getDTMHandleFromNode!");
if (node instanceof org.apache.xml.dtm.ref.DTMNodeProxy)
return ((org.apache.xml.dtm.ref.DTMNodeProxy) node).getDTMNodeNumber();
@@ -437,7 +440,7 @@
int handle = ((DOM2DTM)dtm).getHandleOfNode(node);
if(DTM.NULL == handle)
- throw new RuntimeException("Could not resolve the node to a
handle!");
+ throw new
RuntimeException(XSLMessages.createMessage(XSLTErrorResources.ER_COULD_NOT_RESOLVE_NODE,
null)); //"Could not resolve the node to a handle!");
return handle;
}
1.4 +6 -3
xml-xalan/java/src/org/apache/xml/dtm/ref/IncrementalSAXSource_Filter.java
Index: IncrementalSAXSource_Filter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/IncrementalSAXSource_Filter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IncrementalSAXSource_Filter.java 2001/07/23 22:40:47 1.3
+++ IncrementalSAXSource_Filter.java 2001/07/28 00:25:59 1.4
@@ -71,6 +71,9 @@
import java.io.IOException;
import org.apache.xml.dtm.ref.IncrementalSAXSource;
+import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.res.XSLMessages;
+
/** <p>IncrementalSAXSource_Filter implements IncrementalSAXSource, using a
* standard SAX2 event source as its input and parcelling out those
* events gradually in reponse to deliverMoreNodes() requests. Output from
the
@@ -158,7 +161,7 @@
fControllerCoroutineID = co.co_joinCoroutineSet(controllerCoroutineID);
fSourceCoroutineID = co.co_joinCoroutineSet(sourceCoroutineID);
if (fControllerCoroutineID == -1 || fSourceCoroutineID == -1)
- throw new RuntimeException("co_joinCoroutineSet() failed");
+ throw new
RuntimeException(XSLMessages.createMessage(XSLTErrorResources.ER_COJOINROUTINESET_FAILED,
null)); //"co_joinCoroutineSet() failed");
fNoMoreEvents=false;
eventcounter=frequency;
@@ -607,9 +610,9 @@
public void startParse(InputSource source) throws SAXException
{
if(fNoMoreEvents)
- throw new SAXException("IncrmentalSAXSource_Filter not currently
restartable.");
+ throw new
SAXException(XSLMessages.createMessage(XSLTErrorResources.ER_INCRSAXSRCFILTER_NOT_RESTARTABLE,
null)); //"IncrmentalSAXSource_Filter not currently restartable.");
if(fXMLReader==null)
- throw new SAXException("XMLReader not before startParse request");
+ throw new
SAXException(XSLMessages.createMessage(XSLTErrorResources.ER_XMLRDR_NOT_BEFORE_STARTPARSE,
null)); //"XMLReader not before startParse request");
fXMLReaderInputSource=source;
1.3 +7 -3
xml-xalan/java/src/org/apache/xml/dtm/ref/IncrementalSAXSource_Xerces.java
Index: IncrementalSAXSource_Xerces.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/IncrementalSAXSource_Xerces.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IncrementalSAXSource_Xerces.java 2001/07/20 18:48:11 1.2
+++ IncrementalSAXSource_Xerces.java 2001/07/28 00:25:59 1.3
@@ -63,6 +63,10 @@
import org.apache.xerces.parsers.SAXParser;
import org.xml.sax.XMLReader;
+import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.res.XSLMessages;
+
+
/** <p>IncrementalSAXSource_Xerces takes advantage of the fact that Xerces
* incremental mode is already a coroutine of sorts, and just wraps our
* IncrementalSAXSource API around it.</p>
@@ -151,9 +155,9 @@
public void startParse(InputSource source) throws SAXException
{
if (fIncrementalParser==null)
- throw new SAXException("startParse needs a non-null SAXParser.");
+ throw new
SAXException(XSLMessages.createMessage(XSLTErrorResources.ER_STARTPARSE_NEEDS_SAXPARSER,
null)); //"startParse needs a non-null SAXParser.");
if (fParseInProgress)
- throw new SAXException("startParse may not be called while parsing.");
+ throw new
SAXException(XSLMessages.createMessage(XSLTErrorResources.ER_STARTPARSE_WHILE_PARSING,
null)); //"startParse may not be called while parsing.");
boolean ok=false;
@@ -167,7 +171,7 @@
}
if(!ok)
- throw new SAXException("could not initialize parser with");
+ throw new
SAXException(XSLMessages.createMessage(XSLTErrorResources.ER_COULD_NOT_INIT_PARSER,
null)); //"could not initialize parser with");
}
1.14 +8 -5
xml-xalan/java/src/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM.java
Index: SAX2DTM.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- SAX2DTM.java 2001/07/25 06:22:40 1.13
+++ SAX2DTM.java 2001/07/28 00:25:59 1.14
@@ -61,6 +61,9 @@
import javax.xml.transform.Source;
import javax.xml.transform.SourceLocator;
import org.apache.xalan.transformer.XalanProperties;
+import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.res.XSLMessages;
+
import org.apache.xml.dtm.*;
import org.apache.xml.dtm.ref.*;
import org.apache.xml.utils.StringVector;
@@ -632,7 +635,7 @@
{
/** @todo: implement this org.apache.xml.dtm.DTMDefaultBase abstract
method */
- error("Not yet supported!");
+
error(XSLMessages.createMessage(XSLTErrorResources.ER_METHOD_NOT_SUPPORTED,
null));//"Not yet supported!");
return null;
}
@@ -1077,7 +1080,7 @@
{
/** @todo: implement this org.apache.xml.dtm.DTMDefaultBase abstract
method */
- error("Not yet supported!");
+
error(XSLMessages.createMessage(XSLTErrorResources.ER_METHOD_NOT_SUPPORTED,
null));//"Not yet supported!");
return null;
}
@@ -2203,9 +2206,9 @@
{
if (property.equals(XalanProperties.SOURCE_LOCATION)) {
if (!(value instanceof Boolean))
- throw new RuntimeException("Value for property "
- + XalanProperties.SOURCE_LOCATION
- + " should be a Boolean instance");
+ throw new
RuntimeException(XSLMessages.createMessage(XSLTErrorResources.ER_PROPERTY_VALUE_BOOLEAN,
new Object[]{XalanProperties.SOURCE_LOCATION})); //"Value for property "
+ // + XalanProperties.SOURCE_LOCATION
+ // + " should be a Boolean instance");
m_useSourceLocationProperty = ((Boolean)value).booleanValue();
m_sourceSystemId = new StringVector();
m_sourceLine = new IntVector();
1.5 +5 -1 xml-xalan/java/src/org/apache/xml/utils/ObjectPool.java
Index: ObjectPool.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/ObjectPool.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ObjectPool.java 2001/01/29 11:54:07 1.4
+++ ObjectPool.java 2001/07/28 00:25:59 1.5
@@ -58,6 +58,10 @@
import java.util.*;
+import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.res.XSLMessages;
+
+
/**
* <meta name="usage" content="internal"/>
* Pool of object of a given type to pick from to help memory usage
@@ -172,7 +176,7 @@
catch (IllegalAccessException ex){}
// Throw unchecked exception for error in pool configuration.
- throw new RuntimeException("exception creating new instance for pool");
+ throw new
RuntimeException(XSLMessages.createMessage(XSLTErrorResources.ER_EXCEPTION_CREATING_POOL,
null)); //"exception creating new instance for pool");
}
else
{
1.7 +6 -3 xml-xalan/java/src/org/apache/xml/utils/QName.java
Index: QName.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/QName.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- QName.java 2001/01/02 03:42:50 1.6
+++ QName.java 2001/07/28 00:25:59 1.7
@@ -127,7 +127,8 @@
{
if (localName == null)
- throw new IllegalArgumentException("Argument 'localName' is null");
+ throw new IllegalArgumentException(XSLMessages.createXPATHMessage(
+ XPATHErrorResources.ER_ARG_LOCALNAME_NULL, null)); //"Argument
'localName' is null");
_namespaceURI = namespaceURI;
_localName = localName;
@@ -146,7 +147,8 @@
{
if (localName == null)
- throw new IllegalArgumentException("Argument 'localName' is null");
+ throw new IllegalArgumentException(XSLMessages.createXPATHMessage(
+ XPATHErrorResources.ER_ARG_LOCALNAME_NULL, null)); //"Argument
'localName' is null");
_namespaceURI = namespaceURI;
_prefix = prefix;
@@ -164,7 +166,8 @@
{
if (localName == null)
- throw new IllegalArgumentException("Argument 'localName' is null");
+ throw new IllegalArgumentException(XSLMessages.createXPATHMessage(
+ XPATHErrorResources.ER_ARG_LOCALNAME_NULL, null)); //"Argument
'localName' is null");
_namespaceURI = null;
_localName = localName;
1.6 +24 -21 xml-xalan/java/src/org/apache/xml/utils/URI.java
Index: URI.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/URI.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- URI.java 2001/01/03 10:09:32 1.5
+++ URI.java 2001/07/28 00:26:00 1.6
@@ -59,6 +59,9 @@
import java.io.IOException;
import java.io.Serializable;
+import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.res.XSLMessages;
+
/**
* A class to represent a Uniform Resource Identifier (URI). This class
* is designed to handle the parsing of URIs and provide access to
@@ -88,7 +91,7 @@
* default port for a specific scheme). Rather, it only knows the
* grammar and basic set of operations that can be applied to a URI.
*
- * @version $Id: URI.java,v 1.5 2001/01/03 10:09:32 sboag Exp $
+ * @version $Id: URI.java,v 1.6 2001/07/28 00:26:00 mmidy Exp $
*
*/
public class URI implements Serializable
@@ -320,7 +323,7 @@
if (p_scheme == null || p_scheme.trim().length() == 0)
{
- throw new MalformedURIException("Scheme is required!");
+ throw new
MalformedURIException(XSLMessages.createMessage(XSLTErrorResources.ER_SCHEME_REQUIRED,
null)); //"Scheme is required!");
}
if (p_host == null)
@@ -328,13 +331,13 @@
if (p_userinfo != null)
{
throw new MalformedURIException(
- "Userinfo may not be specified if host is not specified!");
+
XSLMessages.createMessage(XSLTErrorResources.ER_NO_USERINFO_IF_NO_HOST, null));
//"Userinfo may not be specified if host is not specified!");
}
if (p_port != -1)
{
throw new MalformedURIException(
- "Port may not be specified if host is not specified!");
+
XSLMessages.createMessage(XSLTErrorResources.ER_NO_PORT_IF_NO_HOST, null));
//"Port may not be specified if host is not specified!");
}
}
@@ -343,13 +346,13 @@
if (p_path.indexOf('?') != -1 && p_queryString != null)
{
throw new MalformedURIException(
- "Query string cannot be specified in path and query string!");
+
XSLMessages.createMessage(XSLTErrorResources.ER_NO_QUERY_STRING_IN_PATH,
null)); //"Query string cannot be specified in path and query string!");
}
if (p_path.indexOf('#') != -1 && p_fragment != null)
{
throw new MalformedURIException(
- "Fragment cannot be specified in both the path and fragment!");
+
XSLMessages.createMessage(XSLTErrorResources.ER_NO_FRAGMENT_STRING_IN_PATH,
null)); //"Fragment cannot be specified in both the path and fragment!");
}
}
@@ -403,7 +406,7 @@
&& (p_uriSpec == null || p_uriSpec.trim().length() == 0))
{
throw new MalformedURIException(
- "Cannot initialize URI with empty parameters.");
+
XSLMessages.createMessage(XSLTErrorResources.ER_CANNOT_INIT_URI_EMPTY_PARMS,
null)); //"Cannot initialize URI with empty parameters.");
}
// just make a copy of the base if spec is empty
@@ -423,7 +426,7 @@
{
if (p_base == null)
{
- throw new MalformedURIException("No scheme found in URI: "+uriSpec);
+ throw new
MalformedURIException(XSLMessages.createMessage(XSLTErrorResources.ER_NO_SCHEME_IN_URI,
new Object[]{uriSpec})); //"No scheme found in URI: "+uriSpec);
}
}
else
@@ -636,7 +639,7 @@
if (scheme.length() == 0)
{
- throw new MalformedURIException("No scheme found in URI.");
+ throw new
MalformedURIException(XSLMessages.createMessage(XSLTErrorResources.ER_NO_SCHEME_INURI,
null)); //"No scheme found in URI.");
}
else
{
@@ -787,15 +790,15 @@
||!isHex(p_uriSpec.charAt(index + 2)))
{
throw new MalformedURIException(
- "Path contains invalid escape sequence!");
+
XSLMessages.createMessage(XSLTErrorResources.ER_PATH_CONTAINS_INVALID_ESCAPE_SEQUENCE,
null)); //"Path contains invalid escape sequence!");
}
}
else if (!isReservedCharacter(testChar)
&&!isUnreservedCharacter(testChar))
{
if ('\\' != testChar)
- throw new MalformedURIException("Path contains invalid character: "
- + testChar);
+ throw new
MalformedURIException(XSLMessages.createMessage(XSLTErrorResources.ER_PATH_INVALID_CHAR,
new Object[]{String.valueOf(testChar)})); //"Path contains invalid character: "
+ //+ testChar);
}
index++;
@@ -1052,12 +1055,12 @@
if (p_scheme == null)
{
- throw new MalformedURIException("Cannot set scheme from null string!");
+ throw new
MalformedURIException(XSLMessages.createMessage(XSLTErrorResources.ER_SCHEME_FROM_NULL_STRING,
null)); //"Cannot set scheme from null string!");
}
if (!isConformantSchemeName(p_scheme))
{
- throw new MalformedURIException("The scheme is not conformant.");
+ throw new
MalformedURIException(XSLMessages.createMessage(XSLTErrorResources.ER_SCHEME_NOT_CONFORMANT,
null)); //"The scheme is not conformant.");
}
m_scheme = p_scheme.toLowerCase();
@@ -1140,7 +1143,7 @@
}
else if (!isWellFormedAddress(p_host))
{
- throw new MalformedURIException("Host is not a well formed address!");
+ throw new
MalformedURIException(XSLMessages.createMessage(XSLTErrorResources.ER_HOST_ADDRESS_NOT_WELLFORMED,
null)); //"Host is not a well formed address!");
}
m_host = p_host;
@@ -1165,12 +1168,12 @@
if (m_host == null)
{
throw new MalformedURIException(
- "Port cannot be set when host is null!");
+
XSLMessages.createMessage(XSLTErrorResources.ER_PORT_WHEN_HOST_NULL, null));
//"Port cannot be set when host is null!");
}
}
else if (p_port != -1)
{
- throw new MalformedURIException("Invalid port number!");
+ throw new
MalformedURIException(XSLMessages.createMessage(XSLTErrorResources.ER_INVALID_PORT,
null)); //"Invalid port number!");
}
m_port = p_port;
@@ -1228,7 +1231,7 @@
if (!isURIString(p_addToPath))
{
- throw new MalformedURIException("Path contains invalid character!");
+ throw new
MalformedURIException(XSLMessages.createMessage(XSLTErrorResources.ER_PATH_INVALID_CHAR,
new Object[]{p_addToPath})); //"Path contains invalid character!");
}
if (m_path == null || m_path.trim().length() == 0)
@@ -1327,16 +1330,16 @@
else if (!isGenericURI())
{
throw new MalformedURIException(
- "Fragment can only be set for a generic URI!");
+
XSLMessages.createMessage(XSLTErrorResources.ER_FRAG_FOR_GENERIC_URI, null));
//"Fragment can only be set for a generic URI!");
}
else if (getPath() == null)
{
throw new MalformedURIException(
- "Fragment cannot be set when path is null!");
+ XSLMessages.createMessage(XSLTErrorResources.ER_FRAG_WHEN_PATH_NULL,
null)); //"Fragment cannot be set when path is null!");
}
else if (!isURIString(p_fragment))
{
- throw new MalformedURIException("Fragment contains invalid
character!");
+ throw new
MalformedURIException(XSLMessages.createMessage(XSLTErrorResources.ER_FRAG_INVALID_CHAR,
null)); //"Fragment contains invalid character!");
}
else
{
1.13 +19 -15 xml-xalan/java/src/org/apache/xpath/NodeSet.java
Index: NodeSet.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/NodeSet.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- NodeSet.java 2001/06/15 05:15:18 1.12
+++ NodeSet.java 2001/07/28 00:26:00 1.13
@@ -66,6 +66,10 @@
import org.apache.xml.utils.NodeVector;
import org.apache.xpath.axes.ContextNodeList;
+import org.apache.xpath.res.XPATHErrorResources;
+import org.apache.xalan.res.XSLMessages;
+
+
/**
* <meta name="usage" content="advanced"/>
* <p>The NodeSet class can act as either a NodeVector,
@@ -414,7 +418,7 @@
{
if (!m_mutable)
- throw new RuntimeException("This NodeSet is not mutable!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NODESET_NOT_MUTABLE,
null)); //"This NodeSet is not mutable!");
this.addElement(n);
}
@@ -432,7 +436,7 @@
{
if (!m_mutable)
- throw new RuntimeException("This NodeSet is not mutable!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NODESET_NOT_MUTABLE,
null)); //"This NodeSet is not mutable!");
insertElementAt(n, pos);
}
@@ -448,7 +452,7 @@
{
if (!m_mutable)
- throw new RuntimeException("This NodeSet is not mutable!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NODESET_NOT_MUTABLE,
null)); //"This NodeSet is not mutable!");
this.removeElement(n);
}
@@ -466,7 +470,7 @@
{
if (!m_mutable)
- throw new RuntimeException("This NodeSet is not mutable!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NODESET_NOT_MUTABLE,
null)); //"This NodeSet is not mutable!");
if (null != nodelist) // defensive to fix a bug that Sanjiva reported.
{
@@ -506,7 +510,7 @@
{
if (!m_mutable)
- throw new RuntimeException("This NodeSet is not mutable!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NODESET_NOT_MUTABLE,
null)); //"This NodeSet is not mutable!");
addNodes((NodeIterator) ns);
}
@@ -523,7 +527,7 @@
{
if (!m_mutable)
- throw new RuntimeException("This NodeSet is not mutable!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NODESET_NOT_MUTABLE,
null)); //"This NodeSet is not mutable!");
if (null != iterator) // defensive to fix a bug that Sanjiva reported.
{
@@ -551,7 +555,7 @@
{
if (!m_mutable)
- throw new RuntimeException("This NodeSet is not mutable!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NODESET_NOT_MUTABLE,
null)); //"This NodeSet is not mutable!");
int nChildren = nodelist.getLength();
@@ -579,7 +583,7 @@
{
if (!m_mutable)
- throw new RuntimeException("This NodeSet is not mutable!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NODESET_NOT_MUTABLE,
null)); //"This NodeSet is not mutable!");
Node node;
@@ -607,7 +611,7 @@
{
if (!m_mutable)
- throw new RuntimeException("This NodeSet is not mutable!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NODESET_NOT_MUTABLE,
null)); //"This NodeSet is not mutable!");
boolean foundit = false;
int i;
@@ -670,7 +674,7 @@
{
if (!m_mutable)
- throw new RuntimeException("This NodeSet is not mutable!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NODESET_NOT_MUTABLE,
null));
//XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NODESET_NOT_MUTABLE,
null)); //"This NodeSet is not mutable!");
int insertIndex = -1;
@@ -747,7 +751,7 @@
{
if (!m_mutable)
- throw new RuntimeException("This NodeSet is not mutable!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NODESET_NOT_MUTABLE,
null)); //"This NodeSet is not mutable!");
return addNodeInDocOrder(node, true, support);
} // end addNodeInDocOrder(Vector v, Object obj)
@@ -915,7 +919,7 @@
public void addElement(Node value)
{
if (!m_mutable)
- throw new RuntimeException("This NodeSet is not mutable!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NODESET_NOT_MUTABLE,
null)); //"This NodeSet is not mutable!");
if ((m_firstFree + 1) >= m_mapSize)
{
@@ -1142,7 +1146,7 @@
public void insertElementAt(Node value, int at)
{
if (!m_mutable)
- throw new RuntimeException("This NodeSet is not mutable!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NODESET_NOT_MUTABLE,
null)); //"This NodeSet is not mutable!");
if (null == m_map)
{
@@ -1235,7 +1239,7 @@
public boolean removeElement(Node s)
{
if (!m_mutable)
- throw new RuntimeException("This NodeSet is not mutable!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NODESET_NOT_MUTABLE,
null)); //"This NodeSet is not mutable!");
if (null == m_map)
return false;
@@ -1293,7 +1297,7 @@
public void setElementAt(Node node, int index)
{
if (!m_mutable)
- throw new RuntimeException("This NodeSet is not mutable!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NODESET_NOT_MUTABLE,
null)); //"This NodeSet is not mutable!");
if (null == m_map)
{
1.3 +19 -15 xml-xalan/java/src/org/apache/xpath/NodeSetDTM.java
Index: NodeSetDTM.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/NodeSetDTM.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NodeSetDTM.java 2001/07/17 18:17:49 1.2
+++ NodeSetDTM.java 2001/07/28 00:26:00 1.3
@@ -71,6 +71,10 @@
import org.apache.xml.utils.NodeVector;
import org.apache.xpath.axes.ContextNodeList;
+import org.apache.xpath.res.XPATHErrorResources;
+import org.apache.xalan.res.XSLMessages;
+
+
/**
* <meta name="usage" content="advanced"/>
* <p>The NodeSetDTM class can act as either a NodeVector,
@@ -541,7 +545,7 @@
{
if (!m_mutable)
- throw new RuntimeException("This NodeSetDTM is not mutable!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NODESETDTM_NOT_MUTABLE,
null)); //"This NodeSetDTM is not mutable!");
this.addElement(n);
}
@@ -559,7 +563,7 @@
{
if (!m_mutable)
- throw new RuntimeException("This NodeSetDTM is not mutable!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NODESETDTM_NOT_MUTABLE,
null)); //"This NodeSetDTM is not mutable!");
insertElementAt(n, pos);
}
@@ -575,7 +579,7 @@
{
if (!m_mutable)
- throw new RuntimeException("This NodeSetDTM is not mutable!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NODESETDTM_NOT_MUTABLE,
null)); //"This NodeSetDTM is not mutable!");
this.removeElement(n);
}
@@ -652,7 +656,7 @@
{
if (!m_mutable)
- throw new RuntimeException("This NodeSetDTM is not mutable!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NODESETDTM_NOT_MUTABLE,
null)); //"This NodeSetDTM is not mutable!");
if (null != iterator) // defensive to fix a bug that Sanjiva reported.
{
@@ -709,7 +713,7 @@
{
if (!m_mutable)
- throw new RuntimeException("This NodeSetDTM is not mutable!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NODESETDTM_NOT_MUTABLE,
null)); //"This NodeSetDTM is not mutable!");
int node;
@@ -801,7 +805,7 @@
{
if (!m_mutable)
- throw new RuntimeException("This NodeSetDTM is not mutable!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NODESETDTM_NOT_MUTABLE,
null)); //"This NodeSetDTM is not mutable!");
int insertIndex = -1;
@@ -879,7 +883,7 @@
{
if (!m_mutable)
- throw new RuntimeException("This NodeSetDTM is not mutable!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NODESETDTM_NOT_MUTABLE,
null)); //"This NodeSetDTM is not mutable!");
return addNodeInDocOrder(node, true, support);
} // end addNodeInDocOrder(Vector v, Object obj)
@@ -905,7 +909,7 @@
{
if (!m_mutable)
- throw new RuntimeException("This NodeSetDTM is not mutable!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NODESETDTM_NOT_MUTABLE,
null)); //"This NodeSetDTM is not mutable!");
super.addElement(value);
}
@@ -925,7 +929,7 @@
{
if (!m_mutable)
- throw new RuntimeException("This NodeSetDTM is not mutable!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NODESETDTM_NOT_MUTABLE,
null)); //"This NodeSetDTM is not mutable!");
super.insertElementAt(value, at);
}
@@ -941,7 +945,7 @@
{
if (!m_mutable)
- throw new RuntimeException("This NodeSetDTM is not mutable!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NODESETDTM_NOT_MUTABLE,
null)); //"This NodeSetDTM is not mutable!");
super.appendNodes(nodes);
}
@@ -958,7 +962,7 @@
{
if (!m_mutable)
- throw new RuntimeException("This NodeSetDTM is not mutable!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NODESETDTM_NOT_MUTABLE,
null)); //"This NodeSetDTM is not mutable!");
super.removeAllElements();
}
@@ -980,7 +984,7 @@
{
if (!m_mutable)
- throw new RuntimeException("This NodeSetDTM is not mutable!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NODESETDTM_NOT_MUTABLE,
null)); //"This NodeSetDTM is not mutable!");
return super.removeElement(s);
}
@@ -999,7 +1003,7 @@
{
if (!m_mutable)
- throw new RuntimeException("This NodeSetDTM is not mutable!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NODESETDTM_NOT_MUTABLE,
null)); //"This NodeSetDTM is not mutable!");
super.removeElementAt(i);
}
@@ -1020,7 +1024,7 @@
{
if (!m_mutable)
- throw new RuntimeException("This NodeSetDTM is not mutable!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NODESETDTM_NOT_MUTABLE,
null)); //"This NodeSetDTM is not mutable!");
super.setElementAt(node, index);
}
@@ -1037,7 +1041,7 @@
{
if (!m_mutable)
- throw new RuntimeException("This NodeSetDTM is not mutable!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NODESETDTM_NOT_MUTABLE,
null)); //"This NodeSetDTM is not mutable!");
super.setElementAt(node, index);
}
1.33 +5 -1 xml-xalan/java/src/org/apache/xpath/VariableStack.java
Index: VariableStack.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/VariableStack.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- VariableStack.java 2001/07/11 09:54:24 1.32
+++ VariableStack.java 2001/07/28 00:26:00 1.33
@@ -59,6 +59,10 @@
import org.apache.xpath.XPathContext;
import org.apache.xpath.objects.XObject;
+import org.apache.xpath.res.XPATHErrorResources;
+import org.apache.xalan.res.XSLMessages;
+
+
import javax.xml.transform.TransformerException;
/**
@@ -459,7 +463,7 @@
return getGlobalVariable(xctxt, vvar.getIndex());
}
- throw new javax.xml.transform.TransformerException("Variable not
resolvable: " + qname);
+ throw new
javax.xml.transform.TransformerException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_VAR_NOT_RESOLVABLE,
new Object[]{qname.toString()})); //"Variable not resolvable: " + qname);
}
} // end VariableStack
1.21 +1 -1 xml-xalan/java/src/org/apache/xpath/XPath.java
Index: XPath.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/XPath.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- XPath.java 2001/06/12 19:16:08 1.20
+++ XPath.java 2001/07/28 00:26:00 1.21
@@ -217,7 +217,7 @@
else if (MATCH == type)
parser.initMatchPattern(compiler, exprString, prefixResolver);
else
- throw new RuntimeException("Can not deal with XPath type: " + type);
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_CANNOT_DEAL_XPATH_TYPE,
new Object[]{Integer.toString(type)})); //"Can not deal with XPath type: " +
type);
// System.out.println("----------------");
Expression expr = compiler.compile(0);
1.28 +1 -1 xml-xalan/java/src/org/apache/xpath/XPathContext.java
Index: XPathContext.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/XPathContext.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- XPathContext.java 2001/07/10 08:38:30 1.27
+++ XPathContext.java 2001/07/28 00:26:00 1.28
@@ -545,7 +545,7 @@
public void setErrorListener(ErrorListener listener) throws
IllegalArgumentException
{
if (listener == null)
- throw new IllegalArgumentException("Null error handler");
+ throw new
IllegalArgumentException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NULL_ERROR_HANDLER,
null)); //"Null error handler");
m_errorListener = listener;
}
1.18 +12 -10
xml-xalan/java/src/org/apache/xpath/axes/WalkerFactory.java
Index: WalkerFactory.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/WalkerFactory.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- WalkerFactory.java 2001/07/27 17:42:40 1.17
+++ WalkerFactory.java 2001/07/28 00:26:00 1.18
@@ -65,6 +65,8 @@
import org.apache.xpath.patterns.FunctionPattern;
import org.apache.xpath.Expression;
import org.apache.xpath.objects.XNumber;
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xpath.res.XPATHErrorResources;
import org.apache.xml.dtm.DTMFilter;
import org.apache.xml.dtm.DTMIterator;
@@ -383,8 +385,8 @@
return Axis.FILTEREDLIST;
}
- throw new RuntimeException("Programmer's assertion: unknown opcode: "
- + stepType);
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NULL_ERROR_HANDLER,
new Object[]{Integer.toString(stepType)})); //"Programmer's assertion: unknown
opcode: "
+ //+ stepType);
}
static boolean functionProximateOrContainsProximate(Compiler compiler,
@@ -604,8 +606,8 @@
foundSelf = true;
break;
default :
- throw new RuntimeException("Programmer's assertion: unknown opcode: "
- + stepType);
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NULL_ERROR_HANDLER,
new Object[]{Integer.toString(stepType)})); //"Programmer's assertion: unknown
opcode: "
+ // + stepType);
}
stepOpCodePos = compiler.getNextStepPos(stepOpCodePos);
@@ -724,8 +726,8 @@
analysisResult |= (BIT_MATCH_PATTERN | BIT_PARENT);
break;
default :
- throw new RuntimeException("Programmer's assertion: unknown opcode: "
- + stepType);
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NULL_ERROR_HANDLER,
new Object[]{Integer.toString(stepType)})); //"Programmer's assertion: unknown
opcode: "
+ //+ stepType);
}
if (OpCodes.NODETYPE_NODE == ops[stepOpCodePos + 3]) // child::node()
@@ -1058,8 +1060,8 @@
predicateAxis = Axis.DESCENDANT;
break;
default :
- throw new RuntimeException("Programmer's assertion: unknown opcode: "
- + stepType);
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NULL_ERROR_HANDLER,
new Object[]{Integer.toString(stepType)})); //"Programmer's assertion: unknown
opcode: "
+ //+ stepType);
}
if(null == ai)
{
@@ -1222,8 +1224,8 @@
ai = new AxesWalker(lpi, Axis.SELF);
break;
default :
- throw new RuntimeException("Programmer's assertion: unknown opcode: "
- + stepType);
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_NULL_ERROR_HANDLER,
new Object[]{Integer.toString(stepType)})); //"Programmer's assertion: unknown
opcode: "
+ //+ stepType);
}
if (simpleInit)
1.7 +3 -1
xml-xalan/java/src/org/apache/xpath/functions/FuncSubstring.java
Index: FuncSubstring.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncSubstring.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FuncSubstring.java 2001/06/12 19:16:38 1.6
+++ FuncSubstring.java 2001/07/28 00:26:00 1.7
@@ -64,6 +64,8 @@
import org.apache.xpath.XPath;
import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XString;
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xpath.res.XPATHErrorResources;
import org.apache.xml.utils.XMLString;
/**
@@ -147,6 +149,6 @@
public void checkNumberArgs(int argNum) throws WrongNumberArgsException
{
if (argNum < 2)
- throw new WrongNumberArgsException("2 or 3");
+ throw new
WrongNumberArgsException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_TWO_OR_THREE,
null)); //"2 or 3");
}
}
1.7 +3 -1
xml-xalan/java/src/org/apache/xpath/functions/FunctionDef1Arg.java
Index: FunctionDef1Arg.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FunctionDef1Arg.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionDef1Arg.java 2001/06/12 19:16:39 1.6
+++ FunctionDef1Arg.java 2001/07/28 00:26:00 1.7
@@ -62,6 +62,8 @@
import org.apache.xpath.objects.XNodeSet;
import org.apache.xpath.objects.XNumber;
import org.apache.xpath.objects.XString;
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xpath.res.XPATHErrorResources;
import org.apache.xml.utils.XMLString;
@@ -180,7 +182,7 @@
public void checkNumberArgs(int argNum) throws WrongNumberArgsException
{
if (argNum > 1)
- throw new WrongNumberArgsException("0 or 1");
+ throw new
WrongNumberArgsException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_ZERO_OR_ONE,
null)); //"0 or 1");
}
/**
1.4 +4 -2
xml-xalan/java/src/org/apache/xpath/objects/XRTreeFragSelectWrapper.java
Index: XRTreeFragSelectWrapper.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XRTreeFragSelectWrapper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XRTreeFragSelectWrapper.java 2001/06/15 17:54:27 1.3
+++ XRTreeFragSelectWrapper.java 2001/07/28 00:26:00 1.4
@@ -9,6 +9,8 @@
import org.apache.xpath.DOMHelper;
import org.apache.xpath.XPathContext;
import org.apache.xpath.Expression;
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xpath.res.XPATHErrorResources;
/**
* This class makes an select statement act like an result tree fragment.
@@ -112,7 +114,7 @@
*/
public int rtf()
{
- throw new RuntimeException("rtf() not supported by
XRTreeFragSelectWrapper!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_RTF_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
null)); //"rtf() not supported by XRTreeFragSelectWrapper!");
}
/**
@@ -122,7 +124,7 @@
*/
public DTMIterator asNodeIterator()
{
- throw new RuntimeException("asNodeIterator() not supported by
XRTreeFragSelectWrapper!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_RTF_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER,
null)); //"asNodeIterator() not supported by XRTreeFragSelectWrapper!");
}
}
1.4 +7 -3
xml-xalan/java/src/org/apache/xpath/objects/XStringForChars.java
Index: XStringForChars.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XStringForChars.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XStringForChars.java 2001/06/18 02:16:14 1.3
+++ XStringForChars.java 2001/07/28 00:26:00 1.4
@@ -4,6 +4,10 @@
import org.apache.xml.utils.XMLString;
import org.apache.xml.utils.XMLStringFactory;
import org.apache.xml.utils.XMLCharacterRecognizer;
+
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xpath.res.XPATHErrorResources;
+
import java.util.Locale;
@@ -34,7 +38,7 @@
m_length = length;
if(null == val)
throw new IllegalArgumentException(
- "The FastStringBuffer argument can not be null!!");
+
XSLMessages.createXPATHMessage(XPATHErrorResources.ER_FASTSTRINGBUFFER_CANNOT_BE_NULL,
null)); //"The FastStringBuffer argument can not be null!!");
}
@@ -47,7 +51,7 @@
{
super(val);
throw new IllegalArgumentException(
- "XStringForChars can not take a string for an
argument!");
+
XSLMessages.createXPATHMessage(XPATHErrorResources.ER_XSTRINGFORCHARS_CANNOT_TAKE_STRING,
null)); //"XStringForChars can not take a string for an argument!");
}
/**
@@ -57,7 +61,7 @@
*/
public FastStringBuffer fsb()
{
- throw new RuntimeException("fsb() not supported for XStringForChars!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_FSB_NOT_SUPPORTED_XSTRINGFORCHARS,
null)); //"fsb() not supported for XStringForChars!");
}
/**
1.13 +4 -3
xml-xalan/java/src/org/apache/xpath/operations/Variable.java
Index: Variable.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/operations/Variable.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Variable.java 2001/07/11 09:54:26 1.12
+++ Variable.java 2001/07/28 00:26:00 1.13
@@ -66,6 +66,7 @@
import org.w3c.dom.Node;
import org.apache.xpath.res.XPATHErrorResources;
+import org.apache.xalan.res.XSLMessages;
/**
* The variable reference expression executer.
@@ -123,8 +124,8 @@
return;
}
}
- throw new RuntimeException("Could not find variable with the name of "
- +m_qname.toString()+"!");
+ throw new
RuntimeException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_COULD_NOT_FIND_VAR,
new Object[]{m_qname.toString()})); //"Could not find variable with the name
of "
+ // +m_qname.toString()+"!");
}
@@ -233,7 +234,7 @@
}
}
- throw new javax.xml.transform.TransformerException("Variable not
resolvable: "+m_qname);
+ throw new
javax.xml.transform.TransformerException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_VAR_NOT_RESOLVABLE,
new Object[]{m_qname.toString()})); //"Variable not resolvable: "+m_qname);
}
}
}
1.9 +139 -1
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XPATHErrorResources.java 2001/06/15 05:15:59 1.8
+++ XPATHErrorResources.java 2001/07/28 00:26:00 1.9
@@ -84,7 +84,7 @@
public static final String WARNING_SUFFIX = "WR";
/** Field MAX_CODE */
- public static final int MAX_CODE = 69; // this is needed to keep track of
the number of messages
+ public static final int MAX_CODE = 83; // this is needed to keep track of
the number of messages
/** Field MAX_WARNING */
public static final int MAX_WARNING = 11; // this is needed to keep track
of the number of warnings
@@ -741,6 +741,144 @@
contents[ER_FUNCTION_TOKEN_NOT_FOUND][1] =
"function token not found.";
}
+
+ /** Argument 'localName' is null */
+ public static final int ER_ARG_LOCALNAME_NULL = 70;
+
+ static
+ {
+ contents[ER_ARG_LOCALNAME_NULL][1] =
+ "Argument 'localName' is null";
+ }
+
+ /** Can not deal with XPath type: */
+ public static final int ER_CANNOT_DEAL_XPATH_TYPE = 71;
+
+ static
+ {
+ contents[ER_CANNOT_DEAL_XPATH_TYPE][1] =
+ "Can not deal with XPath type: {0}";
+ }
+
+ /** This NodeSet is not mutable */
+ public static final int ER_NODESET_NOT_MUTABLE = 72;
+
+ static
+ {
+ contents[ER_NODESET_NOT_MUTABLE][1] =
+ "This NodeSet is not mutable";
+ }
+
+ /** This NodeSetDTM is not mutable */
+ public static final int ER_NODESETDTM_NOT_MUTABLE = 73;
+
+ static
+ {
+ contents[ER_NODESETDTM_NOT_MUTABLE][1] =
+ "This NodeSetDTM is not mutable";
+ }
+
+ /** Variable not resolvable: */
+ public static final int ER_VAR_NOT_RESOLVABLE = 74;
+
+ static
+ {
+ contents[ER_VAR_NOT_RESOLVABLE][1] =
+ "Variable not resolvable: {0}";
+ }
+
+ /** Null error handler */
+ public static final int ER_NULL_ERROR_HANDLER = 75;
+
+ static
+ {
+ contents[ER_NULL_ERROR_HANDLER][1] =
+ "Null error handler";
+ }
+
+ /** Programmer's assertion: unknown opcode */
+ public static final int ER_PROG_ASSERT_UNKNOWN_OPCODE = 76;
+
+ static
+ {
+ contents[ER_PROG_ASSERT_UNKNOWN_OPCODE][1] =
+ "Programmer's assertion: unknown opcode: {0}";
+ }
+
+ /** 0 or 1 */
+ public static final int ER_ZERO_OR_ONE = 77;
+
+ static
+ {
+ contents[ER_ZERO_OR_ONE][1] =
+ "0 or 1";
+ }
+
+ /** 2 or 3 */
+ public static final int ER_TWO_OR_THREE = 78;
+
+ static
+ {
+ contents[ER_TWO_OR_THREE][1] =
+ "0 or 1";
+ }
+
+
+
+ /** rtf() not supported by XRTreeFragSelectWrapper */
+ public static final int ER_RTF_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER = 78;
+
+ static
+ {
+ contents[ER_RTF_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER][1] =
+ "rtf() not supported by XRTreeFragSelectWrapper";
+ }
+
+ /** asNodeIterator() not supported by XRTreeFragSelectWrapper */
+ public static final int
ER_ASNODEITERATOR_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER = 79;
+
+ static
+ {
+ contents[ER_ASNODEITERATOR_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER][1] =
+ "asNodeIterator() not supported by XRTreeFragSelectWrapper";
+ }
+
+ /** fsb() not supported for XStringForChars */
+ public static final int ER_FSB_NOT_SUPPORTED_XSTRINGFORCHARS = 80;
+
+ static
+ {
+ contents[ER_FSB_NOT_SUPPORTED_XSTRINGFORCHARS][1] =
+ "fsb() not supported for XStringForChars";
+ }
+
+ /** Could not find variable with the name of */
+ public static final int ER_COULD_NOT_FIND_VAR = 81;
+
+ static
+ {
+ contents[ER_COULD_NOT_FIND_VAR][1] =
+ "Could not find variable with the name of {0}";
+ }
+
+ /** XStringForChars can not take a string for an argument */
+ public static final int ER_XSTRINGFORCHARS_CANNOT_TAKE_STRING = 82;
+
+ static
+ {
+ contents[ER_XSTRINGFORCHARS_CANNOT_TAKE_STRING][1] =
+ "XStringForChars can not take a string for an argument";
+ }
+
+ /** The FastStringBuffer argument can not be null */
+ public static final int ER_FASTSTRINGBUFFER_CANNOT_BE_NULL = 83;
+
+ static
+ {
+ contents[ER_FASTSTRINGBUFFER_CANNOT_BE_NULL][1] =
+ "The FastStringBuffer argument can not be null";
+ }
+
// Warnings...
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
