Changeset 7489 for trunk/Res_Xalan/org/apache/xml/dtm/ref/DTMManagerDefault.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/DTMManagerDefault.java (modified) (2 diffs)

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

@@ -318 +318 @@
           // created a new DTM.
           addDTM(dtm, dtmPos, 0);
-
-
-          boolean haveXercesParser =
-                     (null != reader)
-                     && (reader.getClass()
-                               .getName()
-                               .equals("org.apache.xerces.parsers.SAXParser") );
         
-          if (haveXercesParser) {
-            incremental = true;  // No matter what.  %REVIEW%
-          }
-        
-          // If the reader is null, but they still requested an incremental
-          // build, then we still want to set up the IncrementalSAXSource stuff.
-          if (m_incremental && incremental
-               /* || ((null == reader) && incremental) */) {
-            IncrementalSAXSource coParser=null;
-
-            if (haveXercesParser) {
-              // IncrementalSAXSource_Xerces to avoid threading.
-              try {
-                coParser =(IncrementalSAXSource)
-                  Class.forName("org.apache.xml.dtm.ref.IncrementalSAXSource_Xerces").newInstance();  
-              }  catch( Exception ex ) {
-                ex.printStackTrace();
-                coParser=null;
-              }
-            }
-
-            if (coParser==null ) {
-              // Create a IncrementalSAXSource to run on the secondary thread.
-              if (null == reader) {
-                coParser = new IncrementalSAXSource_Filter();
-              } else {
-                IncrementalSAXSource_Filter filter =
-                         new IncrementalSAXSource_Filter();
-                filter.setXMLReader(reader);
-                coParser=filter;
-              }
-            }
-
-                        
-            /**************************************************************
-            // EXPERIMENTAL 3/22/02
-            if (JKESS_XNI_EXPERIMENT && m_incremental &&
-                  dtm instanceof XNI2DTM && 
-                  coParser instanceof IncrementalSAXSource_Xerces) {
-                org.apache.xerces.xni.parser.XMLPullParserConfiguration xpc=
-                      ((IncrementalSAXSource_Xerces)coParser)
-                                           .getXNIParserConfiguration();
-              if (xpc!=null) {
-                // Bypass SAX; listen to the XNI stream
-                ((XNI2DTM)dtm).setIncrementalXNISource(xpc);
-              } else {
-                  // Listen to the SAX stream (will fail, diagnostically...)
-                dtm.setIncrementalSAXSource(coParser);
-              }
-            } else
-            ***************************************************************/
-          
-            // Have the DTM set itself up as IncrementalSAXSource's listener.
-            dtm.setIncrementalSAXSource(coParser);
-
-            if (null == xmlSource) {
-
-              // Then the user will construct it themselves.
-              return dtm;
-            }
-
-            if (null == reader.getErrorHandler()) {
-              reader.setErrorHandler(dtm);
-            }
-            reader.setDTDHandler(dtm);
-
-            try {
-              // Launch parsing coroutine.  Launches a second thread,
-              // if we're using IncrementalSAXSource.filter().
-
-              coParser.startParse(xmlSource);
-            } catch (RuntimeException re) {
-
-              dtm.clearCoRoutine();
-
-              throw re;
-            } catch (Exception e) {
-
-              dtm.clearCoRoutine();
-
-              throw new org.apache.xml.utils.WrappedRuntimeException(e);
-            }
-          } else {
             if (null == reader) {
-
               // Then the user will construct it themselves.
               return dtm;
@@ -440 +349 @@
               throw new org.apache.xml.utils.WrappedRuntimeException(e);
             }
-          }
 
           if (DUMPTREE) {