You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by sb...@apache.org on 2001/05/16 07:32:56 UTC
cvs commit: xml-xalan/java/src/org/apache/xalan/transformer TrAXFilter.java TransformerImpl.java
sboag 01/05/15 22:32:56
Modified: java/src/org/apache/xalan/lib/sql Tag: DTM_EXP
ExtensionError.java XConnection.java
java/src/org/apache/xalan/templates Tag: DTM_EXP
ElemForEach.java ElemValueOf.java
java/src/org/apache/xalan/transformer Tag: DTM_EXP
TrAXFilter.java TransformerImpl.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.5.2.1 +0 -1 xml-xalan/java/src/org/apache/xalan/lib/sql/ExtensionError.java
Index: ExtensionError.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/lib/sql/ExtensionError.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- ExtensionError.java 2001/03/15 17:50:03 1.5
+++ ExtensionError.java 2001/05/16 05:32:55 1.5.2.1
@@ -70,7 +70,6 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.xalan.stree.DocumentImpl;
import org.w3c.dom.traversal.NodeFilter;
import org.w3c.dom.traversal.NodeIterator;
1.10.2.1 +0 -2 xml-xalan/java/src/org/apache/xalan/lib/sql/XConnection.java
Index: XConnection.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/lib/sql/XConnection.java,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -r1.10 -r1.10.2.1
--- XConnection.java 2001/03/15 17:50:04 1.10
+++ XConnection.java 2001/05/16 05:32:55 1.10.2.1
@@ -72,8 +72,6 @@
import org.w3c.dom.NodeList;
import org.w3c.dom.Node;
-import org.apache.xalan.stree.ElementImpl;
-
/**
* An XSLT extension that allows a stylesheet to
* access JDBC data. From the stylesheet perspective,
No revision
No revision
1.20.2.4 +0 -1 xml-xalan/java/src/org/apache/xalan/templates/ElemForEach.java
Index: ElemForEach.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemForEach.java,v
retrieving revision 1.20.2.3
retrieving revision 1.20.2.4
diff -u -r1.20.2.3 -r1.20.2.4
--- ElemForEach.java 2001/05/10 20:48:12 1.20.2.3
+++ ElemForEach.java 2001/05/16 05:32:55 1.20.2.4
@@ -77,7 +77,6 @@
import org.apache.xalan.transformer.NodeSorter;
import org.apache.xalan.transformer.ResultTreeHandler;
import org.apache.xalan.transformer.StackGuard;
-import org.apache.xalan.stree.SaxEventDispatch;
import javax.xml.transform.SourceLocator;
import javax.xml.transform.TransformerException;
1.13.2.2 +0 -1 xml-xalan/java/src/org/apache/xalan/templates/ElemValueOf.java
Index: ElemValueOf.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemValueOf.java,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -r1.13.2.1 -r1.13.2.2
--- ElemValueOf.java 2001/04/10 18:44:50 1.13.2.1
+++ ElemValueOf.java 2001/05/16 05:32:55 1.13.2.2
@@ -73,7 +73,6 @@
import org.apache.xalan.transformer.ResultTreeHandler;
import javax.xml.transform.TransformerException;
-import org.apache.xalan.stree.SaxEventDispatch;
/**
* <meta name="usage" content="advanced"/>
No revision
No revision
1.6.2.1 +2 -4 xml-xalan/java/src/org/apache/xalan/transformer/TrAXFilter.java
Index: TrAXFilter.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/TrAXFilter.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- TrAXFilter.java 2001/01/31 20:54:38 1.6
+++ TrAXFilter.java 2001/05/16 05:32:56 1.6.2.1
@@ -17,8 +17,6 @@
import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.ErrorListener;
-import org.apache.xalan.stree.SourceTreeHandler;
-
public class TrAXFilter extends XMLFilterImpl
{
private Templates m_templates;
@@ -171,8 +169,8 @@
}
ContentHandler ch = m_transformer.getInputContentHandler();
- if(ch instanceof SourceTreeHandler)
- ((SourceTreeHandler)ch).setUseMultiThreading(true);
+// if(ch instanceof SourceTreeHandler)
+// ((SourceTreeHandler)ch).setUseMultiThreading(true);
p.setContentHandler(ch);
if(ch instanceof EntityResolver)
1.90.2.8 +20 -27 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.90.2.7
retrieving revision 1.90.2.8
diff -u -r1.90.2.7 -r1.90.2.8
--- TransformerImpl.java 2001/05/15 16:58:51 1.90.2.7
+++ TransformerImpl.java 2001/05/16 05:32:56 1.90.2.8
@@ -70,9 +70,6 @@
// Xalan imports
import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.stree.SourceTreeHandler;
-import org.apache.xalan.stree.DocumentImpl;
-import org.apache.xalan.stree.DocImpl;
import org.apache.xalan.templates.Constants;
import org.apache.xalan.templates.ElemAttributeSet;
import org.apache.xalan.templates.ElemTemplateElement;
@@ -501,7 +498,7 @@
try
{
DTMManager mgr = this.getXPathContext().getDTMManager();
- DTM dtm = mgr.getDTM(source, false, this);
+ DTM dtm = mgr.getDTM(source, false, this, true);
boolean hardDelete = true; // %REVIEW% I have to think about this. -sb
try
@@ -1172,8 +1169,7 @@
if (null == m_inputContentHandler)
{
- m_inputContentHandler = new SourceTreeHandler(this, doDocFrag, m_urlOfSource);
- ((SourceTreeHandler)m_inputContentHandler).setUseMultiThreading(true);
+ m_inputContentHandler = new TransformerHandlerImpl(this, doDocFrag, m_urlOfSource);
}
return m_inputContentHandler;
@@ -1657,17 +1653,13 @@
ElemTemplateElement templateParent)
throws TransformerException
{
- // XPathContext xctxt = getXPathContext();
- // Document docFactory = xctxt.getDOMHelper().getDOMFactory();
- ContentHandler rtfHandler;
- int resultFragment = DTM.NULL;
+ XPathContext xctxt = getXPathContext();
- // %TODO% Use SAX2DTM here (I think)
- rtfHandler = new SourceTreeHandler(this, true, templateParent.getBaseIdentifier());
- ((SourceTreeHandler)rtfHandler).setUseMultiThreading(false);
- ((SourceTreeHandler)rtfHandler).setShouldTransformAtEnd(false);
+ DTM dtmFrag = xctxt.getDTM(null, true, this, false);
+ ContentHandler rtfHandler = dtmFrag.getContentHandler();
+
// Create a ResultTreeFrag object.
- resultFragment = ((SourceTreeHandler)rtfHandler).getDTMRoot();
+ int resultFragment = resultFragment = dtmFrag.getDocument();
// Save the current result tree handler.
ResultTreeHandler savedRTreeHandler = this.m_resultTreeHandler;
@@ -2799,19 +2791,20 @@
// // Consider re-throwing the exception if this flag is set.
// e.printStackTrace();
// }
-
- if (m_inputContentHandler instanceof SourceTreeHandler)
- {
- SourceTreeHandler sth = (SourceTreeHandler) m_inputContentHandler;
-
- sth.setExceptionThrown(e);
- }
+
+ // %REVIEW Need DTM equivelent?
+// if (m_inputContentHandler instanceof SourceTreeHandler)
+// {
+// SourceTreeHandler sth = (SourceTreeHandler) m_inputContentHandler;
+//
+// sth.setExceptionThrown(e);
+// }
ContentHandler ch = getContentHandler();
- if(ch instanceof SourceTreeHandler)
- {
- SourceTreeHandler sth = (SourceTreeHandler) ch;
- ((TransformerImpl)(sth.getTransformer())).postExceptionFromThread(e);
- }
+// if(ch instanceof SourceTreeHandler)
+// {
+// SourceTreeHandler sth = (SourceTreeHandler) ch;
+// ((TransformerImpl)(sth.getTransformer())).postExceptionFromThread(e);
+// }
m_isTransformDone = true;
m_exceptionThrown = e;
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org