knoaman 2003/01/15 07:49:49
Modified: c/src/xercesc/internal DGXMLScanner.hpp IGXMLScanner.hpp
SGXMLScanner.hpp WFXMLScanner.hpp
XMLScannerResolver.cpp
c/src/xercesc/util XMLUni.cpp XMLUni.hpp
Log:
Change constant declaration name to match its value.
Revision Changes Path
1.3 +4 -1 xml-xerces/c/src/xercesc/internal/DGXMLScanner.hpp
Index: DGXMLScanner.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/DGXMLScanner.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DGXMLScanner.hpp 13 Jan 2003 18:29:41 -0000 1.2
+++ DGXMLScanner.hpp 15 Jan 2003 15:49:49 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2003/01/15 15:49:49 knoaman
+ * Change constant declaration name to match its value.
+ *
* Revision 1.2 2003/01/13 18:29:41 knoaman
* Return proper scanner name.
*
@@ -240,7 +243,7 @@
inline const XMLCh* DGXMLScanner::getName() const
{
- return XMLUni::fgDGScanner;
+ return XMLUni::fgDGXMLScanner;
}
1.3 +4 -1 xml-xerces/c/src/xercesc/internal/IGXMLScanner.hpp
Index: IGXMLScanner.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/IGXMLScanner.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IGXMLScanner.hpp 13 Jan 2003 16:30:18 -0000 1.2
+++ IGXMLScanner.hpp 15 Jan 2003 15:49:49 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2003/01/15 15:49:49 knoaman
+ * Change constant declaration name to match its value.
+ *
* Revision 1.2 2003/01/13 16:30:18 knoaman
* [Bug 14469] Validator doesn't enforce xsd:key.
*
@@ -307,7 +310,7 @@
inline const XMLCh* IGXMLScanner::getName() const
{
- return XMLUni::fgIGScanner;
+ return XMLUni::fgIGXMLScanner;
}
1.3 +4 -1 xml-xerces/c/src/xercesc/internal/SGXMLScanner.hpp
Index: SGXMLScanner.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/SGXMLScanner.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SGXMLScanner.hpp 13 Jan 2003 16:30:18 -0000 1.2
+++ SGXMLScanner.hpp 15 Jan 2003 15:49:49 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2003/01/15 15:49:49 knoaman
+ * Change constant declaration name to match its value.
+ *
* Revision 1.2 2003/01/13 16:30:18 knoaman
* [Bug 14469] Validator doesn't enforce xsd:key.
*
@@ -301,7 +304,7 @@
inline const XMLCh* SGXMLScanner::getName() const
{
- return XMLUni::fgSGScanner;
+ return XMLUni::fgSGXMLScanner;
}
1.3 +4 -1 xml-xerces/c/src/xercesc/internal/WFXMLScanner.hpp
Index: WFXMLScanner.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/WFXMLScanner.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WFXMLScanner.hpp 2 Jan 2003 16:29:05 -0000 1.2
+++ WFXMLScanner.hpp 15 Jan 2003 15:49:49 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2003/01/15 15:49:49 knoaman
+ * Change constant declaration name to match its value.
+ *
* Revision 1.2 2003/01/02 16:29:05 knoaman
* Modified the way we handle element tags.
*
@@ -202,7 +205,7 @@
inline const XMLCh* WFXMLScanner::getName() const
{
- return XMLUni::fgWFScanner;
+ return XMLUni::fgWFXMLScanner;
}
1.4 +11 -11 xml-xerces/c/src/xercesc/internal/XMLScannerResolver.cpp
Index: XMLScannerResolver.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XMLScannerResolver.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLScannerResolver.cpp 9 Dec 2002 15:47:49 -0000 1.3
+++ XMLScannerResolver.cpp 15 Jan 2003 15:49:49 -0000 1.4
@@ -63,10 +63,10 @@
// Includes
// ---------------------------------------------------------------------------
#include <xercesc/internal/XMLScannerResolver.hpp>
-#include <xercesc/internal/IGXMLScanner.hpp>
#include <xercesc/internal/WFXMLScanner.hpp>
-#include <xercesc/internal/SGXMLScanner.hpp>
#include <xercesc/internal/DGXMLScanner.hpp>
+#include <xercesc/internal/SGXMLScanner.hpp>
+#include <xercesc/internal/IGXMLScanner.hpp>
XERCES_CPP_NAMESPACE_BEGIN
@@ -83,13 +83,13 @@
XMLScannerResolver::resolveScanner(const XMLCh* const scannerName,
XMLValidator* const valToAdopt)
{
- if (XMLString::equals(scannerName, XMLUni::fgWFScanner))
+ if (XMLString::equals(scannerName, XMLUni::fgWFXMLScanner))
return new WFXMLScanner(valToAdopt);
- else if (XMLString::equals(scannerName, XMLUni::fgIGScanner))
+ else if (XMLString::equals(scannerName, XMLUni::fgIGXMLScanner))
return new IGXMLScanner(valToAdopt);
- else if (XMLString::equals(scannerName, XMLUni::fgSGScanner))
+ else if (XMLString::equals(scannerName, XMLUni::fgSGXMLScanner))
return new SGXMLScanner(valToAdopt);
- else if (XMLString::equals(scannerName, XMLUni::fgDGScanner))
+ else if (XMLString::equals(scannerName, XMLUni::fgDGXMLScanner))
return new DGXMLScanner(valToAdopt);
// REVISIT: throw an exception or return a default one?
@@ -104,13 +104,13 @@
XMLErrorReporter* const errReporter,
XMLValidator* const valToAdopt)
{
- if (XMLString::equals(scannerName, XMLUni::fgWFScanner))
+ if (XMLString::equals(scannerName, XMLUni::fgWFXMLScanner))
return new WFXMLScanner(docHandler, docTypeHandler, entityHandler,
errReporter, valToAdopt);
- else if (XMLString::equals(scannerName, XMLUni::fgIGScanner))
+ else if (XMLString::equals(scannerName, XMLUni::fgIGXMLScanner))
return new IGXMLScanner(docHandler, docTypeHandler, entityHandler,
errReporter, valToAdopt);
- else if (XMLString::equals(scannerName, XMLUni::fgSGScanner))
+ else if (XMLString::equals(scannerName, XMLUni::fgSGXMLScanner))
return new SGXMLScanner(docHandler, docTypeHandler, entityHandler,
errReporter, valToAdopt);
- else if (XMLString::equals(scannerName, XMLUni::fgDGScanner))
+ else if (XMLString::equals(scannerName, XMLUni::fgDGXMLScanner))
return new DGXMLScanner(docHandler, docTypeHandler, entityHandler,
errReporter, valToAdopt);
// REVISIT: throw an exception or return a default one?
1.27 +5 -5 xml-xerces/c/src/xercesc/util/XMLUni.cpp
Index: XMLUni.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLUni.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- XMLUni.cpp 13 Jan 2003 18:28:00 -0000 1.26
+++ XMLUni.cpp 15 Jan 2003 15:49:49 -0000 1.27
@@ -648,25 +648,25 @@
chLatin_a, chLatin_p, chLatin_o, chLatin_s, chNull
};
-const XMLCh XMLUni::fgWFScanner[] =
+const XMLCh XMLUni::fgWFXMLScanner[] =
{
chLatin_W, chLatin_F, chLatin_X, chLatin_M, chLatin_L, chLatin_S
, chLatin_c, chLatin_a, chLatin_n, chLatin_n, chLatin_e, chLatin_r, chNull
};
-const XMLCh XMLUni::fgIGScanner[] =
+const XMLCh XMLUni::fgIGXMLScanner[] =
{
chLatin_I, chLatin_G, chLatin_X, chLatin_M, chLatin_L, chLatin_S
, chLatin_c, chLatin_a, chLatin_n, chLatin_n, chLatin_e, chLatin_r, chNull
};
-const XMLCh XMLUni::fgSGScanner[] =
+const XMLCh XMLUni::fgSGXMLScanner[] =
{
chLatin_S, chLatin_G, chLatin_X, chLatin_M, chLatin_L, chLatin_S
, chLatin_c, chLatin_a, chLatin_n, chLatin_n, chLatin_e, chLatin_r, chNull
};
-const XMLCh XMLUni::fgDGScanner[] =
+const XMLCh XMLUni::fgDGXMLScanner[] =
{
chLatin_D, chLatin_G, chLatin_X, chLatin_M, chLatin_L, chLatin_S
, chLatin_c, chLatin_a, chLatin_n, chLatin_n, chLatin_e, chLatin_r, chNull
1.24 +5 -5 xml-xerces/c/src/xercesc/util/XMLUni.hpp
Index: XMLUni.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLUni.hpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- XMLUni.hpp 3 Jan 2003 20:09:59 -0000 1.23
+++ XMLUni.hpp 15 Jan 2003 15:49:49 -0000 1.24
@@ -192,10 +192,10 @@
static const XMLCh fgGT[];
static const XMLCh fgQuot[];
static const XMLCh fgApos[];
- static const XMLCh fgWFScanner[];
- static const XMLCh fgIGScanner[];
- static const XMLCh fgSGScanner[];
- static const XMLCh fgDGScanner[];
+ static const XMLCh fgWFXMLScanner[];
+ static const XMLCh fgIGXMLScanner[];
+ static const XMLCh fgSGXMLScanner[];
+ static const XMLCh fgDGXMLScanner[];
// Exception Name
static const XMLCh fgArrayIndexOutOfBoundsException_Name[];
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
