sboag 01/05/15 22:33:45
Modified: java/src/org/apache/xpath Tag: DTM_EXP
SourceTreeManager.java XPathContext.java
java/src/org/apache/xpath/functions Tag: DTM_EXP
FuncCurrent.java
Log:
Removed all dependencies of non-stree classes on stree. RTF construction
is now being done with the DTM.
Defined null Source object for DTMManager#getDTM(Source...
to mean "make me a DTM but don't construct it".
Added incremental arg to DTMManager#getDTM(Source... to tell
if it should build a CoRoutineParser and pass it to the DTM.
Added getLexicalHandler, getDTDHandler, etc., to the DTM
interface. Ultimately needs review.
Fixed some bugs...
Revision Changes Path
No revision
No revision
1.24.2.5 +2 -3
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.24.2.4
retrieving revision 1.24.2.5
diff -u -r1.24.2.4 -r1.24.2.5
--- SourceTreeManager.java 2001/05/14 23:04:05 1.24.2.4
+++ SourceTreeManager.java 2001/05/16 05:33:43 1.24.2.5
@@ -80,7 +80,6 @@
// import org.xml.sax.Locator;
import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.stree.SourceTreeHandler;
import org.apache.xml.utils.SystemIDResolver;
import org.apache.xml.utils.SAXSourceLocator;
import org.apache.xpath.res.XPATHErrorResources;
@@ -340,9 +339,9 @@
Object xowner = xctxt.getOwnerObject();
DTM dtm;
if(null != xowner && xowner instanceof org.apache.xml.dtm.DTMWSFilter)
- dtm = xctxt.getDTM(source, false,
(org.apache.xml.dtm.DTMWSFilter)xowner);
+ dtm = xctxt.getDTM(source, false,
(org.apache.xml.dtm.DTMWSFilter)xowner, false);
else
- dtm = xctxt.getDTM(source, false, null);
+ dtm = xctxt.getDTM(source, false, null, false);
return dtm.getDocument();
}
catch (Exception e)
1.20.2.5 +11 -4 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.20.2.4
retrieving revision 1.20.2.5
diff -u -r1.20.2.4 -r1.20.2.5
--- XPathContext.java 2001/05/07 13:15:37 1.20.2.4
+++ XPathContext.java 2001/05/16 05:33:43 1.20.2.5
@@ -138,23 +138,30 @@
}
/**
- * Get an instance of a DTM. If the unique flag is true, a new instance
will
+ * Get an instance of a DTM, loaded with the content from the
+ * specified source. If the unique flag is true, a new instance will
* always be returned. Otherwise it is up to the DTMManager to return a
* new instance or an instance that it already created and may be being
used
* by someone else.
* (I think more parameters will need to be added for error handling, and
entity
* resolution).
*
- * @param source the specification of the source object.
+ * @param source the specification of the source object, which may be
null,
+ * in which case it is assumed that node construction will
take
+ * by some other means.
* @param unique true if the returned DTM must be unique, probably because
it
* is going to be mutated.
+ * @param whiteSpaceFilter Enables filtering of whitespace nodes, and may
+ * be null.
+ * @param incremental true if the construction should try and be
incremental.
*
* @return a non-null DTM reference.
*/
public DTM getDTM(javax.xml.transform.Source source, boolean unique,
- DTMWSFilter wsfilter)
+ DTMWSFilter wsfilter,
+ boolean incremental)
{
- return m_dtmManager.getDTM(source, unique, wsfilter);
+ return m_dtmManager.getDTM(source, unique, wsfilter, incremental);
}
/**
No revision
No revision
1.5.2.3 +0 -15
xml-xalan/java/src/org/apache/xpath/functions/FuncCurrent.java
Index: FuncCurrent.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncCurrent.java,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -r1.5.2.2 -r1.5.2.3
--- FuncCurrent.java 2001/05/06 02:09:54 1.5.2.2
+++ FuncCurrent.java 2001/05/16 05:33:44 1.5.2.3
@@ -80,21 +80,6 @@
public class FuncCurrent extends Function
{
-// /**
-// * Diagnostics to show string output from a node.
-// *
-// * @param n The input node, which may be null.
-// *
-// * @return A diagnostics string representing the node.
-// */
-// protected String nodeToString(int n)
-// {
-//
-// return (null != n)
-// ? n.getNodeName() + "{" + ((org.apache.xalan.stree.Child)
n).getUid() + "}"
-// : "null";
-// }
-
/**
* Execute the function. The function must return
* a valid object.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
