cvs commit: xml-xalan/src/org/apache/xalan/xpath/dtm DTMLiaison.java

[sboag]

sboag       00/07/23 10:01:35

  Modified:    src/org/apache/xalan/xpath/dtm DTMLiaison.java
  Log:
  Use m_isDefaultUseValidation to control if dynamic validation is on.  Control 
use of namespaces feature via use of m_useDOM2getNamespaceURI.
  
  Revision  Changes    Path
  1.18      +14 -2     xml-xalan/src/org/apache/xalan/xpath/dtm/DTMLiaison.java
  
  Index: DTMLiaison.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xpath/dtm/DTMLiaison.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- DTMLiaison.java   2000/07/19 18:14:25     1.17
  +++ DTMLiaison.java   2000/07/23 17:01:35     1.18
  @@ -221,10 +221,22 @@
           
parser.setFeature("http://apache.org/xml/features/dom/create-entity-ref-nodes";, 
                             getShouldExpandEntityRefs());
   
  -        parser.setFeature("http://xml.org/sax/features/namespaces";, true);
  +        // parser.setFeature("http://xml.org/sax/features/namespaces";, true);
  +        if(m_useDOM2getNamespaceURI)
  +        {
  +          parser.setFeature("http://xml.org/sax/features/namespaces";, true);
  +        }
  +        else
  +        {
  +          parser.setFeature("http://xml.org/sax/features/namespaces";, false);
  +        }
   
  -        if(getUseValidation())
  +        if(m_isDefaultUseValidation)
  +          
parser.setFeature("http://apache.org/xml/features/validation/dynamic";, true);
  +        else if(getUseValidation())
             parser.setFeature("http://xml.org/sax/features/validation";, true);
  +        else
  +          parser.setFeature("http://xml.org/sax/features/validation";, false);
   
           // PR:DMAN4LSRDL Submitted by:<[EMAIL PROTECTED]> remove unneeded 
else clause
           // "http://xml.org/sax/features/validation/dynamic"; is and should be 
false