You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by el...@apache.org on 2001/10/10 16:41:19 UTC

cvs commit: xml-xerces/java/src/org/apache/xerces/impl/v2 XSDAttributeTraverser.java

elena       01/10/10 07:41:19

  Modified:    java/src/org/apache/xerces/impl/v2
                        XSDAttributeTraverser.java
  Log:
  We were loosing default values for attributes
  (because we relied on the new Datatype design which is not implemented yet)
  
  Revision  Changes    Path
  1.17      +11 -4     xml-xerces/java/src/org/apache/xerces/impl/v2/XSDAttributeTraverser.java
  
  Index: XSDAttributeTraverser.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/XSDAttributeTraverser.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- XSDAttributeTraverser.java	2001/09/28 21:33:40	1.16
  +++ XSDAttributeTraverser.java	2001/10/10 14:41:19	1.17
  @@ -82,7 +82,7 @@
    *
    * @author Sandy Gao, IBM
    *
  - * @version $Id: XSDAttributeTraverser.java,v 1.16 2001/09/28 21:33:40 lmartin Exp $
  + * @version $Id: XSDAttributeTraverser.java,v 1.17 2001/10/10 14:41:19 elena Exp $
    */
   class XSDAttributeTraverser extends XSDAbstractTraverser {
   
  @@ -142,7 +142,6 @@
               attrUse.fConstraintType = consType;
               attrUse.fDefault = defaultAtt;
           }
  -
           fAttrChecker.returnAttrArray(attrValues, schemaDoc);
   
           //src-attribute
  @@ -371,7 +370,11 @@
           boolean ret = true;
   
           try {
  -            attribute.fDefault = attribute.fType.validate((String)attribute.fDefault, null);
  +
  +            //REVISIT:  Our validators don't return Objects yet, instead  return null
  +            //         
  +            //attribute.fDefault = attribute.fType.validate((String)attribute.fDefault, null);
  +            attribute.fType.validate((String)attribute.fDefault, null);
           } catch (InvalidDatatypeValueException ide) {
               ret = false;
           }
  @@ -385,7 +388,11 @@
           boolean ret = true;
   
           try {
  -            attrUse.fDefault = attrUse.fAttrDecl.fType.validate((String)attrUse.fDefault, null);
  +
  +            //REVISIT:  Our validators don't return Objects yet, instead  return null
  +            //         
  +            //attrUse.fDefault = attrUse.fAttrDecl.fType.validate((String)attrUse.fDefault, null);
  +            attrUse.fAttrDecl.fType.validate((String)attrUse.fDefault, null);
           } catch (InvalidDatatypeValueException ide) {
               ret = false;
           }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org