mmidy 01/04/11 09:02:23
Modified: java/src/org/apache/xalan/processor ProcessorInclude.java
TransformerFactoryImpl.java
java/src/org/apache/xalan/transformer
TransformerIdentityImpl.java
java/src/org/apache/xml/utils TreeWalker.java
Log:
Create new TreeWalker constructor that takes a systemId parameter. Change
TreeWalker to change fields in the locator and not set it for each node.
Revision Changes Path
1.18 +1 -1
xml-xalan/java/src/org/apache/xalan/processor/ProcessorInclude.java
Index: ProcessorInclude.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/ProcessorInclude.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ProcessorInclude.java 2001/03/12 02:12:43 1.17
+++ ProcessorInclude.java 2001/04/11 16:02:21 1.18
@@ -230,7 +230,7 @@
if (null != source && source instanceof DOMSource)
{
Node node = ((DOMSource)source).getNode();
- TreeWalker walker = new TreeWalker(handler, new
org.apache.xpath.DOM2Helper());
+ TreeWalker walker = new TreeWalker(handler, new
org.apache.xpath.DOM2Helper(), source.getSystemId());
try
{
1.29 +4 -4
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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- TransformerFactoryImpl.java 2001/03/12 02:12:44 1.28
+++ TransformerFactoryImpl.java 2001/04/11 16:02:21 1.29
@@ -190,7 +190,7 @@
try
{
TemplatesHandler builder = newTemplatesHandler();
- TreeWalker walker = new TreeWalker(builder, new
org.apache.xpath.DOM2Helper());
+ TreeWalker walker = new TreeWalker(builder, new
org.apache.xpath.DOM2Helper(), builder.getSystemId());
walker.traverse(node);
@@ -224,11 +224,11 @@
// Assume it's already been reported to the error listener.
throw tce;
}
- catch (TransformerException tce)
+ /* catch (TransformerException tce)
{
// Assume it's already been reported to the error listener.
throw new TransformerConfigurationException(tce.getMessage(), tce);
- }
+ }*/
catch (Exception e)
{
if (m_errorListener != null)
@@ -356,7 +356,7 @@
{
if (null != node)
{
- TreeWalker walker = new TreeWalker(handler, new
org.apache.xpath.DOM2Helper());
+ TreeWalker walker = new TreeWalker(handler, new
org.apache.xpath.DOM2Helper(), baseID);
walker.traverse(node);
}
1.11 +1 -1
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TransformerIdentityImpl.java 2001/03/12 02:12:52 1.10
+++ TransformerIdentityImpl.java 2001/04/11 16:02:22 1.11
@@ -319,7 +319,7 @@
}
else
{
- TreeWalker walker = new TreeWalker(this, new
org.apache.xpath.DOM2Helper());
+ TreeWalker walker = new TreeWalker(this, new
org.apache.xpath.DOM2Helper(), m_systemID);
walker.traverse(dNode);
}
}
1.10 +31 -4 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TreeWalker.java 2001/04/06 18:20:01 1.9
+++ TreeWalker.java 2001/04/11 16:02:22 1.10
@@ -84,7 +84,7 @@
protected DOMHelper m_dh;
/** Locator object for this TreeWalker */
- private Locator m_locator = new LocatorImpl();
+ private LocatorImpl m_locator = new LocatorImpl();
/**
* Get the ContentHandler used for the tree walk.
@@ -95,6 +95,23 @@
{
return m_contentHandler;
}
+
+ /**
+ * Constructor.
+ * @param contentHandler The implemention of the
+ * @param systemId System identifier for the document.
+ * contentHandler operation (toXMLString, digest, ...)
+ */
+ public TreeWalker(ContentHandler contentHandler, DOMHelper dh, String
systemId)
+ {
+ this.m_contentHandler = contentHandler;
+ m_contentHandler.setDocumentLocator(m_locator);
+ if (systemId != null)
+ m_locator.setSystemId(systemId);
+ else
+ m_locator.setSystemId(System.getProperty("user.dir"));
+ m_dh = dh;
+ }
/**
* Constructor.
@@ -105,6 +122,7 @@
{
this.m_contentHandler = contentHandler;
m_contentHandler.setDocumentLocator(m_locator);
+ m_locator.setSystemId(System.getProperty("user.dir"));
m_dh = dh;
}
@@ -117,7 +135,8 @@
{
this.m_contentHandler = contentHandler;
m_contentHandler.setDocumentLocator(m_locator);
- m_dh = new org.apache.xpath.DOM2Helper();
+ m_locator.setSystemId(System.getProperty("user.dir"));
+ m_dh = new org.apache.xpath.DOM2Helper();
}
/**
@@ -247,9 +266,17 @@
}
if (node instanceof Locator)
+ {
+ Locator loc = (Locator)node;
+ m_locator.setColumnNumber(loc.getColumnNumber());
+ m_locator.setLineNumber(loc.getLineNumber());
+ m_locator.setPublicId(loc.getPublicId());
+ m_locator.setSystemId(loc.getSystemId());
+ }
+ else
{
- m_locator = (Locator)node;
- m_contentHandler.setDocumentLocator(m_locator);
+ m_locator.setColumnNumber(0);
+ m_locator.setLineNumber(0);
}
switch (node.getNodeType())
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
