You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by pe...@apache.org on 2002/02/14 16:17:32 UTC
cvs commit: xml-xerces/c/src/xercesc/validators/datatype UnionDatatypeValidator.hpp UnionDatatypeValidator.cpp DatatypeValidator.hpp BooleanDatatypeValidator.hpp BooleanDatatypeValidator.cpp AnySimpleTypeDatatypeValidator.hpp AnySimpleTypeDatatypeValidator.cpp AbstractStringValidator.hpp AbstractStringValidator.cpp AbstractNumericFacetValidator.hpp AbstractNumericFacetValidator.cpp
peiyongz 02/02/14 07:17:31
Modified: c/src/xercesc/validators/datatype UnionDatatypeValidator.hpp
UnionDatatypeValidator.cpp DatatypeValidator.hpp
BooleanDatatypeValidator.hpp
BooleanDatatypeValidator.cpp
AnySimpleTypeDatatypeValidator.hpp
AnySimpleTypeDatatypeValidator.cpp
AbstractStringValidator.hpp
AbstractStringValidator.cpp
AbstractNumericFacetValidator.hpp
AbstractNumericFacetValidator.cpp
Log:
getEnumString()
Revision Changes Path
1.2 +6 -1 xml-xerces/c/src/xercesc/validators/datatype/UnionDatatypeValidator.hpp
Index: UnionDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/UnionDatatypeValidator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UnionDatatypeValidator.hpp 1 Feb 2002 22:22:43 -0000 1.1
+++ UnionDatatypeValidator.hpp 14 Feb 2002 15:17:31 -0000 1.2
@@ -55,10 +55,13 @@
*/
/*
- * $Id: UnionDatatypeValidator.hpp,v 1.1 2002/02/01 22:22:43 peiyongz Exp $
+ * $Id: UnionDatatypeValidator.hpp,v 1.2 2002/02/14 15:17:31 peiyongz Exp $
* $Log: UnionDatatypeValidator.hpp,v $
- * Revision 1.1 2002/02/01 22:22:43 peiyongz
- * Initial revision
+ * Revision 1.2 2002/02/14 15:17:31 peiyongz
+ * getEnumString()
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:43 peiyongz
+ * sane_include
*
* Revision 1.9 2001/12/13 16:48:29 peiyongz
* Avoid dangling pointer
@@ -131,6 +134,8 @@
virtual ~UnionDatatypeValidator();
//@}
+
+ virtual const RefVectorOf<XMLCh>* getEnumString() const;
// -----------------------------------------------------------------------
// Getter methods
1.2 +8 -1 xml-xerces/c/src/xercesc/validators/datatype/UnionDatatypeValidator.cpp
Index: UnionDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/UnionDatatypeValidator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UnionDatatypeValidator.cpp 1 Feb 2002 22:22:42 -0000 1.1
+++ UnionDatatypeValidator.cpp 14 Feb 2002 15:17:31 -0000 1.2
@@ -55,10 +55,13 @@
*/
/*
- * $Id: UnionDatatypeValidator.cpp,v 1.1 2002/02/01 22:22:42 peiyongz Exp $
+ * $Id: UnionDatatypeValidator.cpp,v 1.2 2002/02/14 15:17:31 peiyongz Exp $
* $Log: UnionDatatypeValidator.cpp,v $
- * Revision 1.1 2002/02/01 22:22:42 peiyongz
- * Initial revision
+ * Revision 1.2 2002/02/14 15:17:31 peiyongz
+ * getEnumString()
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:42 peiyongz
+ * sane_include
*
* Revision 1.5 2001/10/02 18:59:29 peiyongz
* Invalid_Facet_Tag to display the tag name
@@ -385,6 +388,10 @@
return -1;
}
+const RefVectorOf<XMLCh>* UnionDatatypeValidator::getEnumString() const
+{
+ return getEnumeration();
+}
/**
* End of file UnionDatatypeValidator.cpp
*/
1.2 +7 -1 xml-xerces/c/src/xercesc/validators/datatype/DatatypeValidator.hpp
Index: DatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/DatatypeValidator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DatatypeValidator.hpp 1 Feb 2002 22:22:40 -0000 1.1
+++ DatatypeValidator.hpp 14 Feb 2002 15:17:31 -0000 1.2
@@ -55,7 +55,7 @@
*/
/*
- * $Id: DatatypeValidator.hpp,v 1.1 2002/02/01 22:22:40 peiyongz Exp $
+ * $Id: DatatypeValidator.hpp,v 1.2 2002/02/14 15:17:31 peiyongz Exp $
*/
#if !defined(DATATYPEVALIDATOR_HPP)
@@ -192,6 +192,12 @@
* To be redefined in List/Union validators
*/
virtual bool isAtomic() const;
+
+ /**
+ * Returns the datatype enumeration if any is set.
+ * Derived class shall provide their own copy.
+ */
+ virtual const RefVectorOf<XMLCh>* getEnumString() const = 0;
//@}
1.2 +3 -1 xml-xerces/c/src/xercesc/validators/datatype/BooleanDatatypeValidator.hpp
Index: BooleanDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/BooleanDatatypeValidator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BooleanDatatypeValidator.hpp 1 Feb 2002 22:22:40 -0000 1.1
+++ BooleanDatatypeValidator.hpp 14 Feb 2002 15:17:31 -0000 1.2
@@ -55,7 +55,7 @@
*/
/*
- * $Id: BooleanDatatypeValidator.hpp,v 1.1 2002/02/01 22:22:40 peiyongz Exp $
+ * $Id: BooleanDatatypeValidator.hpp,v 1.2 2002/02/14 15:17:31 peiyongz Exp $
*/
#if !defined(BOOLEAN_DATATYPEVALIDATOR_HPP)
@@ -83,6 +83,8 @@
virtual ~BooleanDatatypeValidator();
//@}
+
+ virtual const RefVectorOf<XMLCh>* getEnumString() const;
// -----------------------------------------------------------------------
// Getter methods
1.2 +8 -0 xml-xerces/c/src/xercesc/validators/datatype/BooleanDatatypeValidator.cpp
Index: BooleanDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/BooleanDatatypeValidator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BooleanDatatypeValidator.cpp 1 Feb 2002 22:22:40 -0000 1.1
+++ BooleanDatatypeValidator.cpp 14 Feb 2002 15:17:31 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log: BooleanDatatypeValidator.cpp,v $
- * Revision 1.1 2002/02/01 22:22:40 peiyongz
- * Initial revision
+ * Revision 1.2 2002/02/14 15:17:31 peiyongz
+ * getEnumString()
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:40 peiyongz
+ * sane_include
*
* Revision 1.7 2001/10/02 18:59:29 peiyongz
* Invalid_Facet_Tag to display the tag name
@@ -220,6 +223,11 @@
}
return 1;
+}
+
+const RefVectorOf<XMLCh>* BooleanDatatypeValidator::getEnumString() const
+{
+ return 0;
}
/**
1.2 +3 -1 xml-xerces/c/src/xercesc/validators/datatype/AnySimpleTypeDatatypeValidator.hpp
Index: AnySimpleTypeDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/AnySimpleTypeDatatypeValidator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AnySimpleTypeDatatypeValidator.hpp 1 Feb 2002 22:22:40 -0000 1.1
+++ AnySimpleTypeDatatypeValidator.hpp 14 Feb 2002 15:17:31 -0000 1.2
@@ -55,7 +55,7 @@
*/
/*
- * $Id: AnySimpleTypeDatatypeValidator.hpp,v 1.1 2002/02/01 22:22:40 peiyongz Exp $
+ * $Id: AnySimpleTypeDatatypeValidator.hpp,v 1.2 2002/02/14 15:17:31 peiyongz Exp $
*/
#if !defined(ANYSIMPLETYPEDATATYPEVALIDATOR_HPP)
@@ -86,6 +86,8 @@
virtual ~AnySimpleTypeDatatypeValidator();
//@}
+
+ virtual const RefVectorOf<XMLCh>* getEnumString() const;
// -----------------------------------------------------------------------
// Getter methods
1.2 +9 -0 xml-xerces/c/src/xercesc/validators/datatype/AnySimpleTypeDatatypeValidator.cpp
Index: AnySimpleTypeDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/AnySimpleTypeDatatypeValidator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AnySimpleTypeDatatypeValidator.cpp 1 Feb 2002 22:22:40 -0000 1.1
+++ AnySimpleTypeDatatypeValidator.cpp 14 Feb 2002 15:17:31 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log: AnySimpleTypeDatatypeValidator.cpp,v $
- * Revision 1.1 2002/02/01 22:22:40 peiyongz
- * Initial revision
+ * Revision 1.2 2002/02/14 15:17:31 peiyongz
+ * getEnumString()
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:40 peiyongz
+ * sane_include
*
* Revision 1.1 2001/08/24 17:12:01 knoaman
* Add support for anySimpleType.
@@ -105,6 +108,12 @@
// to satisfy some compilers
return 0;
}
+
+const RefVectorOf<XMLCh>* AnySimpleTypeDatatypeValidator::getEnumString() const
+{
+ return 0;
+}
+
/**
* End of file AnySimpleTypeDatatypeValidator.cpp
*/
1.2 +6 -1 xml-xerces/c/src/xercesc/validators/datatype/AbstractStringValidator.hpp
Index: AbstractStringValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/AbstractStringValidator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractStringValidator.hpp 1 Feb 2002 22:22:40 -0000 1.1
+++ AbstractStringValidator.hpp 14 Feb 2002 15:17:31 -0000 1.2
@@ -55,10 +55,13 @@
*/
/*
- * $Id: AbstractStringValidator.hpp,v 1.1 2002/02/01 22:22:40 peiyongz Exp $
+ * $Id: AbstractStringValidator.hpp,v 1.2 2002/02/14 15:17:31 peiyongz Exp $
* $Log: AbstractStringValidator.hpp,v $
- * Revision 1.1 2002/02/01 22:22:40 peiyongz
- * Initial revision
+ * Revision 1.2 2002/02/14 15:17:31 peiyongz
+ * getEnumString()
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:40 peiyongz
+ * sane_include
*
* Revision 1.9 2001/12/13 16:48:29 peiyongz
* Avoid dangling pointer
@@ -116,6 +119,8 @@
virtual ~AbstractStringValidator();
//@}
+
+ virtual const RefVectorOf<XMLCh>* getEnumString() const;
// -----------------------------------------------------------------------
// Validation methods
1.2 +8 -0 xml-xerces/c/src/xercesc/validators/datatype/AbstractStringValidator.cpp
Index: AbstractStringValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/AbstractStringValidator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractStringValidator.cpp 1 Feb 2002 22:22:39 -0000 1.1
+++ AbstractStringValidator.cpp 14 Feb 2002 15:17:31 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log: AbstractStringValidator.cpp,v $
- * Revision 1.1 2002/02/01 22:22:39 peiyongz
- * Initial revision
+ * Revision 1.2 2002/02/14 15:17:31 peiyongz
+ * getEnumString()
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:39 peiyongz
+ * sane_include
*
* Revision 1.7 2001/12/13 16:48:29 peiyongz
* Avoid dangling pointer
@@ -651,6 +654,11 @@
checkAdditionalFacet(content);
+}
+
+const RefVectorOf<XMLCh>* AbstractStringValidator::getEnumString() const
+{
+ return getEnumeration();
}
/**
1.2 +6 -1 xml-xerces/c/src/xercesc/validators/datatype/AbstractNumericFacetValidator.hpp
Index: AbstractNumericFacetValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/AbstractNumericFacetValidator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractNumericFacetValidator.hpp 1 Feb 2002 22:22:39 -0000 1.1
+++ AbstractNumericFacetValidator.hpp 14 Feb 2002 15:17:31 -0000 1.2
@@ -55,10 +55,13 @@
*/
/*
- * $Id: AbstractNumericFacetValidator.hpp,v 1.1 2002/02/01 22:22:39 peiyongz Exp $
+ * $Id: AbstractNumericFacetValidator.hpp,v 1.2 2002/02/14 15:17:31 peiyongz Exp $
* $Log: AbstractNumericFacetValidator.hpp,v $
- * Revision 1.1 2002/02/01 22:22:39 peiyongz
- * Initial revision
+ * Revision 1.2 2002/02/14 15:17:31 peiyongz
+ * getEnumString()
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:39 peiyongz
+ * sane_include
*
* Revision 1.3 2001/11/22 20:23:20 peiyongz
* _declspec(dllimport) and inline warning C4273
@@ -91,6 +94,8 @@
virtual ~AbstractNumericFacetValidator();
//@}
+
+ virtual const RefVectorOf<XMLCh>* getEnumString() const;
protected:
1.2 +13 -2 xml-xerces/c/src/xercesc/validators/datatype/AbstractNumericFacetValidator.cpp
Index: AbstractNumericFacetValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/AbstractNumericFacetValidator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractNumericFacetValidator.cpp 1 Feb 2002 22:22:39 -0000 1.1
+++ AbstractNumericFacetValidator.cpp 14 Feb 2002 15:17:31 -0000 1.2
@@ -55,10 +55,13 @@
*/
/*
- * $Id: AbstractNumericFacetValidator.cpp,v 1.1 2002/02/01 22:22:39 peiyongz Exp $
+ * $Id: AbstractNumericFacetValidator.cpp,v 1.2 2002/02/14 15:17:31 peiyongz Exp $
* $Log: AbstractNumericFacetValidator.cpp,v $
- * Revision 1.1 2002/02/01 22:22:39 peiyongz
- * Initial revision
+ * Revision 1.2 2002/02/14 15:17:31 peiyongz
+ * getEnumString()
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:39 peiyongz
+ * sane_include
*
* Revision 1.6 2001/12/13 16:48:29 peiyongz
* Avoid dangling pointer
@@ -140,6 +143,9 @@
//~RefVectorOf will delete all adopted elements
if (!fEnumerationInherited && fEnumeration)
delete fEnumeration;
+
+ if (!fEnumerationInherited && fStrEnumeration)
+ delete fStrEnumeration;
}
AbstractNumericFacetValidator::AbstractNumericFacetValidator(
@@ -170,7 +176,7 @@
{
fStrEnumeration = enums; // save the literal value
- Janitor<RefVectorOf<XMLCh> > janStrEnum(fStrEnumeration);
+ // which is needed for getEnumString()
if (enums)
{
@@ -779,6 +785,11 @@
// inherit "fixed" option
setFixed(getFixed() | numBase->getFixed());
+}
+
+const RefVectorOf<XMLCh>* AbstractNumericFacetValidator::getEnumString() const
+{
+ return (fEnumerationInherited? getBaseValidator()->getEnumString() : fStrEnumeration );
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org