Changeset 7489 for trunk/Res_Xalan/org/apache/xml/dtm/ref/DTMDocumentImpl.java

Timestamp:

11/24/06 14:20:40 (6 years ago)

Author:

sys

Message:

cleanup incrementalSax

File:

• trunk/Res_Xalan/org/apache/xml/dtm/ref/DTMDocumentImpl.java (modified) (5 diffs)

trunk/Res_Xalan/org/apache/xml/dtm/ref/DTMDocumentImpl.java

@@ -97 +97 @@
         protected String m_documentBaseURI;
 
-  /** If we're building the model incrementally on demand, we need to
-   * be able to tell the source when to send us more data.
-   *
-   * Note that if this has not been set, and you attempt to read ahead
-   * of the current build point, we'll probably throw a null-pointer
-   * exception. We could try to wait-and-retry instead, as a very poor
-   * fallback, but that has all the known problems with multithreading
-   * on multiprocessors and we Don't Want to Go There.
-   *
-   * @see setIncrementalSAXSource
-   */
-  private IncrementalSAXSource m_incrSAXSource=null;
-
-
         // ========= DTM data structure declarations. ==============
 
@@ -163 +149 @@
                 m_xsf = xstringfactory;
         }
-
-  /** Bind a IncrementalSAXSource to this DTM. If we discover we need nodes
-   * that have not yet been built, we will ask this object to send us more
-   * events, and it will manage interactions with its data sources.
-   *
-   * Note that we do not actually build the IncrementalSAXSource, since we don't
-   * know what source it's reading from, what thread that source will run in,
-   * or when it will run.
-   *
-   * @param source The IncrementalSAXSource that we want to recieve events from
-   * on demand.
-   */
-  public void setIncrementalSAXSource(IncrementalSAXSource source)
-  {
-    m_incrSAXSource=source;
-
-    // Establish SAX-stream link so we can receive the requested data
-    source.setContentHandler(this);
-    source.setLexicalHandler(this);
-
-    // Are the following really needed? IncrementalSAXSource doesn't yet
-    // support them, and they're mostly no-ops here...
-    //source.setErrorHandler(this);
-    //source.setDTDHandler(this);
-    //source.setDeclHandler(this);
-  }
 
         /**
@@ -319 +279 @@
   public org.xml.sax.ContentHandler getContentHandler()
   {
-    if (m_incrSAXSource instanceof IncrementalSAXSource_Filter)
-      return (ContentHandler) m_incrSAXSource;
-    else
       return this;
   }
@@ -337 +294 @@
   public LexicalHandler getLexicalHandler()
   {
-
-    if (m_incrSAXSource instanceof IncrementalSAXSource_Filter)
-      return (LexicalHandler) m_incrSAXSource;
-    else
       return this;
   }
@@ -395 +348 @@
   public boolean needsTwoThreads()
   {
-    return null!=m_incrSAXSource;
+    return false;
   }