sboag 00/11/10 12:55:10
Modified: java/src/org/apache/xalan/processor
TransformerFactoryImpl.java
java/src/org/apache/xalan/transformer TransformerImpl.java
java/src/org/apache/xpath SourceTreeManager.java
XPathContext.java
Log:
In TrAX, changed get/setBaseID to get/setSystemID.
Revision Changes Path
1.4 +2 -2
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TransformerFactoryImpl.java 2000/11/07 00:30:44 1.3
+++ TransformerFactoryImpl.java 2000/11/10 20:55:06 1.4
@@ -283,7 +283,7 @@
{
DOMSource dsource = (DOMSource)source;
node = dsource.getNode();
- baseID = dsource.getBaseID();
+ baseID = dsource.getSystemId();
}
else
{
@@ -567,7 +567,7 @@
{
DOMSource dsource = (DOMSource)source;
Node node = dsource.getNode();
- String baseID = dsource.getBaseID();
+ String baseID = dsource.getSystemId();
builder.setBaseID(baseID);
return processFromNode(node, baseID);
}
1.47 +1 -1
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.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- TransformerImpl.java 2000/11/09 19:13:49 1.46
+++ TransformerImpl.java 2000/11/10 20:55:09 1.47
@@ -453,7 +453,7 @@
if(source instanceof DOMSource)
{
DOMSource dsource = (DOMSource)source;
- m_urlOfSource = dsource.getBaseID();
+ m_urlOfSource = dsource.getSystemId();
this.transformNode(dsource.getNode());
return;
}
1.13 +4 -4
xml-xalan/java/src/org/apache/xpath/SourceTreeManager.java
Index: SourceTreeManager.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/SourceTreeManager.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SourceTreeManager.java 2000/11/07 00:31:51 1.12
+++ SourceTreeManager.java 2000/11/10 20:55:10 1.13
@@ -239,14 +239,14 @@
throw new RuntimeException(
"Programmer's Error! "
+ "putDocumentInCache found reparse of doc: "
- + source.getBaseID());
+ + source.getSystemId());
return;
}
- if (null != source.getBaseID())
+ if (null != source.getSystemId())
{
- m_sourceTree.addElement(new SourceTree(n, source.getBaseID()));
+ m_sourceTree.addElement(new SourceTree(n, source.getSystemId()));
}
}
catch (TransformerException te)
@@ -271,7 +271,7 @@
return ((DOMSource)source).getNode();
// TODO: Not sure if the BaseID is really the same thing as the ID.
- String url = source.getBaseID();
+ String url = source.getSystemId();
if (null == url)
return null;
1.12 +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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XPathContext.java 2000/11/09 19:13:50 1.11
+++ XPathContext.java 2000/11/10 20:55:10 1.12
@@ -384,7 +384,7 @@
{
Source source = getSourceTreeManager().resolveURI(base, urlString,
getSAXLocator());
- return source.getBaseID();
+ return source.getSystemId();
}
catch (TransformerException te)
{
