cvs commit: xml-xerces/java/src/org/apache/xerces/xinclude XIncludeHandler.java

[mrglavas]

mrglavas    2005/09/15 10:51:14

  Modified:    java/src/org/apache/xerces/xpointer XPointerHandler.java
               java/src/org/apache/xerces/xinclude XIncludeHandler.java
  Log:
  Reverting part of the previous commit. DTD events from the
  child pipelines should never be propogated to the main one.
  
  Revision  Changes    Path
  1.3       +1 -5      
xml-xerces/java/src/org/apache/xerces/xpointer/XPointerHandler.java
  
  Index: XPointerHandler.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xerces/java/src/org/apache/xerces/xpointer/XPointerHandler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XPointerHandler.java      15 Sep 2005 17:47:34 -0000      1.2
  +++ XPointerHandler.java      15 Sep 2005 17:51:14 -0000      1.3
  @@ -120,10 +120,6 @@
           fDocumentHandler = handler;
       }
       
  -    public void setDTDHandler(XMLDTDHandler handler) {
  -        fDTDHandler = handler;
  -    }
  -    
       // 
************************************************************************
       //  Implementation of the XPointerProcessor interface.
       // 
************************************************************************
  
  
  
  1.60      +2 -10     
xml-xerces/java/src/org/apache/xerces/xinclude/XIncludeHandler.java
  
  Index: XIncludeHandler.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xerces/java/src/org/apache/xerces/xinclude/XIncludeHandler.java,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- XIncludeHandler.java      15 Sep 2005 17:47:34 -0000      1.59
  +++ XIncludeHandler.java      15 Sep 2005 17:51:14 -0000      1.60
  @@ -1394,15 +1394,7 @@
        * @see 
org.apache.xerces.xni.parser.XMLDTDSource#setDTDHandler(org.apache.xerces.xni.XMLDTDHandler)
        */
       public void setDTDHandler(XMLDTDHandler handler) {
  -        if (fDTDHandler != handler) {
  -            fDTDHandler = handler;
  -            if (fXIncludeChildConfig != null) {
  -                fXIncludeChildConfig.setDTDHandler(handler);
  -            }
  -            if (fXPointerChildConfig != null) {
  -                fXPointerChildConfig.setDTDHandler(handler);
  -            }
  -        }
  +        fDTDHandler = handler;
       }
   
       // XIncludeHandler methods
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]