knoaman 2003/11/25 10:08:32
Modified: c/src/xercesc/framework/psvi XSTypeDefinition.hpp
XSTypeDefinition.cpp XSSimpleTypeDefinition.hpp
XSSimpleTypeDefinition.cpp XSModel.cpp
XSComplexTypeDefinition.hpp
XSComplexTypeDefinition.cpp
Log:
Misc. PSVI updates. Thanks to David Cargill.
Revision Changes Path
1.7 +7 -14 xml-xerces/c/src/xercesc/framework/psvi/XSTypeDefinition.hpp
Index: XSTypeDefinition.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/psvi/XSTypeDefinition.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XSTypeDefinition.hpp 21 Nov 2003 17:34:04 -0000 1.6
+++ XSTypeDefinition.hpp 25 Nov 2003 18:08:31 -0000 1.7
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2003/11/25 18:08:31 knoaman
+ * Misc. PSVI updates. Thanks to David Cargill.
+ *
* Revision 1.6 2003/11/21 17:34:04 knoaman
* PSVI update
*
@@ -209,31 +212,21 @@
* Convenience method: check if this type is derived from the given
* <code>ancestorType</code>.
* @param ancestorType An ancestor type definition.
- * @param derivationMethod A bit combination representing a subset of {
- * <code>DERIVATION_RESTRICTION, DERIVATION_EXTENSION, DERIVATION_UNION,
DERIVATION_LIST</code>
- * }.
* @return Return true if this type is derived from
- * <code>ancestorType</code> using only derivation methods from the
- * <code>derivationMethod</code>.
+ * <code>ancestorType</code>.
*/
- virtual bool derivedFromType(const XSTypeDefinition* const ancestorType,
- short derivationMethod) = 0;
+ virtual bool derivedFromType(const XSTypeDefinition* const ancestorType) = 0;
/**
* Convenience method: check if this type is derived from the given
* ancestor type.
* @param typeNamespace An ancestor type namespace.
* @param name An ancestor type name.
- * @param derivationMethod A bit combination representing a subset of {
- * <code>DERIVATION_RESTRICTION, DERIVATION_EXTENSION, DERIVATION_UNION,
DERIVATION_LIST</code>
- * }.
* @return Return true if this type is derived from
- * the ancestor defined by <code>typeNamespace</code> and <code>name</code>
using only
- * derivation methods from the <code>derivationMethod</code>.
+ * the ancestor defined by <code>typeNamespace</code> and <code>name</code>.
*/
bool derivedFrom(const XMLCh* typeNamespace,
- const XMLCh* name,
- short derivationMethod);
+ const XMLCh* name);
//@}
1.7 +5 -4 xml-xerces/c/src/xercesc/framework/psvi/XSTypeDefinition.cpp
Index: XSTypeDefinition.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/psvi/XSTypeDefinition.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XSTypeDefinition.cpp 21 Nov 2003 17:34:04 -0000 1.6
+++ XSTypeDefinition.cpp 25 Nov 2003 18:08:31 -0000 1.7
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2003/11/25 18:08:31 knoaman
+ * Misc. PSVI updates. Thanks to David Cargill.
+ *
* Revision 1.6 2003/11/21 17:34:04 knoaman
* PSVI update
*
@@ -115,11 +118,9 @@
}
bool XSTypeDefinition::derivedFrom(const XMLCh *typeNamespace,
- const XMLCh *name,
- short derivationMethod)
+ const XMLCh *name)
{
- // REVISIT: review
- // REVISIT: how to check derivationMethod (note: Java doesn't check)...
+ // REVISIT: review
if (!name)
return false;
1.8 +5 -7
xml-xerces/c/src/xercesc/framework/psvi/XSSimpleTypeDefinition.hpp
Index: XSSimpleTypeDefinition.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/framework/psvi/XSSimpleTypeDefinition.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XSSimpleTypeDefinition.hpp 24 Nov 2003 15:45:36 -0000 1.7
+++ XSSimpleTypeDefinition.hpp 25 Nov 2003 18:08:31 -0000 1.8
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2003/11/25 18:08:31 knoaman
+ * Misc. PSVI updates. Thanks to David Cargill.
+ *
* Revision 1.7 2003/11/24 15:45:36 knoaman
* PSVI: finish construction of XSSimpleTypeDefinition
*
@@ -381,15 +384,10 @@
* Convenience method: check if this type is derived from the given
* <code>ancestorType</code>.
* @param ancestorType An ancestor type definition.
- * @param derivationMethod A bit combination representing a subset of {
- * <code>DERIVATION_RESTRICTION, DERIVATION_EXTENSION, DERIVATION_UNION,
DERIVATION_LIST</code>
- * }.
* @return Return true if this type is derived from
- * <code>ancestorType</code> using only derivation methods from the
- * <code>derivationMethod</code>.
+ * <code>ancestorType</code>.
*/
- bool derivedFromType(const XSTypeDefinition* const ancestorType,
- short derivationMethod);
+ bool derivedFromType(const XSTypeDefinition* const ancestorType);
//@}
1.7 +4 -3
xml-xerces/c/src/xercesc/framework/psvi/XSSimpleTypeDefinition.cpp
Index: XSSimpleTypeDefinition.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/framework/psvi/XSSimpleTypeDefinition.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XSSimpleTypeDefinition.cpp 24 Nov 2003 15:45:36 -0000 1.6
+++ XSSimpleTypeDefinition.cpp 25 Nov 2003 18:08:31 -0000 1.7
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2003/11/25 18:08:31 knoaman
+ * Misc. PSVI updates. Thanks to David Cargill.
+ *
* Revision 1.6 2003/11/24 15:45:36 knoaman
* PSVI: finish construction of XSSimpleTypeDefinition
*
@@ -258,11 +261,9 @@
return fBaseType;
}
-bool XSSimpleTypeDefinition::derivedFromType(const XSTypeDefinition * const
ancestorType,
- short derivationMethod)
+bool XSSimpleTypeDefinition::derivedFromType(const XSTypeDefinition * const
ancestorType)
{
// REVISIT: review
- // REVISIT: how to check derivationMethod (note: Java doesn't check)...
if (!ancestorType)
return false;
1.9 +8 -3 xml-xerces/c/src/xercesc/framework/psvi/XSModel.cpp
Index: XSModel.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/psvi/XSModel.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XSModel.cpp 21 Nov 2003 22:34:45 -0000 1.8
+++ XSModel.cpp 25 Nov 2003 18:08:31 -0000 1.9
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2003/11/25 18:08:31 knoaman
+ * Misc. PSVI updates. Thanks to David Cargill.
+ *
* Revision 1.8 2003/11/21 22:34:45 neilg
* More schema component model implementation, thanks to David Cargill.
* In particular, this cleans up and completes the XSModel, XSNamespaceItem,
@@ -263,7 +266,7 @@
, fAddedBuiltinDatatypeValidators(false)
{
fURIStringPool = grammarPool->getURIStringPool();
- fObjFactory = new XSObjectFactory(manager);
+ fObjFactory = new (fMemoryManager) XSObjectFactory(manager);
// Populate XSNamedMaps by going through the components
for (unsigned int i=0; i<XSConstants::MULTIVALUE_FACET; i++)
@@ -365,7 +368,7 @@
, fAddedBuiltinDatatypeValidators(false)
{
fURIStringPool = grammarResolver->getStringPool();
- fObjFactory = new XSObjectFactory(manager);
+ fObjFactory = new (manager) XSObjectFactory(manager);
unsigned int i;
// Populate XSNamedMaps by going through the components
@@ -473,7 +476,7 @@
XMLCh* NameSpace =
XMLString::replicate(grammarsToAdd->elementAt(i)->getTargetNamespace(), manager);
fNamespaceStringList->addElement(NameSpace);
- XSNamespaceItem* namespaceItem = new XSNamespaceItem(this,
grammarsToAdd->elementAt(i), manager);
+ XSNamespaceItem* namespaceItem = new (manager) XSNamespaceItem(this,
grammarsToAdd->elementAt(i), manager);
fXSNamespaceItemList->addElement(namespaceItem);
fHashNamespace->put(NameSpace, namespaceItem);
1.6 +5 -7
xml-xerces/c/src/xercesc/framework/psvi/XSComplexTypeDefinition.hpp
Index: XSComplexTypeDefinition.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/framework/psvi/XSComplexTypeDefinition.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSComplexTypeDefinition.hpp 21 Nov 2003 17:19:30 -0000 1.5
+++ XSComplexTypeDefinition.hpp 25 Nov 2003 18:08:31 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2003/11/25 18:08:31 knoaman
+ * Misc. PSVI updates. Thanks to David Cargill.
+ *
* Revision 1.5 2003/11/21 17:19:30 knoaman
* PSVI update.
*
@@ -263,15 +266,10 @@
* Convenience method: check if this type is derived from the given
* <code>ancestorType</code>.
* @param ancestorType An ancestor type definition.
- * @param derivationMethod A bit combination representing a subset of {
- * <code>DERIVATION_RESTRICTION, DERIVATION_EXTENSION, DERIVATION_UNION,
DERIVATION_LIST</code>
- * }.
* @return Return true if this type is derived from
- * <code>ancestorType</code> using only derivation methods from the
- * <code>derivationMethod</code>.
+ * <code>ancestorType</code>.
*/
- bool derivedFromType(const XSTypeDefinition* const ancestorType,
- short derivationMethod);
+ bool derivedFromType(const XSTypeDefinition* const ancestorType);
//@}
1.7 +4 -3
xml-xerces/c/src/xercesc/framework/psvi/XSComplexTypeDefinition.cpp
Index: XSComplexTypeDefinition.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/framework/psvi/XSComplexTypeDefinition.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XSComplexTypeDefinition.cpp 21 Nov 2003 17:19:30 -0000 1.6
+++ XSComplexTypeDefinition.cpp 25 Nov 2003 18:08:31 -0000 1.7
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2003/11/25 18:08:31 knoaman
+ * Misc. PSVI updates. Thanks to David Cargill.
+ *
* Revision 1.6 2003/11/21 17:19:30 knoaman
* PSVI update.
*
@@ -230,11 +233,9 @@
return fBaseType;
}
-bool XSComplexTypeDefinition::derivedFromType(const XSTypeDefinition * const
ancestorType,
- short derivationMethod)
+bool XSComplexTypeDefinition::derivedFromType(const XSTypeDefinition * const
ancestorType)
{
// REVISIT: review
- // REVISIT: how to check derivationMethod (note: Java doesn't check)...
if (!ancestorType)
return false;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
