You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xmlbeans-cvs@xml.apache.org by ce...@apache.org on 2004/02/03 03:05:56 UTC

cvs commit: xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/validator Validator.java

cezar       2004/02/02 18:05:56

  Modified:    v2/src/typeimpl/org/apache/xmlbeans/impl/validator
                        Validator.java
  Log:
  Use stack for current element.
  
  DRT: passed
  
  Revision  Changes    Path
  1.5       +8 -1      xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/validator/Validator.java
  
  Index: Validator.java
  ===================================================================
  RCS file: /home/cvs/xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/validator/Validator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Validator.java	29 Jan 2004 00:49:10 -0000	1.4
  +++ Validator.java	3 Feb 2004 02:05:56 -0000	1.5
  @@ -1621,7 +1621,14 @@
   
       public SchemaLocalElement getCurrentElement()
       {
  -        return _localElement;// != null ? _localElement : (_stateStack!=null ? (SchemaLocalElement)_stateStack._field : null);
  +        if (_localElement != null)
  +            return _localElement;
  +
  +        //try getting it from the stack (this should happen after END)  
  +        if (_stateStack!=null && _stateStack._field instanceof SchemaLocalElement )
  +            return (SchemaLocalElement)_stateStack._field;
  +
  +        return null;
       }
   
       public SchemaParticle getCurrentWildcardElement()
  
  
  

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