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 2003/10/17 23:18:04 UTC
cvs commit: xml-xerces/c/src/xercesc/validators/schema/identity IdentityConstraint.cpp XercesXPath.cpp
peiyongz 2003/10/17 14:18:04
Modified: c/src/xercesc/validators/schema/identity
IdentityConstraint.cpp XercesXPath.cpp
Log:
using XTemplateSerializer
Revision Changes Path
1.7 +7 -28 xml-xerces/c/src/xercesc/validators/schema/identity/IdentityConstraint.cpp
Index: IdentityConstraint.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/IdentityConstraint.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- IdentityConstraint.cpp 14 Oct 2003 15:24:23 -0000 1.6
+++ IdentityConstraint.cpp 17 Oct 2003 21:18:04 -0000 1.7
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2003/10/17 21:18:04 peiyongz
+ * using XTemplateSerializer
+ *
* Revision 1.6 2003/10/14 15:24:23 peiyongz
* Implementation of Serialization/Deserialization
*
@@ -98,6 +101,8 @@
#include <xercesc/validators/schema/identity/IC_Key.hpp>
#include <xercesc/validators/schema/identity/IC_KeyRef.hpp>
+#include <xercesc/internal/XTemplateSerializer.hpp>
+
XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
@@ -210,16 +215,7 @@
* Serialize RefVectorOf<IC_Field>* fFields;
*
***/
- if (serEng.needToWriteTemplateObject(fFields))
- {
- int vectorLength = fFields->size();
- serEng<<vectorLength;
-
- for ( int i = 0 ; i < vectorLength; i++)
- {
- serEng<<fFields->elementAt(i);
- }
- }
+ XTemplateSerializer::storeObject(fFields, serEng);
}
else
@@ -235,24 +231,7 @@
* Deserialize RefVectorOf<IC_Field>* fFields;
*
***/
- if (serEng.needToReadTemplateObject((void**)&fFields))
- {
- if (!fFields)
- {
- fFields = new (fMemoryManager) RefVectorOf<IC_Field>(8, true, fMemoryManager);
- }
-
- serEng.registerTemplateObject(fFields);
-
- int vectorLength = 0;
- serEng>>vectorLength;
- for ( int i = 0 ; i < vectorLength; i++)
- {
- IC_Field* data;
- serEng>>data;
- fFields->addElement(data);
- }
- }
+ XTemplateSerializer::loadObject(&fFields, 8, true, serEng);
}
1.11 +9 -67 xml-xerces/c/src/xercesc/validators/schema/identity/XercesXPath.cpp
Index: XercesXPath.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/XercesXPath.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XercesXPath.cpp 14 Oct 2003 15:24:23 -0000 1.10
+++ XercesXPath.cpp 17 Oct 2003 21:18:04 -0000 1.11
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.11 2003/10/17 21:18:04 peiyongz
+ * using XTemplateSerializer
+ *
* Revision 1.10 2003/10/14 15:24:23 peiyongz
* Implementation of Serialization/Deserialization
*
@@ -111,6 +114,8 @@
#include <xercesc/util/RuntimeException.hpp>
#include <xercesc/util/OutOfMemoryException.hpp>
+#include <xercesc/internal/XTemplateSerializer.hpp>
+
XERCES_CPP_NAMESPACE_BEGIN
@@ -338,47 +343,16 @@
if (serEng.isStoring())
{
/***
- *
* Serialize RefVectorOf<XercesStep>* fSteps;
- *
***/
- if (serEng.needToWriteTemplateObject(fSteps))
- {
- int vectorLength = fSteps->size();
- serEng<<vectorLength;
-
- for ( int i = 0 ; i < vectorLength; i++)
- {
- serEng<<fSteps->elementAt(i);
- }
- }
-
+ XTemplateSerializer::storeObject(fSteps, serEng);
}
else
{
/***
- *
* Deserialize RefVectorOf<XercesStep>* fSteps;
- *
***/
- if (serEng.needToReadTemplateObject((void**)&fSteps))
- {
- if (!fSteps)
- {
- fSteps = new (serEng.getMemoryManager()) RefVectorOf<XercesStep>(8, true, serEng.getMemoryManager());
- }
-
- serEng.registerTemplateObject(fSteps);
-
- int vectorLength = 0;
- serEng>>vectorLength;
- for ( int i = 0 ; i < vectorLength; i++)
- {
- XercesStep* data;
- serEng>>data;
- fSteps->addElement(data);
- }
- }
+ XTemplateSerializer::loadObject(&fSteps, 8, true, serEng);
}
}
@@ -757,21 +731,9 @@
serEng.writeString(fExpression);
/***
- *
* Serialize RefVectorOf<XercesLocationPath>* fLocationPaths;
- *
***/
- if (serEng.needToWriteTemplateObject(fLocationPaths))
- {
- int vectorLength = fLocationPaths->size();
- serEng<<vectorLength;
-
- for ( int i = 0 ; i < vectorLength; i++)
- {
- serEng<<fLocationPaths->elementAt(i);
- }
- }
-
+ XTemplateSerializer::storeObject(fLocationPaths, serEng);
}
else
{
@@ -779,29 +741,9 @@
serEng.readString(fExpression);
/***
- *
* Deserialize RefVectorOf<XercesLocationPath>* fLocationPaths;
- *
***/
- if (serEng.needToReadTemplateObject((void**)&fLocationPaths))
- {
- if (!fLocationPaths)
- {
- fLocationPaths = new (fMemoryManager) RefVectorOf<XercesLocationPath>(8, true, fMemoryManager);
- }
-
- serEng.registerTemplateObject(fLocationPaths);
-
- int vectorLength = 0;
- serEng>>vectorLength;
- for ( int i = 0 ; i < vectorLength; i++)
- {
- XercesLocationPath* data;
- serEng>>data;
- fLocationPaths->addElement(data);
- }
- }
-
+ XTemplateSerializer::loadObject(&fLocationPaths, 8, true, serEng);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org