You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by je...@locus.apache.org on 2000/06/22 00:02:42 UTC

cvs commit: xml-xerces/java/src/org/apache/xerces/validators/datatype QNameDatatypeValidator.java StringDatatypeValidator.java

jeffreyr    00/06/21 15:02:40

  Modified:    java/src/org/apache/xerces/validators/datatype
                        QNameDatatypeValidator.java
                        StringDatatypeValidator.java
  Log:
  fixed lexicographical comparison logical bug in String and QName validators
  
  Revision  Changes    Path
  1.5       +4 -4      xml-xerces/java/src/org/apache/xerces/validators/datatype/QNameDatatypeValidator.java
  
  Index: QNameDatatypeValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/datatype/QNameDatatypeValidator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- QNameDatatypeValidator.java	2000/06/21 20:57:26	1.4
  +++ QNameDatatypeValidator.java	2000/06/21 22:02:36	1.5
  @@ -78,7 +78,7 @@
    * XML]. 
    * 
    * @author Jeffrey Rodriguez
  - * @version $Id: QNameDatatypeValidator.java,v 1.4 2000/06/21 20:57:26 jeffreyr Exp $
  + * @version $Id: QNameDatatypeValidator.java,v 1.5 2000/06/21 22:02:36 jeffreyr Exp $
    */
   public class QNameDatatypeValidator extends  AbstractDatatypeValidator {
       private Locale    fLocale          = null;
  @@ -325,7 +325,7 @@
           if ( isMaxExclusiveDefined == true ) {
               int comparisonResult;
               comparisonResult  = compare( content, fMaxExclusive );
  -            System.out.println( "maxExc = " + comparisonResult );
  +            //System.out.println( "maxExc = " + comparisonResult );
   
               if ( comparisonResult >= 0 ) {
                   throw new InvalidDatatypeValueException( "Value '"+content+ "'  must be " +
  @@ -345,7 +345,7 @@
           if ( isMinExclusiveDefined == true ) {
               int comparisonResult;
               comparisonResult  = compare( content, fMinExclusive );
  -            System.out.println( "minExc = " + comparisonResult );
  +            //System.out.println( "minExc = " + comparisonResult );
   
               if ( comparisonResult <= 0 )
                   throw new InvalidDatatypeValueException( "Value '"+content+ "' must be " +
  @@ -354,7 +354,7 @@
           if ( isMinInclusiveDefined == true ) {
               int comparisonResult;
               comparisonResult = compare( content, fMinInclusive );
  -            System.out.println( "minInc = " + comparisonResult );
  +            //System.out.println( "minInc = " + comparisonResult );
               if ( comparisonResult < 0 )
                   throw new InvalidDatatypeValueException( "Value '"+content+ "' must be " +
                                                            "lexicographically greater or equal than '" + fMinInclusive  + "'." );
  
  
  
  1.12      +3 -3      xml-xerces/java/src/org/apache/xerces/validators/datatype/StringDatatypeValidator.java
  
  Index: StringDatatypeValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/datatype/StringDatatypeValidator.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- StringDatatypeValidator.java	2000/06/21 20:57:26	1.11
  +++ StringDatatypeValidator.java	2000/06/21 22:02:37	1.12
  @@ -73,7 +73,7 @@
    * @author Ted Leung
    * @author Kito D. Mann, Virtua Communications Corp.
    * @author Jeffrey Rodriguez
  - * @version $Id: StringDatatypeValidator.java,v 1.11 2000/06/21 20:57:26 jeffreyr Exp $
  + * @version $Id: StringDatatypeValidator.java,v 1.12 2000/06/21 22:02:37 jeffreyr Exp $
    */
   public class StringDatatypeValidator extends AbstractDatatypeValidator{
       private Locale     fLocale          = null;
  @@ -367,7 +367,7 @@
               int comparisonResult;
               comparisonResult  = compare( content, fMinExclusive );
   
  -            System.out.println( "exclusive = " + comparisonResult );
  +            //System.out.println( "exclusive = " + comparisonResult );
   
               if ( comparisonResult <= 0 )
                   throw new InvalidDatatypeValueException( "MinExclusive:Value '"+content+ "' must be " +
  @@ -376,7 +376,7 @@
           if ( isMinInclusiveDefined == true ) {
               int comparisonResult;
               comparisonResult = compare( content, fMinInclusive );
  -            System.out.println( "inclusive = " + comparisonResult );
  +            //System.out.println( "inclusive = " + comparisonResult );
               if ( comparisonResult < 0 )
                   throw new InvalidDatatypeValueException( "MinInclusive:Value '"+content+ "' must be " +
                          "lexicographically greater or equal than '" + fMinInclusive  + "'." );