dbertoni 01/12/14 12:01:52 Modified: c/src/XalanSourceTree XalanSourceTreeParserLiaison.cpp XalanSourceTreeParserLiaison.hpp Log: Changed for renamed XMLParserLiaison member function. Added new accessor function for document number. Revision Changes Path 1.23 +10 -8 xml-xalan/c/src/XalanSourceTree/XalanSourceTreeParserLiaison.cpp Index: XalanSourceTreeParserLiaison.cpp =================================================================== RCS file: /home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeParserLiaison.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- XalanSourceTreeParserLiaison.cpp 2001/11/07 04:06:46 1.22 +++ XalanSourceTreeParserLiaison.cpp 2001/12/14 20:01:52 1.23 @@ -2,7 +2,7 @@ * The Apache Software License, Version 1.1 * * - * Copyright (c) 1999-2000 The Apache Software Foundation. All rights + * Copyright (c) 1999-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -127,8 +127,10 @@ -XalanSourceTreeParserLiaison::XalanSourceTreeParserLiaison(XalanSourceTreeDOMSupport& /* theSupport */) : - m_documentNumber(0), +XalanSourceTreeParserLiaison::XalanSourceTreeParserLiaison( + XalanSourceTreeDOMSupport& /* theSupport */, + DocumentNumberType theStartingNumber) : + m_documentNumber(theStartingNumber), m_xercesParserLiaison(), m_documentMap(), m_persistentDocumentMap(), @@ -138,8 +140,8 @@ -XalanSourceTreeParserLiaison::XalanSourceTreeParserLiaison() : - m_documentNumber(0), +XalanSourceTreeParserLiaison::XalanSourceTreeParserLiaison(DocumentNumberType theStartingNumber) : + m_documentNumber(theStartingNumber), m_xercesParserLiaison(), m_documentMap(), m_persistentDocumentMap(), @@ -281,8 +283,8 @@ -unsigned long -XalanSourceTreeParserLiaison::getDocumentNumber() +XalanSourceTreeParserLiaison::DocumentNumberType +XalanSourceTreeParserLiaison::getNextDocumentNumber() { return m_documentNumber++; } @@ -483,7 +485,7 @@ XalanSourceTreeParserLiaison::createXalanSourceTreeDocument() { XalanSourceTreeDocument* const theNewDocument = - new XalanSourceTreeDocument(m_documentNumber++, m_poolAllText); + new XalanSourceTreeDocument(getNextDocumentNumber(), m_poolAllText); m_documentMap[theNewDocument] = theNewDocument; 1.14 +18 -7 xml-xalan/c/src/XalanSourceTree/XalanSourceTreeParserLiaison.hpp Index: XalanSourceTreeParserLiaison.hpp =================================================================== RCS file: /home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeParserLiaison.hpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- XalanSourceTreeParserLiaison.hpp 2001/11/07 04:06:46 1.13 +++ XalanSourceTreeParserLiaison.hpp 2001/12/14 20:01:52 1.14 @@ -2,7 +2,7 @@ * The Apache Software License, Version 1.1 * * - * Copyright (c) 1999-2000 The Apache Software Foundation. All rights + * Copyright (c) 1999-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -89,15 +89,20 @@ * Construct a XalanSourceTreeParserLiaison instance. * * @param theSupport instance of DOMSupport object + * @param theStartingNumber the starting number for documents * - * @deprecated This constructor is deprecated. Use the default constructor instead. + * @deprecated This constructor is deprecated. Use the next constructor instead. */ - XalanSourceTreeParserLiaison(XalanSourceTreeDOMSupport& theSupport); + XalanSourceTreeParserLiaison( + XalanSourceTreeDOMSupport& theSupport, + DocumentNumberType theStartingNumber = 0); /** * Construct a XalanSourceTreeParserLiaison instance. + * + * @param theStartingNumber the starting number for documents */ - XalanSourceTreeParserLiaison(); + XalanSourceTreeParserLiaison(DocumentNumberType theStartingNumber = 0); virtual ~XalanSourceTreeParserLiaison(); @@ -157,8 +162,8 @@ virtual void destroyDocument(XalanDocument* theDocument); - virtual unsigned long - getDocumentNumber(); + virtual DocumentNumberType + getNextDocumentNumber(); virtual int getIndent() const; @@ -353,11 +358,17 @@ XalanSourceTreeDocument*> DocumentMapType; #endif + DocumentNumberType + getDocumentNumber() const + { + return m_documentNumber; + } + private: // Data members... - unsigned long m_documentNumber; + DocumentNumberType m_documentNumber; XercesParserLiaison m_xercesParserLiaison;
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]