mmidy 01/06/15 11:49:16
Modified: java/compat_src/org/apache/xalan/xpath XNodeSet.java
XNull.java XObject.java XRTreeFrag.java
XString.java
java/compat_src/org/apache/xalan/xslt XSLTEngineImpl.java
Log:
Changes because of XalanJ2 updates.
Revision Changes Path
1.6 +4 -4
xml-xalan/java/compat_src/org/apache/xalan/xpath/XNodeSet.java
Index: XNodeSet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/compat_src/org/apache/xalan/xpath/XNodeSet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XNodeSet.java 2001/06/15 14:11:16 1.5
+++ XNodeSet.java 2001/06/15 18:49:15 1.6
@@ -201,16 +201,16 @@
public DocumentFragment rtree(XPathContext support)
{
org.apache.xpath.XPathContext context =
(org.apache.xpath.XPathContext)support;
- int result = m_xnodeset.rtree(context);
- return
(DocumentFragment)context.getDTMManager().getDTM(result).getNode(result);
+ return m_xnodeset.rtree(context);
+ //return
(DocumentFragment)context.getDTMManager().getDTM(result).getNode(result);
}
/**
* Cast result object to a nodelist.
*/
- public NodeList nodeset()
+ public NodeList nodeset() throws javax.xml.transform.TransformerException
{
- return new DTMNodeList(m_xnodeset.nodeset());
+ return new DTMNodeList(m_xnodeset.iter());
}
/**
1.5 +2 -2
xml-xalan/java/compat_src/org/apache/xalan/xpath/XNull.java
Index: XNull.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/compat_src/org/apache/xalan/xpath/XNull.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XNull.java 2001/06/14 22:26:56 1.4
+++ XNull.java 2001/06/15 18:49:15 1.5
@@ -136,8 +136,8 @@
public DocumentFragment rtree(XPathContext support)
{
org.apache.xpath.XPathContext context =
(org.apache.xpath.XPathContext)support;
- int result = m_xnull.rtree(context);
- return
(DocumentFragment)context.getDTMManager().getDTM(result).getNode(result);
+ return m_xnull.rtree(context);
+ //return
(DocumentFragment)context.getDTMManager().getDTM(result).getNode(result);
}
/**
1.4 +2 -2
xml-xalan/java/compat_src/org/apache/xalan/xpath/XObject.java
Index: XObject.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/compat_src/org/apache/xalan/xpath/XObject.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XObject.java 2001/06/14 22:26:57 1.3
+++ XObject.java 2001/06/15 18:49:15 1.4
@@ -144,8 +144,8 @@
public DocumentFragment rtree(XPathSupport support)
{
org.apache.xpath.XPathContext context =
(org.apache.xpath.XPathContext)support;
- int result = m_xObject.rtree(context);
- return
(DocumentFragment)context.getDTMManager().getDTM(result).getNode(result);
+ return m_xObject.rtree(context);
+ //return
(DocumentFragment)context.getDTMManager().getDTM(result).getNode(result);
}
/**
1.5 +2 -2
xml-xalan/java/compat_src/org/apache/xalan/xpath/XRTreeFrag.java
Index: XRTreeFrag.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/compat_src/org/apache/xalan/xpath/XRTreeFrag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XRTreeFrag.java 2001/06/14 22:26:58 1.4
+++ XRTreeFrag.java 2001/06/15 18:49:15 1.5
@@ -126,8 +126,8 @@
*/
public DocumentFragment rtree()
{
- int result = m_xrtreefrag.rtree(context);
- return
(DocumentFragment)context.getDTMManager().getDTM(result).getNode(result);
+ return m_xrtreefrag.rtree(context);
+ //return
(DocumentFragment)context.getDTMManager().getDTM(result).getNode(result);
}
/**
1.5 +4 -4
xml-xalan/java/compat_src/org/apache/xalan/xpath/XString.java
Index: XString.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/compat_src/org/apache/xalan/xpath/XString.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XString.java 2001/06/14 22:26:58 1.4
+++ XString.java 2001/06/15 18:49:15 1.5
@@ -180,8 +180,8 @@
public DocumentFragment rtree(XPathSupport support)
{
org.apache.xpath.XPathContext context =
(org.apache.xpath.XPathContext)support;
- int result = m_xstring.rtree(context);
- return
(DocumentFragment)context.getDTMManager().getDTM(result).getNode(result);
+ return m_xstring.rtree(context);
+ //return
(DocumentFragment)context.getDTMManager().getDTM(result).getNode(result);
}
@@ -195,8 +195,8 @@
public DocumentFragment rtree(XPathContext support)
{
org.apache.xpath.XPathContext context =
(org.apache.xpath.XPathContext)support;
- int result = m_xstring.rtree(context);
- return
(DocumentFragment)context.getDTMManager().getDTM(result).getNode(result);
+ return m_xstring.rtree(context);
+ //return
(DocumentFragment)context.getDTMManager().getDTM(result).getNode(result);
}
1.28 +4 -4
xml-xalan/java/compat_src/org/apache/xalan/xslt/XSLTEngineImpl.java
Index: XSLTEngineImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/compat_src/org/apache/xalan/xslt/XSLTEngineImpl.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- XSLTEngineImpl.java 2001/06/14 22:27:19 1.27
+++ XSLTEngineImpl.java 2001/06/15 18:49:16 1.28
@@ -857,7 +857,7 @@
parser.initXPath(compiler, "id("+fragID+")", nsNode);
org.apache.xpath.objects.XObject xobj = xpath.execute(xpathContext,
fragBase, nsNode);
- nl = new org.apache.xml.dtm.ref.DTMNodeIterator(xobj.nodeset());
+ nl = new org.apache.xml.dtm.ref.DTMNodeIterator(xobj.iter());
if(nl.nextNode() == null)
{
// xobj = Stylesheet.evalXPathStr(getExecContext(), "//[EMAIL
PROTECTED]'"+fragID+"']", fragBase, nsNode);
@@ -868,7 +868,7 @@
parser.initXPath(compiler, "//[EMAIL PROTECTED]'"+fragID+"']",
nsNode);
xobj = xpath.execute(xpathContext, fragBase, nsNode);
- nl = new org.apache.xml.dtm.ref.DTMNodeIterator(xobj.nodeset());
+ nl = new org.apache.xml.dtm.ref.DTMNodeIterator(xobj.iter());
if(nl.nextNode() == null)
{
// xobj = Stylesheet.evalXPathStr(getExecContext(), "//[EMAIL
PROTECTED]'"+fragID+"']", fragBase, nsNode);
@@ -878,7 +878,7 @@
// Parse the xpath
parser.initXPath(compiler, "//[EMAIL PROTECTED]'"+fragID+"']",
nsNode);
xobj = xpath.execute(xpathContext, fragBase, nsNode);
- nl = new org.apache.xml.dtm.ref.DTMNodeIterator(xobj.nodeset());
+ nl = new org.apache.xml.dtm.ref.DTMNodeIterator(xobj.iter());
if(nl.nextNode() == null)
{
// Well, hell, maybe it's an XPath...
@@ -890,7 +890,7 @@
// Parse the xpath
parser.initXPath(compiler, fragID, nsNode);
xobj = xpath.execute(xpathContext, fragBase, nsNode);
- nl = new org.apache.xml.dtm.ref.DTMNodeIterator(xobj.nodeset());
+ nl = new org.apache.xml.dtm.ref.DTMNodeIterator(xobj.iter());
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
