[Jibx-cvs] core/build/src/org/jibx/binding/model SequenceVisitor.java,NONE,1.1 MappingElement.java,1.5,1.6 StructureElementBase.java,1.8,1.9

[Dennis S. <dso...@us...>]

Update of /cvsroot/jibx/core/build/src/org/jibx/binding/model
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19185/build/src/org/jibx/binding/model

Modified Files:
	MappingElement.java StructureElementBase.java 
Added Files:
	SequenceVisitor.java 
Log Message:
Implement component tour to check for invalid sequence of text values.

Index: MappingElement.java
===================================================================
RCS file: /cvsroot/jibx/core/build/src/org/jibx/binding/model/MappingElement.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MappingElement.java	23 Jul 2005 02:48:58 -0000	1.5
--- MappingElement.java	24 Jul 2005 07:38:58 -0000	1.6
***************
*** 282,285 ****
--- 282,292 ----
              }
          }
+         
+         // check use of text values in children of structure with name
+         SequenceVisitor visitor = new SequenceVisitor(null, vctx);
+         TreeContext tctx = vctx.getChildContext();
+         tctx.tourTree(this, visitor);
+         
+         // run base class validation
          super.validate(vctx);
      }

--- NEW FILE: SequenceVisitor.java ---
/*
Copyright (c) 2005, Dennis M. Sosnoski
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

 * Redistributions of source code must retain the above copyright notice, this
   list of conditions and the following disclaimer.
 * Redistributions in binary form must reproduce the above copyright notice,
   this list of conditions and the following disclaimer in the documentation
   and/or other materials provided with the distribution.
 * Neither the name of JiBX nor the names of its contributors may be used
   to endorse or promote products derived from this software without specific
   prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

package org.jibx.binding.model;

/**
 * Visitor for child tree of structure with an element definition. This
 * verifies that text and CDATA components are only used in ways consistent
 * with parsing (i.e., each use must be preceeded by a required element).
 */
class SequenceVisitor extends ModelVisitor
{
    private final StructureElementBase m_baseStructure;
    private final ValidationContext m_validationContext;
    private boolean m_isTextAllowed;
    
    /**
     * Constructor.
     * 
     * @param base root of subtree being visited (<code>null</code> if not
     * a structure)
     * @param vctx validation context used for reporting errors
     */
    public SequenceVisitor(StructureElementBase base,
        ValidationContext vctx) {
        m_baseStructure = base;
        m_validationContext = vctx;
        m_isTextAllowed = true;
    }
    
    /* (non-Javadoc)
     * @see org.jibx.binding.model.ModelVisitor#visit(org.jibx.binding.model.StructureElementBase)
     */
    public boolean visit(StructureElementBase node) {
        if (node != m_baseStructure && node.hasName()) {
            m_isTextAllowed = !node.isOptional();
            return false;
        } else {
            return true;
        }
    }
    
    /* (non-Javadoc)
     * @see org.jibx.binding.model.ModelVisitor#visit(org.jibx.binding.model.ValueElement)
     */
    public boolean visit(ValueElement node) {
        switch (node.getStyle()) {
            case ValueElement.CDATA_STYLE:
            case ValueElement.TEXT_STYLE:
                if (m_isTextAllowed) {
                    m_isTextAllowed = false;
                } else {
                    m_validationContext.addError
                        ("Text value must be preceded by required element",
                        node);
                }
                break;
                
            case NestingAttributes.ELEMENT_STYLE:
                m_isTextAllowed = !node.isOptional();
                break;
            
            case NestingAttributes.ATTRIBUTE_STYLE:
                break;
        }
        return false;
    }
    
    /* (non-Javadoc)
     * @see org.jibx.binding.model.ModelVisitor#exit(org.jibx.binding.model.StructureElementBase)
     */
    public void exit(StructureElementBase node) {
        if (node.hasName()) {
            m_isTextAllowed = !node.isOptional();
        }
    }
}
Index: StructureElementBase.java
===================================================================
RCS file: /cvsroot/jibx/core/build/src/org/jibx/binding/model/StructureElementBase.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** StructureElementBase.java	10 Jul 2005 18:51:23 -0000	1.8
--- StructureElementBase.java	24 Jul 2005 07:38:58 -0000	1.9
***************
*** 415,421 ****
--- 415,425 ----
       */
      public void validate(ValidationContext vctx) {
+         
+         // validate the attribute groups
          m_nameAttrs.validate(vctx);
          m_propertyAttrs.validate(vctx);
          if (!vctx.isSkipped(this)) {
+             
+             // check for way of constructing instance on input
              if (vctx.isInBinding() && m_propertyAttrs.hasProperty() &&
                  getFactory() == null && getMarshaller() == null &&
***************
*** 429,432 ****
--- 433,443 ----
                  }
              }
+             
+             // check use of text values in children of structure with name
+             SequenceVisitor visitor = new SequenceVisitor(this, vctx);
+             TreeContext tctx = vctx.getChildContext();
+             tctx.tourTree(this, visitor);
+             
+             // finish with superclass validation
              super.validate(vctx);
          }