You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mm...@locus.apache.org on 2000/08/29 22:03:07 UTC

cvs commit: xml-xalan/java/src/org/apache/xalan/processor XSLTElementProcessor.java XSLTSchema.java

mmidy       00/08/29 13:03:07

  Modified:    java/src/org/apache/xalan/processor
                        XSLTElementProcessor.java XSLTSchema.java
  Log:
  Make sure required attributes are defined
  
  Revision  Changes    Path
  1.2       +9 -0      xml-xalan/java/src/org/apache/xalan/processor/XSLTElementProcessor.java
  
  Index: XSLTElementProcessor.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/processor/XSLTElementProcessor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XSLTElementProcessor.java	2000/06/19 16:52:15	1.1
  +++ XSLTElementProcessor.java	2000/08/29 20:03:06	1.2
  @@ -65,6 +65,10 @@
   import org.xml.sax.ErrorHandler;
   import org.xml.sax.SAXException;
   import org.xml.sax.SAXParseException;
  +
  +import org.apache.xalan.res.XSLMessages;
  +import org.apache.xalan.res.XSLTErrorResources;
  +
   import java.util.Vector;
   
   /**
  @@ -330,6 +334,11 @@
             attrDef.setDefAttrValue(handler, target);
           }
         }
  +      if (attrDef.getRequired())
  +      {
  +        if(!processedDefs.contains(attrDef))
  +          handler.error(XSLMessages.createMessage(XSLTErrorResources.ER_REQUIRES_ATTRIB, new Object[]{rawName, attrDef.getName()}) , null);    
  +      }    
       }
   
     }
  
  
  
  1.6       +1 -1      xml-xalan/java/src/org/apache/xalan/processor/XSLTSchema.java
  
  Index: XSLTSchema.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/processor/XSLTSchema.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XSLTSchema.java	2000/07/31 22:09:07	1.5
  +++ XSLTSchema.java	2000/08/29 20:03:06	1.6
  @@ -172,7 +172,7 @@
         = new XSLTAttributeDef(null, "result-prefix", XSLTAttributeDef.T_CDATA, true);
   
       XSLTAttributeDef disableOutputEscapingAttr
  -      = new XSLTAttributeDef(null, "disable-output-escaping", XSLTAttributeDef.T_YESNO, true);
  +      = new XSLTAttributeDef(null, "disable-output-escaping", XSLTAttributeDef.T_YESNO, false);
       
       XSLTAttributeDef levelAttr
         = new XSLTAttributeDef(null, "level", false,