You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mk...@apache.org on 2003/01/22 17:18:05 UTC
cvs commit: xml-xalan/java/src/org/apache/xml/utils AttList.java DOMBuilder.java DefaultErrorHandler.java ListingErrorHandler.java ObjectPool.java PrefixResolverDefault.java QName.java TreeWalker.java URI.java UnImplNode.java
mkwan 2003/01/22 08:18:05
Modified: java/src/org/apache/xml/dtm DTMException.java
DTMManager.java
java/src/org/apache/xml/dtm/ref ChunkedIntArray.java
CoroutineManager.java DTMDefaultBase.java
DTMDefaultBaseIterators.java
DTMDefaultBaseTraversers.java
DTMManagerDefault.java
IncrementalSAXSource_Filter.java
IncrementalSAXSource_Xerces.java
java/src/org/apache/xml/dtm/ref/dom2dtm DOM2DTM.java
java/src/org/apache/xml/dtm/ref/sax2dtm SAX2DTM.java
SAX2RTFDTM.java
java/src/org/apache/xml/utils AttList.java DOMBuilder.java
DefaultErrorHandler.java ListingErrorHandler.java
ObjectPool.java PrefixResolverDefault.java
QName.java TreeWalker.java URI.java UnImplNode.java
Log:
DTM Separation -- patches for files under org.apache.xml
1. Replace all invocations of XSLMessages.createMessage() by
XMLMessages.createXMLMessage().
2. Replace XSLTErrorResources by XMLErrorResources.
3. In IncrementalSAXSource_Filter, use ThreadControllerWrapper.runThread()
rather than calling TransformerImpl.runTransformThread().
4. In SAX2DTM, use a setter method to set the source location property.
Remove the field access to org.apache.xalan.processor.TransformerFactoryImpl.m_source_location.
Revision Changes Path
1.4 +4 -5 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DTMException.java 28 Jul 2001 00:25:59 -0000 1.3
+++ DTMException.java 22 Jan 2003 16:18:03 -0000 1.4
@@ -7,9 +7,8 @@
import javax.xml.transform.SourceLocator;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.res.XSLMessages;
-
+import org.apache.xml.res.XMLErrorResources;
+import org.apache.xml.res.XMLMessages;
/**
@@ -95,12 +94,12 @@
public synchronized Throwable initCause(Throwable cause) {
if ((this.containedException == null) && (cause != null)) {
- throw new IllegalStateException(XSLMessages.createMessage(XSLTErrorResources.ER_CANNOT_OVERWRITE_CAUSE, null)); //"Can't overwrite cause");
+ throw new IllegalStateException(XMLMessages.createXMLMessage(XMLErrorResources.ER_CANNOT_OVERWRITE_CAUSE, null)); //"Can't overwrite cause");
}
if (cause == this) {
throw new IllegalArgumentException(
- XSLMessages.createMessage(XSLTErrorResources.ER_SELF_CAUSATION_NOT_PERMITTED, null)); //"Self-causation not permitted");
+ XMLMessages.createXMLMessage(XMLErrorResources.ER_SELF_CAUSATION_NOT_PERMITTED, null)); //"Self-causation not permitted");
}
this.containedException = cause;
1.12 +4 -4 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DTMManager.java 14 Jan 2003 21:32:33 -0000 1.11
+++ DTMManager.java 22 Jan 2003 16:18:03 -0000 1.12
@@ -56,8 +56,8 @@
*/
package org.apache.xml.dtm;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xml.res.XMLMessages;
+import org.apache.xml.res.XMLErrorResources;
import org.apache.xml.utils.PrefixResolver;
import org.apache.xml.utils.XMLStringFactory;
@@ -171,13 +171,13 @@
/* The fallback implementation class name */
"org.apache.xml.dtm.ref.DTMManagerDefault");
} catch (FactoryFinder.ConfigurationError e) {
- throw new DTMConfigurationException(XSLMessages.createMessage(XSLTErrorResources.ER_NO_DEFAULT_IMPL, null)); //"No default implementation found");
+ throw new DTMConfigurationException(XMLMessages.createXMLMessage(XMLErrorResources.ER_NO_DEFAULT_IMPL, null)); //"No default implementation found");
}
if (factoryImpl == null)
{
- throw new DTMConfigurationException(XSLMessages.createMessage(XSLTErrorResources.ER_NO_DEFAULT_IMPL, null)); //"No default implementation found");
+ throw new DTMConfigurationException(XMLMessages.createXMLMessage(XMLErrorResources.ER_NO_DEFAULT_IMPL, null)); //"No default implementation found");
}
factoryImpl.setXMLStringFactory(xsf);
1.4 +5 -5 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ChunkedIntArray.java 28 Jul 2001 00:25:59 -0000 1.3
+++ ChunkedIntArray.java 22 Jan 2003 16:18:03 -0000 1.4
@@ -59,8 +59,8 @@
import org.w3c.dom.*;
import org.apache.xml.dtm.*;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.res.XSLMessages;
+import org.apache.xml.res.XMLErrorResources;
+import org.apache.xml.res.XMLMessages;
/**
* <code>ChunkedIntArray</code> is an extensible array of blocks of integers.
@@ -96,7 +96,7 @@
ChunkedIntArray(int slotsize)
{
if(this.slotsize<slotsize)
- throw new ArrayIndexOutOfBoundsException(XSLMessages.createMessage(XSLTErrorResources.ER_CHUNKEDINTARRAY_NOT_SUPPORTED, new Object[]{Integer.toString(slotsize)})); //"ChunkedIntArray("+slotsize+") not currently supported");
+ throw new ArrayIndexOutOfBoundsException(XMLMessages.createXMLMessage(XMLErrorResources.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);
@@ -158,7 +158,7 @@
{
// System.out.println("Using slow read (1)");
if (offset>=slotsize)
- throw new ArrayIndexOutOfBoundsException(XSLMessages.createMessage(XSLTErrorResources.ER_OFFSET_BIGGER_THAN_SLOT, null)); //"Offset bigger than slot");
+ throw new ArrayIndexOutOfBoundsException(XMLMessages.createXMLMessage(XMLErrorResources.ER_OFFSET_BIGGER_THAN_SLOT, null)); //"Offset bigger than slot");
position*=slotsize;
int chunkpos = position >> lowbits;
int slotpos = position & lowmask;
@@ -239,7 +239,7 @@
*/
{
if (offset >= slotsize)
- throw new ArrayIndexOutOfBoundsException(XSLMessages.createMessage(XSLTErrorResources.ER_OFFSET_BIGGER_THAN_SLOT, null)); //"Offset bigger than slot");
+ throw new ArrayIndexOutOfBoundsException(XMLMessages.createXMLMessage(XMLErrorResources.ER_OFFSET_BIGGER_THAN_SLOT, null)); //"Offset bigger than slot");
position*=slotsize;
int chunkpos = position >> lowbits;
int slotpos = position & lowmask;
1.6 +5 -5 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CoroutineManager.java 28 Jul 2001 00:25:59 -0000 1.5
+++ CoroutineManager.java 22 Jan 2003 16:18:03 -0000 1.6
@@ -59,8 +59,8 @@
import java.util.*;
import org.apache.xml.dtm.*;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.res.XSLMessages;
+import org.apache.xml.res.XMLErrorResources;
+import org.apache.xml.res.XMLMessages;
/**
@@ -298,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(XSLMessages.createMessage(XSLTErrorResources.ER_COROUTINE_NOT_AVAIL, new Object[]{Integer.toString(toCoroutine)})); //"Coroutine not available, id="+toCoroutine);
+ throw new java.lang.NoSuchMethodException(XMLMessages.createXMLMessage(XMLErrorResources.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.
@@ -326,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(XSLMessages.createMessage(XSLTErrorResources.ER_COROUTINE_CO_EXIT, null)); //"CoroutineManager recieved co_exit() request");
+ throw new java.lang.NoSuchMethodException(XMLMessages.createXMLMessage(XMLErrorResources.ER_COROUTINE_CO_EXIT, null)); //"CoroutineManager recieved co_exit() request");
}
return m_yield;
@@ -367,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(XSLMessages.createMessage(XSLTErrorResources.ER_COROUTINE_NOT_AVAIL, new Object[]{Integer.toString(toCoroutine)})); //"Coroutine not available, id="+toCoroutine);
+ throw new java.lang.NoSuchMethodException(XMLMessages.createXMLMessage(XMLErrorResources.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.31 +7 -7 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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- DTMDefaultBase.java 17 Dec 2002 16:24:29 -0000 1.30
+++ DTMDefaultBase.java 22 Jan 2003 16:18:03 -0000 1.31
@@ -78,8 +78,8 @@
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 org.apache.xml.res.XMLMessages;
+import org.apache.xml.res.XMLErrorResources;
import java.io.*; // for dumpDTM
@@ -1471,7 +1471,7 @@
{
// %TBD%
- error(XSLMessages.createMessage(XSLTErrorResources.ER_METHOD_NOT_SUPPORTED, null));//("getStringValueChunkCount not yet supported!");
+ error(XMLMessages.createXMLMessage(XMLErrorResources.ER_METHOD_NOT_SUPPORTED, null));//("getStringValueChunkCount not yet supported!");
return 0;
}
@@ -1494,7 +1494,7 @@
{
// %TBD%
- error(XSLMessages.createMessage(XSLTErrorResources.ER_METHOD_NOT_SUPPORTED, null));//"getStringValueChunk not yet supported!");
+ error(XMLMessages.createXMLMessage(XMLErrorResources.ER_METHOD_NOT_SUPPORTED, null));//"getStringValueChunk not yet supported!");
return null;
}
@@ -1601,7 +1601,7 @@
{
/** @todo: implement this org.apache.xml.dtm.DTMDefaultBase abstract method */
- error(XSLMessages.createMessage(XSLTErrorResources.ER_METHOD_NOT_SUPPORTED, null));//"Not yet supported!");
+ error(XMLMessages.createXMLMessage(XMLErrorResources.ER_METHOD_NOT_SUPPORTED, null));//"Not yet supported!");
return null;
}
@@ -2035,7 +2035,7 @@
*/
public void appendChild(int newChild, boolean clone, boolean cloneDepth)
{
- error(XSLMessages.createMessage(XSLTErrorResources.ER_METHOD_NOT_SUPPORTED, null));//"appendChild not yet supported!");
+ error(XMLMessages.createXMLMessage(XMLErrorResources.ER_METHOD_NOT_SUPPORTED, null));//"appendChild not yet supported!");
}
/**
@@ -2049,7 +2049,7 @@
*/
public void appendTextChild(String str)
{
- error(XSLMessages.createMessage(XSLTErrorResources.ER_METHOD_NOT_SUPPORTED, null));//"appendTextChild not yet supported!");
+ error(XMLMessages.createXMLMessage(XMLErrorResources.ER_METHOD_NOT_SUPPORTED, null));//"appendTextChild not yet supported!");
}
/**
1.16 +6 -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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DTMDefaultBaseIterators.java 10 Jul 2002 18:57:00 -0000 1.15
+++ DTMDefaultBaseIterators.java 22 Jan 2003 16:18:03 -0000 1.16
@@ -62,8 +62,8 @@
import org.apache.xml.utils.XMLStringFactory;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.res.XSLMessages;
+import org.apache.xml.res.XMLErrorResources;
+import org.apache.xml.res.XMLMessages;
/**
@@ -166,7 +166,7 @@
iterator = new TypedRootIterator(type);
break;
default :
- throw new DTMException(XSLMessages.createMessage(XSLTErrorResources.ER_TYPED_ITERATOR_AXIS_NOT_IMPLEMENTED, new Object[]{Axis.names[axis]})); //"Error: typed iterator for axis "
+ throw new DTMException(XMLMessages.createXMLMessage(XMLErrorResources.ER_TYPED_ITERATOR_AXIS_NOT_IMPLEMENTED, new Object[]{Axis.names[axis]})); //"Error: typed iterator for axis "
//+ Axis.names[axis] + "not implemented");
}
}
@@ -230,7 +230,7 @@
iterator = new RootIterator();
break;
default :
- throw new DTMException(XSLMessages.createMessage(XSLTErrorResources.ER_ITERATOR_AXIS_NOT_IMPLEMENTED, new Object[]{Axis.names[axis]})); //"Error: iterator for axis '" + Axis.names[axis]
+ throw new DTMException(XMLMessages.createXMLMessage(XMLErrorResources.ER_ITERATOR_AXIS_NOT_IMPLEMENTED, new Object[]{Axis.names[axis]})); //"Error: iterator for axis '" + Axis.names[axis]
//+ "' not implemented");
}
@@ -1173,7 +1173,7 @@
}
catch (CloneNotSupportedException e)
{
- throw new DTMException(XSLMessages.createMessage(XSLTErrorResources.ER_ITERATOR_CLONE_NOT_SUPPORTED, null)); //"Iterator clone not supported.");
+ throw new DTMException(XMLMessages.createXMLMessage(XMLErrorResources.ER_ITERATOR_CLONE_NOT_SUPPORTED, null)); //"Iterator clone not supported.");
}
}
@@ -1468,7 +1468,7 @@
}
catch (CloneNotSupportedException e)
{
- throw new DTMException(XSLMessages.createMessage(XSLTErrorResources.ER_ITERATOR_CLONE_NOT_SUPPORTED, null)); //"Iterator clone not supported.");
+ throw new DTMException(XMLMessages.createXMLMessage(XMLErrorResources.ER_ITERATOR_CLONE_NOT_SUPPORTED, null)); //"Iterator clone not supported.");
}
}
1.13 +4 -4 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DTMDefaultBaseTraversers.java 19 Aug 2002 20:51:41 -0000 1.12
+++ DTMDefaultBaseTraversers.java 22 Jan 2003 16:18:03 -0000 1.13
@@ -62,8 +62,8 @@
import org.apache.xml.utils.XMLStringFactory;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.res.XSLMessages;
+import org.apache.xml.res.XMLErrorResources;
+import org.apache.xml.res.XMLMessages;
/**
@@ -191,11 +191,11 @@
case Axis.FILTEREDLIST :
return null; // Don't want to throw an exception for this one.
default :
- throw new DTMException(XSLMessages.createMessage(XSLTErrorResources.ER_UNKNOWN_AXIS_TYPE, new Object[]{Integer.toString(axis)})); //"Unknown axis traversal type: "+axis);
+ throw new DTMException(XMLMessages.createXMLMessage(XMLErrorResources.ER_UNKNOWN_AXIS_TYPE, new Object[]{Integer.toString(axis)})); //"Unknown axis traversal type: "+axis);
}
if (null == traverser)
- throw new DTMException(XSLMessages.createMessage(XSLTErrorResources.ER_AXIS_TRAVERSER_NOT_SUPPORTED, new Object[]{Axis.names[axis]}));
+ throw new DTMException(XMLMessages.createXMLMessage(XMLErrorResources.ER_AXIS_TRAVERSER_NOT_SUPPORTED, new Object[]{Axis.names[axis]}));
// "Axis traverser not supported: "
// + Axis.names[axis]);
1.42 +6 -6 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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- DTMManagerDefault.java 10 Apr 2002 13:30:42 -0000 1.41
+++ DTMManagerDefault.java 22 Jan 2003 16:18:03 -0000 1.42
@@ -99,8 +99,8 @@
import org.apache.xml.utils.XMLString;
import org.apache.xml.utils.XMLStringFactory;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.res.XSLMessages;
+import org.apache.xml.res.XMLErrorResources;
+import org.apache.xml.res.XMLMessages;
/**
* The default implementation for the DTMManager.
@@ -183,7 +183,7 @@
if(id>=IDENT_MAX_DTMS)
{
// TODO: %REVIEW% Not really the right error message.
- throw new DTMException(XSLMessages.createMessage(XSLTErrorResources.ER_NO_DTMIDS_AVAIL, null)); //"No more DTM IDs are available!");
+ throw new DTMException(XMLMessages.createXMLMessage(XMLErrorResources.ER_NO_DTMIDS_AVAIL, null)); //"No more DTM IDs are available!");
}
// We used to just allocate the array size to IDENT_MAX_DTMS.
@@ -521,7 +521,7 @@
// It should have been handled by a derived class or the caller
// made a mistake.
- throw new DTMException(XSLMessages.createMessage(XSLTErrorResources.ER_NOT_SUPPORTED, new Object[]{source})); //"Not supported: " + source);
+ throw new DTMException(XMLMessages.createXMLMessage(XMLErrorResources.ER_NOT_SUPPORTED, new Object[]{source})); //"Not supported: " + source);
}
}
}
@@ -538,7 +538,7 @@
synchronized public int getDTMHandleFromNode(org.w3c.dom.Node node)
{
if(null == node)
- throw new IllegalArgumentException(XSLMessages.createMessage(XSLTErrorResources.ER_NODE_NON_NULL, null)); //"node must be non-null for getDTMHandleFromNode!");
+ throw new IllegalArgumentException(XMLMessages.createXMLMessage(XMLErrorResources.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();
@@ -620,7 +620,7 @@
handle = ((DOM2DTM)dtm).getHandleOfNode(node);
if(DTM.NULL == handle)
- throw new RuntimeException(XSLMessages.createMessage(XSLTErrorResources.ER_COULD_NOT_RESOLVE_NODE, null)); //"Could not resolve the node to a handle!");
+ throw new RuntimeException(XMLMessages.createXMLMessage(XMLErrorResources.ER_COULD_NOT_RESOLVE_NODE, null)); //"Could not resolve the node to a handle!");
return handle;
}
1.8 +8 -6 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- IncrementalSAXSource_Filter.java 6 Feb 2002 17:46:45 -0000 1.7
+++ IncrementalSAXSource_Filter.java 22 Jan 2003 16:18:04 -0000 1.8
@@ -72,8 +72,9 @@
import java.io.IOException;
import org.apache.xml.dtm.ref.IncrementalSAXSource;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.res.XSLMessages;
+import org.apache.xml.utils.ThreadControllerWrapper;
+import org.apache.xml.res.XMLErrorResources;
+import org.apache.xml.res.XMLMessages;
/** <p>IncrementalSAXSource_Filter implements IncrementalSAXSource, using a
* standard SAX2 event source as its input and parcelling out those
@@ -163,7 +164,7 @@
fControllerCoroutineID = co.co_joinCoroutineSet(controllerCoroutineID);
fSourceCoroutineID = co.co_joinCoroutineSet(sourceCoroutineID);
if (fControllerCoroutineID == -1 || fSourceCoroutineID == -1)
- throw new RuntimeException(XSLMessages.createMessage(XSLTErrorResources.ER_COJOINROUTINESET_FAILED, null)); //"co_joinCoroutineSet() failed");
+ throw new RuntimeException(XMLMessages.createXMLMessage(XMLErrorResources.ER_COJOINROUTINESET_FAILED, null)); //"co_joinCoroutineSet() failed");
fNoMoreEvents=false;
eventcounter=frequency;
@@ -638,14 +639,15 @@
public void startParse(InputSource source) throws SAXException
{
if(fNoMoreEvents)
- throw new SAXException(XSLMessages.createMessage(XSLTErrorResources.ER_INCRSAXSRCFILTER_NOT_RESTARTABLE, null)); //"IncrmentalSAXSource_Filter not currently restartable.");
+ throw new SAXException(XMLMessages.createXMLMessage(XMLErrorResources.ER_INCRSAXSRCFILTER_NOT_RESTARTABLE, null)); //"IncrmentalSAXSource_Filter not currently restartable.");
if(fXMLReader==null)
- throw new SAXException(XSLMessages.createMessage(XSLTErrorResources.ER_XMLRDR_NOT_BEFORE_STARTPARSE, null)); //"XMLReader not before startParse request");
+ throw new SAXException(XMLMessages.createXMLMessage(XMLErrorResources.ER_XMLRDR_NOT_BEFORE_STARTPARSE, null)); //"XMLReader not before startParse request");
fXMLReaderInputSource=source;
// Xalan thread pooling...
- org.apache.xalan.transformer.TransformerImpl.runTransformThread(this);
+ // org.apache.xalan.transformer.TransformerImpl.runTransformThread(this);
+ ThreadControllerWrapper.runThread(this, -1);
}
/* Thread logic to support startParseThread()
1.9 +5 -5 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- IncrementalSAXSource_Xerces.java 6 Feb 2002 17:46:45 -0000 1.8
+++ IncrementalSAXSource_Xerces.java 22 Jan 2003 16:18:04 -0000 1.9
@@ -63,8 +63,8 @@
import org.apache.xerces.parsers.SAXParser;
import org.xml.sax.XMLReader;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.res.XSLMessages;
+import org.apache.xml.res.XMLErrorResources;
+import org.apache.xml.res.XMLMessages;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
@@ -294,9 +294,9 @@
public void startParse(InputSource source) throws SAXException
{
if (fIncrementalParser==null)
- throw new SAXException(XSLMessages.createMessage(XSLTErrorResources.ER_STARTPARSE_NEEDS_SAXPARSER, null)); //"startParse needs a non-null SAXParser.");
+ throw new SAXException(XMLMessages.createXMLMessage(XMLErrorResources.ER_STARTPARSE_NEEDS_SAXPARSER, null)); //"startParse needs a non-null SAXParser.");
if (fParseInProgress)
- throw new SAXException(XSLMessages.createMessage(XSLTErrorResources.ER_STARTPARSE_WHILE_PARSING, null)); //"startParse may not be called while parsing.");
+ throw new SAXException(XMLMessages.createXMLMessage(XMLErrorResources.ER_STARTPARSE_WHILE_PARSING, null)); //"startParse may not be called while parsing.");
boolean ok=false;
@@ -310,7 +310,7 @@
}
if(!ok)
- throw new SAXException(XSLMessages.createMessage(XSLTErrorResources.ER_COULD_NOT_INIT_PARSER, null)); //"could not initialize parser with");
+ throw new SAXException(XMLMessages.createXMLMessage(XMLErrorResources.ER_COULD_NOT_INIT_PARSER, null)); //"could not initialize parser with");
}
1.30 +3 -3 xml-xalan/java/src/org/apache/xml/dtm/ref/dom2dtm/DOM2DTM.java
Index: DOM2DTM.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/dom2dtm/DOM2DTM.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- DOM2DTM.java 4 Dec 2002 20:38:32 -0000 1.29
+++ DOM2DTM.java 22 Jan 2003 16:18:04 -0000 1.30
@@ -79,8 +79,8 @@
import org.apache.xml.utils.XMLString;
import org.apache.xml.utils.XMLStringFactory;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.res.XSLMessages;
+import org.apache.xml.res.XMLErrorResources;
+import org.apache.xml.res.XMLMessages;
/** The <code>DOM2DTM</code> class serves up a DOM's contents via the
* DTM API.
@@ -234,7 +234,7 @@
// %REVIEW% Wrong error message, but I've been told we're trying
// not to add messages right not for I18N reasons.
// %REVIEW% Should this be a Fatal Error?
- error(XSLMessages.createMessage(XSLTErrorResources.ER_NO_DTMIDS_AVAIL, null));//"No more DTM IDs are available";
+ error(XMLMessages.createXMLMessage(XMLErrorResources.ER_NO_DTMIDS_AVAIL, null));//"No more DTM IDs are available";
}
}
1.31 +22 -11 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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- SAX2DTM.java 17 Dec 2002 22:08:11 -0000 1.30
+++ SAX2DTM.java 22 Jan 2003 16:18:04 -0000 1.31
@@ -60,9 +60,6 @@
import java.util.Vector;
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.*;
@@ -76,6 +73,8 @@
import org.apache.xml.utils.XMLCharacterRecognizer;
import org.apache.xml.utils.XMLString;
import org.apache.xml.utils.XMLStringFactory;
+import org.apache.xml.res.XMLErrorResources;
+import org.apache.xml.res.XMLMessages;
import org.xml.sax.*;
import org.xml.sax.ext.*;
@@ -230,6 +229,12 @@
*/
protected boolean m_useSourceLocationProperty = false;
+ /**
+ * Describes whether information about document source location
+ * should be maintained or not. This static flag is set by TransformerFactoryImpl.
+ */
+ protected static boolean m_source_location = false;
+
/** Made protected for access by SAX2RTFDTM.
*/
protected StringVector m_sourceSystemId;
@@ -271,17 +276,23 @@
m_dataOrQName = new SuballocatedIntVector(m_initialblocksize);
- // %REVIEW%
- // A public static is not a good way to retrieve the system-level
- // FEATURE_SOURCE_LOCATION flag, but we didn't want to deal with
- // changing APIs at this time. MUST reconsider.
- m_useSourceLocationProperty=org.apache.xalan.processor.TransformerFactoryImpl.m_source_location;
+ // m_useSourceLocationProperty=org.apache.xalan.processor.TransformerFactoryImpl.m_source_location;
+ m_useSourceLocationProperty = m_source_location;
m_sourceSystemId = (m_useSourceLocationProperty) ? new StringVector() : null;
m_sourceLine = (m_useSourceLocationProperty) ? new IntVector() : null;
m_sourceColumn = (m_useSourceLocationProperty) ? new IntVector() : null;
}
/**
+ * Set whether information about document source location
+ * should be maintained or not.
+ */
+ public static void setUseSourceLocation(boolean useSourceLocation)
+ {
+ m_source_location = useSourceLocation;
+ }
+
+ /**
* Get the data or qualified name for the given node identity.
*
* @param identity The node identity.
@@ -676,7 +687,7 @@
{
/** @todo: implement this org.apache.xml.dtm.DTMDefaultBase abstract method */
- error(XSLMessages.createMessage(XSLTErrorResources.ER_METHOD_NOT_SUPPORTED, null));//"Not yet supported!");
+ error(XMLMessages.createXMLMessage(XMLErrorResources.ER_METHOD_NOT_SUPPORTED, null));//"Not yet supported!");
return null;
}
@@ -872,7 +883,7 @@
// %REVIEW% Wrong error message, but I've been told we're trying
// not to add messages right not for I18N reasons.
// %REVIEW% Should this be a Fatal Error?
- error(XSLMessages.createMessage(XSLTErrorResources.ER_NO_DTMIDS_AVAIL, null));//"No more DTM IDs are available";
+ error(XMLMessages.createXMLMessage(XMLErrorResources.ER_NO_DTMIDS_AVAIL, null));//"No more DTM IDs are available";
}
}
@@ -1156,7 +1167,7 @@
{
/** @todo: implement this org.apache.xml.dtm.DTMDefaultBase abstract method */
- error(XSLMessages.createMessage(XSLTErrorResources.ER_METHOD_NOT_SUPPORTED, null));//"Not yet supported!");
+ error(XMLMessages.createXMLMessage(XMLErrorResources.ER_METHOD_NOT_SUPPORTED, null));//"Not yet supported!");
return null;
}
1.5 +0 -3 xml-xalan/java/src/org/apache/xml/dtm/ref/sax2dtm/SAX2RTFDTM.java
Index: SAX2RTFDTM.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/sax2dtm/SAX2RTFDTM.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SAX2RTFDTM.java 21 May 2002 16:25:12 -0000 1.4
+++ SAX2RTFDTM.java 22 Jan 2003 16:18:04 -0000 1.5
@@ -60,9 +60,6 @@
import java.util.Vector;
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.*;
1.8 +2 -2 xml-xalan/java/src/org/apache/xml/utils/AttList.java
Index: AttList.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/AttList.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AttList.java 21 Dec 2001 14:08:00 -0000 1.7
+++ AttList.java 22 Jan 2003 16:18:04 -0000 1.8
@@ -60,8 +60,8 @@
import org.xml.sax.*;
-import org.apache.xpath.DOMHelper;
-import org.apache.xpath.DOM2Helper;
+import org.apache.xml.utils.DOMHelper;
+import org.apache.xml.utils.DOM2Helper;
/**
* <meta name="usage" content="internal"/>
1.12 +6 -6 xml-xalan/java/src/org/apache/xml/utils/DOMBuilder.java
Index: DOMBuilder.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/DOMBuilder.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DOMBuilder.java 10 Jul 2002 21:44:21 -0000 1.11
+++ DOMBuilder.java 22 Jan 2003 16:18:05 -0000 1.12
@@ -56,8 +56,8 @@
*/
package org.apache.xml.utils;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xpath.res.XPATHErrorResources;
+import org.apache.xml.res.XMLMessages;
+import org.apache.xml.res.XMLErrorResources;
import org.apache.xml.utils.NodeVector;
import java.util.Stack;
@@ -190,8 +190,8 @@
if ((null != data) && (data.trim().length() > 0))
{
throw new org.xml.sax.SAXException(
- XSLMessages.createXPATHMessage(
- XPATHErrorResources.ER_CANT_OUTPUT_TEXT_BEFORE_DOC, null)); //"Warning: can't output text before document element! Ignoring...");
+ XMLMessages.createXMLMessage(
+ XMLErrorResources.ER_CANT_OUTPUT_TEXT_BEFORE_DOC, null)); //"Warning: can't output text before document element! Ignoring...");
}
ok = false;
@@ -201,8 +201,8 @@
if (m_doc.getDocumentElement() != null)
{
throw new org.xml.sax.SAXException(
- XSLMessages.createXPATHMessage(
- XPATHErrorResources.ER_CANT_HAVE_MORE_THAN_ONE_ROOT, null)); //"Can't have more than one root on a DOM!");
+ XMLMessages.createXMLMessage(
+ XMLErrorResources.ER_CANT_HAVE_MORE_THAN_ONE_ROOT, null)); //"Can't have more than one root on a DOM!");
}
}
1.11 +6 -6 xml-xalan/java/src/org/apache/xml/utils/DefaultErrorHandler.java
Index: DefaultErrorHandler.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/DefaultErrorHandler.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultErrorHandler.java 8 Jul 2002 22:07:23 -0000 1.10
+++ DefaultErrorHandler.java 22 Jan 2003 16:18:05 -0000 1.11
@@ -61,8 +61,8 @@
import javax.xml.transform.TransformerException;
import javax.xml.transform.SourceLocator;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xml.res.XMLMessages;
+import org.apache.xml.res.XMLErrorResources;
import java.io.PrintWriter;
import java.io.PrintStream;
@@ -338,12 +338,12 @@
String id = (null != locator.getPublicId() )
? locator.getPublicId()
: (null != locator.getSystemId())
- ? locator.getSystemId() : XSLMessages.createMessage(XSLTErrorResources.ER_SYSTEMID_UNKNOWN, null); //"SystemId Unknown";
+ ? locator.getSystemId() : XMLMessages.createXMLMessage(XMLErrorResources.ER_SYSTEMID_UNKNOWN, null); //"SystemId Unknown";
- pw.print(id + "; " +XSLMessages.createMessage("line", null) + locator.getLineNumber()
- + "; " +XSLMessages.createMessage("column", null) + locator.getColumnNumber()+"; ");
+ pw.print(id + "; " +XMLMessages.createXMLMessage("line", null) + locator.getLineNumber()
+ + "; " +XMLMessages.createXMLMessage("column", null) + locator.getColumnNumber()+"; ");
}
else
- pw.print("("+XSLMessages.createMessage(XSLTErrorResources.ER_LOCATION_UNKNOWN, null)+")");
+ pw.print("("+XMLMessages.createXMLMessage(XMLErrorResources.ER_LOCATION_UNKNOWN, null)+")");
}
}
1.3 +4 -4 xml-xalan/java/src/org/apache/xml/utils/ListingErrorHandler.java
Index: ListingErrorHandler.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/ListingErrorHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ListingErrorHandler.java 7 Jun 2002 17:13:54 -0000 1.2
+++ ListingErrorHandler.java 22 Jan 2003 16:18:05 -0000 1.3
@@ -68,8 +68,8 @@
import javax.xml.transform.ErrorListener;
import javax.xml.transform.SourceLocator;
import javax.xml.transform.TransformerException;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xml.res.XMLMessages;
+import org.apache.xml.res.XMLErrorResources;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
@@ -97,7 +97,7 @@
public ListingErrorHandler(PrintWriter pw)
{
if (null == pw)
- throw new NullPointerException(XSLMessages.createMessage(XSLTErrorResources.ER_ERRORHANDLER_CREATED_WITH_NULL_PRINTWRITER, null));
+ throw new NullPointerException(XMLMessages.createXMLMessage(XMLErrorResources.ER_ERRORHANDLER_CREATED_WITH_NULL_PRINTWRITER, null));
// "ListingErrorHandler created with null PrintWriter!");
m_pw = pw;
1.6 +3 -3 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ObjectPool.java 28 Jul 2001 00:25:59 -0000 1.5
+++ ObjectPool.java 22 Jan 2003 16:18:05 -0000 1.6
@@ -58,8 +58,8 @@
import java.util.*;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.res.XSLMessages;
+import org.apache.xml.res.XMLErrorResources;
+import org.apache.xml.res.XMLMessages;
/**
@@ -176,7 +176,7 @@
catch (IllegalAccessException ex){}
// Throw unchecked exception for error in pool configuration.
- throw new RuntimeException(XSLMessages.createMessage(XSLTErrorResources.ER_EXCEPTION_CREATING_POOL, null)); //"exception creating new instance for pool");
+ throw new RuntimeException(XMLMessages.createXMLMessage(XMLErrorResources.ER_EXCEPTION_CREATING_POOL, null)); //"exception creating new instance for pool");
}
else
{
1.4 +1 -8 xml-xalan/java/src/org/apache/xml/utils/PrefixResolverDefault.java
Index: PrefixResolverDefault.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/PrefixResolverDefault.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PrefixResolverDefault.java 10 Jun 2002 21:34:40 -0000 1.3
+++ PrefixResolverDefault.java 22 Jan 2003 16:18:05 -0000 1.4
@@ -75,13 +75,6 @@
Node m_context;
/**
- * The URI for the XML namespace.
- * (Duplicate of that found in org.apache.xpath.XPathContext).
- */
- public static final String S_XMLNAMESPACEURI =
- "http://www.w3.org/XML/1998/namespace";
-
- /**
* Construct a PrefixResolverDefault object.
* @param xpathExpressionContext The context from
* which XPath expression prefixes will be resolved.
@@ -128,7 +121,7 @@
if (prefix.equals("xml"))
{
- namespace = S_XMLNAMESPACEURI;
+ namespace = Constants.S_XMLNAMESPACEURI;
}
else
{
1.10 +28 -28 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- QName.java 24 Jul 2002 14:15:03 -0000 1.9
+++ QName.java 22 Jan 2003 16:18:05 -0000 1.10
@@ -61,8 +61,8 @@
import org.w3c.dom.Element;
-import org.apache.xpath.res.XPATHErrorResources;
-import org.apache.xalan.res.XSLMessages;
+import org.apache.xml.res.XMLErrorResources;
+import org.apache.xml.res.XMLMessages;
/**
* <meta name="usage" content="general"/>
@@ -143,15 +143,15 @@
// This check was already here. So, for now, I will not add it to the validation
// that is done when the validate parameter is true.
if (localName == null)
- throw new IllegalArgumentException(XSLMessages.createXPATHMessage(
- XPATHErrorResources.ER_ARG_LOCALNAME_NULL, null)); //"Argument 'localName' is null");
+ throw new IllegalArgumentException(XMLMessages.createXMLMessage(
+ XMLErrorResources.ER_ARG_LOCALNAME_NULL, null)); //"Argument 'localName' is null");
if (validate)
{
if (!XMLChar.isValidNCName(localName))
{
- throw new IllegalArgumentException(XSLMessages.createXPATHMessage(
- XPATHErrorResources.ER_ARG_LOCALNAME_INVALID,null )); //"Argument 'localName' not a valid NCName");
+ throw new IllegalArgumentException(XMLMessages.createXMLMessage(
+ XMLErrorResources.ER_ARG_LOCALNAME_INVALID,null )); //"Argument 'localName' not a valid NCName");
}
}
@@ -190,21 +190,21 @@
// This check was already here. So, for now, I will not add it to the validation
// that is done when the validate parameter is true.
if (localName == null)
- throw new IllegalArgumentException(XSLMessages.createXPATHMessage(
- XPATHErrorResources.ER_ARG_LOCALNAME_NULL, null)); //"Argument 'localName' is null");
+ throw new IllegalArgumentException(XMLMessages.createXMLMessage(
+ XMLErrorResources.ER_ARG_LOCALNAME_NULL, null)); //"Argument 'localName' is null");
if (validate)
{
if (!XMLChar.isValidNCName(localName))
{
- throw new IllegalArgumentException(XSLMessages.createXPATHMessage(
- XPATHErrorResources.ER_ARG_LOCALNAME_INVALID,null )); //"Argument 'localName' not a valid NCName");
+ throw new IllegalArgumentException(XMLMessages.createXMLMessage(
+ XMLErrorResources.ER_ARG_LOCALNAME_INVALID,null )); //"Argument 'localName' not a valid NCName");
}
if ((null != prefix) && (!XMLChar.isValidNCName(prefix)))
{
- throw new IllegalArgumentException(XSLMessages.createXPATHMessage(
- XPATHErrorResources.ER_ARG_PREFIX_INVALID,null )); //"Argument 'prefix' not a valid NCName");
+ throw new IllegalArgumentException(XMLMessages.createXMLMessage(
+ XMLErrorResources.ER_ARG_PREFIX_INVALID,null )); //"Argument 'prefix' not a valid NCName");
}
}
@@ -240,15 +240,15 @@
// This check was already here. So, for now, I will not add it to the validation
// that is done when the validate parameter is true.
if (localName == null)
- throw new IllegalArgumentException(XSLMessages.createXPATHMessage(
- XPATHErrorResources.ER_ARG_LOCALNAME_NULL, null)); //"Argument 'localName' is null");
+ throw new IllegalArgumentException(XMLMessages.createXMLMessage(
+ XMLErrorResources.ER_ARG_LOCALNAME_NULL, null)); //"Argument 'localName' is null");
if (validate)
{
if (!XMLChar.isValidNCName(localName))
{
- throw new IllegalArgumentException(XSLMessages.createXPATHMessage(
- XPATHErrorResources.ER_ARG_LOCALNAME_INVALID,null )); //"Argument 'localName' not a valid NCName");
+ throw new IllegalArgumentException(XMLMessages.createXMLMessage(
+ XMLErrorResources.ER_ARG_LOCALNAME_INVALID,null )); //"Argument 'localName' not a valid NCName");
}
}
_namespaceURI = null;
@@ -325,8 +325,8 @@
if (null == namespace)
{
throw new RuntimeException(
- XSLMessages.createXPATHMessage(
- XPATHErrorResources.ER_PREFIX_MUST_RESOLVE,
+ XMLMessages.createXMLMessage(
+ XMLErrorResources.ER_PREFIX_MUST_RESOLVE,
new Object[]{ prefix })); //"Prefix must resolve to a namespace: "+prefix);
}
}
@@ -338,8 +338,8 @@
{
if ((_localName == null) || (!XMLChar.isValidNCName(_localName)))
{
- throw new IllegalArgumentException(XSLMessages.createXPATHMessage(
- XPATHErrorResources.ER_ARG_LOCALNAME_INVALID,null )); //"Argument 'localName' not a valid NCName");
+ throw new IllegalArgumentException(XMLMessages.createXMLMessage(
+ XMLErrorResources.ER_ARG_LOCALNAME_INVALID,null )); //"Argument 'localName' not a valid NCName");
}
}
_namespaceURI = namespace;
@@ -408,8 +408,8 @@
if (null == _namespaceURI)
{
throw new RuntimeException(
- XSLMessages.createXPATHMessage(
- XPATHErrorResources.ER_PREFIX_MUST_RESOLVE,
+ XMLMessages.createXMLMessage(
+ XMLErrorResources.ER_PREFIX_MUST_RESOLVE,
new Object[]{ prefix })); //"Prefix must resolve to a namespace: "+prefix);
}
}
@@ -427,8 +427,8 @@
{
if ((_localName == null) || (!XMLChar.isValidNCName(_localName)))
{
- throw new IllegalArgumentException(XSLMessages.createXPATHMessage(
- XPATHErrorResources.ER_ARG_LOCALNAME_INVALID,null )); //"Argument 'localName' not a valid NCName");
+ throw new IllegalArgumentException(XMLMessages.createXMLMessage(
+ XMLErrorResources.ER_ARG_LOCALNAME_INVALID,null )); //"Argument 'localName' not a valid NCName");
}
}
@@ -483,8 +483,8 @@
if (null == _namespaceURI)
{
throw new RuntimeException(
- XSLMessages.createXPATHMessage(
- XPATHErrorResources.ER_PREFIX_MUST_RESOLVE,
+ XMLMessages.createXMLMessage(
+ XMLErrorResources.ER_PREFIX_MUST_RESOLVE,
new Object[]{ prefix })); //"Prefix must resolve to a namespace: "+prefix);
}
}
@@ -496,8 +496,8 @@
{
if ((_localName == null) || (!XMLChar.isValidNCName(_localName)))
{
- throw new IllegalArgumentException(XSLMessages.createXPATHMessage(
- XPATHErrorResources.ER_ARG_LOCALNAME_INVALID,null )); //"Argument 'localName' not a valid NCName");
+ throw new IllegalArgumentException(XMLMessages.createXMLMessage(
+ XMLErrorResources.ER_ARG_LOCALNAME_INVALID,null )); //"Argument 'localName' not a valid NCName");
}
}
1.16 +1 -3 xml-xalan/java/src/org/apache/xml/utils/TreeWalker.java
Index: TreeWalker.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/TreeWalker.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TreeWalker.java 29 Jul 2002 21:51:15 -0000 1.15
+++ TreeWalker.java 22 Jan 2003 16:18:05 -0000 1.16
@@ -62,8 +62,6 @@
import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.helpers.LocatorImpl;
-import org.apache.xpath.DOM2Helper;
-import org.apache.xpath.DOMHelper;
import org.apache.xml.utils.NodeConsumer;
/**
@@ -164,7 +162,7 @@
catch (SecurityException se){// user.dir not accessible from applet
m_locator.setSystemId("");
}
- m_dh = new org.apache.xpath.DOM2Helper();
+ m_dh = new DOM2Helper();
}
/**
1.9 +21 -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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- URI.java 1 Nov 2002 16:26:01 -0000 1.8
+++ URI.java 22 Jan 2003 16:18:05 -0000 1.9
@@ -59,8 +59,8 @@
import java.io.IOException;
import java.io.Serializable;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.res.XSLMessages;
+import org.apache.xml.res.XMLErrorResources;
+import org.apache.xml.res.XMLMessages;
/**
* A class to represent a Uniform Resource Identifier (URI). This class
@@ -322,7 +322,7 @@
if (p_scheme == null || p_scheme.trim().length() == 0)
{
- throw new MalformedURIException(XSLMessages.createMessage(XSLTErrorResources.ER_SCHEME_REQUIRED, null)); //"Scheme is required!");
+ throw new MalformedURIException(XMLMessages.createXMLMessage(XMLErrorResources.ER_SCHEME_REQUIRED, null)); //"Scheme is required!");
}
if (p_host == null)
@@ -330,13 +330,13 @@
if (p_userinfo != null)
{
throw new MalformedURIException(
- XSLMessages.createMessage(XSLTErrorResources.ER_NO_USERINFO_IF_NO_HOST, null)); //"Userinfo may not be specified if host is not specified!");
+ XMLMessages.createXMLMessage(XMLErrorResources.ER_NO_USERINFO_IF_NO_HOST, null)); //"Userinfo may not be specified if host is not specified!");
}
if (p_port != -1)
{
throw new MalformedURIException(
- XSLMessages.createMessage(XSLTErrorResources.ER_NO_PORT_IF_NO_HOST, null)); //"Port may not be specified if host is not specified!");
+ XMLMessages.createXMLMessage(XMLErrorResources.ER_NO_PORT_IF_NO_HOST, null)); //"Port may not be specified if host is not specified!");
}
}
@@ -345,13 +345,13 @@
if (p_path.indexOf('?') != -1 && p_queryString != null)
{
throw new MalformedURIException(
- XSLMessages.createMessage(XSLTErrorResources.ER_NO_QUERY_STRING_IN_PATH, null)); //"Query string cannot be specified in path and query string!");
+ XMLMessages.createXMLMessage(XMLErrorResources.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(
- XSLMessages.createMessage(XSLTErrorResources.ER_NO_FRAGMENT_STRING_IN_PATH, null)); //"Fragment cannot be specified in both the path and fragment!");
+ XMLMessages.createXMLMessage(XMLErrorResources.ER_NO_FRAGMENT_STRING_IN_PATH, null)); //"Fragment cannot be specified in both the path and fragment!");
}
}
@@ -405,7 +405,7 @@
&& (p_uriSpec == null || p_uriSpec.trim().length() == 0))
{
throw new MalformedURIException(
- XSLMessages.createMessage(XSLTErrorResources.ER_CANNOT_INIT_URI_EMPTY_PARMS, null)); //"Cannot initialize URI with empty parameters.");
+ XMLMessages.createXMLMessage(XMLErrorResources.ER_CANNOT_INIT_URI_EMPTY_PARMS, null)); //"Cannot initialize URI with empty parameters.");
}
// just make a copy of the base if spec is empty
@@ -426,7 +426,7 @@
{
if (p_base == null)
{
- throw new MalformedURIException(XSLMessages.createMessage(XSLTErrorResources.ER_NO_SCHEME_IN_URI, new Object[]{uriSpec})); //"No scheme found in URI: "+uriSpec);
+ throw new MalformedURIException(XMLMessages.createXMLMessage(XMLErrorResources.ER_NO_SCHEME_IN_URI, new Object[]{uriSpec})); //"No scheme found in URI: "+uriSpec);
}
}
else
@@ -635,7 +635,7 @@
if (scheme.length() == 0)
{
- throw new MalformedURIException(XSLMessages.createMessage(XSLTErrorResources.ER_NO_SCHEME_INURI, null)); //"No scheme found in URI.");
+ throw new MalformedURIException(XMLMessages.createXMLMessage(XMLErrorResources.ER_NO_SCHEME_INURI, null)); //"No scheme found in URI.");
}
else
{
@@ -786,14 +786,14 @@
||!isHex(p_uriSpec.charAt(index + 2)))
{
throw new MalformedURIException(
- XSLMessages.createMessage(XSLTErrorResources.ER_PATH_CONTAINS_INVALID_ESCAPE_SEQUENCE, null)); //"Path contains invalid escape sequence!");
+ XMLMessages.createXMLMessage(XMLErrorResources.ER_PATH_CONTAINS_INVALID_ESCAPE_SEQUENCE, null)); //"Path contains invalid escape sequence!");
}
}
else if (!isReservedCharacter(testChar)
&&!isUnreservedCharacter(testChar))
{
if ('\\' != testChar)
- throw new MalformedURIException(XSLMessages.createMessage(XSLTErrorResources.ER_PATH_INVALID_CHAR, new Object[]{String.valueOf(testChar)})); //"Path contains invalid character: "
+ throw new MalformedURIException(XMLMessages.createXMLMessage(XMLErrorResources.ER_PATH_INVALID_CHAR, new Object[]{String.valueOf(testChar)})); //"Path contains invalid character: "
//+ testChar);
}
@@ -1051,12 +1051,12 @@
if (p_scheme == null)
{
- throw new MalformedURIException(XSLMessages.createMessage(XSLTErrorResources.ER_SCHEME_FROM_NULL_STRING, null)); //"Cannot set scheme from null string!");
+ throw new MalformedURIException(XMLMessages.createXMLMessage(XMLErrorResources.ER_SCHEME_FROM_NULL_STRING, null)); //"Cannot set scheme from null string!");
}
if (!isConformantSchemeName(p_scheme))
{
- throw new MalformedURIException(XSLMessages.createMessage(XSLTErrorResources.ER_SCHEME_NOT_CONFORMANT, null)); //"The scheme is not conformant.");
+ throw new MalformedURIException(XMLMessages.createXMLMessage(XMLErrorResources.ER_SCHEME_NOT_CONFORMANT, null)); //"The scheme is not conformant.");
}
m_scheme = p_scheme.toLowerCase();
@@ -1139,7 +1139,7 @@
}
else if (!isWellFormedAddress(p_host))
{
- throw new MalformedURIException(XSLMessages.createMessage(XSLTErrorResources.ER_HOST_ADDRESS_NOT_WELLFORMED, null)); //"Host is not a well formed address!");
+ throw new MalformedURIException(XMLMessages.createXMLMessage(XMLErrorResources.ER_HOST_ADDRESS_NOT_WELLFORMED, null)); //"Host is not a well formed address!");
}
m_host = p_host;
@@ -1164,12 +1164,12 @@
if (m_host == null)
{
throw new MalformedURIException(
- XSLMessages.createMessage(XSLTErrorResources.ER_PORT_WHEN_HOST_NULL, null)); //"Port cannot be set when host is null!");
+ XMLMessages.createXMLMessage(XMLErrorResources.ER_PORT_WHEN_HOST_NULL, null)); //"Port cannot be set when host is null!");
}
}
else if (p_port != -1)
{
- throw new MalformedURIException(XSLMessages.createMessage(XSLTErrorResources.ER_INVALID_PORT, null)); //"Invalid port number!");
+ throw new MalformedURIException(XMLMessages.createXMLMessage(XMLErrorResources.ER_INVALID_PORT, null)); //"Invalid port number!");
}
m_port = p_port;
@@ -1227,7 +1227,7 @@
if (!isURIString(p_addToPath))
{
- throw new MalformedURIException(XSLMessages.createMessage(XSLTErrorResources.ER_PATH_INVALID_CHAR, new Object[]{p_addToPath})); //"Path contains invalid character!");
+ throw new MalformedURIException(XMLMessages.createXMLMessage(XMLErrorResources.ER_PATH_INVALID_CHAR, new Object[]{p_addToPath})); //"Path contains invalid character!");
}
if (m_path == null || m_path.trim().length() == 0)
@@ -1326,16 +1326,16 @@
else if (!isGenericURI())
{
throw new MalformedURIException(
- XSLMessages.createMessage(XSLTErrorResources.ER_FRAG_FOR_GENERIC_URI, null)); //"Fragment can only be set for a generic URI!");
+ XMLMessages.createXMLMessage(XMLErrorResources.ER_FRAG_FOR_GENERIC_URI, null)); //"Fragment can only be set for a generic URI!");
}
else if (getPath() == null)
{
throw new MalformedURIException(
- XSLMessages.createMessage(XSLTErrorResources.ER_FRAG_WHEN_PATH_NULL, null)); //"Fragment cannot be set when path is null!");
+ XMLMessages.createXMLMessage(XMLErrorResources.ER_FRAG_WHEN_PATH_NULL, null)); //"Fragment cannot be set when path is null!");
}
else if (!isURIString(p_fragment))
{
- throw new MalformedURIException(XSLMessages.createMessage(XSLTErrorResources.ER_FRAG_INVALID_CHAR, null)); //"Fragment contains invalid character!");
+ throw new MalformedURIException(XMLMessages.createXMLMessage(XMLErrorResources.ER_FRAG_INVALID_CHAR, null)); //"Fragment contains invalid character!");
}
else
{
1.6 +81 -81 xml-xalan/java/src/org/apache/xml/utils/UnImplNode.java
Index: UnImplNode.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/UnImplNode.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UnImplNode.java 10 Jan 2003 02:02:03 -0000 1.5
+++ UnImplNode.java 22 Jan 2003 16:18:05 -0000 1.6
@@ -58,8 +58,8 @@
import org.w3c.dom.*;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.res.XSLMessages;
+import org.apache.xml.res.XMLErrorResources;
+import org.apache.xml.res.XMLMessages;
/**
* <meta name="usage" content="internal"/>
@@ -84,7 +84,7 @@
System.out.println("DOM ERROR! class: " + this.getClass().getName());
- throw new RuntimeException(XSLMessages.createMessage(msg, null));
+ throw new RuntimeException(XMLMessages.createXMLMessage(msg, null));
}
/**
@@ -98,7 +98,7 @@
System.out.println("DOM ERROR! class: " + this.getClass().getName());
- throw new RuntimeException(XSLMessages.createMessage(msg, args)); //"UnImplNode error: "+msg);
+ throw new RuntimeException(XMLMessages.createXMLMessage(msg, args)); //"UnImplNode error: "+msg);
}
/**
@@ -113,7 +113,7 @@
public Node appendChild(Node newChild) throws DOMException
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"appendChild not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"appendChild not supported!");
return null;
}
@@ -126,7 +126,7 @@
public boolean hasChildNodes()
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"hasChildNodes not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"hasChildNodes not supported!");
return false;
}
@@ -139,7 +139,7 @@
public short getNodeType()
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getNodeType not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getNodeType not supported!");
return 0;
}
@@ -152,7 +152,7 @@
public Node getParentNode()
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getParentNode not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getParentNode not supported!");
return null;
}
@@ -165,7 +165,7 @@
public NodeList getChildNodes()
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getChildNodes not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getChildNodes not supported!");
return null;
}
@@ -178,7 +178,7 @@
public Node getFirstChild()
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getFirstChild not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getFirstChild not supported!");
return null;
}
@@ -191,7 +191,7 @@
public Node getLastChild()
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getLastChild not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getLastChild not supported!");
return null;
}
@@ -204,7 +204,7 @@
public Node getNextSibling()
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getNextSibling not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getNextSibling not supported!");
return null;
}
@@ -217,7 +217,7 @@
public int getLength()
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getLength not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getLength not supported!");
return 0;
} // getLength():int
@@ -232,7 +232,7 @@
public Node item(int index)
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"item not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"item not supported!");
return null;
} // item(int):Node
@@ -245,7 +245,7 @@
public Document getOwnerDocument()
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getOwnerDocument not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getOwnerDocument not supported!");
return null;
}
@@ -258,7 +258,7 @@
public String getTagName()
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getTagName not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getTagName not supported!");
return null;
}
@@ -271,7 +271,7 @@
public String getNodeName()
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getNodeName not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getNodeName not supported!");
return null;
}
@@ -279,7 +279,7 @@
/** Unimplemented. See org.w3c.dom.Node */
public void normalize()
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"normalize not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"normalize not supported!");
}
/**
@@ -292,7 +292,7 @@
public NodeList getElementsByTagName(String name)
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getElementsByTagName not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getElementsByTagName not supported!");
return null;
}
@@ -309,7 +309,7 @@
public Attr removeAttributeNode(Attr oldAttr) throws DOMException
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"removeAttributeNode not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"removeAttributeNode not supported!");
return null;
}
@@ -326,7 +326,7 @@
public Attr setAttributeNode(Attr newAttr) throws DOMException
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"setAttributeNode not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"setAttributeNode not supported!");
return null;
}
@@ -342,7 +342,7 @@
public boolean hasAttribute(String name)
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"hasAttribute not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"hasAttribute not supported!");
return false;
}
@@ -359,7 +359,7 @@
public boolean hasAttributeNS(String name, String x)
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"hasAttributeNS not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"hasAttributeNS not supported!");
return false;
}
@@ -375,7 +375,7 @@
public Attr getAttributeNode(String name)
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getAttributeNode not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getAttributeNode not supported!");
return null;
}
@@ -389,7 +389,7 @@
*/
public void removeAttribute(String name) throws DOMException
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"removeAttribute not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"removeAttribute not supported!");
}
/**
@@ -402,7 +402,7 @@
*/
public void setAttribute(String name, String value) throws DOMException
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"setAttribute not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"setAttribute not supported!");
}
/**
@@ -415,7 +415,7 @@
public String getAttribute(String name)
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getAttribute not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getAttribute not supported!");
return null;
}
@@ -428,7 +428,7 @@
public boolean hasAttributes()
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"hasAttributes not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"hasAttributes not supported!");
return false;
}
@@ -445,7 +445,7 @@
String localName)
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getElementsByTagNameNS not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getElementsByTagNameNS not supported!");
return null;
}
@@ -462,7 +462,7 @@
public Attr setAttributeNodeNS(Attr newAttr) throws DOMException
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"setAttributeNodeNS not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"setAttributeNodeNS not supported!");
return null;
}
@@ -478,7 +478,7 @@
public Attr getAttributeNodeNS(String namespaceURI, String localName)
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getAttributeNodeNS not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getAttributeNodeNS not supported!");
return null;
}
@@ -494,7 +494,7 @@
public void removeAttributeNS(String namespaceURI, String localName)
throws DOMException
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"removeAttributeNS not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"removeAttributeNS not supported!");
}
/**
@@ -511,7 +511,7 @@
String namespaceURI, String qualifiedName, String value)
throws DOMException
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"setAttributeNS not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"setAttributeNS not supported!");
}
/**
@@ -525,7 +525,7 @@
public String getAttributeNS(String namespaceURI, String localName)
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getAttributeNS not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getAttributeNS not supported!");
return null;
}
@@ -538,7 +538,7 @@
public Node getPreviousSibling()
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getPreviousSibling not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getPreviousSibling not supported!");
return null;
}
@@ -553,7 +553,7 @@
public Node cloneNode(boolean deep)
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"cloneNode not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"cloneNode not supported!");
return null;
}
@@ -568,7 +568,7 @@
public String getNodeValue() throws DOMException
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getNodeValue not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getNodeValue not supported!");
return null;
}
@@ -582,7 +582,7 @@
*/
public void setNodeValue(String nodeValue) throws DOMException
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"setNodeValue not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"setNodeValue not supported!");
}
/**
@@ -597,7 +597,7 @@
// public String getValue ()
// {
- // error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getValue not supported!");
+ // error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getValue not supported!");
// return null;
// }
@@ -610,7 +610,7 @@
*/
public void setValue(String value) throws DOMException
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"setValue not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"setValue not supported!");
}
/**
@@ -632,7 +632,7 @@
public Element getOwnerElement()
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getOwnerElement not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getOwnerElement not supported!");
return null;
}
@@ -645,7 +645,7 @@
public boolean getSpecified()
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"setValue not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"setValue not supported!");
return false;
}
@@ -658,7 +658,7 @@
public NamedNodeMap getAttributes()
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getAttributes not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getAttributes not supported!");
return null;
}
@@ -676,7 +676,7 @@
public Node insertBefore(Node newChild, Node refChild) throws DOMException
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"insertBefore not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"insertBefore not supported!");
return null;
}
@@ -694,7 +694,7 @@
public Node replaceChild(Node newChild, Node oldChild) throws DOMException
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"replaceChild not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"replaceChild not supported!");
return null;
}
@@ -711,7 +711,7 @@
public Node removeChild(Node oldChild) throws DOMException
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"replaceChild not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"replaceChild not supported!");
return null;
}
@@ -745,7 +745,7 @@
public String getNamespaceURI()
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getNamespaceURI not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getNamespaceURI not supported!");
return null;
}
@@ -758,7 +758,7 @@
public String getPrefix()
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getPrefix not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getPrefix not supported!");
return null;
}
@@ -772,7 +772,7 @@
*/
public void setPrefix(String prefix) throws DOMException
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"setPrefix not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"setPrefix not supported!");
}
/**
@@ -783,7 +783,7 @@
public String getLocalName()
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getLocalName not supported!");
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED); //"getLocalName not supported!");
return null;
}
@@ -796,7 +796,7 @@
public DocumentType getDoctype()
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED);
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);
return null;
}
@@ -809,7 +809,7 @@
public DOMImplementation getImplementation()
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED);
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);
return null;
}
@@ -822,7 +822,7 @@
public Element getDocumentElement()
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED);
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);
return null;
}
@@ -839,7 +839,7 @@
public Element createElement(String tagName) throws DOMException
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED);
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);
return null;
}
@@ -852,7 +852,7 @@
public DocumentFragment createDocumentFragment()
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED);
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);
return null;
}
@@ -867,7 +867,7 @@
public Text createTextNode(String data)
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED);
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);
return null;
}
@@ -882,7 +882,7 @@
public Comment createComment(String data)
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED);
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);
return null;
}
@@ -899,7 +899,7 @@
public CDATASection createCDATASection(String data) throws DOMException
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED);
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);
return null;
}
@@ -918,7 +918,7 @@
String target, String data) throws DOMException
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED);
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);
return null;
}
@@ -935,7 +935,7 @@
public Attr createAttribute(String name) throws DOMException
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED);
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);
return null;
}
@@ -953,7 +953,7 @@
throws DOMException
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED);
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);
return null;
}
@@ -977,7 +977,7 @@
public Node importNode(Node importedNode, boolean deep) throws DOMException
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED);
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);
return null;
}
@@ -996,7 +996,7 @@
throws DOMException
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED);
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);
return null;
}
@@ -1015,7 +1015,7 @@
throws DOMException
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED);
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);
return null;
}
@@ -1030,7 +1030,7 @@
public Element getElementById(String elementId)
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED);
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);
return null;
}
@@ -1045,7 +1045,7 @@
*/
public void setData(String data) throws DOMException
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED);
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);
}
/**
@@ -1061,7 +1061,7 @@
public String substringData(int offset, int count) throws DOMException
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED);
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);
return null;
}
@@ -1075,7 +1075,7 @@
*/
public void appendData(String arg) throws DOMException
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED);
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);
}
/**
@@ -1089,7 +1089,7 @@
*/
public void insertData(int offset, String arg) throws DOMException
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED);
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);
}
/**
@@ -1102,7 +1102,7 @@
*/
public void deleteData(int offset, int count) throws DOMException
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED);
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);
}
/**
@@ -1117,7 +1117,7 @@
public void replaceData(int offset, int count, String arg)
throws DOMException
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED);
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);
}
/**
@@ -1132,7 +1132,7 @@
public Text splitText(int offset) throws DOMException
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED);
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);
return null;
}
@@ -1150,7 +1150,7 @@
public Node adoptNode(Node source) throws DOMException
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED);
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);
return null;
}
@@ -1169,7 +1169,7 @@
public String getEncoding()
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED);
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);
return null;
}
@@ -1187,7 +1187,7 @@
*/
public void setEncoding(String encoding)
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED);
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);
}
/**
@@ -1204,7 +1204,7 @@
public boolean getStandalone()
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED);
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);
return false;
}
@@ -1222,7 +1222,7 @@
*/
public void setStandalone(boolean standalone)
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED);
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);
}
/**
@@ -1243,7 +1243,7 @@
public boolean getStrictErrorChecking()
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED);
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);
return false;
}
@@ -1265,7 +1265,7 @@
*/
public void setStrictErrorChecking(boolean strictErrorChecking)
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED);
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);
}
/**
@@ -1282,7 +1282,7 @@
public String getVersion()
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED);
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);
return null;
}
@@ -1300,6 +1300,6 @@
*/
public void setVersion(String version)
{
- error(XSLTErrorResources.ER_FUNCTION_NOT_SUPPORTED);
+ error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org