dbertoni 2002/11/21 17:12:53
Modified: c/src/XercesParserLiaison XercesAttrBridge.cpp
XercesAttrBridge.hpp XercesAttrWrapper.cpp
XercesAttrWrapper.hpp
XercesAttrWrapperAllocator.cpp
XercesAttrWrapperAllocator.hpp
XercesAttributeBridgeAllocator.cpp
XercesAttributeBridgeAllocator.hpp
XercesBridgeHelper.cpp XercesBridgeHelper.hpp
XercesBridgeNavigator.cpp XercesBridgeNavigator.hpp
XercesCDATASectionBridge.cpp
XercesCDATASectionBridge.hpp
XercesCDATASectionWrapper.cpp
XercesCDATASectionWrapper.hpp
XercesCommentBridge.cpp XercesCommentBridge.hpp
XercesCommentWrapper.cpp XercesCommentWrapper.hpp
XercesDOMException.cpp XercesDOMException.hpp
XercesDOMImplementationBridge.cpp
XercesDOMImplementationBridge.hpp
XercesDOMImplementationWrapper.cpp
XercesDOMImplementationWrapper.hpp
XercesDOMSupport.cpp XercesDOMSupport.hpp
XercesDOMWalker.cpp XercesDOMWalker.hpp
XercesDOMWrapperException.cpp
XercesDOMWrapperException.hpp
XercesDOM_NodeHack.cpp XercesDOM_NodeHack.hpp
XercesDocumentBridge.cpp XercesDocumentBridge.hpp
XercesDocumentFragmentBridge.cpp
XercesDocumentFragmentBridge.hpp
XercesDocumentNamedNodeListCache.cpp
XercesDocumentNamedNodeListCache.hpp
XercesDocumentTypeBridge.cpp
XercesDocumentTypeBridge.hpp
XercesDocumentTypeWrapper.cpp
XercesDocumentTypeWrapper.hpp
XercesDocumentWrapper.cpp XercesDocumentWrapper.hpp
XercesElementBridge.cpp XercesElementBridge.hpp
XercesElementBridgeAllocator.cpp
XercesElementBridgeAllocator.hpp
XercesElementNamedNodeListCache.cpp
XercesElementNamedNodeListCache.hpp
XercesElementWrapper.cpp XercesElementWrapper.hpp
XercesElementWrapperAllocator.cpp
XercesElementWrapperAllocator.hpp
XercesEntityBridge.cpp XercesEntityBridge.hpp
XercesEntityReferenceBridge.cpp
XercesEntityReferenceBridge.hpp
XercesEntityReferenceWrapper.cpp
XercesEntityReferenceWrapper.hpp
XercesEntityWrapper.cpp XercesEntityWrapper.hpp
XercesLiaisonXalanDOMStringPool.cpp
XercesLiaisonXalanDOMStringPool.hpp
XercesNamedNodeListCache.cpp
XercesNamedNodeListCache.hpp
XercesNamedNodeMapBridge.cpp
XercesNamedNodeMapBridge.hpp
XercesNamedNodeMapWrapper.cpp
XercesNamedNodeMapWrapper.hpp
XercesNodeListBridge.cpp XercesNodeListBridge.hpp
XercesNodeListWrapper.cpp XercesNodeListWrapper.hpp
XercesNotationBridge.cpp XercesNotationBridge.hpp
XercesNotationWrapper.cpp XercesNotationWrapper.hpp
XercesParserLiaison.cpp XercesParserLiaison.hpp
XercesParserLiaisonDefinitions.hpp
XercesProcessingInstructionBridge.cpp
XercesProcessingInstructionBridge.hpp
XercesProcessingInstructionWrapper.cpp
XercesProcessingInstructionWrapper.hpp
XercesTextBridge.cpp XercesTextBridge.hpp
XercesTextBridgeAllocator.cpp
XercesTextBridgeAllocator.hpp XercesTextWrapper.cpp
XercesTextWrapper.hpp
XercesTextWrapperAllocator.cpp
XercesTextWrapperAllocator.hpp
XercesToXalanNodeMap.cpp XercesToXalanNodeMap.hpp
XercesTreeWalker.cpp XercesTreeWalker.hpp
XercesWrapperHelper.cpp XercesWrapperHelper.hpp
XercesWrapperNavigator.cpp
XercesWrapperNavigator.hpp
XercesWrapperToXalanNodeMap.cpp
XercesWrapperToXalanNodeMap.hpp
Added: c/src/XercesParserLiaison XercesBridgeTypes.hpp
XercesWrapperTypes.hpp
Log:
Updates for new C++ namespace support.
Revision Changes Path
1.6 +11 -10 xml-xalan/c/src/XercesParserLiaison/XercesAttrBridge.cpp
Index: XercesAttrBridge.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesAttrBridge.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XercesAttrBridge.cpp 23 Feb 2002 04:02:10 -0000 1.5
+++ XercesAttrBridge.cpp 22 Nov 2002 01:12:49 -0000 1.6
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,8 +73,12 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesAttrBridge::XercesAttrBridge(
- const DOM_Attr&
theXercesAttr,
+ const DOM_AttrType&
theXercesAttr,
const XercesBridgeNavigator& theNavigator) :
XalanAttr(),
m_xercesNode(theXercesAttr),
@@ -348,14 +352,7 @@
void
XercesAttrBridge::setValue(const XalanDOMString& value)
{
- try
- {
- m_xercesNode.setValue(c_wstr(value));
- }
- catch(const DOM_DOMException& theException)
- {
- throw XercesDOMException(theException);
- }
+ XercesBridgeHelper::setNodeValue(m_xercesNode, value);
}
@@ -365,3 +362,7 @@
{
return m_navigator.getOwnerElement(m_xercesNode);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +13 -4 xml-xalan/c/src/XercesParserLiaison/XercesAttrBridge.hpp
Index: XercesAttrBridge.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesAttrBridge.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XercesAttrBridge.hpp 10 Jul 2002 00:40:00 -0000 1.8
+++ XercesAttrBridge.hpp 22 Nov 2002 01:12:49 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -75,10 +75,15 @@
+#include <XercesParserLiaison/XercesBridgeTypes.hpp>
#include <XercesParserLiaison/XercesNodeListBridge.hpp>
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XercesBridgeNavigator;
class XalanElement;
@@ -89,7 +94,7 @@
public:
XercesAttrBridge(
- const DOM_Attr&
theXercesAttr,
+ const DOM_AttrType&
theXercesAttr,
const XercesBridgeNavigator& theNavigator);
virtual
@@ -497,7 +502,7 @@
*
* @return The Xerces node
*/
- DOM_Attr
+ DOM_AttrType
getXercesNode() const
{
return m_xercesNode;
@@ -515,12 +520,16 @@
operator==(const XercesAttrBridge& theRHS) const;
// Data members...
- DOM_Attr m_xercesNode;
+ DOM_AttrType m_xercesNode;
XercesNodeListBridge m_children;
const XercesBridgeNavigator& m_navigator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XercesParserLiaison/XercesAttrWrapper.cpp
Index: XercesAttrWrapper.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesAttrWrapper.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesAttrWrapper.cpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesAttrWrapper.cpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -77,8 +77,12 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesAttrWrapper::XercesAttrWrapper(
- const DOMAttr*
theXercesAttr,
+ const DOMAttrType*
theXercesAttr,
const XercesWrapperNavigator& theNavigator) :
XalanAttr(),
m_xercesNode(theXercesAttr),
@@ -366,3 +370,7 @@
{
return m_navigator.getOwnerElement(m_xercesNode);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +12 -3 xml-xalan/c/src/XercesParserLiaison/XercesAttrWrapper.hpp
Index: XercesAttrWrapper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesAttrWrapper.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesAttrWrapper.hpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesAttrWrapper.hpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -72,6 +72,11 @@
#include <XercesParserLiaison/XercesNodeListWrapper.hpp>
+#include <XercesParserLiaison/XercesWrapperTypes.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
@@ -85,7 +90,7 @@
public:
XercesAttrWrapper(
- const DOMAttr*
theXercesAttr,
+ const DOMAttrType*
theXercesAttr,
const XercesWrapperNavigator& theNavigator);
virtual
@@ -493,7 +498,7 @@
*
* @return The Xerces node
*/
- const DOMAttr*
+ const DOMAttrType*
getXercesNode() const
{
return m_xercesNode;
@@ -511,12 +516,16 @@
operator==(const XercesAttrWrapper& theRHS) const;
// Data members...
- const DOMAttr* const m_xercesNode;
+ const DOMAttrType* const m_xercesNode;
XercesNodeListWrapper m_children;
const XercesWrapperNavigator& m_navigator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1
xml-xalan/c/src/XercesParserLiaison/XercesAttrWrapperAllocator.cpp
Index: XercesAttrWrapperAllocator.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesAttrWrapperAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesAttrWrapperAllocator.cpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesAttrWrapperAllocator.cpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesAttrWrapperAllocator::XercesAttrWrapperAllocator(size_type
theBlockCount) :
m_allocator(theBlockCount)
{
@@ -75,7 +79,7 @@
XercesAttrWrapperAllocator::ObjectType*
XercesAttrWrapperAllocator::create(
- const DOMAttr*
theXercesAttr,
+ const DOMAttrType*
theXercesAttr,
const XercesWrapperNavigator& theNavigator)
{
ObjectType* const theBlock = m_allocator.allocateBlock();
@@ -95,3 +99,7 @@
{
m_allocator.reset();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1
xml-xalan/c/src/XercesParserLiaison/XercesAttrWrapperAllocator.hpp
Index: XercesAttrWrapperAllocator.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesAttrWrapperAllocator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesAttrWrapperAllocator.hpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesAttrWrapperAllocator.hpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -72,6 +72,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XERCESPARSERLIAISON_EXPORT XercesAttrWrapperAllocator
{
public:
@@ -108,7 +112,7 @@
*/
ObjectType*
create(
- const DOMAttr*
theXercesAttr,
+ const DOMAttrType*
theXercesAttr,
const XercesWrapperNavigator& theNavigator);
/**
@@ -151,6 +155,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +10 -2
xml-xalan/c/src/XercesParserLiaison/XercesAttributeBridgeAllocator.cpp
Index: XercesAttributeBridgeAllocator.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesAttributeBridgeAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesAttributeBridgeAllocator.cpp 10 Aug 2000 18:03:35 -0000
1.1
+++ XercesAttributeBridgeAllocator.cpp 22 Nov 2002 01:12:49 -0000
1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesAttributeBridgeAllocator::XercesAttributeBridgeAllocator(size_type
theBlockCount) :
m_allocator(theBlockCount)
{
@@ -75,7 +79,7 @@
XercesAttributeBridgeAllocator::ObjectType*
XercesAttributeBridgeAllocator::create(
- const DOM_Attr&
theXercesAttr,
+ const DOM_AttrType&
theXercesAttr,
const XercesBridgeNavigator& theNavigator)
{
ObjectType* const theBlock = m_allocator.allocateBlock();
@@ -95,3 +99,7 @@
{
m_allocator.reset();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +10 -2
xml-xalan/c/src/XercesParserLiaison/XercesAttributeBridgeAllocator.hpp
Index: XercesAttributeBridgeAllocator.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesAttributeBridgeAllocator.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XercesAttributeBridgeAllocator.hpp 3 Oct 2002 01:31:34 -0000
1.3
+++ XercesAttributeBridgeAllocator.hpp 22 Nov 2002 01:12:49 -0000
1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -72,6 +72,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XERCESPARSERLIAISON_EXPORT XercesAttributeBridgeAllocator
{
public:
@@ -108,7 +112,7 @@
*/
ObjectType*
create(
- const DOM_Attr&
theXercesAttr,
+ const DOM_AttrType&
theXercesAttr,
const XercesBridgeNavigator& theNavigator);
/**
@@ -151,6 +155,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +31 -23
xml-xalan/c/src/XercesParserLiaison/XercesBridgeHelper.cpp
Index: XercesBridgeHelper.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesBridgeHelper.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XercesBridgeHelper.cpp 10 Jul 2002 00:40:00 -0000 1.4
+++ XercesBridgeHelper.cpp 22 Nov 2002 01:12:49 -0000 1.5
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -71,16 +71,20 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
void
XercesBridgeHelper::setNodeValue(
- DOM_Node& theXercesNode,
+ DOM_NodeType& theXercesNode,
const XalanDOMString& nodeValue)
{
try
{
theXercesNode.setNodeValue(XalanDOMStringToXercesDOMString(nodeValue));
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -89,13 +93,13 @@
void
-XercesBridgeHelper::normalize(DOM_Node& theXercesNode)
+XercesBridgeHelper::normalize(DOM_NodeType& theXercesNode)
{
try
{
theXercesNode.normalize();
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -105,7 +109,7 @@
bool
XercesBridgeHelper::isSupported(
- const DOM_Node& theXercesNode,
+ const DOM_NodeType& theXercesNode,
const XalanDOMString& feature,
const XalanDOMString& version)
{
@@ -118,14 +122,14 @@
void
XercesBridgeHelper::setPrefix(
- DOM_Node& theXercesNode,
+ DOM_NodeType& theXercesNode,
const XalanDOMString& prefix)
{
try
{
theXercesNode.setPrefix(XalanDOMStringToXercesDOMString(prefix));
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -135,17 +139,17 @@
const XalanDOMString
XercesBridgeHelper::substringData(
- const DOM_CharacterData& theXercesNode,
- unsigned int offset,
- unsigned int count)
+ const DOM_CharacterDataType& theXercesNode,
+ unsigned int offset,
+ unsigned int count)
{
try
{
- const DOMString
theString(theXercesNode.substringData(offset, count));
+ const DOMStringType
theString(theXercesNode.substringData(offset, count));
return XalanDOMString(theString.rawBuffer(),
theString.length());
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -155,14 +159,14 @@
void
XercesBridgeHelper::appendData(
- DOM_CharacterData& theXercesNode,
+ DOM_CharacterDataType& theXercesNode,
const XalanDOMString& arg)
{
try
{
theXercesNode.appendData(XalanDOMStringToXercesDOMString(arg));
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -172,7 +176,7 @@
void
XercesBridgeHelper::insertData(
- DOM_CharacterData& theXercesNode,
+ DOM_CharacterDataType& theXercesNode,
unsigned int offset,
const XalanDOMString& arg)
{
@@ -180,7 +184,7 @@
{
theXercesNode.insertData(offset,
XalanDOMStringToXercesDOMString(arg));
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -190,15 +194,15 @@
void
XercesBridgeHelper::deleteData(
- DOM_CharacterData& theXercesNode,
- unsigned int offset,
- unsigned int count)
+ DOM_CharacterDataType& theXercesNode,
+ unsigned int offset,
+ unsigned int count)
{
try
{
theXercesNode.deleteData(offset, count);
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -208,7 +212,7 @@
void
XercesBridgeHelper::replaceData(
- DOM_CharacterData& theXercesNode,
+ DOM_CharacterDataType& theXercesNode,
unsigned int offset,
unsigned int count,
const XalanDOMString& arg)
@@ -217,8 +221,12 @@
{
theXercesNode.replaceData(offset, count,
XalanDOMStringToXercesDOMString(arg));
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +26 -17
xml-xalan/c/src/XercesParserLiaison/XercesBridgeHelper.hpp
Index: XercesBridgeHelper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesBridgeHelper.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XercesBridgeHelper.hpp 10 Jul 2002 00:40:00 -0000 1.6
+++ XercesBridgeHelper.hpp 22 Nov 2002 01:12:49 -0000 1.7
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -80,10 +80,15 @@
#include <XercesParserLiaison/XercesBridgeNavigator.hpp>
+#include <XercesParserLiaison/XercesBridgeTypes.hpp>
-class DOM_CharacterData;
+XALAN_DECLARE_XERCES_CLASS(DOM_CharacterData)
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
@@ -93,59 +98,59 @@
typedef unsigned int XercesStringLengthType;
- static const DOMString
+ static const DOMStringType
XalanDOMStringToXercesDOMString(const XalanDOMString& theString)
{
assert(XercesStringLengthType(theString.length()) ==
theString.length());
- return DOMString(&theString[0],
XercesStringLengthType(theString.length()));
+ return DOMStringType(&theString[0],
XercesStringLengthType(theString.length()));
}
static void
setNodeValue(
- DOM_Node& theXercesNode,
+ DOM_NodeType& theXercesNode,
const XalanDOMString& nodeValue);
static void
- normalize(DOM_Node& theXercesNode);
+ normalize(DOM_NodeType& theXercesNode);
static bool
isSupported(
- const DOM_Node& theXercesNode,
+ const DOM_NodeType& theXercesNode,
const XalanDOMString& feature,
const XalanDOMString& version);
static void
setPrefix(
- DOM_Node& theXercesNode,
+ DOM_NodeType& theXercesNode,
const XalanDOMString& prefix);
static const XalanDOMString
substringData(
- const DOM_CharacterData& theXercesNode,
- unsigned int offset,
- unsigned int count);
+ const DOM_CharacterDataType& theXercesNode,
+ unsigned int offset,
+ unsigned int count);
static void
appendData(
- DOM_CharacterData& theXercesNode,
+ DOM_CharacterDataType& theXercesNode,
const XalanDOMString& arg);
static void
insertData(
- DOM_CharacterData& theXercesNode,
+ DOM_CharacterDataType& theXercesNode,
unsigned int offset,
const XalanDOMString& arg);
static void
deleteData(
- DOM_CharacterData& theXercesNode,
- unsigned int offset,
- unsigned int count);
+ DOM_CharacterDataType& theXercesNode,
+ unsigned int offset,
+ unsigned int count);
static void
replaceData(
- DOM_CharacterData& theXercesNode,
+ DOM_CharacterDataType& theXercesNode,
unsigned int offset,
unsigned int count,
const XalanDOMString& arg);
@@ -156,6 +161,10 @@
XercesBridgeHelper(const XercesBridgeHelper&);
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +45 -37
xml-xalan/c/src/XercesParserLiaison/XercesBridgeNavigator.cpp
Index: XercesBridgeNavigator.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesBridgeNavigator.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XercesBridgeNavigator.cpp 29 Nov 2001 15:24:08 -0000 1.8
+++ XercesBridgeNavigator.cpp 22 Nov 2002 01:12:49 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
// I'm using this to distinguish between null nodes, which are valid, and
// an uninitialized cached node address. This is probably bogus, and I'll
// probably just change this to 0, but this is experimental anyway...
@@ -115,7 +119,7 @@
XalanNode*
-XercesBridgeNavigator::mapNode(const DOM_Node& theXercesNode)
const
+XercesBridgeNavigator::mapNode(const DOM_NodeType& theXercesNode) const
{
return m_ownerDocument->mapNode(theXercesNode);
}
@@ -123,14 +127,14 @@
XalanAttr*
-XercesBridgeNavigator::mapNode(const DOM_Attr& theXercesNode)
const
+XercesBridgeNavigator::mapNode(const DOM_AttrType& theXercesNode) const
{
return m_ownerDocument->mapNode(theXercesNode);
}
-DOM_Node
+DOM_NodeType
XercesBridgeNavigator::mapNode(const XalanNode* theXalanNode)
const
{
return m_ownerDocument->mapNode(theXalanNode);
@@ -138,7 +142,7 @@
-DOM_Attr
+DOM_AttrType
XercesBridgeNavigator::mapNode(const XalanAttr* theXalanNode)
const
{
return m_ownerDocument->mapNode(theXalanNode);
@@ -147,7 +151,7 @@
XalanNode*
-XercesBridgeNavigator::getParentNode(const DOM_Node& theXercesNode) const
+XercesBridgeNavigator::getParentNode(const DOM_NodeType& theXercesNode)
const
{
if (m_parentNode == invalidNodeAddress)
{
@@ -164,7 +168,7 @@
XalanNode*
-XercesBridgeNavigator::getPreviousSibling(const DOM_Node& theXercesNode)
const
+XercesBridgeNavigator::getPreviousSibling(const DOM_NodeType&
theXercesNode) const
{
if (m_previousSibling == invalidNodeAddress)
{
@@ -181,7 +185,7 @@
XalanNode*
-XercesBridgeNavigator::getNextSibling(const DOM_Node& theXercesNode)
const
+XercesBridgeNavigator::getNextSibling(const DOM_NodeType& theXercesNode)
const
{
if (m_nextSibling == invalidNodeAddress)
{
@@ -198,7 +202,7 @@
XalanNode*
-XercesBridgeNavigator::getFirstChild(const DOM_Node& theXercesNode) const
+XercesBridgeNavigator::getFirstChild(const DOM_NodeType& theXercesNode)
const
{
if (m_firstChild == invalidNodeAddress)
{
@@ -215,7 +219,7 @@
XalanNode*
-XercesBridgeNavigator::getLastChild(const DOM_Node& theXercesNode) const
+XercesBridgeNavigator::getLastChild(const DOM_NodeType&
theXercesNode) const
{
if (m_lastChild == invalidNodeAddress)
{
@@ -233,23 +237,23 @@
XalanNode*
XercesBridgeNavigator::insertBefore(
- DOM_Node& theXercesParent,
+ DOM_NodeType& theXercesParent,
XalanNode* newChild,
XalanNode* refChild) const
{
assert(newChild != 0);
// Get the corresponding Xerces nodes...
- const DOM_Node theNewChild = m_ownerDocument->mapNode(newChild);
- const DOM_Node theRefChild = m_ownerDocument->mapNode(refChild);
+ const DOM_NodeType theNewChild =
m_ownerDocument->mapNode(newChild);
+ const DOM_NodeType theRefChild =
m_ownerDocument->mapNode(refChild);
try
{
- const DOM_Node theXercesResult =
+ const DOM_NodeType theXercesResult =
theXercesParent.insertBefore(theNewChild, theRefChild);
assert(m_ownerDocument->mapNode(theXercesResult) == newChild);
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -261,24 +265,24 @@
XalanNode*
XercesBridgeNavigator:: replaceChild(
- DOM_Node& theXercesParent,
- XalanNode* newChild,
- XalanNode* oldChild) const
+ DOM_NodeType& theXercesParent,
+ XalanNode* newChild,
+ XalanNode* oldChild) const
{
assert(newChild != 0);
assert(oldChild != 0);
// Get the corresponding Xerces nodes...
- const DOM_Node theNewChild = m_ownerDocument->mapNode(newChild);
- const DOM_Node theOldChild = m_ownerDocument->mapNode(oldChild);
+ const DOM_NodeType theNewChild =
m_ownerDocument->mapNode(newChild);
+ const DOM_NodeType theOldChild =
m_ownerDocument->mapNode(oldChild);
try
{
- const DOM_Node theXercesResult =
+ const DOM_NodeType theXercesResult =
theXercesParent.replaceChild(theNewChild, theOldChild);
assert(m_ownerDocument->mapNode(theXercesResult) == oldChild);
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -290,21 +294,21 @@
XalanNode*
XercesBridgeNavigator::removeChild(
- DOM_Node& theXercesParent,
- XalanNode* oldChild) const
+ DOM_NodeType& theXercesParent,
+ XalanNode* oldChild) const
{
assert(oldChild != 0);
// Get the corresponding Xerces nodes...
- const DOM_Node theOldChild = m_ownerDocument->mapNode(oldChild);
+ const DOM_NodeType theOldChild =
m_ownerDocument->mapNode(oldChild);
try
{
- const DOM_Node theXercesResult =
+ const DOM_NodeType theXercesResult =
theXercesParent.removeChild(theOldChild);
assert(m_ownerDocument->mapNode(theXercesResult) == oldChild);
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -316,8 +320,8 @@
XalanNode*
XercesBridgeNavigator::appendChild(
- DOM_Node& theXercesParent,
- XalanNode* newChild) const
+ DOM_NodeType& theXercesParent,
+ XalanNode* newChild) const
{
return insertBefore(theXercesParent, newChild, 0);
}
@@ -326,7 +330,7 @@
XalanElement*
-XercesBridgeNavigator::getOwnerElement(const DOM_Attr& theXercesAttr)
const
+XercesBridgeNavigator::getOwnerElement(const DOM_AttrType& theXercesAttr)
const
{
if (m_parentNode != invalidNodeAddress)
{
@@ -348,9 +352,9 @@
XalanNode*
XercesBridgeNavigator::cloneNode(
- const XalanNode* theXalanNode,
- const DOM_Node& theXercesNode,
- bool deep) const
+ const XalanNode* theXalanNode,
+ const DOM_NodeType& theXercesNode,
+ bool deep) const
{
return m_ownerDocument->internalCloneNode(theXalanNode, theXercesNode,
deep);
}
@@ -359,19 +363,19 @@
XalanText*
XercesBridgeNavigator::splitText(
- DOM_Text& theXercesText,
+ DOM_TextType& theXercesText,
unsigned int offset) const
{
XalanText* theXalanText = 0;
try
{
- DOM_Text theNewXercesText =
theXercesText.splitText(offset);
+ DOM_TextType theNewXercesText =
theXercesText.splitText(offset);
assert(theXercesText.isNull() == false);
theXalanText =
m_ownerDocument->createBridgeNode(theNewXercesText, 0, true);
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -382,7 +386,11 @@
const XalanDOMString&
-XercesBridgeNavigator:: getPooledString(const DOMString&
theString) const
+XercesBridgeNavigator:: getPooledString(const DOMStringType&
theString) const
{
return m_ownerDocument->getPooledString(theString.rawBuffer(),
theString.length());
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +38 -30
xml-xalan/c/src/XercesParserLiaison/XercesBridgeNavigator.hpp
Index: XercesBridgeNavigator.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesBridgeNavigator.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XercesBridgeNavigator.hpp 29 Nov 2001 15:24:08 -0000 1.7
+++ XercesBridgeNavigator.hpp 22 Nov 2002 01:12:49 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -71,15 +71,19 @@
-class DOM_Attr;
-class DOM_Node;
+#include <XercesParserLiaison/XercesBridgeTypes.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XercesDocumentBridge;
class XalanAttr;
class XalanElement;
class XalanNode;
class XalanText;
-class DOM_Text;
-class DOMString;
@@ -111,15 +115,15 @@
}
XalanNode*
- mapNode(const DOM_Node& theXercesNode) const;
+ mapNode(const DOM_NodeType& theXercesNode) const;
XalanAttr*
- mapNode(const DOM_Attr& theXercesNode) const;
+ mapNode(const DOM_AttrType& theXercesNode) const;
- DOM_Node
+ DOM_NodeType
mapNode(const XalanNode* theXalanNode) const;
- DOM_Attr
+ DOM_AttrType
mapNode(const XalanAttr* theXercesNode) const;
unsigned long
@@ -135,7 +139,7 @@
}
XalanNode*
- getParentNode(const DOM_Node& theXercesNode) const;
+ getParentNode(const DOM_NodeType& theXercesNode) const;
XalanNode*
getParentNode() const
@@ -150,7 +154,7 @@
}
XalanNode*
- getPreviousSibling(const DOM_Node& theXercesNode) const;
+ getPreviousSibling(const DOM_NodeType& theXercesNode) const;
XalanNode*
getPreviousSibling() const
@@ -165,7 +169,7 @@
}
XalanNode*
- getNextSibling(const DOM_Node& theXercesNode) const;
+ getNextSibling(const DOM_NodeType& theXercesNode) const;
XalanNode*
getNextSibling() const
@@ -180,7 +184,7 @@
}
XalanNode*
- getFirstChild(const DOM_Node& theXercesNode) const;
+ getFirstChild(const DOM_NodeType& theXercesNode) const;
XalanNode*
getFirstChild() const
@@ -195,7 +199,7 @@
}
XalanNode*
- getLastChild(const DOM_Node& theXercesNode) const;
+ getLastChild(const DOM_NodeType& theXercesNode) const;
XalanNode*
getLastChild() const
@@ -211,38 +215,38 @@
XalanNode*
insertBefore(
- DOM_Node& theXercesParent,
- XalanNode* newChild,
- XalanNode* refChild) const;
+ DOM_NodeType& theXercesParent,
+ XalanNode* newChild,
+ XalanNode* refChild) const;
XalanNode*
replaceChild(
- DOM_Node& theXercesParent,
- XalanNode* newChild,
- XalanNode* oldChild) const;
+ DOM_NodeType& theXercesParent,
+ XalanNode* newChild,
+ XalanNode* oldChild) const;
XalanNode*
removeChild(
- DOM_Node& theXercesParent,
- XalanNode* oldChild) const;
+ DOM_NodeType& theXercesParent,
+ XalanNode* oldChild) const;
XalanNode*
appendChild(
- DOM_Node& theXercesParent,
- XalanNode* newChild) const;
+ DOM_NodeType& theXercesParent,
+ XalanNode* newChild) const;
XalanElement*
- getOwnerElement(const DOM_Attr& theXercesAttr) const;
+ getOwnerElement(const DOM_AttrType& theXercesAttr) const;
XalanNode*
cloneNode(
- const XalanNode* theXalanNode,
- const DOM_Node& theXercesNode,
- bool deep) const;
+ const XalanNode* theXalanNode,
+ const DOM_NodeType& theXercesNode,
+ bool deep) const;
XalanText*
splitText(
- DOM_Text& theXercesText,
+ DOM_TextType& theXercesText,
unsigned int offset) const;
/**
@@ -253,7 +257,7 @@
* @return A const reference to the pooled string.
*/
const XalanDOMString&
- getPooledString(const DOMString& theString) const;
+ getPooledString(const DOMStringType& theString) const;
private:
@@ -276,6 +280,10 @@
unsigned long m_index;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +10 -4
xml-xalan/c/src/XercesParserLiaison/XercesCDATASectionBridge.cpp
Index: XercesCDATASectionBridge.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesCDATASectionBridge.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XercesCDATASectionBridge.cpp 23 Feb 2002 04:02:10 -0000 1.6
+++ XercesCDATASectionBridge.cpp 22 Nov 2002 01:12:49 -0000 1.7
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -72,8 +72,12 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesCDATASectionBridge::XercesCDATASectionBridge(
- const DOM_CDATASection&
theXercesCDATASection,
+ const DOM_CDATASectionType&
theXercesCDATASection,
const XercesBridgeNavigator& theNavigator) :
XalanCDATASection(),
m_xercesNode(theXercesCDATASection),
@@ -279,8 +283,6 @@
const XalanDOMString&
XercesCDATASectionBridge::getNamespaceURI() const
{
- const DOMString theString();
-
return m_navigator.getPooledString(m_xercesNode.getNamespaceURI());
}
@@ -405,3 +407,7 @@
{
return isXMLWhitespace(getData());
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +16 -4
xml-xalan/c/src/XercesParserLiaison/XercesCDATASectionBridge.hpp
Index: XercesCDATASectionBridge.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesCDATASectionBridge.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XercesCDATASectionBridge.hpp 10 Jul 2002 00:40:00 -0000 1.7
+++ XercesCDATASectionBridge.hpp 22 Nov 2002 01:12:49 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -75,6 +75,14 @@
+#include <XercesParserLiaison/XercesBridgeTypes.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XercesBridgeNavigator;
@@ -84,7 +92,7 @@
public:
XercesCDATASectionBridge(
- const DOM_CDATASection&
theXercesCDATASection,
+ const DOM_CDATASectionType&
theXercesCDATASection,
const XercesBridgeNavigator& theNavigator);
virtual
@@ -598,7 +606,7 @@
*
* @return The Xerces node
*/
- DOM_CDATASection
+ DOM_CDATASectionType
getXercesNode() const
{
return m_xercesNode;
@@ -616,10 +624,14 @@
operator==(const XercesCDATASectionBridge& theRHS) const;
// Data members...
- DOM_CDATASection m_xercesNode;
+ DOM_CDATASectionType m_xercesNode;
const XercesBridgeNavigator& m_navigator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -3
xml-xalan/c/src/XercesParserLiaison/XercesCDATASectionWrapper.cpp
Index: XercesCDATASectionWrapper.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesCDATASectionWrapper.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesCDATASectionWrapper.cpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesCDATASectionWrapper.cpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -77,8 +77,12 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesCDATASectionWrapper::XercesCDATASectionWrapper(
- const DOMCDATASection*
theXercesCDATASection,
+ const DOMCDATASectionType*
theXercesCDATASection,
const XercesWrapperNavigator& theNavigator) :
XalanCDATASection(),
m_xercesNode(theXercesCDATASection),
@@ -278,8 +282,6 @@
const XalanDOMString&
XercesCDATASectionWrapper::getNamespaceURI() const
{
- const DOMString theString();
-
return m_navigator.getPooledString(m_xercesNode->getNamespaceURI());
}
@@ -405,3 +407,7 @@
{
return isXMLWhitespace(getData());
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +15 -4
xml-xalan/c/src/XercesParserLiaison/XercesCDATASectionWrapper.hpp
Index: XercesCDATASectionWrapper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesCDATASectionWrapper.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesCDATASectionWrapper.hpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesCDATASectionWrapper.hpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -67,7 +67,14 @@
-class DOMCDATASection;
+#include <XercesParserLiaison/XercesWrapperTypes.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XercesWrapperNavigator;
@@ -77,7 +84,7 @@
public:
XercesCDATASectionWrapper(
- const DOMCDATASection*
theXercesCDATASection,
+ const DOMCDATASectionType*
theXercesCDATASection,
const XercesWrapperNavigator& theNavigator);
virtual
@@ -591,7 +598,7 @@
*
* @return The Xerces node
*/
- const DOMCDATASection*
+ const DOMCDATASectionType*
getXercesNode() const
{
return m_xercesNode;
@@ -609,10 +616,14 @@
operator==(const XercesCDATASectionWrapper& theRHS) const;
// Data members...
- const DOMCDATASection* m_xercesNode;
+ const DOMCDATASectionType* m_xercesNode;
const XercesWrapperNavigator& m_navigator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +10 -2
xml-xalan/c/src/XercesParserLiaison/XercesCommentBridge.cpp
Index: XercesCommentBridge.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesCommentBridge.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XercesCommentBridge.cpp 23 Feb 2002 04:02:10 -0000 1.5
+++ XercesCommentBridge.cpp 22 Nov 2002 01:12:49 -0000 1.6
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -68,8 +68,12 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesCommentBridge::XercesCommentBridge(
- const DOM_Comment&
theXercesComment,
+ const DOM_CommentType&
theXercesComment,
const XercesBridgeNavigator& theNavigator) :
XalanComment(),
m_xercesNode(theXercesComment),
@@ -381,3 +385,7 @@
{
XercesBridgeHelper::replaceData(m_xercesNode, offset, count, arg);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +16 -4
xml-xalan/c/src/XercesParserLiaison/XercesCommentBridge.hpp
Index: XercesCommentBridge.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesCommentBridge.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XercesCommentBridge.hpp 10 Jul 2002 00:40:00 -0000 1.7
+++ XercesCommentBridge.hpp 22 Nov 2002 01:12:49 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -75,6 +75,14 @@
+#include <XercesParserLiaison/XercesBridgeTypes.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XercesBridgeNavigator;
@@ -84,7 +92,7 @@
public:
XercesCommentBridge(
- const DOM_Comment&
theXercesComment,
+ const DOM_CommentType&
theXercesComment,
const XercesBridgeNavigator& theNavigator);
virtual
@@ -566,7 +574,7 @@
*
* @return The Xerces node
*/
- DOM_Comment
+ DOM_CommentType
getXercesNode() const
{
return m_xercesNode;
@@ -586,10 +594,14 @@
operator==(const XercesCommentBridge& theRHS) const;
// Data members...
- DOM_Comment m_xercesNode;
+ DOM_CommentType m_xercesNode;
const XercesBridgeNavigator& m_navigator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1
xml-xalan/c/src/XercesParserLiaison/XercesCommentWrapper.cpp
Index: XercesCommentWrapper.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesCommentWrapper.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesCommentWrapper.cpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesCommentWrapper.cpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -73,8 +73,12 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesCommentWrapper::XercesCommentWrapper(
- const DOMComment*
theXercesComment,
+ const DOMCommentType*
theXercesComment,
const XercesWrapperNavigator& theNavigator) :
XalanComment(),
m_xercesNode(theXercesComment),
@@ -381,3 +385,7 @@
{
throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +11 -4
xml-xalan/c/src/XercesParserLiaison/XercesCommentWrapper.hpp
Index: XercesCommentWrapper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesCommentWrapper.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesCommentWrapper.hpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesCommentWrapper.hpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -64,10 +64,14 @@
#include <XalanDOM/XalanComment.hpp>
+#include <XercesParserLiaison/XercesWrapperTypes.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
-class DOMComment;
class XercesWrapperNavigator;
@@ -77,7 +81,7 @@
public:
XercesCommentWrapper(
- const DOMComment*
theXercesComment,
+ const DOMCommentType*
theXercesComment,
const XercesWrapperNavigator& theNavigator);
virtual
@@ -559,7 +563,7 @@
*
* @return The Xerces node
*/
- const DOMComment*
+ const DOMCommentType*
getXercesNode() const
{
return m_xercesNode;
@@ -579,11 +583,14 @@
operator==(const XercesCommentWrapper& theRHS) const;
// Data members...
- const DOMComment* const m_xercesNode;
+ const DOMCommentType* const m_xercesNode;
const XercesWrapperNavigator& m_navigator;
};
+
+
+XALAN_CPP_NAMESPACE_END
#endif // !defined(XERCESCOMMENTWRAPPER_HEADER_GUARD_1357924680)
1.3 +26 -18
xml-xalan/c/src/XercesParserLiaison/XercesDOMException.cpp
Index: XercesDOMException.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDOMException.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesDOMException.cpp 27 Feb 2001 19:08:01 -0000 1.2
+++ XercesDOMException.cpp 22 Nov 2002 01:12:49 -0000 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -62,6 +62,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesDOMException::XercesDOMException(ExceptionCode code) :
XalanDOMException(code)
{
@@ -69,7 +73,7 @@
-XercesDOMException::XercesDOMException(const DOM_DOMException&
theException) :
+XercesDOMException::XercesDOMException(const DOM_DOMExceptionType&
theException) :
XalanDOMException(translateErrorCode(theException.code))
{
}
@@ -90,69 +94,69 @@
XercesDOMException::ExceptionCode
-XercesDOMException::translateErrorCode(DOM_DOMException::ExceptionCode
theCode)
+XercesDOMException::translateErrorCode(DOM_DOMExceptionType::ExceptionCode
theCode)
{
ExceptionCode theXalanCode = UNKNOWN_ERR;
switch(theCode)
{
- case DOM_DOMException::INDEX_SIZE_ERR:
+ case DOM_DOMExceptionType::INDEX_SIZE_ERR:
theXalanCode = INDEX_SIZE_ERR;
break;
- case DOM_DOMException::DOMSTRING_SIZE_ERR:
+ case DOM_DOMExceptionType::DOMSTRING_SIZE_ERR:
theXalanCode = DOMSTRING_SIZE_ERR;
break;
- case DOM_DOMException::HIERARCHY_REQUEST_ERR:
+ case DOM_DOMExceptionType::HIERARCHY_REQUEST_ERR:
theXalanCode = HIERARCHY_REQUEST_ERR;
break;
- case DOM_DOMException::WRONG_DOCUMENT_ERR:
+ case DOM_DOMExceptionType::WRONG_DOCUMENT_ERR:
theXalanCode = WRONG_DOCUMENT_ERR;
break;
- case DOM_DOMException::INVALID_CHARACTER_ERR:
+ case DOM_DOMExceptionType::INVALID_CHARACTER_ERR:
theXalanCode = INVALID_CHARACTER_ERR;
break;
- case DOM_DOMException::NO_DATA_ALLOWED_ERR:
+ case DOM_DOMExceptionType::NO_DATA_ALLOWED_ERR:
theXalanCode = NO_DATA_ALLOWED_ERR;
break;
- case DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR:
+ case DOM_DOMExceptionType::NO_MODIFICATION_ALLOWED_ERR:
theXalanCode = NO_MODIFICATION_ALLOWED_ERR;
break;
- case DOM_DOMException::NOT_FOUND_ERR:
+ case DOM_DOMExceptionType::NOT_FOUND_ERR:
theXalanCode = NOT_FOUND_ERR;
break;
- case DOM_DOMException::NOT_SUPPORTED_ERR:
+ case DOM_DOMExceptionType::NOT_SUPPORTED_ERR:
theXalanCode = INDEX_SIZE_ERR;
break;
- case DOM_DOMException::INUSE_ATTRIBUTE_ERR:
+ case DOM_DOMExceptionType::INUSE_ATTRIBUTE_ERR:
theXalanCode = INUSE_ATTRIBUTE_ERR;
break;
- case DOM_DOMException::INVALID_STATE_ERR:
+ case DOM_DOMExceptionType::INVALID_STATE_ERR:
theXalanCode = INVALID_STATE_ERR;
break;
- case DOM_DOMException::SYNTAX_ERR:
+ case DOM_DOMExceptionType::SYNTAX_ERR:
theXalanCode = SYNTAX_ERR;
break;
- case DOM_DOMException::INVALID_MODIFICATION_ERR:
+ case DOM_DOMExceptionType::INVALID_MODIFICATION_ERR:
theXalanCode = INVALID_MODIFICATION_ERR;
break;
- case DOM_DOMException::NAMESPACE_ERR:
+ case DOM_DOMExceptionType::NAMESPACE_ERR:
theXalanCode = NAMESPACE_ERR;
break;
- case DOM_DOMException::INVALID_ACCESS_ERR:
+ case DOM_DOMExceptionType::INVALID_ACCESS_ERR:
theXalanCode = INVALID_ACCESS_ERR;
break;
@@ -163,3 +167,7 @@
return theXalanCode;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +16 -3
xml-xalan/c/src/XercesParserLiaison/XercesDOMException.hpp
Index: XercesDOMException.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDOMException.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XercesDOMException.hpp 10 Jul 2002 00:40:00 -0000 1.4
+++ XercesDOMException.hpp 22 Nov 2002 01:12:49 -0000 1.5
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -75,6 +75,15 @@
+#include <XercesParserLiaison/XercesBridgeTypes.hpp>
+#include <XercesParserLiaison/XercesWrapperTypes.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XERCESPARSERLIAISON_EXPORT XercesDOMException : public
XalanDOMException
{
public:
@@ -96,7 +105,7 @@
*
* @param code The Xerces DOM_DOMException instance.
*/
- XercesDOMException(const DOM_DOMException& theException);
+ XercesDOMException(const DOM_DOMExceptionType& theException);
/**
* Copy constructor.
@@ -119,8 +128,12 @@
private:
static ExceptionCode
- translateErrorCode(DOM_DOMException::ExceptionCode theCode);
+ translateErrorCode(DOM_DOMExceptionType::ExceptionCode theCode);
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +10 -2
xml-xalan/c/src/XercesParserLiaison/XercesDOMImplementationBridge.cpp
Index: XercesDOMImplementationBridge.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDOMImplementationBridge.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XercesDOMImplementationBridge.cpp 10 Jul 2002 00:40:00 -0000 1.4
+++ XercesDOMImplementationBridge.cpp 22 Nov 2002 01:12:49 -0000 1.5
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -74,7 +74,11 @@
-XercesDOMImplementationBridge::XercesDOMImplementationBridge(DOM_DOMImplementation&
theXercesDOMImplementation) :
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
+XercesDOMImplementationBridge::XercesDOMImplementationBridge(DOM_DOMImplementationType&
theXercesDOMImplementation) :
XalanDOMImplementation(),
m_xercesNode(theXercesDOMImplementation)
{
@@ -131,3 +135,7 @@
return 0;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +15 -4
xml-xalan/c/src/XercesParserLiaison/XercesDOMImplementationBridge.hpp
Index: XercesDOMImplementationBridge.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDOMImplementationBridge.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XercesDOMImplementationBridge.hpp 10 Mar 2002 17:57:17 -0000 1.3
+++ XercesDOMImplementationBridge.hpp 22 Nov 2002 01:12:49 -0000 1.4
@@ -67,7 +67,14 @@
-class DOM_DOMImplementation;
+#include <XercesParserLiaison/XercesBridgeTypes.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XercesBridgeNavigator;
@@ -76,7 +83,7 @@
{
public:
- XercesDOMImplementationBridge(DOM_DOMImplementation&
theXercesDOMImplementation);
+ XercesDOMImplementationBridge(DOM_DOMImplementationType&
theXercesDOMImplementation);
virtual
~XercesDOMImplementationBridge();
@@ -153,7 +160,7 @@
*
* @return The Xerces node
*/
- DOM_DOMImplementation&
+ DOM_DOMImplementationType&
getXercesNode() const
{
return m_xercesNode;
@@ -175,8 +182,12 @@
// Data members...
- DOM_DOMImplementation& m_xercesNode;
+ DOM_DOMImplementationType& m_xercesNode;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1
xml-xalan/c/src/XercesParserLiaison/XercesDOMImplementationWrapper.cpp
Index: XercesDOMImplementationWrapper.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDOMImplementationWrapper.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesDOMImplementationWrapper.cpp 3 Oct 2002 01:32:42 -0000
1.1
+++ XercesDOMImplementationWrapper.cpp 22 Nov 2002 01:12:49 -0000
1.2
@@ -70,7 +70,11 @@
-XercesDOMImplementationWrapper::XercesDOMImplementationWrapper(DOMImplementation*
theXercesDOMImplementation) :
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
+XercesDOMImplementationWrapper::XercesDOMImplementationWrapper(DOMImplementationType*
theXercesDOMImplementation) :
XalanDOMImplementation(),
m_xercesNode(theXercesDOMImplementation)
{
@@ -126,3 +130,7 @@
return 0;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +15 -4
xml-xalan/c/src/XercesParserLiaison/XercesDOMImplementationWrapper.hpp
Index: XercesDOMImplementationWrapper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDOMImplementationWrapper.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesDOMImplementationWrapper.hpp 3 Oct 2002 01:32:42 -0000
1.1
+++ XercesDOMImplementationWrapper.hpp 22 Nov 2002 01:12:49 -0000
1.2
@@ -67,7 +67,14 @@
-class DOMImplementation;
+#include <XercesParserLiaison/XercesWrapperTypes.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XercesWrapperNavigator;
@@ -76,7 +83,7 @@
{
public:
- XercesDOMImplementationWrapper(DOMImplementation*
theXercesDOMImplementation);
+ XercesDOMImplementationWrapper(DOMImplementationType*
theXercesDOMImplementation);
virtual
~XercesDOMImplementationWrapper();
@@ -153,7 +160,7 @@
*
* @return The Xerces node
*/
- DOMImplementation*
+ DOMImplementationType*
getXercesNode() const
{
return m_xercesNode;
@@ -175,8 +182,12 @@
// Data members...
- DOMImplementation* const m_xercesNode;
+ DOMImplementationType* const m_xercesNode;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +9 -1 xml-xalan/c/src/XercesParserLiaison/XercesDOMSupport.cpp
Index: XercesDOMSupport.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDOMSupport.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XercesDOMSupport.cpp 2 Mar 2002 07:18:38 -0000 1.8
+++ XercesDOMSupport.cpp 22 Nov 2002 01:12:49 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesDOMSupport::XercesDOMSupport() :
DOMSupport(),
m_domSupportDefault()
@@ -112,3 +116,7 @@
{
return DOMServices::isNodeAfter(node1, node2);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +9 -1 xml-xalan/c/src/XercesParserLiaison/XercesDOMSupport.hpp
Index: XercesDOMSupport.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDOMSupport.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XercesDOMSupport.hpp 2 Mar 2002 07:18:38 -0000 1.7
+++ XercesDOMSupport.hpp 22 Nov 2002 01:12:49 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XERCESPARSERLIAISON_EXPORT XercesDOMSupport : public DOMSupport
{
public:
@@ -99,6 +103,10 @@
DOMSupportDefault m_domSupportDefault;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +15 -7 xml-xalan/c/src/XercesParserLiaison/XercesDOMWalker.cpp
Index: XercesDOMWalker.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDOMWalker.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesDOMWalker.cpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesDOMWalker.cpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -64,6 +64,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesDOMWalker::XercesDOMWalker()
{
}
@@ -77,15 +81,15 @@
void
-XercesDOMWalker::traverse(const DOMNode* pos)
+XercesDOMWalker::traverse(const DOMNodeType* pos)
{
- const DOMNode* thePos = pos;
+ const DOMNodeType* thePos = pos;
while(thePos != 0)
{
startNode(thePos);
- const DOMNode* nextNode = thePos->getFirstChild();
+ const DOMNodeType* nextNode = thePos->getFirstChild();
while(nextNode == 0)
{
@@ -114,16 +118,16 @@
void
XercesDOMWalker::traverse(
- const DOMNode* pos,
- const DOMNode* parent)
+ const DOMNodeType* pos,
+ const DOMNodeType* parent)
{
- const DOMNode* thePos = pos;
+ const DOMNodeType* thePos = pos;
while(parent != thePos)
{
startNode(thePos);
- const DOMNode* nextNode = thePos->getFirstChild();
+ const DOMNodeType* nextNode = thePos->getFirstChild();
while(nextNode == 0)
{
@@ -147,3 +151,7 @@
thePos = nextNode;
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +11 -6 xml-xalan/c/src/XercesParserLiaison/XercesDOMWalker.hpp
Index: XercesDOMWalker.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDOMWalker.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesDOMWalker.hpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesDOMWalker.hpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -60,10 +60,11 @@
#include <XercesParserLiaison/XercesParserLiaisonDefinitions.hpp>
+#include <XercesParserLiaison/XercesWrapperTypes.hpp>
-class DOMNode;
+XALAN_CPP_NAMESPACE_BEGIN
@@ -83,24 +84,28 @@
* Perform a pre-order traversal non-recursive style.
*/
virtual void
- traverse(const DOMNode* pos);
+ traverse(const DOMNodeType* pos);
/**
* Perform a pre-order traversal non-recursive style.
*/
virtual void
traverse(
- const DOMNode* pos,
- const DOMNode* parent);
+ const DOMNodeType* pos,
+ const DOMNodeType* parent);
protected:
virtual void
- startNode(const DOMNode* node) = 0;
+ startNode(const DOMNodeType* node) = 0;
virtual void
- endNode(const DOMNode* node) = 0;
+ endNode(const DOMNodeType* node) = 0;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +25 -17
xml-xalan/c/src/XercesParserLiaison/XercesDOMWrapperException.cpp
Index: XercesDOMWrapperException.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDOMWrapperException.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesDOMWrapperException.cpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesDOMWrapperException.cpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -62,6 +62,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesDOMWrapperException::XercesDOMWrapperException(ExceptionCode code) :
XalanDOMException(code)
{
@@ -69,7 +73,7 @@
-XercesDOMWrapperException::XercesDOMWrapperException(const DOMException&
theException) :
+XercesDOMWrapperException::XercesDOMWrapperException(const DOMExceptionType&
theException) :
XalanDOMException(translateErrorCode(theException.code))
{
}
@@ -90,69 +94,69 @@
XercesDOMWrapperException::ExceptionCode
-XercesDOMWrapperException::translateErrorCode(DOMException::ExceptionCode
theCode)
+XercesDOMWrapperException::translateErrorCode(DOMExceptionType::ExceptionCode
theCode)
{
ExceptionCode theXalanCode = UNKNOWN_ERR;
switch(theCode)
{
- case DOMException::INDEX_SIZE_ERR:
+ case DOMExceptionType::INDEX_SIZE_ERR:
theXalanCode = INDEX_SIZE_ERR;
break;
- case DOMException::DOMSTRING_SIZE_ERR:
+ case DOMExceptionType::DOMSTRING_SIZE_ERR:
theXalanCode = DOMSTRING_SIZE_ERR;
break;
- case DOMException::HIERARCHY_REQUEST_ERR:
+ case DOMExceptionType::HIERARCHY_REQUEST_ERR:
theXalanCode = HIERARCHY_REQUEST_ERR;
break;
- case DOMException::WRONG_DOCUMENT_ERR:
+ case DOMExceptionType::WRONG_DOCUMENT_ERR:
theXalanCode = WRONG_DOCUMENT_ERR;
break;
- case DOMException::INVALID_CHARACTER_ERR:
+ case DOMExceptionType::INVALID_CHARACTER_ERR:
theXalanCode = INVALID_CHARACTER_ERR;
break;
- case DOMException::NO_DATA_ALLOWED_ERR:
+ case DOMExceptionType::NO_DATA_ALLOWED_ERR:
theXalanCode = NO_DATA_ALLOWED_ERR;
break;
- case DOMException::NO_MODIFICATION_ALLOWED_ERR:
+ case DOMExceptionType::NO_MODIFICATION_ALLOWED_ERR:
theXalanCode = NO_MODIFICATION_ALLOWED_ERR;
break;
- case DOMException::NOT_FOUND_ERR:
+ case DOMExceptionType::NOT_FOUND_ERR:
theXalanCode = NOT_FOUND_ERR;
break;
- case DOMException::NOT_SUPPORTED_ERR:
+ case DOMExceptionType::NOT_SUPPORTED_ERR:
theXalanCode = INDEX_SIZE_ERR;
break;
- case DOMException::INUSE_ATTRIBUTE_ERR:
+ case DOMExceptionType::INUSE_ATTRIBUTE_ERR:
theXalanCode = INUSE_ATTRIBUTE_ERR;
break;
- case DOMException::INVALID_STATE_ERR:
+ case DOMExceptionType::INVALID_STATE_ERR:
theXalanCode = INVALID_STATE_ERR;
break;
- case DOMException::SYNTAX_ERR:
+ case DOMExceptionType::SYNTAX_ERR:
theXalanCode = SYNTAX_ERR;
break;
- case DOMException::INVALID_MODIFICATION_ERR:
+ case DOMExceptionType::INVALID_MODIFICATION_ERR:
theXalanCode = INVALID_MODIFICATION_ERR;
break;
- case DOMException::NAMESPACE_ERR:
+ case DOMExceptionType::NAMESPACE_ERR:
theXalanCode = NAMESPACE_ERR;
break;
- case DOMException::INVALID_ACCESS_ERR:
+ case DOMExceptionType::INVALID_ACCESS_ERR:
theXalanCode = INVALID_ACCESS_ERR;
break;
@@ -163,3 +167,7 @@
return theXalanCode;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +15 -3
xml-xalan/c/src/XercesParserLiaison/XercesDOMWrapperException.hpp
Index: XercesDOMWrapperException.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDOMWrapperException.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesDOMWrapperException.hpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesDOMWrapperException.hpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -71,6 +71,14 @@
+#include <XercesParserLiaison/XercesWrapperTypes.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XERCESPARSERLIAISON_EXPORT XercesDOMWrapperException : public
XalanDOMException
{
public:
@@ -90,9 +98,9 @@
* Constructor which takes a Xerces exception and
* translates it into a XercesDOMException.
*
- * @param code The Xerces DOM_DOMException instance.
+ * @param code The Xerces DOMException instance.
*/
- XercesDOMWrapperException(const DOMException& theException);
+ XercesDOMWrapperException(const DOMExceptionType& theException);
/**
* Copy constructor.
@@ -115,8 +123,12 @@
private:
static ExceptionCode
- translateErrorCode(DOMException::ExceptionCode theCode);
+ translateErrorCode(DOMExceptionType::ExceptionCode theCode);
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +39 -33
xml-xalan/c/src/XercesParserLiaison/XercesDOM_NodeHack.cpp
Index: XercesDOM_NodeHack.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDOM_NodeHack.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XercesDOM_NodeHack.cpp 25 Jan 2001 17:00:18 -0000 1.3
+++ XercesDOM_NodeHack.cpp 22 Nov 2002 01:12:49 -0000 1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,8 +55,6 @@
* <http://www.apache.org/>.
*/
-
-
#include "XercesDOM_NodeHack.hpp"
@@ -68,7 +66,11 @@
-XercesDOM_NodeHack::XercesDOM_NodeHack(NodeImpl* theImpl) :
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
+XercesDOM_NodeHack::XercesDOM_NodeHack(NodeImplType* theImpl) :
DOM_Node(theImpl)
{
}
@@ -81,15 +83,15 @@
-XercesDOM_AttrHack::XercesDOM_AttrHack(AttrImpl* theImpl) :
- DOM_Attr(theImpl)
+XercesDOM_AttrHack::XercesDOM_AttrHack(AttrImplType* theImpl) :
+ ParentType(theImpl)
{
}
-XercesDOM_AttrHack::XercesDOM_AttrHack(const DOM_Attr& theSource) :
- DOM_Attr(theSource)
+XercesDOM_AttrHack::XercesDOM_AttrHack(const ParentType& theSource) :
+ ParentType(theSource)
{
}
@@ -101,15 +103,15 @@
-XercesDOM_ElementHack::XercesDOM_ElementHack(ElementImpl* theImpl) :
- DOM_Element(theImpl)
+XercesDOM_ElementHack::XercesDOM_ElementHack(ElementImplType*
theImpl) :
+ ParentType(theImpl)
{
}
-XercesDOM_ElementHack::XercesDOM_ElementHack(const DOM_Element&
theSource) :
- DOM_Element(theSource)
+XercesDOM_ElementHack::XercesDOM_ElementHack(const ParentType&
theSource) :
+ ParentType(theSource)
{
}
@@ -121,7 +123,7 @@
-const DOMString
+const DOMStringType
XercesDOM_ElementHack::getNodeNameImpl() const
{
#if defined(XALAN_USE_XERCES_INTERNAL_CLASSES)
@@ -133,7 +135,7 @@
-const DOMString
+const DOMStringType
XercesDOM_ElementHack::getNodeValueImpl() const
{
#if defined(XALAN_USE_XERCES_INTERNAL_CLASSES)
@@ -145,7 +147,7 @@
-const DOMString
+const DOMStringType
XercesDOM_ElementHack:: getNamespaceURIImpl() const
{
#if defined(XALAN_USE_XERCES_INTERNAL_CLASSES)
@@ -157,7 +159,7 @@
-const DOMString
+const DOMStringType
XercesDOM_ElementHack::getPrefixImpl() const
{
#if defined(XALAN_USE_XERCES_INTERNAL_CLASSES)
@@ -169,7 +171,7 @@
-const DOMString
+const DOMStringType
XercesDOM_ElementHack::getLocalNameImpl() const
{
#if defined(XALAN_USE_XERCES_INTERNAL_CLASSES)
@@ -181,7 +183,7 @@
-const DOMString
+const DOMStringType
XercesDOM_ElementHack::getTagNameImpl() const
{
#if defined(XALAN_USE_XERCES_INTERNAL_CLASSES)
@@ -193,8 +195,8 @@
-const DOMString
-XercesDOM_ElementHack::getAttributeImpl(const DOMString& name) const
+const DOMStringType
+XercesDOM_ElementHack::getAttributeImpl(const DOMStringType& name) const
{
#if defined(XALAN_USE_XERCES_INTERNAL_CLASSES)
return getImpl()->getAttribute(name);
@@ -205,10 +207,10 @@
-const DOMString
+const DOMStringType
XercesDOM_ElementHack::getAttributeNSImpl(
- const DOMString& namespaceURI,
- const DOMString& localName) const
+ const DOMStringType& namespaceURI,
+ const DOMStringType& localName) const
{
#if defined(XALAN_USE_XERCES_INTERNAL_CLASSES)
return getImpl()->getAttributeNS(namespaceURI, localName);
@@ -219,15 +221,15 @@
-XercesDOM_TextHack::XercesDOM_TextHack(TextImpl* theImpl) :
- DOM_Text(theImpl)
+XercesDOM_TextHack::XercesDOM_TextHack(TextImplType* theImpl) :
+ ParentType(theImpl)
{
}
-XercesDOM_TextHack::XercesDOM_TextHack(const DOM_Text& theSource) :
- DOM_Text(theSource)
+XercesDOM_TextHack::XercesDOM_TextHack(const ParentType& theSource) :
+ ParentType(theSource)
{
}
@@ -239,7 +241,7 @@
-const DOMString
+const DOMStringType
XercesDOM_TextHack::getNodeNameImpl() const
{
#if defined(XALAN_USE_XERCES_INTERNAL_CLASSES)
@@ -251,7 +253,7 @@
-const DOMString
+const DOMStringType
XercesDOM_TextHack::getNodeValueImpl() const
{
#if defined(XALAN_USE_XERCES_INTERNAL_CLASSES)
@@ -263,7 +265,7 @@
-const DOMString
+const DOMStringType
XercesDOM_TextHack::getNamespaceURIImpl() const
{
#if defined(XALAN_USE_XERCES_INTERNAL_CLASSES)
@@ -275,7 +277,7 @@
-const DOMString
+const DOMStringType
XercesDOM_TextHack::getPrefixImpl() const
{
#if defined(XALAN_USE_XERCES_INTERNAL_CLASSES)
@@ -287,7 +289,7 @@
-const DOMString
+const DOMStringType
XercesDOM_TextHack::getLocalNameImpl() const
{
#if defined(XALAN_USE_XERCES_INTERNAL_CLASSES)
@@ -299,7 +301,7 @@
-const DOMString
+const DOMStringType
XercesDOM_TextHack::getDataImpl() const
{
#if defined(XALAN_USE_XERCES_INTERNAL_CLASSES)
@@ -308,3 +310,7 @@
return getData();
#endif
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +119 -41
xml-xalan/c/src/XercesParserLiaison/XercesDOM_NodeHack.hpp
Index: XercesDOM_NodeHack.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDOM_NodeHack.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XercesDOM_NodeHack.hpp 10 Jul 2002 00:40:00 -0000 1.5
+++ XercesDOM_NodeHack.hpp 22 Nov 2002 01:12:49 -0000 1.6
@@ -1,3 +1,60 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Xalan" and "Apache Software Foundation" must
+ * not be used to endorse or promote products derived from this
+ * software without prior written permission. For written
+ * permission, please contact [EMAIL PROTECTED]
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * nor may "Apache" appear in their name, without prior written
+ * permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation and was
+ * originally based on software copyright (c) 1999, International
+ * Business Machines, Inc., http://www.ibm.com. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
#if !defined(XERCESDOM_NODEHACK_HEADER_GUARD_1357924680)
#define XERCESDOM_NODEHACK_HEADER_GUARD_1357924680
@@ -20,24 +77,35 @@
#endif
+
+#include <XercesParserLiaison/XercesBridgeTypes.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
// An evil class to hack the Xerces smart-pointer class. I'm
// only doing this because I have to...
-class XALAN_XERCESPARSERLIAISON_EXPORT XercesDOM_NodeHack : public DOM_Node
+class XALAN_XERCESPARSERLIAISON_EXPORT XercesDOM_NodeHack : public
XERCES_CPP_NAMESPACE_QUALIFIER DOM_Node
{
public:
- XercesDOM_NodeHack(NodeImpl* theImpl = 0);
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Node ParentType;
+
+ XercesDOM_NodeHack(NodeImplType* theImpl = 0);
~XercesDOM_NodeHack();
- NodeImpl*
+ NodeImplType*
getImpl() const
{
return fImpl;
}
- static NodeImpl*
- getImpl(const DOM_Node& theNode)
+ static NodeImplType*
+ getImpl(const ParentType& theNode)
{
#if defined(XALAN_OLD_STYLE_CASTS)
return ((const XercesDOM_NodeHack&)theNode).getImpl();
@@ -49,68 +117,72 @@
-class XALAN_XERCESPARSERLIAISON_EXPORT XercesDOM_AttrHack : public DOM_Attr
+class XALAN_XERCESPARSERLIAISON_EXPORT XercesDOM_AttrHack : public
XERCES_CPP_NAMESPACE_QUALIFIER DOM_Attr
{
public:
- XercesDOM_AttrHack(AttrImpl* theImpl = 0);
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Attr ParentType;
+
+ XercesDOM_AttrHack(AttrImplType* theImpl = 0);
- XercesDOM_AttrHack(const DOM_Attr& theSource);
+ XercesDOM_AttrHack(const ParentType& theSource);
~XercesDOM_AttrHack();
};
-class XALAN_XERCESPARSERLIAISON_EXPORT XercesDOM_ElementHack : public
DOM_Element
+class XALAN_XERCESPARSERLIAISON_EXPORT XercesDOM_ElementHack : public
XERCES_CPP_NAMESPACE_QUALIFIER DOM_Element
{
public:
- XercesDOM_ElementHack(ElementImpl* theImpl = 0);
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Element ParentType;
- XercesDOM_ElementHack(const DOM_Element& theSource);
+ XercesDOM_ElementHack(ElementImplType* theImpl = 0);
+
+ XercesDOM_ElementHack(const ParentType& theSource);
~XercesDOM_ElementHack();
- const DOMString
+ const DOMStringType
getNodeNameImpl() const;
- const DOMString
+ const DOMStringType
getNodeValueImpl() const;
- const DOMString
+ const DOMStringType
getNamespaceURIImpl() const;
- const DOMString
+ const DOMStringType
getPrefixImpl() const;
- const DOMString
+ const DOMStringType
getLocalNameImpl() const;
- const DOMString
+ const DOMStringType
getTagNameImpl() const;
- const DOMString
- getAttributeImpl(const DOMString& name) const;
+ const DOMStringType
+ getAttributeImpl(const DOMStringType& name) const;
- const DOMString
+ const DOMStringType
getAttributeNSImpl(
- const DOMString& namespaceURI,
- const DOMString& localName) const;
+ const DOMStringType& namespaceURI,
+ const DOMStringType& localName) const;
- ElementImpl*
+ ElementImplType*
getImpl() const
{
#if defined(XALAN_OLD_STYLE_CASTS)
- return (ElementImpl*)fImpl;
+ return (ElementImplType*)fImpl;
#else
- return reinterpret_cast<ElementImpl*>(fImpl);
+ return reinterpret_cast<ElementImplType*>(fImpl);
#endif
}
- static ElementImpl*
- getImpl(const DOM_Element& theNode)
+ static ElementImplType*
+ getImpl(const ParentType& theNode)
{
#if defined(XALAN_OLD_STYLE_CASTS)
return ((const XercesDOM_ElementHack&)theNode).getImpl();
@@ -122,47 +194,49 @@
-class XALAN_XERCESPARSERLIAISON_EXPORT XercesDOM_TextHack : public DOM_Text
+class XALAN_XERCESPARSERLIAISON_EXPORT XercesDOM_TextHack : public
XERCES_CPP_NAMESPACE_QUALIFIER DOM_Text
{
public:
- XercesDOM_TextHack(TextImpl* theImpl = 0);
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Text ParentType;
+
+ XercesDOM_TextHack(TextImplType* theImpl = 0);
- XercesDOM_TextHack(const DOM_Text& theSource);
+ XercesDOM_TextHack(const ParentType& theSource);
~XercesDOM_TextHack();
- const DOMString
+ const DOMStringType
getNodeNameImpl() const;
- const DOMString
+ const DOMStringType
getNodeValueImpl() const;
- const DOMString
+ const DOMStringType
getNamespaceURIImpl() const;
- const DOMString
+ const DOMStringType
getPrefixImpl() const;
- const DOMString
+ const DOMStringType
getLocalNameImpl() const;
- const DOMString
+ const DOMStringType
getDataImpl() const;
- TextImpl*
+ TextImplType*
getImpl() const
{
#if defined(XALAN_OLD_STYLE_CASTS)
- return (TextImpl*)fImpl;
+ return (TextImplType*)fImpl;
#else
- return reinterpret_cast<TextImpl*>(fImpl);
+ return reinterpret_cast<TextImplType*>(fImpl);
#endif
}
- static TextImpl*
- getImpl(const DOM_Text& theNode)
+ static TextImplType*
+ getImpl(const ParentType& theNode)
{
#if defined(XALAN_OLD_STYLE_CASTS)
return ((const XercesDOM_TextHack&)theNode).getImpl();
@@ -171,6 +245,10 @@
#endif
}
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.26 +153 -152
xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.cpp
Index: XercesDocumentBridge.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- XercesDocumentBridge.cpp 26 Jun 2002 01:19:13 -0000 1.25
+++ XercesDocumentBridge.cpp 22 Nov 2002 01:12:49 -0000 1.26
@@ -96,10 +96,14 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesDocumentBridge::XercesDocumentBridge(
- const DOM_Document& theXercesDocument,
- bool threadSafe,
- bool buildBridge) :
+ const DOM_DocumentType& theXercesDocument,
+ bool
threadSafe,
+ bool
buildBridge) :
XalanDocument(),
m_xercesDocument(theXercesDocument),
m_documentElement(0),
@@ -118,10 +122,6 @@
m_attributeAllocator(25),
m_stringPool(threadSafe == true ? new XercesLiaisonXalanDOMStringPool :
new XalanDOMStringPool)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::make_pair;
-#endif
-
if (m_mappingMode == false)
{
// The document index is always 1...
@@ -147,7 +147,7 @@
XalanNode*
-XercesDocumentBridge::mapNode(const DOM_Node& theXercesNode) const
+XercesDocumentBridge::mapNode(const DOM_NodeType& theXercesNode) const
{
return mapNode(XercesDOM_NodeHack::getImpl(theXercesNode));
}
@@ -155,7 +155,7 @@
XalanNode*
-XercesDocumentBridge::mapNode(NodeImpl* theXercesNodeImpl) const
+XercesDocumentBridge::mapNode(NodeImplType* theXercesNodeImpl) const
{
XalanNode* theXalanNode = 0;
@@ -188,10 +188,10 @@
-DOM_Node
+DOM_NodeType
XercesDocumentBridge::mapNode(const XalanNode* theXalanNode) const
{
- DOM_Node theXercesNode;
+ DOM_NodeType theXercesNode;
if (theXalanNode != 0)
{
@@ -208,25 +208,25 @@
-DOM_Attr
+DOM_AttrType
XercesDocumentBridge::mapNode(const XalanAttr* theXalanNode) const
{
- NodeImpl* const theXercesNodeImpl =
+ NodeImplType* const theXercesNodeImpl =
mapNodeToImpl(theXalanNode);
#if defined(XALAN_OLD_STYLE_CASTS)
- return XercesDOM_AttrHack((AttrImpl*)theXercesNodeImpl);
+ return XercesDOM_AttrHack((AttrImplType*)theXercesNodeImpl);
#else
- return
XercesDOM_AttrHack(reinterpret_cast<AttrImpl*>(theXercesNodeImpl));
+ return
XercesDOM_AttrHack(reinterpret_cast<AttrImplType*>(theXercesNodeImpl));
#endif
}
-NodeImpl*
+NodeImplType*
XercesDocumentBridge::mapNodeToImpl(const XalanNode* theXalanNode)
const
{
- NodeImpl* theXercesNodeImpl = 0;
+ NodeImplType* theXercesNodeImpl = 0;
if (theXalanNode != 0)
{
@@ -244,7 +244,7 @@
XalanAttr*
-XercesDocumentBridge::mapNode(const DOM_Attr& theXercesNode) const
+XercesDocumentBridge::mapNode(const DOM_AttrType& theXercesNode) const
{
#if defined(XALAN_OLD_STYLE_CASTS)
return
(XercesAttrBridge*)mapNode(XercesDOM_NodeHack::getImpl(theXercesNode));
@@ -256,7 +256,7 @@
XalanElement*
-XercesDocumentBridge::mapNode(const DOM_Element& theXercesNode) const
+XercesDocumentBridge::mapNode(const DOM_ElementType& theXercesNode)
const
{
#if defined(XALAN_OLD_STYLE_CASTS)
return
(XercesElementBridge*)mapNode(XercesDOM_NodeHack::getImpl(theXercesNode));
@@ -270,9 +270,7 @@
void
XercesDocumentBridge::destroyBridge()
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::for_each;
-#endif
+ XALAN_USING_STD(for_each)
// Set this to null, since it will be deleted
// by the next for_each...
@@ -280,9 +278,10 @@
// m_bridgeMap contains all of the nodes that
// are still alive...
- for_each(m_nodes.begin(),
- m_nodes.end(),
- DeleteFunctor<XalanNode>());
+ for_each(
+ m_nodes.begin(),
+ m_nodes.end(),
+ DeleteFunctor<XalanNode>());
// Clear everything out, since we just delete everything...
m_nodes.clear();
@@ -333,9 +332,9 @@
XercesDocumentTypeBridge*
XercesDocumentBridge::createBridgeNode(
- const DOM_DocumentType& theDoctype,
- unsigned long theIndex,
- bool
mapNode) const
+ const DOM_DocumentTypeType& theDoctype,
+ unsigned long
theIndex,
+ bool
mapNode) const
{
// This is a special case, since there is only one
// doctype node allowed...
@@ -373,9 +372,9 @@
XercesElementBridge*
XercesDocumentBridge::createBridgeNode(
- const DOM_Element& theXercesNode,
- unsigned long theIndex,
- bool mapNode) const
+ const DOM_ElementType& theXercesNode,
+ unsigned long theIndex,
+ bool mapNode) const
{
// Create a navigator...
XercesBridgeNavigator& theNavigator = pushNavigator(mapNode);
@@ -408,9 +407,9 @@
XercesDocumentFragmentBridge*
XercesDocumentBridge::createBridgeNode(
- const DOM_DocumentFragment& theXercesNode,
- unsigned long
theIndex,
- bool
mapNode) const
+ const DOM_DocumentFragmentType& theXercesNode,
+ unsigned long
theIndex,
+ bool
mapNode) const
{
// Create a navigator...
XercesBridgeNavigator& theNavigator = pushNavigator(mapNode);
@@ -444,9 +443,9 @@
XercesTextBridge*
XercesDocumentBridge::createBridgeNode(
- const DOM_Text& theXercesNode,
- unsigned long theIndex,
- bool mapNode) const
+ const DOM_TextType& theXercesNode,
+ unsigned long theIndex,
+ bool mapNode) const
{
// Create a navigator...
XercesBridgeNavigator& theNavigator = pushNavigator(mapNode);
@@ -478,9 +477,9 @@
XercesCommentBridge*
XercesDocumentBridge::createBridgeNode(
- const DOM_Comment& theXercesNode,
- unsigned long theIndex,
- bool mapNode) const
+ const DOM_CommentType& theXercesNode,
+ unsigned long theIndex,
+ bool mapNode) const
{
// Create a navigator...
XercesBridgeNavigator& theNavigator = pushNavigator(mapNode);
@@ -514,9 +513,9 @@
XercesCDATASectionBridge*
XercesDocumentBridge::createBridgeNode(
- const DOM_CDATASection& theXercesNode,
- unsigned long theIndex,
- bool
mapNode) const
+ const DOM_CDATASectionType& theXercesNode,
+ unsigned long
theIndex,
+ bool
mapNode) const
{
// Create a navigator...
XercesBridgeNavigator& theNavigator = pushNavigator(mapNode);
@@ -550,9 +549,9 @@
XercesProcessingInstructionBridge*
XercesDocumentBridge::createBridgeNode(
- const DOM_ProcessingInstruction& theXercesNode,
- unsigned long
theIndex,
- bool
mapNode) const
+ const DOM_ProcessingInstructionType& theXercesNode,
+ unsigned long
theIndex,
+ bool
mapNode) const
{
// Create a navigator...
XercesBridgeNavigator& theNavigator = pushNavigator(mapNode);
@@ -586,9 +585,9 @@
XercesAttrBridge*
XercesDocumentBridge::createBridgeNode(
- const DOM_Attr& theXercesNode,
- unsigned long theIndex,
- bool mapNode) const
+ const DOM_AttrType& theXercesNode,
+ unsigned long theIndex,
+ bool mapNode) const
{
// Create a navigator...
XercesBridgeNavigator& theNavigator = pushNavigator(mapNode);
@@ -618,9 +617,9 @@
XercesEntityBridge*
XercesDocumentBridge::createBridgeNode(
- const DOM_Entity& theXercesNode,
- unsigned long theIndex,
- bool mapNode) const
+ const DOM_EntityType& theXercesNode,
+ unsigned long theIndex,
+ bool mapNode) const
{
// Create a navigator...
XercesBridgeNavigator& theNavigator = pushNavigator(mapNode);
@@ -652,9 +651,9 @@
XercesEntityReferenceBridge*
XercesDocumentBridge::createBridgeNode(
- const DOM_EntityReference& theXercesNode,
- unsigned long theIndex,
- bool
mapNode) const
+ const DOM_EntityReferenceType& theXercesNode,
+ unsigned long
theIndex,
+ bool
mapNode) const
{
// Create a navigator...
XercesBridgeNavigator& theNavigator = pushNavigator(mapNode);
@@ -688,8 +687,8 @@
XercesNotationBridge*
XercesDocumentBridge::createBridgeNode(
- const DOM_Notation& theXercesNode,
- unsigned long theIndex,
+ const DOM_NotationType& theXercesNode,
+ unsigned long theIndex,
bool mapNode) const
{
// Create a navigator...
@@ -722,21 +721,21 @@
XalanNode*
XercesDocumentBridge::createBridgeNode(
- const DOM_Node& theXercesNode,
- unsigned long theIndex,
- bool mapNode) const
+ const DOM_NodeType& theXercesNode,
+ unsigned long theIndex,
+ bool mapNode) const
{
XalanNode* theNewNode = 0;
switch(theXercesNode.getNodeType())
{
- case DOM_Node::ATTRIBUTE_NODE:
+ case DOM_NodeType::ATTRIBUTE_NODE:
{
- const DOM_Attr& theAttrNode =
+ const DOM_AttrType& theAttrNode =
#if defined(XALAN_OLD_STYLE_CASTS)
- (const DOM_Attr&)theXercesNode;
+ (const
DOM_AttrType&)theXercesNode;
#else
- static_cast<const
DOM_Attr&>(theXercesNode);
+ static_cast<const
DOM_AttrType&>(theXercesNode);
#endif
theNewNode = createBridgeNode(theAttrNode, theIndex,
mapNode);
@@ -744,13 +743,13 @@
}
break;
- case DOM_Node::CDATA_SECTION_NODE:
+ case DOM_NodeType::CDATA_SECTION_NODE:
{
- const DOM_CDATASection& theCDATASectionNode =
+ const DOM_CDATASectionType&
theCDATASectionNode =
#if defined(XALAN_OLD_STYLE_CASTS)
- (const
DOM_CDATASection&)theXercesNode;
+ (const
DOM_CDATASectionType&)theXercesNode;
#else
- static_cast<const
DOM_CDATASection&>(theXercesNode);
+ static_cast<const
DOM_CDATASectionType&>(theXercesNode);
#endif
theNewNode = createBridgeNode(theCDATASectionNode,
theIndex, mapNode);
@@ -759,13 +758,13 @@
}
break;
- case DOM_Node::COMMENT_NODE:
+ case DOM_NodeType::COMMENT_NODE:
{
- const DOM_Comment& theCommentNode =
+ const DOM_CommentType& theCommentNode =
#if defined(XALAN_OLD_STYLE_CASTS)
- (const
DOM_Comment&)theXercesNode;
+ (const
DOM_CommentType&)theXercesNode;
#else
- static_cast<const
DOM_Comment&>(theXercesNode);
+ static_cast<const
DOM_CommentType&>(theXercesNode);
#endif
theNewNode = createBridgeNode(theCommentNode, theIndex,
mapNode);
@@ -773,13 +772,13 @@
}
break;
- case DOM_Node::DOCUMENT_FRAGMENT_NODE:
+ case DOM_NodeType::DOCUMENT_FRAGMENT_NODE:
{
- const DOM_DocumentFragment&
theDocumentFragmentNode =
+ const DOM_DocumentFragmentType&
theDocumentFragmentNode =
#if defined(XALAN_OLD_STYLE_CASTS)
- (const
DOM_DocumentFragment&)theXercesNode;
+ (const
DOM_DocumentFragmentType&)theXercesNode;
#else
- static_cast<const
DOM_DocumentFragment&>(theXercesNode);
+ static_cast<const
DOM_DocumentFragmentType&>(theXercesNode);
#endif
theNewNode = createBridgeNode(theDocumentFragmentNode,
theIndex, mapNode);
@@ -788,13 +787,13 @@
}
break;
- case DOM_Node::ELEMENT_NODE:
+ case DOM_NodeType::ELEMENT_NODE:
{
- const DOM_Element& theElementNode =
+ const DOM_ElementType& theElementNode =
#if defined(XALAN_OLD_STYLE_CASTS)
- (const
DOM_Element&)theXercesNode;
+ (const
DOM_ElementType&)theXercesNode;
#else
- static_cast<const
DOM_Element&>(theXercesNode);
+ static_cast<const
DOM_ElementType&>(theXercesNode);
#endif
theNewNode = createBridgeNode(theElementNode, theIndex,
mapNode);
@@ -802,13 +801,13 @@
}
break;
- case DOM_Node::ENTITY_NODE:
+ case DOM_NodeType::ENTITY_NODE:
{
- const DOM_Entity& theEntityNode =
+ const DOM_EntityType& theEntityNode =
#if defined(XALAN_OLD_STYLE_CASTS)
- (const
DOM_Entity&)theXercesNode;
+ (const
DOM_EntityType&)theXercesNode;
#else
- static_cast<const
DOM_Entity&>(theXercesNode);
+ static_cast<const
DOM_EntityType&>(theXercesNode);
#endif
theNewNode = createBridgeNode(theEntityNode, theIndex,
mapNode);
@@ -816,13 +815,13 @@
}
break;
- case DOM_Node::ENTITY_REFERENCE_NODE:
+ case DOM_NodeType::ENTITY_REFERENCE_NODE:
{
- const DOM_EntityReference& theEntityReferenceNode =
+ const DOM_EntityReferenceType& theEntityReferenceNode =
#if defined(XALAN_OLD_STYLE_CASTS)
- (const
DOM_EntityReference&)theXercesNode;
+ (const
DOM_EntityReferenceType&)theXercesNode;
#else
- static_cast<const
DOM_EntityReference&>(theXercesNode);
+ static_cast<const
DOM_EntityReferenceType&>(theXercesNode);
#endif
theNewNode = createBridgeNode(theEntityReferenceNode,
theIndex, mapNode);
@@ -830,13 +829,13 @@
}
break;
- case DOM_Node::NOTATION_NODE:
+ case DOM_NodeType::NOTATION_NODE:
{
- const DOM_Notation& theNotationNode =
+ const DOM_NotationType& theNotationNode =
#if defined(XALAN_OLD_STYLE_CASTS)
- (const
DOM_Notation&)theXercesNode;
+ (const
DOM_NotationType&)theXercesNode;
#else
- static_cast<const
DOM_Notation&>(theXercesNode);
+ static_cast<const
DOM_NotationType&>(theXercesNode);
#endif
theNewNode = createBridgeNode(theNotationNode,
theIndex, mapNode);
@@ -844,13 +843,13 @@
}
break;
- case DOM_Node::PROCESSING_INSTRUCTION_NODE:
+ case DOM_NodeType::PROCESSING_INSTRUCTION_NODE:
{
- const DOM_ProcessingInstruction& thePINode =
+ const DOM_ProcessingInstructionType& thePINode =
#if defined(XALAN_OLD_STYLE_CASTS)
- (const
DOM_ProcessingInstruction&)theXercesNode;
+ (const
DOM_ProcessingInstructionType&)theXercesNode;
#else
- static_cast<const
DOM_ProcessingInstruction&>(theXercesNode);
+ static_cast<const
DOM_ProcessingInstructionType&>(theXercesNode);
#endif
theNewNode = createBridgeNode(thePINode, theIndex,
mapNode);
@@ -858,13 +857,13 @@
}
break;
- case DOM_Node::TEXT_NODE:
+ case DOM_NodeType::TEXT_NODE:
{
- const DOM_Text& theTextNode =
+ const DOM_TextType& theTextNode =
#if defined(XALAN_OLD_STYLE_CASTS)
- (const DOM_Text&)theXercesNode;
+ (const
DOM_TextType&)theXercesNode;
#else
- static_cast<const
DOM_Text&>(theXercesNode);
+ static_cast<const
DOM_TextType&>(theXercesNode);
#endif
theNewNode = createBridgeNode(theTextNode, theIndex,
mapNode);
@@ -872,13 +871,13 @@
}
break;
- case DOM_Node::DOCUMENT_TYPE_NODE:
+ case DOM_NodeType::DOCUMENT_TYPE_NODE:
{
- const DOM_DocumentType& theDoctypeNode =
+ const DOM_DocumentTypeType& theDoctypeNode =
#if defined(XALAN_OLD_STYLE_CASTS)
- (const
DOM_DocumentType&)theXercesNode;
+ (const
DOM_DocumentTypeType&)theXercesNode;
#else
- static_cast<const
DOM_DocumentType&>(theXercesNode);
+ static_cast<const
DOM_DocumentTypeType&>(theXercesNode);
#endif
theNewNode = createBridgeNode(theDoctypeNode, theIndex,
mapNode);
@@ -900,9 +899,7 @@
void
XercesDocumentBridge::destroyNode(XalanNode* theNode)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::find;
-#endif
+ XALAN_USING_STD(find)
const NodeVectorType::iterator i =
find(m_nodes.begin(), m_nodes.end(), theNode);
@@ -926,9 +923,9 @@
XalanNode*
XercesDocumentBridge::internalCloneNode(
- const XalanNode* theXalanNode,
- const DOM_Node& theXercesNode,
- bool deep)
+ const XalanNode* theXalanNode,
+ const DOM_NodeType& theXercesNode,
+ bool deep)
{
XalanNode* theNewNode = 0;
@@ -939,12 +936,12 @@
try
{
- const DOM_Node theNewXercesNode =
+ const DOM_NodeType theNewXercesNode =
theXercesNode.cloneNode(deep);
theNewNode = createBridgeNode(theNewXercesNode, 0, true);
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -1061,16 +1058,16 @@
try
{
- const DOM_Node theNewDocument =
m_xercesDocument.cloneNode(deep);
+ const DOM_NodeType theNewDocument =
m_xercesDocument.cloneNode(deep);
theBridge =
#if defined(XALAN_OLD_STYLE_CASTS)
- new XercesDocumentBridge((const
DOM_Document&)theNewDocument);
+ new XercesDocumentBridge((const
DOM_DocumentType&)theNewDocument);
#else
- new XercesDocumentBridge(static_cast<const
DOM_Document&>(theNewDocument));
+ new XercesDocumentBridge(static_cast<const
DOM_DocumentType&>(theNewDocument));
#endif
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -1223,14 +1220,14 @@
try
{
- const DOM_Element theXercesNode =
+ const DOM_ElementType theXercesNode =
m_xercesDocument.createElement(c_wstr(tagName));
assert(theXercesNode.isNull() == false);
theBridgeNode = createBridgeNode(theXercesNode, 0, true);
assert(mapNode(theXercesNode) == theBridgeNode);
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -1247,14 +1244,14 @@
try
{
- const DOM_DocumentFragment theXercesNode =
+ const DOM_DocumentFragmentType theXercesNode =
m_xercesDocument.createDocumentFragment();
assert(theXercesNode.isNull() == false);
theBridgeNode = createBridgeNode(theXercesNode, 0, true);
assert(mapNode(theXercesNode) == theBridgeNode);
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -1271,14 +1268,14 @@
try
{
- const DOM_Text theXercesNode =
+ const DOM_TextType theXercesNode =
m_xercesDocument.createTextNode(c_wstr(data));
assert(theXercesNode.isNull() == false);
theBridgeNode = createBridgeNode(theXercesNode, 0, true);
assert(mapNode(theXercesNode) == theBridgeNode);
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -1295,14 +1292,14 @@
try
{
- const DOM_Comment theXercesNode =
+ const DOM_CommentType theXercesNode =
m_xercesDocument.createComment(c_wstr(data));
assert(theXercesNode.isNull() == false);
theBridgeNode = createBridgeNode(theXercesNode, 0, true);
assert(mapNode(theXercesNode) == theBridgeNode);
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -1319,14 +1316,14 @@
try
{
- const DOM_CDATASection theXercesNode =
+ const DOM_CDATASectionType theXercesNode =
m_xercesDocument.createCDATASection(c_wstr(data));
assert(theXercesNode.isNull() == false);
theBridgeNode = createBridgeNode(theXercesNode, 0, true);
assert(mapNode(theXercesNode) == theBridgeNode);
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -1345,14 +1342,14 @@
try
{
- const DOM_ProcessingInstruction theXercesNode =
+ const DOM_ProcessingInstructionType theXercesNode =
m_xercesDocument.createProcessingInstruction(c_wstr(target), c_wstr(data));
assert(theXercesNode.isNull() == false);
theBridgeNode = createBridgeNode(theXercesNode, 0, true);
assert(mapNode(theXercesNode) == theBridgeNode);
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -1369,14 +1366,14 @@
try
{
- const DOM_Attr theXercesNode =
+ const DOM_AttrType theXercesNode =
m_xercesDocument.createAttribute(c_wstr(name));
assert(theXercesNode.isNull() == false);
theBridgeNode = createBridgeNode(theXercesNode, 0, true);
assert(mapNode(theXercesNode) == theBridgeNode);
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -1393,14 +1390,14 @@
try
{
- const DOM_EntityReference theXercesNode =
+ const DOM_EntityReferenceType theXercesNode =
m_xercesDocument.createEntityReference(c_wstr(name));
assert(theXercesNode.isNull() == false);
theBridgeNode = createBridgeNode(theXercesNode, 0, true);
assert(mapNode(theXercesNode) == theBridgeNode);
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -1471,14 +1468,14 @@
try
{
- const DOM_Element theXercesNode =
+ const DOM_ElementType theXercesNode =
m_xercesDocument.createElementNS(c_wstr(namespaceURI),
c_wstr(qualifiedName));
assert(theXercesNode.isNull() == false);
theBridgeNode = createBridgeNode(theXercesNode, 0, true);
assert(mapNode(theXercesNode) == theBridgeNode);
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -1497,14 +1494,14 @@
try
{
- const DOM_Attr theXercesNode =
+ const DOM_AttrType theXercesNode =
m_xercesDocument.createAttributeNS(c_wstr(namespaceURI), c_wstr(qualifiedName));
assert(theXercesNode.isNull() == false);
theBridgeNode = createBridgeNode(theXercesNode, 0, true);
assert(mapNode(theXercesNode) == theBridgeNode);
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -1533,9 +1530,9 @@
// $$$ ToDo: This is because DOM_Document::getElementById() is not
// const...
#if defined(XALAN_NO_MUTABLE)
- const DOM_Node
theXercesNode(((DOM_Document&)m_xercesDocument).getElementById(c_wstr(elementId)));
+ const DOM_NodeType
theXercesNode(((DOM_DocumentType&)m_xercesDocument).getElementById(c_wstr(elementId)));
#else
- const DOM_Node
theXercesNode(m_xercesDocument.getElementById(c_wstr(elementId)));
+ const DOM_NodeType
theXercesNode(m_xercesDocument.getElementById(c_wstr(elementId)));
#endif
return theXercesNode.isNull() == true ? 0 :
@@ -1551,7 +1548,7 @@
void
XercesDocumentBridge::buildBridgeNodes()
{
- const DOM_Node theStartChild = m_xercesDocument.getFirstChild();
+ const DOM_NodeType theStartChild =
m_xercesDocument.getFirstChild();
if (theStartChild.isNull() == false)
{
@@ -1624,7 +1621,7 @@
void
-XercesDocumentBridge::BuildBridgeTreeWalker::startNode(const DOM_Node&
node)
+XercesDocumentBridge::BuildBridgeTreeWalker::startNode(const DOM_NodeType&
node)
{
XalanNode* const theBridgeNode =
m_document->createBridgeNode(node, m_currentIndex, false);
@@ -1678,17 +1675,17 @@
const short theType = node.getNodeType();
- if (theType == DOM_Node::DOCUMENT_TYPE_NODE)
+ if (theType == DOM_NodeType::DOCUMENT_TYPE_NODE)
{
// Special case for doctype -- we have to build its entities...
- const DOM_DocumentType& theDoctype =
+ const DOM_DocumentTypeType& theDoctype =
#if defined(XALAN_OLD_STYLE_CASTS)
- (const DOM_DocumentType&)node;
+ (const DOM_DocumentTypeType&)node;
#else
- static_cast<const DOM_DocumentType&>(node);
+ static_cast<const DOM_DocumentTypeType&>(node);
#endif
- const DOM_NamedNodeMap theEntities =
+ const DOM_NamedNodeMapType theEntities =
theDoctype.getEntities();
const unsigned int theLength =
@@ -1700,17 +1697,17 @@
m_document->createBridgeNode(theEntities.item(i),
m_currentIndex++, true);
}
}
- else if (theType == DOM_Node::ELEMENT_NODE)
+ else if (theType == DOM_NodeType::ELEMENT_NODE)
{
// Special case for element nodes -- we have to build the attributes...
- const DOM_Element& theElement =
+ const DOM_ElementType& theElement =
#if defined(XALAN_OLD_STYLE_CASTS)
- (const DOM_Element&)node;
+ (const DOM_ElementType&)node;
#else
- static_cast<const DOM_Element&>(node);
+ static_cast<const DOM_ElementType&>(node);
#endif
- const DOM_NamedNodeMap theAttributes =
+ const DOM_NamedNodeMapType theAttributes =
theElement.getAttributes();
const unsigned int theLength =
@@ -1722,7 +1719,7 @@
for (unsigned int i = 0; i < theLength; ++i)
{
// Get the attribute from the node map...
- const DOM_Node theAttr = theAttributes.item(i);
+ const DOM_NodeType theAttr = theAttributes.item(i);
assert(theAttr.isNull() == false);
// Create a bridge node.
@@ -1760,7 +1757,7 @@
void
-XercesDocumentBridge::BuildBridgeTreeWalker::endNode(const DOM_Node& /* node
*/)
+XercesDocumentBridge::BuildBridgeTreeWalker::endNode(const DOM_NodeType&
/* node */)
{
assert(m_parentNavigatorStack.empty() == false);
assert(m_siblingNavigatorStack.empty() == false);
@@ -1801,3 +1798,7 @@
{
return m_stringPool->get(theString, theLength);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.21 +80 -56
xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.hpp
Index: XercesDocumentBridge.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.hpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- XercesDocumentBridge.hpp 10 Jul 2002 00:40:00 -0000 1.20
+++ XercesDocumentBridge.hpp 22 Nov 2002 01:12:49 -0000 1.21
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -106,6 +106,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanDOMStringPool;
class XercesAttrBridge;
class XercesCommentBridge;
@@ -125,6 +129,22 @@
{
public:
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Attr
DOM_AttrType;
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Comment
DOM_CommentType;
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_CDATASection
DOM_CDATASectionType;
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Document
DOM_DocumentType;
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_DocumentFragment
DOM_DocumentFragmentType;
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Element
DOM_ElementType;
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Entity
DOM_EntityType;
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_EntityReference
DOM_EntityReferenceType;
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Node
DOM_NodeType;
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Text
DOM_TextType;
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Notation
DOM_NotationType;
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_ProcessingInstruction
DOM_ProcessingInstructionType;
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Text
DOM_TextType;
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_DocumentType
DOM_DocumentTypeType;
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER NodeImpl
NodeImplType;
+
friend class XercesBridgeNavigator;
/**
@@ -143,9 +163,9 @@
*
*/
XercesDocumentBridge(
- const DOM_Document& theXercesDocument,
- bool threadSafe =
true,
- bool buildBridge =
true);
+ const DOM_DocumentType& theXercesDocument,
+ bool
threadSafe = true,
+ bool
buildBridge = true);
virtual
~XercesDocumentBridge();
@@ -324,21 +344,21 @@
rebuildBridge();
XalanNode*
- mapNode(const DOM_Node& theXercesNode) const;
+ mapNode(const DOM_NodeType& theXercesNode) const;
XalanAttr*
- mapNode(const DOM_Attr& theXercesNode) const;
+ mapNode(const DOM_AttrType& theXercesNode) const;
XalanElement*
- mapNode(const DOM_Element& theXercesNode) const;
+ mapNode(const DOM_ElementType& theXercesNode) const;
- DOM_Node
+ DOM_NodeType
mapNode(const XalanNode* theXalanNode) const;
- DOM_Attr
+ DOM_AttrType
mapNode(const XalanAttr* theXalanNode) const;
- NodeImpl*
+ NodeImplType*
mapNodeToImpl(const XalanNode* theXalanNode) const;
/**
@@ -348,7 +368,7 @@
* @return the Xerces DOM_Document instance.
*
*/
- DOM_Document
+ DOM_DocumentType
getXercesDocument() const
{
return m_xercesDocument;
@@ -362,7 +382,7 @@
void
buildBridgeNodes();
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef deque<XercesBridgeNavigator> NavigatorBridgeVectorType;
typedef deque<XalanNode*> NodeVectorType;
@@ -403,7 +423,7 @@
XalanNode* m_node;
};
- #if defined(XALAN_NO_NAMESPACES)
+ #if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<NavigatorStackEntryType>
NavigatorStackType;
#else
typedef std::vector<NavigatorStackEntryType>
NavigatorStackType;
@@ -412,10 +432,10 @@
protected:
virtual void
- startNode(const DOM_Node& node);
+ startNode(const DOM_NodeType& node);
virtual void
- endNode(const DOM_Node& node);
+ endNode(const DOM_NodeType& node);
private:
@@ -457,7 +477,7 @@
private:
XalanNode*
- mapNode(NodeImpl* theXercesNodeImpl) const;
+ mapNode(NodeImplType* theXercesNodeImpl) const;
// Destruction API...
void
@@ -479,82 +499,82 @@
// More internal implementation stuff...
XalanNode*
internalCloneNode(
- const XalanNode* theXalanNode,
- const DOM_Node& theXercesNode,
- bool deep);
+ const XalanNode* theXalanNode,
+ const DOM_NodeType& theXercesNode,
+ bool deep);
// Factory methods for our implementation nodes...
XalanNode*
createBridgeNode(
- const DOM_Node& theXercesNode,
- unsigned long theIndex,
- bool mapNode) const;
+ const DOM_NodeType& theXercesNode,
+ unsigned long theIndex,
+ bool mapNode) const;
XercesDocumentTypeBridge*
createBridgeNode(
- const DOM_DocumentType& theDoctype,
- unsigned long theIndex,
- bool
mapNode) const;
+ const DOM_DocumentTypeType& theDoctype,
+ unsigned long
theIndex,
+ bool
mapNode) const;
XercesElementBridge*
createBridgeNode(
- const DOM_Element& theXercesNode,
- unsigned long theIndex,
- bool mapNode) const;
+ const DOM_ElementType& theXercesNode,
+ unsigned long theIndex,
+ bool mapNode) const;
XercesDocumentFragmentBridge*
createBridgeNode(
- const DOM_DocumentFragment& theXercesNode,
- unsigned long
theIndex,
- bool
mapNode) const;
+ const DOM_DocumentFragmentType& theXercesNode,
+ unsigned long
theIndex,
+ bool
mapNode) const;
XercesTextBridge*
createBridgeNode(
- const DOM_Text& theXercesNode,
- unsigned long theIndex,
- bool mapNode) const;
+ const DOM_TextType& theXercesNode,
+ unsigned long theIndex,
+ bool mapNode) const;
XercesCommentBridge*
createBridgeNode(
- const DOM_Comment& theXercesNode,
- unsigned long theIndex,
- bool mapNode) const;
+ const DOM_CommentType& theXercesNode,
+ unsigned long theIndex,
+ bool mapNode) const;
XercesCDATASectionBridge*
createBridgeNode(
- const DOM_CDATASection& theXercesNode,
- unsigned long theIndex,
- bool
mapNode) const;
+ const DOM_CDATASectionType& theXercesNode,
+ unsigned long
theIndex,
+ bool
mapNode) const;
XercesProcessingInstructionBridge*
createBridgeNode(
- const DOM_ProcessingInstruction& theXercesNode,
- unsigned long
theIndex,
- bool
mapNode) const;
+ const DOM_ProcessingInstructionType& theXercesNode,
+ unsigned long
theIndex,
+ bool
mapNode) const;
XercesAttrBridge*
createBridgeNode(
- const DOM_Attr& theXercesNode,
- unsigned long theIndex,
- bool mapNode) const;
+ const DOM_AttrType& theXercesNode,
+ unsigned long theIndex,
+ bool mapNode) const;
XercesEntityBridge*
createBridgeNode(
- const DOM_Entity& theXercesNode,
- unsigned long theIndex,
- bool mapNode) const;
+ const DOM_EntityType& theXercesNode,
+ unsigned long theIndex,
+ bool mapNode) const;
XercesEntityReferenceBridge*
createBridgeNode(
- const DOM_EntityReference& theXercesNode,
- unsigned long theIndex,
- bool
mapNode) const;
+ const DOM_EntityReferenceType& theXercesNode,
+ unsigned long
theIndex,
+ bool
mapNode) const;
XercesNotationBridge*
createBridgeNode(
- const DOM_Notation& theXercesNode,
- unsigned long theIndex,
- bool mapNode) const;
+ const DOM_NotationType& theXercesNode,
+ unsigned long theIndex,
+ bool
mapNode) const;
XercesBridgeNavigator&
pushNavigator(bool mappingMode) const;
@@ -564,7 +584,7 @@
// $$$ ToDo: This is because DOM_Document::getElementById() is not
// const...
- mutable DOM_Document
m_xercesDocument;
+ mutable DOM_DocumentType
m_xercesDocument;
XalanElement*
m_documentElement;
@@ -596,6 +616,10 @@
const XalanAutoPtr<XalanDOMStringPool> m_stringPool;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +10 -2
xml-xalan/c/src/XercesParserLiaison/XercesDocumentFragmentBridge.cpp
Index: XercesDocumentFragmentBridge.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentFragmentBridge.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XercesDocumentFragmentBridge.cpp 23 Feb 2002 04:02:10 -0000 1.6
+++ XercesDocumentFragmentBridge.cpp 22 Nov 2002 01:12:49 -0000 1.7
@@ -71,9 +71,13 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesDocumentFragmentBridge::XercesDocumentFragmentBridge(
- const DOM_DocumentFragment&
theXercesDOMDocumentFragment,
- const XercesBridgeNavigator& theNavigator) :
+ const DOM_DocumentFragmentType&
theXercesDOMDocumentFragment,
+ const XercesBridgeNavigator& theNavigator) :
XalanDocumentFragment(),
m_xercesNode(theXercesDOMDocumentFragment),
m_children(theXercesDOMDocumentFragment.getChildNodes(),
@@ -319,3 +323,7 @@
// return m_navigator.getIndex();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +15 -5
xml-xalan/c/src/XercesParserLiaison/XercesDocumentFragmentBridge.hpp
Index: XercesDocumentFragmentBridge.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentFragmentBridge.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XercesDocumentFragmentBridge.hpp 10 Jul 2002 00:40:00 -0000 1.7
+++ XercesDocumentFragmentBridge.hpp 22 Nov 2002 01:12:49 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -79,6 +79,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XercesBridgeNavigator;
@@ -87,9 +91,11 @@
{
public:
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_DocumentFragment
DOM_DocumentFragmentType;
+
XercesDocumentFragmentBridge(
- const DOM_DocumentFragment&
theXercesDOMDocumentFragment,
- const XercesBridgeNavigator& theNavigator);
+ const DOM_DocumentFragmentType&
theXercesDOMDocumentFragment,
+ const XercesBridgeNavigator& theNavigator);
virtual
~XercesDocumentFragmentBridge();
@@ -440,7 +446,7 @@
*
* @return The Xerces node
*/
- DOM_DocumentFragment
+ DOM_DocumentFragmentType
getXercesNode() const
{
return m_xercesNode;
@@ -460,12 +466,16 @@
operator==(const XercesDocumentFragmentBridge& theRHS) const;
// Data members...
- DOM_DocumentFragment m_xercesNode;
+ DOM_DocumentFragmentType m_xercesNode;
XercesNodeListBridge m_children;
const XercesBridgeNavigator& m_navigator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +11 -3
xml-xalan/c/src/XercesParserLiaison/XercesDocumentNamedNodeListCache.cpp
Index: XercesDocumentNamedNodeListCache.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentNamedNodeListCache.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XercesDocumentNamedNodeListCache.cpp 10 Jul 2002 00:40:00 -0000
1.5
+++ XercesDocumentNamedNodeListCache.cpp 22 Nov 2002 01:12:49 -0000
1.6
@@ -72,8 +72,12 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesDocumentNamedNodeListCache::XercesDocumentNamedNodeListCache(
- const DOM_Document&
theXercesDocument,
+ const DOM_DocumentType&
theXercesDocument,
const XercesBridgeNavigator& theNavigator) :
XercesNamedNodeListCache(theNavigator),
m_xercesDocument(theXercesDocument)
@@ -88,7 +92,7 @@
-DOM_NodeList
+DOM_NodeListType
XercesDocumentNamedNodeListCache::getXercesNodeList(const XalanDOMString&
tagname) const
{
return m_xercesDocument.getElementsByTagName(c_wstr(tagname));
@@ -96,10 +100,14 @@
-DOM_NodeList
+DOM_NodeListType
XercesDocumentNamedNodeListCache::getXercesNodeList(
const XalanDOMString& namespaceURI,
const XalanDOMString& localName) const
{
return m_xercesDocument.getElementsByTagNameNS(c_wstr(namespaceURI),
c_wstr(localName));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +16 -5
xml-xalan/c/src/XercesParserLiaison/XercesDocumentNamedNodeListCache.hpp
Index: XercesDocumentNamedNodeListCache.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentNamedNodeListCache.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XercesDocumentNamedNodeListCache.hpp 10 Jul 2002 00:40:00 -0000
1.3
+++ XercesDocumentNamedNodeListCache.hpp 22 Nov 2002 01:12:49 -0000
1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -75,12 +75,19 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XERCESPARSERLIAISON_EXPORT XercesDocumentNamedNodeListCache :
public XercesNamedNodeListCache
{
public:
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Document
DOM_DocumentType;
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_NodeList
DOM_NodeListType;
+
XercesDocumentNamedNodeListCache(
- const DOM_Document&
theXercesDocument,
+ const DOM_DocumentType&
theXercesDocument,
const XercesBridgeNavigator& theNavigator);
virtual
@@ -88,18 +95,22 @@
protected:
- virtual DOM_NodeList
+ virtual DOM_NodeListType
getXercesNodeList(const XalanDOMString& tagname) const;
- virtual DOM_NodeList
+ virtual DOM_NodeListType
getXercesNodeList(
const XalanDOMString& namespaceURI,
const XalanDOMString& localName) const;
private:
- const DOM_Document m_xercesDocument;
+ const DOM_DocumentType m_xercesDocument;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +9 -1
xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeBridge.cpp
Index: XercesDocumentTypeBridge.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeBridge.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XercesDocumentTypeBridge.cpp 23 Feb 2002 04:02:10 -0000 1.6
+++ XercesDocumentTypeBridge.cpp 22 Nov 2002 01:12:49 -0000 1.7
@@ -68,8 +68,12 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesDocumentTypeBridge::XercesDocumentTypeBridge(
- const DOM_DocumentType&
theXercesDOMDocumentType,
+ const DOM_DocumentTypeType&
theXercesDOMDocumentType,
const XercesBridgeNavigator& theNavigator) :
XalanDocumentType(),
m_xercesNode(theXercesDOMDocumentType),
@@ -372,3 +376,7 @@
{
return m_navigator.getPooledString(m_xercesNode.getInternalSubset());
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +15 -5
xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeBridge.hpp
Index: XercesDocumentTypeBridge.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeBridge.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XercesDocumentTypeBridge.hpp 10 Jul 2002 00:40:00 -0000 1.7
+++ XercesDocumentTypeBridge.hpp 22 Nov 2002 01:12:49 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -79,6 +79,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XercesBridgeNavigator;
class XercesDocumentBridge;
@@ -88,8 +92,10 @@
{
public:
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_DocumentType
DOM_DocumentTypeType;
+
XercesDocumentTypeBridge(
- const DOM_DocumentType&
theXercesDOMDocumentType,
+ const DOM_DocumentTypeType&
theXercesDOMDocumentType,
const XercesBridgeNavigator& theNavigator);
virtual
@@ -494,7 +500,7 @@
*
* @return The Xerces node
*/
- DOM_DocumentType
+ DOM_DocumentTypeType
getXercesNode() const
{
return m_xercesNode;
@@ -511,10 +517,10 @@
operator=(const XercesDocumentTypeBridge& theSource);
bool
- operator==(const XercesDocumentTypeBridge& theRHS) const;
+ operator==(const XercesDocumentTypeBridge& theRHS) const;
// Data members...
- DOM_DocumentType m_xercesNode;
+ DOM_DocumentTypeType m_xercesNode;
XercesNamedNodeMapBridge m_entities;
@@ -522,6 +528,10 @@
const XercesBridgeNavigator& m_navigator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1
xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeWrapper.cpp
Index: XercesDocumentTypeWrapper.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeWrapper.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesDocumentTypeWrapper.cpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesDocumentTypeWrapper.cpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -73,8 +73,12 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesDocumentTypeWrapper::XercesDocumentTypeWrapper(
- const DOMDocumentType*
theXercesDOMDocumentType,
+ const DOMDocumentTypeType*
theXercesDOMDocumentType,
const XercesWrapperNavigator& theNavigator) :
XalanDocumentType(),
m_xercesNode(theXercesDOMDocumentType),
@@ -368,3 +372,7 @@
{
return m_navigator.getPooledString(m_xercesNode->getInternalSubset());
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +15 -7
xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeWrapper.hpp
Index: XercesDocumentTypeWrapper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeWrapper.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesDocumentTypeWrapper.hpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesDocumentTypeWrapper.hpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -68,10 +68,14 @@
#include <XercesParserLiaison/XercesNamedNodeMapWrapper.hpp>
+#include <XercesParserLiaison/XercesWrapperTypes.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
-class DOMDocumentType;
class XercesWrapperNavigator;
class XercesDocumentWrapper;
@@ -82,7 +86,7 @@
public:
XercesDocumentTypeWrapper(
- const DOMDocumentType*
theXercesDOMDocumentType,
+ const DOMDocumentTypeType*
theXercesDOMDocumentType,
const XercesWrapperNavigator& theNavigator);
virtual
@@ -487,7 +491,7 @@
*
* @return The Xerces node
*/
- const DOMDocumentType*
+ const DOMDocumentTypeType*
getXercesNode() const
{
return m_xercesNode;
@@ -507,14 +511,18 @@
operator==(const XercesDocumentTypeWrapper& theRHS) const;
// Data members...
- const DOMDocumentType* const m_xercesNode;
+ const DOMDocumentTypeType* const m_xercesNode;
- XercesNamedNodeMapWrapper m_entities;
+ XercesNamedNodeMapWrapper m_entities;
- XercesNamedNodeMapWrapper m_notations;
+ XercesNamedNodeMapWrapper m_notations;
- const XercesWrapperNavigator& m_navigator;
+ const XercesWrapperNavigator& m_navigator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +115 -114
xml-xalan/c/src/XercesParserLiaison/XercesDocumentWrapper.cpp
Index: XercesDocumentWrapper.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentWrapper.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XercesDocumentWrapper.cpp 11 Oct 2002 23:05:44 -0000 1.3
+++ XercesDocumentWrapper.cpp 22 Nov 2002 01:12:49 -0000 1.4
@@ -109,10 +109,14 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesDocumentWrapper::XercesDocumentWrapper(
- const DOMDocument* theXercesDocument,
- bool threadSafe,
- bool buildWrapper) :
+ const DOMDocumentType* theXercesDocument,
+ bool threadSafe,
+ bool buildWrapper) :
XalanDocument(),
m_xercesDocument(theXercesDocument),
m_documentElement(0),
@@ -133,10 +137,6 @@
{
assert(theXercesDocument != 0);
-#if !defined(XALAN_NO_NAMESPACES)
- using std::make_pair;
-#endif
-
if (m_mappingMode == false)
{
// The document index is always 1...
@@ -162,7 +162,7 @@
XalanNode*
-XercesDocumentWrapper::mapNode(const DOMNode* theXercesNode) const
+XercesDocumentWrapper::mapNode(const DOMNodeType* theXercesNode) const
{
XalanNode* theXalanNode = 0;
@@ -175,9 +175,9 @@
if (theXercesNode != m_xercesDocument &&
theXercesNode->getOwnerDocument() !=
m_xercesDocument &&
#if defined(XALAN_OLD_STYLE_CASTS)
- theXercesNode->getParentNode() != (const
DOMNode*)m_xercesDocument)
+ theXercesNode->getParentNode() != (const
DOMNodeType*)m_xercesDocument)
#else
- theXercesNode->getParentNode() !=
static_cast<const DOMNode*>(m_xercesDocument))
+ theXercesNode->getParentNode() !=
static_cast<const DOMNodeType*>(m_xercesDocument))
#endif
{
throw
XercesDOMWrapperException(XercesDOMWrapperException::WRONG_DOCUMENT_ERR);
@@ -197,10 +197,10 @@
-const DOMNode*
+const DOMNodeType*
XercesDocumentWrapper::mapNode(XalanNode* theXalanNode) const
{
- const DOMNode* theXercesNode = 0;
+ const DOMNodeType* theXercesNode = 0;
if (theXalanNode != 0)
{
@@ -217,10 +217,10 @@
-const DOMAttr*
+const DOMAttrType*
XercesDocumentWrapper::mapNode(XalanAttr* theXalanNode) const
{
- const DOMNode* theXercesNode = 0;
+ const DOMNodeType* theXercesNode = 0;
if (theXalanNode != 0)
{
@@ -233,16 +233,16 @@
}
#if defined(XALAN_OLD_STYLE_CASTS)
- return (const DOMAttr*)theXercesNode;
+ return (const DOMAttrType*)theXercesNode;
#else
- return static_cast<const DOMAttr*>(theXercesNode);
+ return static_cast<const DOMAttrType*>(theXercesNode);
#endif
}
XalanAttr*
-XercesDocumentWrapper::mapNode(const DOMAttr* theXercesNode) const
+XercesDocumentWrapper::mapNode(const DOMAttrType* theXercesNode) const
{
#if defined(XALAN_OLD_STYLE_CASTS)
return (XercesAttrWrapper*)mapNode(theXercesNode);
@@ -254,7 +254,7 @@
XalanElement*
-XercesDocumentWrapper::mapNode(const DOMElement* theXercesNode) const
+XercesDocumentWrapper::mapNode(const DOMElementType* theXercesNode)
const
{
#if defined(XALAN_OLD_STYLE_CASTS)
return (XercesElementWrapper*)mapNode(theXercesNode);
@@ -268,9 +268,7 @@
void
XercesDocumentWrapper::destroyWrapper()
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::for_each;
-#endif
+ XALAN_USING_STD(for_each)
// Set this to null, since it will be deleted
// by the next for_each...
@@ -278,9 +276,10 @@
// m_bridgeMap contains all of the nodes that
// are still alive...
- for_each(m_nodes.begin(),
- m_nodes.end(),
- DeleteFunctor<XalanNode>());
+ for_each(
+ m_nodes.begin(),
+ m_nodes.end(),
+ DeleteFunctor<XalanNode>());
// Clear everything out, since we just delete everything...
m_nodes.clear();
@@ -331,7 +330,7 @@
XercesDocumentTypeWrapper*
XercesDocumentWrapper::createWrapperNode(
- const DOMDocumentType* theDoctype,
+ const DOMDocumentTypeType* theDoctype,
unsigned long theIndex,
bool
mapNode) const
{
@@ -371,9 +370,9 @@
XercesElementWrapper*
XercesDocumentWrapper::createWrapperNode(
- const DOMElement* theXercesNode,
- unsigned long theIndex,
- bool mapNode) const
+ const DOMElementType* theXercesNode,
+ unsigned long theIndex,
+ bool mapNode) const
{
// Create a navigator...
XercesWrapperNavigator& theNavigator = pushNavigator(mapNode);
@@ -406,9 +405,9 @@
XercesTextWrapper*
XercesDocumentWrapper::createWrapperNode(
- const DOMText* theXercesNode,
- unsigned long theIndex,
- bool mapNode) const
+ const DOMTextType* theXercesNode,
+ unsigned long theIndex,
+ bool mapNode) const
{
// Create a navigator...
XercesWrapperNavigator& theNavigator = pushNavigator(mapNode);
@@ -440,9 +439,9 @@
XercesCommentWrapper*
XercesDocumentWrapper::createWrapperNode(
- const DOMComment* theXercesNode,
- unsigned long theIndex,
- bool mapNode) const
+ const DOMCommentType* theXercesNode,
+ unsigned long theIndex,
+ bool mapNode) const
{
// Create a navigator...
XercesWrapperNavigator& theNavigator = pushNavigator(mapNode);
@@ -476,9 +475,9 @@
XercesCDATASectionWrapper*
XercesDocumentWrapper::createWrapperNode(
- const DOMCDATASection* theXercesNode,
- unsigned long theIndex,
- bool mapNode) const
+ const DOMCDATASectionType* theXercesNode,
+ unsigned long theIndex,
+ bool
mapNode) const
{
// Create a navigator...
XercesWrapperNavigator& theNavigator = pushNavigator(mapNode);
@@ -512,9 +511,9 @@
XercesProcessingInstructionWrapper*
XercesDocumentWrapper::createWrapperNode(
- const DOMProcessingInstruction* theXercesNode,
- unsigned long
theIndex,
- bool
mapNode) const
+ const DOMProcessingInstructionType*
theXercesNode,
+ unsigned long
theIndex,
+ bool
mapNode) const
{
// Create a navigator...
XercesWrapperNavigator& theNavigator = pushNavigator(mapNode);
@@ -548,9 +547,9 @@
XercesAttrWrapper*
XercesDocumentWrapper::createWrapperNode(
- const DOMAttr* theXercesNode,
- unsigned long theIndex,
- bool mapNode) const
+ const DOMAttrType* theXercesNode,
+ unsigned long theIndex,
+ bool mapNode) const
{
// Create a navigator...
XercesWrapperNavigator& theNavigator = pushNavigator(mapNode);
@@ -580,9 +579,9 @@
XercesEntityWrapper*
XercesDocumentWrapper::createWrapperNode(
- const DOMEntity* theXercesNode,
- unsigned long theIndex,
- bool mapNode) const
+ const DOMEntityType* theXercesNode,
+ unsigned long theIndex,
+ bool mapNode) const
{
// Create a navigator...
XercesWrapperNavigator& theNavigator = pushNavigator(mapNode);
@@ -614,9 +613,9 @@
XercesEntityReferenceWrapper*
XercesDocumentWrapper::createWrapperNode(
- const DOMEntityReference* theXercesNode,
- unsigned long theIndex,
- bool
mapNode) const
+ const DOMEntityReferenceType* theXercesNode,
+ unsigned long
theIndex,
+ bool
mapNode) const
{
// Create a navigator...
XercesWrapperNavigator& theNavigator = pushNavigator(mapNode);
@@ -650,9 +649,9 @@
XercesNotationWrapper*
XercesDocumentWrapper::createWrapperNode(
- const DOMNotation* theXercesNode,
- unsigned long theIndex,
- bool mapNode) const
+ const DOMNotationType* theXercesNode,
+ unsigned long theIndex,
+ bool mapNode) const
{
// Create a navigator...
XercesWrapperNavigator& theNavigator = pushNavigator(mapNode);
@@ -684,9 +683,9 @@
XalanNode*
XercesDocumentWrapper::createWrapperNode(
- const DOMNode* theXercesNode,
- unsigned long theIndex,
- bool mapNode) const
+ const DOMNodeType* theXercesNode,
+ unsigned long theIndex,
+ bool mapNode) const
{
assert(theXercesNode != 0);
@@ -694,13 +693,13 @@
switch(theXercesNode->getNodeType())
{
- case DOMNode::ATTRIBUTE_NODE:
+ case DOMNodeType::ATTRIBUTE_NODE:
{
- const DOMAttr* theAttrNode =
+ const DOMAttrType* theAttrNode =
#if defined(XALAN_OLD_STYLE_CASTS)
- (const DOMAttr*)theXercesNode;
+ (const
DOMAttrType*)theXercesNode;
#else
- static_cast<const
DOMAttr*>(theXercesNode);
+ static_cast<const
DOMAttrType*>(theXercesNode);
#endif
theNewNode = createWrapperNode(theAttrNode, theIndex,
mapNode);
@@ -708,13 +707,13 @@
}
break;
- case DOMNode::CDATA_SECTION_NODE:
+ case DOMNodeType::CDATA_SECTION_NODE:
{
- const DOMCDATASection* theCDATASectionNode =
+ const DOMCDATASectionType* theCDATASectionNode =
#if defined(XALAN_OLD_STYLE_CASTS)
- (const
DOMCDATASection*)theXercesNode;
+ (const
DOMCDATASectionType*)theXercesNode;
#else
- static_cast<const
DOMCDATASection*>(theXercesNode);
+ static_cast<const
DOMCDATASectionType*>(theXercesNode);
#endif
theNewNode = createWrapperNode(theCDATASectionNode,
theIndex, mapNode);
@@ -723,13 +722,13 @@
}
break;
- case DOMNode::COMMENT_NODE:
+ case DOMNodeType::COMMENT_NODE:
{
- const DOMComment* theCommentNode =
+ const DOMCommentType* theCommentNode =
#if defined(XALAN_OLD_STYLE_CASTS)
- (const
DOMComment*)theXercesNode;
+ (const
DOMCommentType*)theXercesNode;
#else
- static_cast<const
DOMComment*>(theXercesNode);
+ static_cast<const
DOMCommentType*>(theXercesNode);
#endif
theNewNode = createWrapperNode(theCommentNode,
theIndex, mapNode);
@@ -737,17 +736,17 @@
}
break;
- case DOMNode::DOCUMENT_FRAGMENT_NODE:
+ case DOMNodeType::DOCUMENT_FRAGMENT_NODE:
throw
XercesDOMWrapperException(XercesDOMWrapperException::NOT_SUPPORTED_ERR);
break;
- case DOMNode::ELEMENT_NODE:
+ case DOMNodeType::ELEMENT_NODE:
{
- const DOMElement* theElementNode =
+ const DOMElementType* theElementNode =
#if defined(XALAN_OLD_STYLE_CASTS)
- (const
DOMElement*)theXercesNode;
+ (const
DOMElementType*)theXercesNode;
#else
- static_cast<const
DOMElement*>(theXercesNode);
+ static_cast<const
DOMElementType*>(theXercesNode);
#endif
theNewNode = createWrapperNode(theElementNode,
theIndex, mapNode);
@@ -755,13 +754,13 @@
}
break;
- case DOMNode::ENTITY_NODE:
+ case DOMNodeType::ENTITY_NODE:
{
- const DOMEntity* theEntityNode =
+ const DOMEntityType* theEntityNode =
#if defined(XALAN_OLD_STYLE_CASTS)
- (const DOMEntity*)theXercesNode;
+ (const
DOMEntityType*)theXercesNode;
#else
- static_cast<const
DOMEntity*>(theXercesNode);
+ static_cast<const
DOMEntityType*>(theXercesNode);
#endif
theNewNode = createWrapperNode(theEntityNode, theIndex,
mapNode);
@@ -769,13 +768,13 @@
}
break;
- case DOMNode::ENTITY_REFERENCE_NODE:
+ case DOMNodeType::ENTITY_REFERENCE_NODE:
{
- const DOMEntityReference* theEntityReferenceNode =
+ const DOMEntityReferenceType* theEntityReferenceNode =
#if defined(XALAN_OLD_STYLE_CASTS)
- (const
DOMEntityReference*)theXercesNode;
+ (const
DOMEntityReferenceType*)theXercesNode;
#else
- static_cast<const
DOMEntityReference*>(theXercesNode);
+ static_cast<const
DOMEntityReferenceType*>(theXercesNode);
#endif
theNewNode = createWrapperNode(theEntityReferenceNode,
theIndex, mapNode);
@@ -783,13 +782,13 @@
}
break;
- case DOMNode::NOTATION_NODE:
+ case DOMNodeType::NOTATION_NODE:
{
- const DOMNotation* theNotationNode =
+ const DOMNotationType* theNotationNode =
#if defined(XALAN_OLD_STYLE_CASTS)
- (const
DOMNotation*)theXercesNode;
+ (const
DOMNotationType*)theXercesNode;
#else
- static_cast<const
DOMNotation*>(theXercesNode);
+ static_cast<const
DOMNotationType*>(theXercesNode);
#endif
theNewNode = createWrapperNode(theNotationNode,
theIndex, mapNode);
@@ -797,13 +796,13 @@
}
break;
- case DOMNode::PROCESSING_INSTRUCTION_NODE:
+ case DOMNodeType::PROCESSING_INSTRUCTION_NODE:
{
- const DOMProcessingInstruction* thePINode =
+ const DOMProcessingInstructionType*
thePINode =
#if defined(XALAN_OLD_STYLE_CASTS)
- (const
DOMProcessingInstruction*)theXercesNode;
+ (const
DOMProcessingInstructionType*)theXercesNode;
#else
- static_cast<const
DOMProcessingInstruction*>(theXercesNode);
+ static_cast<const
DOMProcessingInstructionType*>(theXercesNode);
#endif
theNewNode = createWrapperNode(thePINode, theIndex,
mapNode);
@@ -811,13 +810,13 @@
}
break;
- case DOMNode::TEXT_NODE:
+ case DOMNodeType::TEXT_NODE:
{
- const DOMText* theTextNode =
+ const DOMTextType* theTextNode =
#if defined(XALAN_OLD_STYLE_CASTS)
- (const DOMText*)theXercesNode;
+ (const
DOMTextType*)theXercesNode;
#else
- static_cast<const
DOMText*>(theXercesNode);
+ static_cast<const
DOMTextType*>(theXercesNode);
#endif
theNewNode = createWrapperNode(theTextNode, theIndex,
mapNode);
@@ -825,13 +824,13 @@
}
break;
- case DOMNode::DOCUMENT_TYPE_NODE:
+ case DOMNodeType::DOCUMENT_TYPE_NODE:
{
- const DOMDocumentType* theDoctypeNode =
+ const DOMDocumentTypeType* theDoctypeNode =
#if defined(XALAN_OLD_STYLE_CASTS)
- (const
DOMDocumentType*)theXercesNode;
+ (const
DOMDocumentTypeType*)theXercesNode;
#else
- static_cast<const
DOMDocumentType*>(theXercesNode);
+ static_cast<const
DOMDocumentTypeType*>(theXercesNode);
#endif
theNewNode = createWrapperNode(theDoctypeNode,
theIndex, mapNode);
@@ -853,9 +852,7 @@
void
XercesDocumentWrapper::destroyNode(XalanNode* theNode)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::find;
-#endif
+ XALAN_USING_STD(find)
const NodeVectorType::iterator i =
find(m_nodes.begin(), m_nodes.end(), theNode);
@@ -1299,7 +1296,7 @@
XalanElement*
XercesDocumentWrapper::getElementById(const XalanDOMString&
elementId) const
{
- const DOMNode* const theXercesNode =
m_xercesDocument->getElementById(c_wstr(elementId));
+ const DOMNodeType* const theXercesNode =
m_xercesDocument->getElementById(c_wstr(elementId));
if (theXercesNode == 0)
{
@@ -1320,7 +1317,7 @@
void
XercesDocumentWrapper::buildWrapperNodes()
{
- const DOMNode* theStartChild = m_xercesDocument->getFirstChild();
+ const DOMNodeType* theStartChild =
m_xercesDocument->getFirstChild();
if (theStartChild != 0)
{
@@ -1393,7 +1390,7 @@
void
-XercesDocumentWrapper::BuildWrapperTreeWalker::startNode(const DOMNode*
node)
+XercesDocumentWrapper::BuildWrapperTreeWalker::startNode(const DOMNodeType*
node)
{
XalanNode* const theWrapperNode =
m_document->createWrapperNode(node, m_currentIndex, false);
@@ -1447,17 +1444,17 @@
const short theType = node->getNodeType();
- if (theType == DOMNode::DOCUMENT_TYPE_NODE)
+ if (theType == DOMNodeType::DOCUMENT_TYPE_NODE)
{
// Special case for doctype -- we have to build its entities...
- const DOMDocumentType* const theDoctype =
+ const DOMDocumentTypeType* const theDoctype =
#if defined(XALAN_OLD_STYLE_CASTS)
- (const DOMDocumentType*)node;
+ (const DOMDocumentTypeType*)node;
#else
- static_cast<const DOMDocumentType*>(node);
+ static_cast<const DOMDocumentTypeType*>(node);
#endif
- const DOMNamedNodeMap* const theEntities =
+ const DOMNamedNodeMapType* const theEntities =
theDoctype->getEntities();
const unsigned int theLength =
@@ -1469,17 +1466,17 @@
m_document->createWrapperNode(theEntities->item(i),
m_currentIndex++, true);
}
}
- else if (theType == DOMNode::ELEMENT_NODE)
+ else if (theType == DOMNodeType::ELEMENT_NODE)
{
// Special case for element nodes -- we have to build the attributes...
- const DOMElement* const theElement =
+ const DOMElementType* const theElement =
#if defined(XALAN_OLD_STYLE_CASTS)
- (const DOMElement*)node;
+ (const DOMElementType*)node;
#else
- static_cast<const DOMElement*>(node);
+ static_cast<const DOMElementType*>(node);
#endif
- const DOMNamedNodeMap* const theAttributes =
+ const DOMNamedNodeMapType* const theAttributes =
theElement->getAttributes();
assert(theAttributes != 0);
@@ -1492,7 +1489,7 @@
for (unsigned int i = 0; i < theLength; ++i)
{
// Get the attribute from the node map...
- const DOMNode* const theAttr =
theAttributes->item(i);
+ const DOMNodeType* const theAttr =
theAttributes->item(i);
assert(theAttr != 0);
// Create a bridge node.
@@ -1530,7 +1527,7 @@
void
-XercesDocumentWrapper::BuildWrapperTreeWalker::endNode(const DOMNode*
/* node */)
+XercesDocumentWrapper::BuildWrapperTreeWalker::endNode(const DOMNodeType*
/* node */)
{
assert(m_parentNavigatorStack.empty() == false);
assert(m_siblingNavigatorStack.empty() == false);
@@ -1571,3 +1568,7 @@
{
return m_stringPool->get(theString, theLength);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +50 -50
xml-xalan/c/src/XercesParserLiaison/XercesDocumentWrapper.hpp
Index: XercesDocumentWrapper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentWrapper.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesDocumentWrapper.hpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesDocumentWrapper.hpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -96,17 +96,13 @@
-class DOMComment;
-class DOMEntity;
-class DOMEntityReference;
-class DOMDocument;
-class DOMDocumentType;
-class DOMAttr;
-class DOMElement;
-class DOMCDATASection;
-class DOMNotation;
-class DOMText;
-class DOMProcessingInstruction;
+#include <XercesParserLiaison/XercesWrapperTypes.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
class XalanDOMStringPool;
class XercesCommentWrapper;
@@ -142,9 +138,9 @@
*
*/
XercesDocumentWrapper(
- const DOMDocument* theXercesDocument,
- bool threadSafe = true,
- bool buildWrapper = true);
+ const DOMDocumentType* theXercesDocument,
+ bool threadSafe =
true,
+ bool buildWrapper =
true);
virtual
~XercesDocumentWrapper();
@@ -323,18 +319,18 @@
rebuildWrapper();
XalanNode*
- mapNode(const DOMNode* theXercesNode) const;
+ mapNode(const DOMNodeType* theXercesNode) const;
XalanAttr*
- mapNode(const DOMAttr* theXercesNode) const;
+ mapNode(const DOMAttrType* theXercesNode) const;
XalanElement*
- mapNode(const DOMElement* theXercesNode) const;
+ mapNode(const DOMElementType* theXercesNode) const;
- const DOMNode*
+ const DOMNodeType*
mapNode(XalanNode* theXalanNode) const;
- const DOMAttr*
+ const DOMAttrType*
mapNode(XalanAttr* theXalanNode) const;
/**
@@ -344,7 +340,7 @@
* @return the Xerces DOMDocument instance.
*
*/
- const DOMDocument*
+ const DOMDocumentType*
getXercesDocument() const
{
return m_xercesDocument;
@@ -358,7 +354,7 @@
void
buildWrapperNodes();
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef deque<XercesWrapperNavigator> WrapperNavigatorVectorType;
typedef deque<XalanNode*> NodeVectorType;
@@ -399,7 +395,7 @@
XalanNode* m_node;
};
- #if defined(XALAN_NO_NAMESPACES)
+ #if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<NavigatorStackEntryType>
NavigatorStackType;
#else
typedef std::vector<NavigatorStackEntryType>
NavigatorStackType;
@@ -408,10 +404,10 @@
protected:
virtual void
- startNode(const DOMNode* node);
+ startNode(const DOMNodeType* node);
virtual void
- endNode(const DOMNode* node);
+ endNode(const DOMNodeType* node);
private:
@@ -474,67 +470,67 @@
// Factory methods for our implementation nodes...
XalanNode*
createWrapperNode(
- const DOMNode* theXercesNode,
- unsigned long theIndex,
- bool mapNode) const;
+ const DOMNodeType* theXercesNode,
+ unsigned long theIndex,
+ bool mapNode) const;
XercesDocumentTypeWrapper*
createWrapperNode(
- const DOMDocumentType* theDoctype,
- unsigned long theIndex,
- bool mapNode) const;
+ const DOMDocumentTypeType* theDoctype,
+ unsigned long theIndex,
+ bool
mapNode) const;
XercesElementWrapper*
createWrapperNode(
- const DOMElement* theXercesNode,
- unsigned long theIndex,
- bool mapNode) const;
+ const DOMElementType* theXercesNode,
+ unsigned long theIndex,
+ bool mapNode) const;
XercesTextWrapper*
createWrapperNode(
- const DOMText* theXercesNode,
+ const DOMTextType* theXercesNode,
unsigned long theIndex,
bool mapNode) const;
XercesCommentWrapper*
createWrapperNode(
- const DOMComment* theXercesNode,
- unsigned long theIndex,
- bool mapNode) const;
+ const DOMCommentType* theXercesNode,
+ unsigned long theIndex,
+ bool mapNode) const;
XercesCDATASectionWrapper*
createWrapperNode(
- const DOMCDATASection* theXercesNode,
+ const DOMCDATASectionType* theXercesNode,
unsigned long theIndex,
bool
mapNode) const;
XercesProcessingInstructionWrapper*
createWrapperNode(
- const DOMProcessingInstruction* theXercesNode,
- unsigned long
theIndex,
- bool
mapNode) const;
+ const DOMProcessingInstructionType*
theXercesNode,
+ unsigned long
theIndex,
+ bool
mapNode) const;
XercesAttrWrapper*
createWrapperNode(
- const DOMAttr* theXercesNode,
+ const DOMAttrType* theXercesNode,
unsigned long theIndex,
bool mapNode) const;
XercesEntityWrapper*
createWrapperNode(
- const DOMEntity* theXercesNode,
- unsigned long theIndex,
- bool mapNode) const;
+ const DOMEntityType* theXercesNode,
+ unsigned long theIndex,
+ bool mapNode) const;
XercesEntityReferenceWrapper*
createWrapperNode(
- const DOMEntityReference* theXercesNode,
- unsigned long theIndex,
- bool
mapNode) const;
+ const DOMEntityReferenceType* theXercesNode,
+ unsigned long
theIndex,
+ bool
mapNode) const;
XercesNotationWrapper*
createWrapperNode(
- const DOMNotation* theXercesNode,
+ const DOMNotationType* theXercesNode,
unsigned long theIndex,
bool mapNode) const;
@@ -544,7 +540,7 @@
// This is a private helper class for building the tree...
friend class BuildWrapperTreeWalker;
- const DOMDocument* const
m_xercesDocument;
+ const DOMDocumentType* const m_xercesDocument;
XalanElement*
m_documentElement;
@@ -576,6 +572,10 @@
const XalanAutoPtr<XalanDOMStringPool> m_stringPool;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +32 -17
xml-xalan/c/src/XercesParserLiaison/XercesElementBridge.cpp
Index: XercesElementBridge.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesElementBridge.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XercesElementBridge.cpp 23 Feb 2002 04:02:10 -0000 1.7
+++ XercesElementBridge.cpp 22 Nov 2002 01:12:49 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,8 +73,12 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesElementBridge::XercesElementBridge(
- const DOM_Element&
theXercesElement,
+ const DOM_ElementType&
theXercesElement,
const XercesBridgeNavigator& theNavigator) :
XalanElement(),
m_xercesNode(theXercesElement),
@@ -366,7 +370,7 @@
{
m_xercesNode.setAttribute(c_wstr(name), c_wstr(value));
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -379,7 +383,7 @@
{
assert(newAttr != 0);
- const DOM_Attr theXercesAttrNode =
+ const DOM_AttrType theXercesAttrNode =
m_navigator.mapNode(newAttr);
assert(theXercesAttrNode.isNull() == false);
@@ -387,12 +391,12 @@
try
{
- const DOM_Attr theXercesAttrResult =
+ const DOM_AttrType theXercesAttrResult =
m_xercesNode.setAttributeNode(theXercesAttrNode);
theXalanAttrResult = m_navigator.mapNode(theXercesAttrResult);
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -407,7 +411,7 @@
{
assert(oldAttr != 0);
- const DOM_Attr theXercesAttrNode =
+ const DOM_AttrType theXercesAttrNode =
m_navigator.mapNode(oldAttr);
assert(theXercesAttrNode.isNull() == false);
@@ -415,12 +419,12 @@
try
{
- const DOM_Attr theXercesAttrResult =
+ const DOM_AttrType theXercesAttrResult =
m_xercesNode.removeAttributeNode(theXercesAttrNode);
theXalanAttrResult = m_navigator.mapNode(theXercesAttrResult);
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -437,7 +441,7 @@
{
m_xercesNode.removeAttribute(c_wstr(name));
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -465,7 +469,7 @@
{
m_xercesNode.setAttributeNS(c_wstr(namespaceURI),
c_wstr(qualifiedName), c_wstr(value));
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -482,7 +486,7 @@
{
m_xercesNode.removeAttributeNS(c_wstr(namespaceURI),
c_wstr(localName));
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -495,10 +499,17 @@
const XalanDOMString& namespaceURI,
const XalanDOMString& localName) const
{
- const DOM_Attr theAttrNode =
+ const DOM_AttrType theAttrNode =
m_xercesNode.getAttributeNodeNS(c_wstr(namespaceURI),
c_wstr(localName));
- return m_navigator.mapNode(theAttrNode);
+ if (theAttrNode.isNull() == true)
+ {
+ return 0;
+ }
+ else
+ {
+ return m_navigator.mapNode(theAttrNode);
+ }
}
@@ -509,7 +520,7 @@
assert(newAttr != 0);
- const DOM_Attr theXercesAttrNode =
+ const DOM_AttrType theXercesAttrNode =
m_navigator.mapNode(newAttr);
assert(theXercesAttrNode.isNull() == false);
@@ -517,12 +528,12 @@
try
{
- const DOM_Attr theXercesAttrResult =
+ const DOM_AttrType theXercesAttrResult =
m_xercesNode.setAttributeNodeNS(theXercesAttrNode);
theXalanAttrResult = m_navigator.mapNode(theXercesAttrResult);
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -540,3 +551,7 @@
// Not supported...
return 0;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +13 -3
xml-xalan/c/src/XercesParserLiaison/XercesElementBridge.hpp
Index: XercesElementBridge.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesElementBridge.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XercesElementBridge.hpp 10 Jul 2002 00:40:00 -0000 1.8
+++ XercesElementBridge.hpp 22 Nov 2002 01:12:49 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -89,6 +89,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XercesBridgeNavigator;
@@ -97,8 +101,10 @@
{
public:
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Element DOM_ElementType;
+
XercesElementBridge(
- const DOM_Element&
theXercesElement,
+ const DOM_ElementType&
theXercesElement,
const XercesBridgeNavigator& theNavigator);
virtual
@@ -729,7 +735,7 @@
*
* @return The Xerces node
*/
- DOM_Element
+ DOM_ElementType
getXercesNode() const
{
return m_xercesNode;
@@ -757,6 +763,10 @@
XercesNamedNodeMapBridge m_attributes;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1
xml-xalan/c/src/XercesParserLiaison/XercesElementBridgeAllocator.cpp
Index: XercesElementBridgeAllocator.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesElementBridgeAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesElementBridgeAllocator.cpp 10 Aug 2000 18:03:35 -0000 1.1
+++ XercesElementBridgeAllocator.cpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesElementBridgeAllocator::XercesElementBridgeAllocator(size_type
theBlockCount) :
m_allocator(theBlockCount)
{
@@ -75,7 +79,7 @@
XercesElementBridgeAllocator::ObjectType*
XercesElementBridgeAllocator::create(
- const DOM_Element&
theXercesElement,
+ const DOM_ElementType&
theXercesElement,
const XercesBridgeNavigator& theNavigator)
{
ObjectType* const theBlock = m_allocator.allocateBlock();
@@ -95,3 +99,7 @@
{
m_allocator.reset();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +11 -2
xml-xalan/c/src/XercesParserLiaison/XercesElementBridgeAllocator.hpp
Index: XercesElementBridgeAllocator.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesElementBridgeAllocator.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XercesElementBridgeAllocator.hpp 3 Oct 2002 01:31:51 -0000 1.3
+++ XercesElementBridgeAllocator.hpp 22 Nov 2002 01:12:49 -0000 1.4
@@ -72,11 +72,16 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XERCESPARSERLIAISON_EXPORT XercesElementBridgeAllocator
{
public:
- typedef XercesElementBridge
ObjectType;
+ typedef XercesElementBridge ObjectType;
+
#if defined(XALAN_NO_DEFAULT_TEMPLATE_ARGUMENTS)
typedef ArenaBlock<ObjectType>
ArenaBlockType;
@@ -108,7 +113,7 @@
*/
ObjectType*
create(
- const DOM_Element&
theXercesElement,
+ const DOM_ElementType&
theXercesElement,
const XercesBridgeNavigator& theNavigator);
/**
@@ -152,6 +157,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +11 -3
xml-xalan/c/src/XercesParserLiaison/XercesElementNamedNodeListCache.cpp
Index: XercesElementNamedNodeListCache.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesElementNamedNodeListCache.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XercesElementNamedNodeListCache.cpp 10 Jul 2002 00:40:00 -0000
1.5
+++ XercesElementNamedNodeListCache.cpp 22 Nov 2002 01:12:49 -0000
1.6
@@ -72,8 +72,12 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesElementNamedNodeListCache::XercesElementNamedNodeListCache(
- const DOM_Element&
theXercesElement,
+ const DOM_ElementType&
theXercesElement,
const XercesBridgeNavigator& theNavigator) :
XercesNamedNodeListCache(theNavigator),
m_xercesElement(theXercesElement)
@@ -88,7 +92,7 @@
-DOM_NodeList
+DOM_NodeListType
XercesElementNamedNodeListCache::getXercesNodeList(const XalanDOMString&
tagname) const
{
return m_xercesElement.getElementsByTagName(c_wstr(tagname));
@@ -96,10 +100,14 @@
-DOM_NodeList
+DOM_NodeListType
XercesElementNamedNodeListCache::getXercesNodeList(
const XalanDOMString& namespaceURI,
const XalanDOMString& localName) const
{
return m_xercesElement.getElementsByTagNameNS(c_wstr(namespaceURI),
c_wstr(localName));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +13 -4
xml-xalan/c/src/XercesParserLiaison/XercesElementNamedNodeListCache.hpp
Index: XercesElementNamedNodeListCache.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesElementNamedNodeListCache.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XercesElementNamedNodeListCache.hpp 10 Jul 2002 00:40:00 -0000
1.3
+++ XercesElementNamedNodeListCache.hpp 22 Nov 2002 01:12:49 -0000
1.4
@@ -72,6 +72,11 @@
#include <XercesParserLiaison/XercesNamedNodeListCache.hpp>
+#include <XercesParserLiaison/XercesBridgeTypes.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
@@ -80,7 +85,7 @@
public:
XercesElementNamedNodeListCache(
- const DOM_Element&
theXercesElement,
+ const DOM_ElementType&
theXercesElement,
const XercesBridgeNavigator& theNavigator);
virtual
@@ -88,18 +93,22 @@
protected:
- virtual DOM_NodeList
+ virtual DOM_NodeListType
getXercesNodeList(const XalanDOMString& tagname) const;
- virtual DOM_NodeList
+ virtual DOM_NodeListType
getXercesNodeList(
const XalanDOMString& namespaceURI,
const XalanDOMString& localName) const;
private:
- const DOM_Element m_xercesElement;
+ const DOM_ElementType m_xercesElement;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +20 -5
xml-xalan/c/src/XercesParserLiaison/XercesElementWrapper.cpp
Index: XercesElementWrapper.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesElementWrapper.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesElementWrapper.cpp 3 Oct 2002 03:52:59 -0000 1.2
+++ XercesElementWrapper.cpp 22 Nov 2002 01:12:49 -0000 1.3
@@ -77,8 +77,12 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesElementWrapper::XercesElementWrapper(
- const DOMElement*
theXercesElement,
+ const DOMElementType*
theXercesElement,
const XercesWrapperNavigator& theNavigator) :
XalanElement(),
m_xercesNode(theXercesElement),
@@ -336,7 +340,7 @@
const XalanDOMString&
-XercesElementWrapper::getAttribute(const XalanDOMString& name)
const
+XercesElementWrapper::getAttribute(const XalanDOMString& name) const
{
return
m_navigator.getPooledString(m_xercesNode->getAttribute(c_wstr(name)));
}
@@ -344,7 +348,7 @@
XalanAttr*
-XercesElementWrapper::getAttributeNode(const XalanDOMString& name)
const
+XercesElementWrapper::getAttributeNode(const XalanDOMString& name) const
{
#if defined(XALAN_OLD_STYLE_CASTS)
return (XalanAttr*)m_attributes.getNamedItem(name);
@@ -439,10 +443,17 @@
const XalanDOMString& namespaceURI,
const XalanDOMString& localName) const
{
- DOMAttr* const theAttrNode =
+ DOMAttrType* const theAttrNode =
m_xercesNode->getAttributeNodeNS(c_wstr(namespaceURI),
c_wstr(localName));
- return m_navigator.mapNode(theAttrNode);
+ if (theAttrNode == 0)
+ {
+ return 0;
+ }
+ else
+ {
+ return m_navigator.mapNode(theAttrNode);
+ }
}
@@ -466,3 +477,7 @@
return 0;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +12 -4
xml-xalan/c/src/XercesParserLiaison/XercesElementWrapper.hpp
Index: XercesElementWrapper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesElementWrapper.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesElementWrapper.hpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesElementWrapper.hpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -77,10 +77,14 @@
#include <XercesParserLiaison/XercesNamedNodeMapWrapper.hpp>
#include <XercesParserLiaison/XercesNodeListWrapper.hpp>
+#include <XercesParserLiaison/XercesWrapperTypes.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
-class DOMElement;
class XercesWrapperNavigator;
@@ -90,7 +94,7 @@
public:
XercesElementWrapper(
- const DOMElement*
theXercesElement,
+ const DOMElementType*
theXercesElement,
const XercesWrapperNavigator& theNavigator);
virtual
@@ -721,7 +725,7 @@
*
* @return The Xerces node
*/
- const DOMElement*
+ const DOMElementType*
getXercesNode() const
{
return m_xercesNode;
@@ -741,7 +745,7 @@
operator==(const XercesElementWrapper& theRHS) const;
// Data members...
- const DOMElement* const m_xercesNode;
+ const DOMElementType* const m_xercesNode;
const XercesWrapperNavigator& m_navigator;
@@ -749,6 +753,10 @@
XercesNamedNodeMapWrapper m_attributes;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1
xml-xalan/c/src/XercesParserLiaison/XercesElementWrapperAllocator.cpp
Index: XercesElementWrapperAllocator.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesElementWrapperAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesElementWrapperAllocator.cpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesElementWrapperAllocator.cpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesElementWrapperAllocator::XercesElementWrapperAllocator(size_type
theBlockCount) :
m_allocator(theBlockCount)
{
@@ -75,7 +79,7 @@
XercesElementWrapperAllocator::ObjectType*
XercesElementWrapperAllocator::create(
- const DOMElement*
theXercesElement,
+ const DOMElementType*
theXercesElement,
const XercesWrapperNavigator& theNavigator)
{
ObjectType* const theBlock = m_allocator.allocateBlock();
@@ -95,3 +99,7 @@
{
m_allocator.reset();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +8 -3
xml-xalan/c/src/XercesParserLiaison/XercesElementWrapperAllocator.hpp
Index: XercesElementWrapperAllocator.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesElementWrapperAllocator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesElementWrapperAllocator.hpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesElementWrapperAllocator.hpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -69,10 +69,11 @@
#include <XercesParserLiaison/XercesElementWrapper.hpp>
+#include <XercesParserLiaison/XercesWrapperTypes.hpp>
-class DOMElement;
+XALAN_CPP_NAMESPACE_BEGIN
@@ -80,7 +81,7 @@
{
public:
- typedef XercesElementWrapper
ObjectType;
+ typedef XercesElementWrapper
ObjectType;
#if defined(XALAN_NO_DEFAULT_TEMPLATE_ARGUMENTS)
typedef ArenaBlock<ObjectType>
ArenaBlockType;
@@ -112,7 +113,7 @@
*/
ObjectType*
create(
- const DOMElement*
theXercesElement,
+ const DOMElementType*
theXercesElement,
const XercesWrapperNavigator& theNavigator);
/**
@@ -156,6 +157,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +10 -2
xml-xalan/c/src/XercesParserLiaison/XercesEntityBridge.cpp
Index: XercesEntityBridge.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesEntityBridge.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XercesEntityBridge.cpp 23 Feb 2002 04:02:10 -0000 1.6
+++ XercesEntityBridge.cpp 22 Nov 2002 01:12:49 -0000 1.7
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -68,8 +68,12 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesEntityBridge::XercesEntityBridge(
- const DOM_Entity&
theXercesDOMEntity,
+ const DOM_EntityType&
theXercesDOMEntity,
const XercesBridgeNavigator& theNavigator) :
XalanEntity(),
m_xercesNode(theXercesDOMEntity),
@@ -334,3 +338,7 @@
{
return m_navigator.getPooledString(m_xercesNode.getNotationName());
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +13 -3
xml-xalan/c/src/XercesParserLiaison/XercesEntityBridge.hpp
Index: XercesEntityBridge.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesEntityBridge.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XercesEntityBridge.hpp 10 Jul 2002 00:40:00 -0000 1.8
+++ XercesEntityBridge.hpp 22 Nov 2002 01:12:49 -0000 1.9
@@ -79,6 +79,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XercesBridgeNavigator;
@@ -87,8 +91,10 @@
{
public:
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Entity
DOM_EntityType;
+
XercesEntityBridge(
- const DOM_Entity&
theXercesDOMEntity,
+ const DOM_EntityType&
theXercesDOMEntity,
const XercesBridgeNavigator& theNavigator);
virtual
@@ -472,7 +478,7 @@
*
* @return The Xerces node
*/
- DOM_Entity
+ DOM_EntityType
getXercesNode() const
{
return m_xercesNode;
@@ -497,12 +503,16 @@
// constructor parameter. I have no idea why MSVC
// generate bogus code when using the parameter, but
// it does...
- DOM_Entity m_xercesNode;
+ DOM_EntityType m_xercesNode;
const XercesBridgeNavigator& m_navigator;
XercesNodeListBridge m_children;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +10 -2
xml-xalan/c/src/XercesParserLiaison/XercesEntityReferenceBridge.cpp
Index: XercesEntityReferenceBridge.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesEntityReferenceBridge.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XercesEntityReferenceBridge.cpp 23 Feb 2002 04:02:11 -0000 1.5
+++ XercesEntityReferenceBridge.cpp 22 Nov 2002 01:12:49 -0000 1.6
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -67,8 +67,12 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesEntityReferenceBridge::XercesEntityReferenceBridge(
- const DOM_EntityReference&
theXercesDOMEntityReference,
+ const DOM_EntityReferenceType&
theXercesDOMEntityReference,
const XercesBridgeNavigator& theNavigator) :
XalanEntityReference(),
m_xercesNode(theXercesDOMEntityReference),
@@ -310,3 +314,7 @@
{
return m_navigator.getIndex();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +12 -3
xml-xalan/c/src/XercesParserLiaison/XercesEntityReferenceBridge.hpp
Index: XercesEntityReferenceBridge.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesEntityReferenceBridge.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XercesEntityReferenceBridge.hpp 10 Jul 2002 00:40:00 -0000 1.7
+++ XercesEntityReferenceBridge.hpp 22 Nov 2002 01:12:49 -0000 1.8
@@ -75,10 +75,15 @@
+#include <XercesParserLiaison/XercesBridgeTypes.hpp>
#include <XercesParserLiaison/XercesNodeListBridge.hpp>
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XercesBridgeNavigator;
@@ -88,7 +93,7 @@
public:
XercesEntityReferenceBridge(
- const DOM_EntityReference&
theXercesDOMEntityReference,
+ const DOM_EntityReferenceType&
theXercesDOMEntityReference,
const XercesBridgeNavigator& theNavigator);
virtual
@@ -440,7 +445,7 @@
*
* @return The Xerces node
*/
- DOM_EntityReference
+ DOM_EntityReferenceType
getXercesNode() const
{
return m_xercesNode;
@@ -460,12 +465,16 @@
operator==(const XercesEntityReferenceBridge& theRHS) const;
// Data members...
- DOM_EntityReference m_xercesNode;
+ DOM_EntityReferenceType m_xercesNode;
const XercesBridgeNavigator& m_navigator;
XercesNodeListBridge m_children;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1
xml-xalan/c/src/XercesParserLiaison/XercesEntityReferenceWrapper.cpp
Index: XercesEntityReferenceWrapper.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesEntityReferenceWrapper.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesEntityReferenceWrapper.cpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesEntityReferenceWrapper.cpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -73,8 +73,12 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesEntityReferenceWrapper::XercesEntityReferenceWrapper(
- const DOMEntityReference*
theXercesDOMEntityReference,
+ const DOMEntityReferenceType*
theXercesDOMEntityReference,
const XercesWrapperNavigator& theNavigator) :
XalanEntityReference(),
m_xercesNode(theXercesDOMEntityReference),
@@ -318,3 +322,7 @@
{
return m_navigator.getIndex();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +14 -6
xml-xalan/c/src/XercesParserLiaison/XercesEntityReferenceWrapper.hpp
Index: XercesEntityReferenceWrapper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesEntityReferenceWrapper.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesEntityReferenceWrapper.hpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesEntityReferenceWrapper.hpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -68,10 +68,14 @@
#include <XercesParserLiaison/XercesNodeListWrapper.hpp>
+#include <XercesParserLiaison/XercesWrapperTypes.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
-class DOMEntityReference;
class XercesWrapperNavigator;
@@ -81,7 +85,7 @@
public:
XercesEntityReferenceWrapper(
- const DOMEntityReference*
theXercesDOMEntityReference,
+ const DOMEntityReferenceType*
theXercesDOMEntityReference,
const XercesWrapperNavigator& theNavigator);
virtual
@@ -433,7 +437,7 @@
*
* @return The Xerces node
*/
- const DOMEntityReference*
+ const DOMEntityReferenceType*
getXercesNode() const
{
return m_xercesNode;
@@ -453,12 +457,16 @@
operator==(const XercesEntityReferenceWrapper& theRHS) const;
// Data members...
- const DOMEntityReference* const m_xercesNode;
+ const DOMEntityReferenceType* const m_xercesNode;
- const XercesWrapperNavigator& m_navigator;
+ const XercesWrapperNavigator& m_navigator;
- XercesNodeListWrapper m_children;
+ XercesNodeListWrapper m_children;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1
xml-xalan/c/src/XercesParserLiaison/XercesEntityWrapper.cpp
Index: XercesEntityWrapper.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesEntityWrapper.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesEntityWrapper.cpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesEntityWrapper.cpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -73,8 +73,12 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesEntityWrapper::XercesEntityWrapper(
- const DOMEntity*
theXercesDOMEntity,
+ const DOMEntityType*
theXercesDOMEntity,
const XercesWrapperNavigator& theNavigator) :
XalanEntity(),
m_xercesNode(theXercesDOMEntity),
@@ -342,3 +346,7 @@
{
return m_navigator.getPooledString(m_xercesNode->getNotationName());
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +12 -4
xml-xalan/c/src/XercesParserLiaison/XercesEntityWrapper.hpp
Index: XercesEntityWrapper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesEntityWrapper.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesEntityWrapper.hpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesEntityWrapper.hpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -68,10 +68,14 @@
#include <XercesParserLiaison/XercesNodeListWrapper.hpp>
+#include <XercesParserLiaison/XercesWrapperTypes.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
-class DOMEntity;
class XercesWrapperNavigator;
@@ -81,7 +85,7 @@
public:
XercesEntityWrapper(
- const DOMEntity*
theXercesDOMEntity,
+ const DOMEntityType*
theXercesDOMEntity,
const XercesWrapperNavigator& theNavigator);
virtual
@@ -465,7 +469,7 @@
*
* @return The Xerces node
*/
- const DOMEntity*
+ const DOMEntityType*
getXercesNode() const
{
return m_xercesNode;
@@ -483,12 +487,16 @@
operator==(const XercesEntityWrapper& theRHS) const;
// Data members...
- const DOMEntity* const m_xercesNode;
+ const DOMEntityType* const m_xercesNode;
const XercesWrapperNavigator& m_navigator;
XercesNodeListWrapper m_children;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +18 -10
xml-xalan/c/src/XercesParserLiaison/XercesLiaisonXalanDOMStringPool.cpp
Index: XercesLiaisonXalanDOMStringPool.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesLiaisonXalanDOMStringPool.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XercesLiaisonXalanDOMStringPool.cpp 27 Aug 2002 23:56:20 -0000
1.4
+++ XercesLiaisonXalanDOMStringPool.cpp 22 Nov 2002 01:12:49 -0000
1.5
@@ -60,8 +60,12 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesLiaisonXalanDOMStringPool::XercesLiaisonXalanDOMStringPool() :
- XalanDOMStringPool(),
+ ParentType(),
m_mutex()
{
}
@@ -77,9 +81,9 @@
void
XercesLiaisonXalanDOMStringPool::clear()
{
- XMLMutexLock theLock(&m_mutex);
+ XMLMutexLockType theLock(&m_mutex);
- BaseClassType::clear();
+ ParentType::clear();
}
@@ -88,12 +92,12 @@
XercesLiaisonXalanDOMStringPool::size() const
{
#if defined(XALAN_NO_MUTABLE)
- XMLMutexLock
theLock(&((XercesLiaisonXalanDOMStringPool*)this)->m_mutex);
+ XMLMutexLockType
theLock(&((XercesLiaisonXalanDOMStringPool*)this)->m_mutex);
#else
- XMLMutexLock theLock(&m_mutex);
+ XMLMutexLockType theLock(&m_mutex);
#endif
- return BaseClassType::size();
+ return ParentType::size();
}
@@ -101,9 +105,9 @@
const XalanDOMString&
XercesLiaisonXalanDOMStringPool::get(const XalanDOMString& theString)
{
- XMLMutexLock theLock(&m_mutex);
+ XMLMutexLockType theLock(&m_mutex);
- return BaseClassType::get(theString);
+ return ParentType::get(theString);
}
@@ -113,7 +117,11 @@
const XalanDOMChar* theString,
XalanDOMString::size_type theLength)
{
- XMLMutexLock theLock(&m_mutex);
+ XMLMutexLockType theLock(&m_mutex);
- return BaseClassType::get(theString, theLength);
+ return ParentType::get(theString, theLength);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +12 -2
xml-xalan/c/src/XercesParserLiaison/XercesLiaisonXalanDOMStringPool.hpp
Index: XercesLiaisonXalanDOMStringPool.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesLiaisonXalanDOMStringPool.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XercesLiaisonXalanDOMStringPool.hpp 27 Aug 2002 23:56:20 -0000
1.5
+++ XercesLiaisonXalanDOMStringPool.hpp 22 Nov 2002 01:12:49 -0000
1.6
@@ -72,12 +72,18 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
// A version of XalanDOMStringPool which is synchronized using a Xerces
Mutex.
class XALAN_XERCESPARSERLIAISON_EXPORT XercesLiaisonXalanDOMStringPool :
public XalanDOMStringPool
{
public:
- typedef XalanDOMStringPool BaseClassType;
+ typedef XalanDOMStringPool ParentType;
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER XMLMutex
XMLMutexType;
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER XMLMutexLock
XMLMutexLockType;
explicit
XercesLiaisonXalanDOMStringPool();
@@ -113,8 +119,12 @@
operator==(const XercesLiaisonXalanDOMStringPool&) const;
// Data members...
- mutable XMLMutex m_mutex;
+ mutable XMLMutexType m_mutex;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +18 -10
xml-xalan/c/src/XercesParserLiaison/XercesNamedNodeListCache.cpp
Index: XercesNamedNodeListCache.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesNamedNodeListCache.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XercesNamedNodeListCache.cpp 10 Jul 2002 00:40:00 -0000 1.8
+++ XercesNamedNodeListCache.cpp 22 Nov 2002 01:12:49 -0000 1.9
@@ -82,6 +82,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesNamedNodeListCache::XercesNamedNodeListCache(const
XercesBridgeNavigator& theNavigator) :
m_navigator(theNavigator),
m_cachedNodeLists(),
@@ -93,17 +97,17 @@
XercesNamedNodeListCache::~XercesNamedNodeListCache()
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::for_each;
-#endif
+ XALAN_USING_STD(for_each)
- for_each(m_cachedNodeLists.begin(),
- m_cachedNodeLists.end(),
- makeMapValueDeleteFunctor(m_cachedNodeLists));
-
- for_each(m_cachedNodeListsNS.begin(),
- m_cachedNodeListsNS.end(),
- makeMapValueDeleteFunctor(m_cachedNodeListsNS));
+ for_each(
+ m_cachedNodeLists.begin(),
+ m_cachedNodeLists.end(),
+ makeMapValueDeleteFunctor(m_cachedNodeLists));
+
+ for_each(
+ m_cachedNodeListsNS.begin(),
+ m_cachedNodeListsNS.end(),
+ makeMapValueDeleteFunctor(m_cachedNodeListsNS));
}
@@ -173,3 +177,7 @@
#endif
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +15 -4
xml-xalan/c/src/XercesParserLiaison/XercesNamedNodeListCache.hpp
Index: XercesNamedNodeListCache.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesNamedNodeListCache.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XercesNamedNodeListCache.hpp 19 Sep 2000 14:47:37 -0000 1.4
+++ XercesNamedNodeListCache.hpp 22 Nov 2002 01:12:49 -0000 1.5
@@ -75,7 +75,14 @@
-class DOM_NodeList;
+#include <XercesParserLiaison/XercesBridgeTypes.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XercesBridgeNavigator;
class XercesNodeListBridge;
@@ -98,7 +105,7 @@
const XalanDOMString& namespaceURI,
const XalanDOMString& localName) const;
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef map<XalanDOMString,
XercesNodeListBridge*,
less<XalanDOMString> >
NodeListCacheType;
@@ -109,10 +116,10 @@
protected:
- virtual DOM_NodeList
+ virtual DOM_NodeListType
getXercesNodeList(const XalanDOMString& tagname) const = 0;
- virtual DOM_NodeList
+ virtual DOM_NodeListType
getXercesNodeList(
const XalanDOMString& namespaceURI,
const XalanDOMString& localName) const = 0;
@@ -129,6 +136,10 @@
mutable NodeListCacheType m_cachedNodeListsNS;
#endif
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +20 -12
xml-xalan/c/src/XercesParserLiaison/XercesNamedNodeMapBridge.cpp
Index: XercesNamedNodeMapBridge.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesNamedNodeMapBridge.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XercesNamedNodeMapBridge.cpp 10 Jul 2002 00:40:00 -0000 1.5
+++ XercesNamedNodeMapBridge.cpp 22 Nov 2002 01:12:49 -0000 1.6
@@ -77,13 +77,17 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesNamedNodeMapBridge::XercesNamedNodeMapBridge(
- const DOM_NamedNodeMap&
theXercesNamedNodeMap,
+ const DOM_NamedNodeMapType&
theXercesNamedNodeMap,
const XercesBridgeNavigator& theNavigator) :
m_xercesNamedNodeMap(theXercesNamedNodeMap),
m_navigator(theNavigator)
{
- assert(m_xercesNamedNodeMap != (const DOM_NullPtr*)0);
+ assert(m_xercesNamedNodeMap != (const XERCES_CPP_NAMESPACE_QUALIFIER
DOM_NullPtr*)0);
}
@@ -102,7 +106,7 @@
XalanNode* theXalanNode = 0;
// Find the DOM_Node that corresponds to the bridge node...
- const DOM_Node theNode = m_navigator.mapNode(arg);
+ const DOM_NodeType theNode = m_navigator.mapNode(arg);
if (theNode.isNull() == true)
{
@@ -112,7 +116,7 @@
try
{
- const DOM_Node theOldXercesNode =
+ const DOM_NodeType theOldXercesNode =
m_xercesNamedNodeMap.setNamedItem(theNode);
if (theNode.isNull() == false)
@@ -122,7 +126,7 @@
assert(theXalanNode != 0);
}
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -163,14 +167,14 @@
try
{
- const DOM_Node theXercesNode =
+ const DOM_NodeType theXercesNode =
m_xercesNamedNodeMap.removeNamedItem(c_wstr(name));
// A node was removed, so get it corresponding XalanNode...
theXalanNode = m_navigator.mapNode(theXercesNode);
assert(theXalanNode != 0);
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -202,7 +206,7 @@
XalanNode* theXalanNode = 0;
// Find the DOM_Node that corresponds to the bridge node...
- const DOM_Node theNode = m_navigator.mapNode(arg);
+ const DOM_NodeType theNode = m_navigator.mapNode(arg);
if (theNode.isNull() == true)
{
@@ -212,7 +216,7 @@
try
{
- const DOM_Node theOldXercesNode =
+ const DOM_NodeType theOldXercesNode =
m_xercesNamedNodeMap.setNamedItemNS(theNode);
if (theNode.isNull() == false)
@@ -222,7 +226,7 @@
assert(theXalanNode != 0);
}
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
@@ -241,17 +245,21 @@
try
{
- const DOM_Node theXercesNode =
+ const DOM_NodeType theXercesNode =
m_xercesNamedNodeMap.removeNamedItemNS(c_wstr(namespaceURI), c_wstr(localName));
// A node was removed, so get it corresponding XalanNode...
theXalanNode = m_navigator.mapNode(theXercesNode);
assert(theXalanNode != 0);
}
- catch(const DOM_DOMException& theException)
+ catch(const DOM_DOMExceptionType& theException)
{
throw XercesDOMException(theException);
}
return theXalanNode;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +13 -3
xml-xalan/c/src/XercesParserLiaison/XercesNamedNodeMapBridge.hpp
Index: XercesNamedNodeMapBridge.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesNamedNodeMapBridge.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XercesNamedNodeMapBridge.hpp 10 Jul 2002 00:40:00 -0000 1.3
+++ XercesNamedNodeMapBridge.hpp 22 Nov 2002 01:12:49 -0000 1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -75,6 +75,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XercesBridgeNavigator;
class XercesNodeBridge;
@@ -84,8 +88,10 @@
{
public:
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_NamedNodeMap
DOM_NamedNodeMapType;
+
XercesNamedNodeMapBridge(
- const DOM_NamedNodeMap&
theXercesNamedNodeMap,
+ const DOM_NamedNodeMapType&
theXercesNamedNodeMap,
const XercesBridgeNavigator& theNavigator);
virtual
@@ -266,10 +272,14 @@
// $$$ ToDo: Eventually, this will not need to be mutable.
- mutable DOM_NamedNodeMap m_xercesNamedNodeMap;
+ mutable DOM_NamedNodeMapType m_xercesNamedNodeMap;
const XercesBridgeNavigator& m_navigator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1
xml-xalan/c/src/XercesParserLiaison/XercesNamedNodeMapWrapper.cpp
Index: XercesNamedNodeMapWrapper.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesNamedNodeMapWrapper.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesNamedNodeMapWrapper.cpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesNamedNodeMapWrapper.cpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -73,8 +73,12 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesNamedNodeMapWrapper::XercesNamedNodeMapWrapper(
- const DOMNamedNodeMap*
theXercesNamedNodeMap,
+ const DOMNamedNodeMapType*
theXercesNamedNodeMap,
const XercesWrapperNavigator& theNavigator) :
m_xercesNamedNodeMap(theXercesNamedNodeMap),
m_navigator(theNavigator)
@@ -166,3 +170,7 @@
return 0;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +15 -4
xml-xalan/c/src/XercesParserLiaison/XercesNamedNodeMapWrapper.hpp
Index: XercesNamedNodeMapWrapper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesNamedNodeMapWrapper.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesNamedNodeMapWrapper.hpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesNamedNodeMapWrapper.hpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -67,7 +67,14 @@
-class DOMNamedNodeMap;
+#include <XercesParserLiaison/XercesWrapperTypes.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XercesWrapperNavigator;
class XercesNodeBridge;
@@ -78,7 +85,7 @@
public:
XercesNamedNodeMapWrapper(
- const DOMNamedNodeMap*
theXercesNamedNodeMap,
+ const DOMNamedNodeMapType*
theXercesNamedNodeMap,
const XercesWrapperNavigator& theNavigator);
virtual
@@ -258,10 +265,14 @@
operator==(const XercesNamedNodeMapWrapper& theRHS) const;
- const DOMNamedNodeMap* const m_xercesNamedNodeMap;
+ const DOMNamedNodeMapType* const m_xercesNamedNodeMap;
- const XercesWrapperNavigator& m_navigator;
+ const XercesWrapperNavigator& m_navigator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +10 -2
xml-xalan/c/src/XercesParserLiaison/XercesNodeListBridge.cpp
Index: XercesNodeListBridge.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesNodeListBridge.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesNodeListBridge.cpp 11 Apr 2000 14:39:30 -0000 1.1
+++ XercesNodeListBridge.cpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -66,8 +66,12 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesNodeListBridge::XercesNodeListBridge(
- const DOM_NodeList&
theXercesNodeList,
+ const DOM_NodeListType&
theXercesNodeList,
const XercesBridgeNavigator& theNavigator) :
XalanNodeList(),
m_xercesNodeList(theXercesNodeList),
@@ -105,3 +109,7 @@
{
return m_xercesNodeList.getLength();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +15 -3
xml-xalan/c/src/XercesParserLiaison/XercesNodeListBridge.hpp
Index: XercesNodeListBridge.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesNodeListBridge.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XercesNodeListBridge.hpp 10 Jul 2002 00:40:00 -0000 1.3
+++ XercesNodeListBridge.hpp 22 Nov 2002 01:12:49 -0000 1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -75,6 +75,14 @@
+#include <XercesParserLiaison/XercesBridgeTypes.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XercesBridgeNavigator;
@@ -84,7 +92,7 @@
public:
XercesNodeListBridge(
- const DOM_NodeList&
theXercesNodeList,
+ const DOM_NodeListType&
theXercesNodeList,
const XercesBridgeNavigator& theNavigator);
XercesNodeListBridge(const XercesNodeListBridge& theSource);
@@ -130,10 +138,14 @@
// Data members...
- DOM_NodeList m_xercesNodeList;
+ DOM_NodeListType m_xercesNodeList;
const XercesBridgeNavigator& m_navigator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +9 -1
xml-xalan/c/src/XercesParserLiaison/XercesNodeListWrapper.cpp
Index: XercesNodeListWrapper.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesNodeListWrapper.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesNodeListWrapper.cpp 3 Oct 2002 03:46:09 -0000 1.2
+++ XercesNodeListWrapper.cpp 22 Nov 2002 01:12:49 -0000 1.3
@@ -70,8 +70,12 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesNodeListWrapper::XercesNodeListWrapper(
- const DOMNodeList*
theXercesNodeList,
+ const DOMNodeListType*
theXercesNodeList,
const XercesWrapperNavigator& theNavigator) :
XalanNodeList(),
m_xercesNodeList(theXercesNodeList),
@@ -114,3 +118,7 @@
return m_xercesNodeList->getLength();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +14 -3
xml-xalan/c/src/XercesParserLiaison/XercesNodeListWrapper.hpp
Index: XercesNodeListWrapper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesNodeListWrapper.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesNodeListWrapper.hpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesNodeListWrapper.hpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -67,7 +67,14 @@
-class DOMNodeList;
+#include <XercesParserLiaison/XercesWrapperTypes.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XercesWrapperNavigator;
@@ -77,7 +84,7 @@
public:
XercesNodeListWrapper(
- const DOMNodeList*
theXercesNodeList,
+ const DOMNodeListType*
theXercesNodeList,
const XercesWrapperNavigator& theNavigator);
XercesNodeListWrapper(const XercesNodeListWrapper& theSource);
@@ -123,10 +130,14 @@
// Data members...
- const DOMNodeList* m_xercesNodeList;
+ const DOMNodeListType* m_xercesNodeList;
const XercesWrapperNavigator& m_navigator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +10 -2
xml-xalan/c/src/XercesParserLiaison/XercesNotationBridge.cpp
Index: XercesNotationBridge.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesNotationBridge.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XercesNotationBridge.cpp 23 Feb 2002 04:02:11 -0000 1.5
+++ XercesNotationBridge.cpp 22 Nov 2002 01:12:49 -0000 1.6
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -67,8 +67,12 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesNotationBridge::XercesNotationBridge(
- const DOM_Notation&
theXercesDOMNotation,
+ const DOM_NotationType&
theXercesDOMNotation,
const XercesBridgeNavigator& theNavigator) :
XalanNotation(),
m_xercesNode(theXercesDOMNotation),
@@ -323,3 +327,7 @@
{
return m_navigator.getPooledString(m_xercesNode.getSystemId());
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +16 -4
xml-xalan/c/src/XercesParserLiaison/XercesNotationBridge.hpp
Index: XercesNotationBridge.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesNotationBridge.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XercesNotationBridge.hpp 10 Jul 2002 00:40:00 -0000 1.7
+++ XercesNotationBridge.hpp 22 Nov 2002 01:12:49 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -75,6 +75,14 @@
+#include <XercesParserLiaison/XercesBridgeTypes.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XercesBridgeNavigator;
@@ -84,7 +92,7 @@
public:
XercesNotationBridge(
- const DOM_Notation&
theXercesDOMNotation,
+ const DOM_NotationType&
theXercesDOMNotation,
const XercesBridgeNavigator& theNavigator);
virtual
@@ -460,7 +468,7 @@
*
* @return The Xerces node
*/
- DOM_Notation
+ DOM_NotationType
getXercesNode() const
{
return m_xercesNode;
@@ -478,10 +486,14 @@
operator==(const XercesNotationBridge& theRHS) const;
// Data members...
- DOM_Notation m_xercesNode;
+ DOM_NotationType m_xercesNode;
const XercesBridgeNavigator& m_navigator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1
xml-xalan/c/src/XercesParserLiaison/XercesNotationWrapper.cpp
Index: XercesNotationWrapper.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesNotationWrapper.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesNotationWrapper.cpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesNotationWrapper.cpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -73,8 +73,12 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesNotationWrapper::XercesNotationWrapper(
- const DOMNotation*
theXercesDOMNotation,
+ const DOMNotationType*
theXercesDOMNotation,
const XercesWrapperNavigator& theNavigator) :
XalanNotation(),
m_xercesNode(theXercesDOMNotation),
@@ -332,3 +336,7 @@
{
return m_navigator.getPooledString(m_xercesNode->getSystemId());
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +15 -4
xml-xalan/c/src/XercesParserLiaison/XercesNotationWrapper.hpp
Index: XercesNotationWrapper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesNotationWrapper.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesNotationWrapper.hpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesNotationWrapper.hpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -67,7 +67,14 @@
-class DOMNotation;
+#include <XercesParserLiaison/XercesWrapperTypes.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XercesWrapperNavigator;
@@ -77,7 +84,7 @@
public:
XercesNotationWrapper(
- const DOMNotation*
theXercesDOMNotation,
+ const DOMNotationType*
theXercesDOMNotation,
const XercesWrapperNavigator& theNavigator);
virtual
@@ -453,7 +460,7 @@
*
* @return The Xerces node
*/
- const DOMNotation*
+ const DOMNotationType*
getXercesNode() const
{
return m_xercesNode;
@@ -471,10 +478,14 @@
operator==(const XercesNotationWrapper& theRHS) const;
// Data members...
- const DOMNotation* const m_xercesNode;
+ const DOMNotationType* const m_xercesNode;
const XercesWrapperNavigator& m_navigator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.56 +50 -56
xml-xalan/c/src/XercesParserLiaison/XercesParserLiaison.cpp
Index: XercesParserLiaison.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesParserLiaison.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- XercesParserLiaison.cpp 17 Nov 2002 00:48:06 -0000 1.55
+++ XercesParserLiaison.cpp 22 Nov 2002 01:12:49 -0000 1.56
@@ -97,6 +97,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesParserLiaison::XercesParserLiaison(XercesDOMSupport& /* theSupport
*/) :
m_indent(-1),
m_useValidation(false),
@@ -146,10 +150,6 @@
void
XercesParserLiaison::reset()
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::for_each;
-#endif
-
// Delete any live documents...
for(DocumentMapType::iterator i = m_documentMap.begin();
i != m_documentMap.end();
@@ -197,11 +197,11 @@
void
XercesParserLiaison::parseXMLStream(
- const InputSource& urlInputSource,
- DocumentHandler& handler,
+ const InputSourceType& urlInputSource,
+ DocumentHandlerType& handler,
const XalanDOMString& /* identifier */)
{
- XalanAutoPtr<SAXParser> theParser(CreateSAXParser());
+ XalanAutoPtr<SAXParserType> theParser(CreateSAXParser());
theParser->setDocumentHandler(&handler);
@@ -221,14 +221,10 @@
XalanDocument*
XercesParserLiaison::parseXMLStream(
- const InputSource& reader,
+ const InputSourceType& reader,
const XalanDOMString& /* identifier */)
{
-#if XERCES_VERSION_MAJOR >= 2
- XalanAutoPtr<XercesDOMParser> theParser(CreateDOMParser());
-#else
- XalanAutoPtr<DOMParser> theParser(CreateDOMParser());
-#endif
+ XalanAutoPtr<DOMParserType> theParser(CreateDOMParser());
if (m_errorHandler == 0)
{
@@ -242,12 +238,12 @@
theParser->parse(reader);
#if XERCES_VERSION_MAJOR >= 2
- DOMDocument* const theXercesDocument =
+ DOMDocumentType* const theXercesDocument =
theParser->getDocument();
theXercesDocument->normalize();
#else
- DOM_Document theXercesDocument =
+ DOM_DocumentType theXercesDocument =
theParser->getDocument();
theXercesDocument.normalize();
@@ -278,8 +274,8 @@
XalanDocument*
XercesParserLiaison::createDocument()
{
- const DOM_Document theXercesDocument =
- DOM_Document::createDocument();
+ const DOM_DocumentType theXercesDocument =
+ DOM_DocumentType::createDocument();
return createDocument(theXercesDocument, false, false);
}
@@ -363,7 +359,7 @@
-ErrorHandler*
+ErrorHandlerType*
XercesParserLiaison::getErrorHandler() const
{
return m_errorHandler;
@@ -372,7 +368,7 @@
void
-XercesParserLiaison::setErrorHandler(ErrorHandler* handler)
+XercesParserLiaison::setErrorHandler(ErrorHandlerType* handler)
{
m_errorHandler = handler;
}
@@ -411,7 +407,7 @@
-EntityResolver*
+EntityResolverType*
XercesParserLiaison::getEntityResolver() const
{
return m_entityResolver;
@@ -420,7 +416,7 @@
void
-XercesParserLiaison::setEntityResolver(EntityResolver* resolver)
+XercesParserLiaison::setEntityResolver(EntityResolverType* resolver)
{
m_entityResolver = resolver;
}
@@ -475,9 +471,9 @@
XalanDocument*
XercesParserLiaison::createDocument(
- const DOM_Document& theXercesDocument,
- bool threadSafe,
- bool buildBridge)
+ const DOM_DocumentType& theXercesDocument,
+ bool
threadSafe,
+ bool
buildBridge)
{
return doCreateDocument(theXercesDocument, threadSafe, buildBridge);
}
@@ -486,9 +482,9 @@
XalanDocument*
XercesParserLiaison::createDocument(
- const DOMDocument* theXercesDocument,
- bool threadSafe,
- bool buildWrapper)
+ const DOMDocumentType* theXercesDocument,
+ bool threadSafe,
+ bool buildWrapper)
{
// As we did not create the underlying DOMDocument - ensure we don't
// delete it later.
@@ -519,18 +515,18 @@
-DOM_Document
+DOM_DocumentType
XercesParserLiaison::mapXercesDocument(const XalanDocument* theDocument)
const
{
const DocumentMapType::const_iterator i =
m_documentMap.find(theDocument);
- return i != m_documentMap.end() ? (*i).second.m_isDeprecated == true ?
(*i).second.m_bridge->getXercesDocument() : DOM_Document() : DOM_Document();
+ return i != m_documentMap.end() ? (*i).second.m_isDeprecated == true ?
(*i).second.m_bridge->getXercesDocument() : DOM_DocumentType() :
DOM_DocumentType();
}
-const DOMDocument*
+const DOMDocumentType*
XercesParserLiaison::mapToXercesDocument(const XalanDocument*
theDocument) const
{
const DocumentMapType::const_iterator i =
@@ -542,7 +538,7 @@
void
-XercesParserLiaison::fatalError(const SAXParseException& e)
+XercesParserLiaison::fatalError(const SAXParseExceptionType& e)
{
XalanDOMString theMessage("Fatal Error");
@@ -556,10 +552,8 @@
}
else
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::cerr;
- using std::endl;
-#endif
+ XALAN_USING_STD(cerr)
+ XALAN_USING_STD(endl)
cerr << endl << theMessage << endl;
}
@@ -570,7 +564,7 @@
void
-XercesParserLiaison::error(const SAXParseException& e)
+XercesParserLiaison::error(const SAXParseExceptionType& e)
{
XalanDOMString theMessage("Error ");
@@ -584,10 +578,8 @@
}
else
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::cerr;
- using std::endl;
-#endif
+ XALAN_USING_STD(cerr)
+ XALAN_USING_STD(endl)
cerr << endl << theMessage << endl;
}
@@ -601,7 +593,7 @@
void
-XercesParserLiaison::warning(const SAXParseException& e)
+XercesParserLiaison::warning(const SAXParseExceptionType& e)
{
XalanDOMString theMessage("Warning ");
@@ -613,10 +605,8 @@
}
else
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::cerr;
- using std::endl;
-#endif
+ XALAN_USING_STD(cerr)
+ XALAN_USING_STD(endl)
cerr << endl << theMessage << endl;
}
@@ -626,8 +616,8 @@
void
XercesParserLiaison::formatErrorMessage(
- const SAXParseException& e,
- XalanDOMString& theMessage)
+ const SAXParseExceptionType& e,
+ XalanDOMString&
theMessage)
{
append(theMessage, " at (file ");
@@ -702,10 +692,10 @@
-SAXParser*
+XercesParserLiaison::SAXParserType*
XercesParserLiaison::CreateSAXParser()
{
- SAXParser* const theParser = new SAXParser;
+ SAXParserType* const theParser = new SAXParserType;
theParser->setDoValidation(false);
@@ -727,9 +717,9 @@
XercesDocumentBridge*
XercesParserLiaison::doCreateDocument(
- const DOM_Document& theXercesDocument,
- bool threadSafe,
- bool buildBridge)
+ const DOM_DocumentType& theXercesDocument,
+ bool
threadSafe,
+ bool
buildBridge)
{
XercesDocumentBridge* const theNewDocument =
new XercesDocumentBridge(theXercesDocument, threadSafe,
buildBridge);
@@ -743,10 +733,10 @@
XercesDocumentWrapper*
XercesParserLiaison::doCreateDocument(
- const DOMDocument* theXercesDocument,
- bool threadSafe,
- bool buildWrapper,
- bool isOwned)
+ const DOMDocumentType* theXercesDocument,
+ bool threadSafe,
+ bool buildWrapper,
+ bool isOwned)
{
XercesDocumentWrapper* const theNewDocument =
new XercesDocumentWrapper(theXercesDocument, threadSafe,
buildWrapper);
@@ -758,3 +748,7 @@
return theNewDocument;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.40 +60 -43
xml-xalan/c/src/XercesParserLiaison/XercesParserLiaison.hpp
Index: XercesParserLiaison.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesParserLiaison.hpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- XercesParserLiaison.hpp 17 Nov 2002 00:48:06 -0000 1.39
+++ XercesParserLiaison.hpp 22 Nov 2002 01:12:49 -0000 1.40
@@ -78,28 +78,41 @@
-class DOM_Document;
-class DOMDocument;
+#include <XercesParserLiaison/XercesBridgeTypes.hpp>
+#include <XercesParserLiaison/XercesWrapperTypes.hpp>
+
+
+
#if XERCES_VERSION_MAJOR >= 2
-class XercesDOMParser;
+XALAN_DECLARE_XERCES_CLASS(XercesDOMParser);
#else
-class DOMParser;
+XALAN_DECLARE_XERCES_CLASS(DOMParser);
#endif
+XALAN_DECLARE_XERCES_CLASS(SAXParser);
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class DOMSupport;
-class EntityResolver;
-class InputSource;
-class SAXParser;
class XercesDOMSupport;
class XercesDocumentBridge;
class XercesDocumentWrapper;
class XSLProcessor;
+typedef XERCES_CPP_NAMESPACE_QUALIFIER SAXParseException
SAXParseExceptionType;
-class XALAN_XERCESPARSERLIAISON_EXPORT XercesParserLiaison : public
XMLParserLiaison, public ErrorHandler
+class XALAN_XERCESPARSERLIAISON_EXPORT XercesParserLiaison :
+ public XMLParserLiaison,
+ public ErrorHandlerType
{
public:
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER SAXParser
SAXParserType;
+
/**
* Construct a XercesParserLiaison instance.
*
@@ -130,13 +143,13 @@
virtual XalanDocument*
parseXMLStream(
- const InputSource& reader,
+ const InputSourceType& reader,
const XalanDOMString& identifier = XalanDOMString());
virtual void
parseXMLStream(
- const InputSource& urlInputSource,
- DocumentHandler& handler,
+ const InputSourceType& urlInputSource,
+ DocumentHandlerType& handler,
const XalanDOMString& identifier = XalanDOMString());
// Create a non-thread safe document, with no synchronization and no
bridge...
@@ -165,11 +178,11 @@
virtual const XalanDOMString
getParserDescription() const;
- virtual EntityResolver*
+ virtual EntityResolverType*
getEntityResolver() const;
virtual void
- setEntityResolver(EntityResolver* resolver);
+ setEntityResolver(EntityResolverType* resolver);
// These interfaces are new to XercesParserLiaison...
@@ -213,7 +226,7 @@
*
* @return A pointer to the installed error handler object.
*/
- virtual ErrorHandler*
+ virtual ErrorHandlerType*
getErrorHandler() const;
/**
@@ -225,7 +238,7 @@
* as per the SAX specification.
*/
virtual void
- setErrorHandler(ErrorHandler* handler);
+ setErrorHandler(ErrorHandlerType* handler);
/**
* This method returns the state of the parser's namespace
@@ -338,7 +351,7 @@
* @return a pointer to a new XalanDocument-derived instance.
*/
XalanDocument*
- createDocument(const DOM_Document& theXercesDocument)
+ createDocument(const DOM_DocumentType& theXercesDocument)
{
return createDocument(theXercesDocument, m_threadSafe,
m_buildBridge);
}
@@ -359,9 +372,9 @@
*/
XalanDocument*
createDocument(
- const DOM_Document& theXercesDocument,
- bool threadSafe,
- bool buildBridge);
+ const DOM_DocumentType& theXercesDocument,
+ bool
threadSafe,
+ bool
buildBridge);
/**
* Create a XalanDocument proxy for an existing Xerces document.
@@ -373,7 +386,7 @@
* @return a pointer to a new XalanDocument-derived instance.
*/
XalanDocument*
- createDocument(const DOMDocument* theXercesDocument)
+ createDocument(const DOMDocumentType* theXercesDocument)
{
return createDocument(theXercesDocument, m_threadSafe,
m_buildWrapper);
}
@@ -391,9 +404,9 @@
*/
XalanDocument*
createDocument(
- const DOMDocument* theXercesDocument,
- bool threadSafe,
- bool buildWrapper);
+ const DOMDocumentType* theXercesDocument,
+ bool threadSafe,
+ bool buildWrapper);
/**
* This API is deprecated.
@@ -434,7 +447,7 @@
* @param theDocument A pointer to a XalanDocument instance.
* @return A pointer to the XercesDocumentBridge instance.
*/
- DOM_Document
+ DOM_DocumentType
mapXercesDocument(const XalanDocument* theDocument) const;
/**
@@ -446,19 +459,19 @@
* @param theDocument A pointer to a XalanDocument instance.
* @return A pointer to the XercesDocumentBridge instance.
*/
- const DOMDocument*
+ const DOMDocumentType*
mapToXercesDocument(const XalanDocument* theDocument) const;
// Implementations for SAX ErrorHandler
virtual void
- warning(const SAXParseException& exception);
+ warning(const SAXParseExceptionType& exception);
virtual void
- error(const SAXParseException& exception);
+ error(const SAXParseExceptionType& exception);
virtual void
- fatalError(const SAXParseException& exception);
+ fatalError(const SAXParseExceptionType& exception);
virtual void
resetErrors();
@@ -499,7 +512,7 @@
}
};
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef map<const XalanDocument*,
DocumentEntry,
less<const XalanDocument*> > DocumentMapType;
@@ -616,22 +629,22 @@
}
#if XERCES_VERSION_MAJOR >= 2
- typedef XercesDOMParser DOMParserType;
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER XercesDOMParser DOMParserType;
#else
- typedef DOMParser DOMParserType;
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMParser
DOMParserType;
#endif
protected:
static void
formatErrorMessage(
- const SAXParseException& e,
- XalanDOMString& theMessage);
+ const SAXParseExceptionType& e,
+ XalanDOMString&
theMessage);
DOMParserType*
CreateDOMParser();
- virtual SAXParser*
+ virtual SAXParserType*
CreateSAXParser();
/**
@@ -644,9 +657,9 @@
*/
XercesDocumentBridge*
doCreateDocument(
- const DOM_Document& theXercesDocument,
- bool threadSafe,
- bool buildBridge);
+ const DOM_DocumentType& theXercesDocument,
+ bool
threadSafe,
+ bool
buildBridge);
/**
* Create a XalanDocument proxy for an existing Xerces document.
@@ -658,10 +671,10 @@
*/
XercesDocumentWrapper*
doCreateDocument(
- const DOMDocument* theXercesDocument,
- bool threadSafe,
- bool buildWrapper,
- bool isOwned);
+ const DOMDocumentType* theXercesDocument,
+ bool threadSafe,
+ bool buildWrapper,
+ bool isOwned);
private:
@@ -676,9 +689,9 @@
bool m_exitOnFirstFatalError;
- EntityResolver* m_entityResolver;
+ EntityResolverType* m_entityResolver;
- ErrorHandler* m_errorHandler;
+ ErrorHandlerType* m_errorHandler;
XalanDOMString m_externalSchemaLocation;
@@ -694,6 +707,10 @@
ExecutionContext* m_executionContext;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +1 -1
xml-xalan/c/src/XercesParserLiaison/XercesParserLiaisonDefinitions.hpp
Index: XercesParserLiaisonDefinitions.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesParserLiaisonDefinitions.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XercesParserLiaisonDefinitions.hpp 24 Jul 2002 23:14:46 -0000
1.3
+++ XercesParserLiaisonDefinitions.hpp 22 Nov 2002 01:12:49 -0000
1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.6 +12 -11
xml-xalan/c/src/XercesParserLiaison/XercesProcessingInstructionBridge.cpp
Index: XercesProcessingInstructionBridge.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesProcessingInstructionBridge.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XercesProcessingInstructionBridge.cpp 23 Feb 2002 04:02:11 -0000
1.5
+++ XercesProcessingInstructionBridge.cpp 22 Nov 2002 01:12:49 -0000
1.6
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -68,9 +68,13 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesProcessingInstructionBridge::XercesProcessingInstructionBridge(
- const DOM_ProcessingInstruction&
theXercesDOMProcessingInstruction,
- const XercesBridgeNavigator& theNavigator) :
+ const DOM_ProcessingInstructionType&
theXercesDOMProcessingInstruction,
+ const XercesBridgeNavigator&
theNavigator) :
XalanProcessingInstruction(),
m_xercesNode(theXercesDOMProcessingInstruction),
m_navigator(theNavigator)
@@ -338,12 +342,9 @@
void
XercesProcessingInstructionBridge::setData(const XalanDOMString& data)
{
- try
- {
- m_xercesNode.setData(c_wstr(data));
- }
- catch(const DOM_DOMException& theException)
- {
- throw XercesDOMException(theException);
- }
+ XercesBridgeHelper::setNodeValue(m_xercesNode, data);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +17 -5
xml-xalan/c/src/XercesParserLiaison/XercesProcessingInstructionBridge.hpp
Index: XercesProcessingInstructionBridge.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesProcessingInstructionBridge.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XercesProcessingInstructionBridge.hpp 10 Jul 2002 00:40:00 -0000
1.7
+++ XercesProcessingInstructionBridge.hpp 22 Nov 2002 01:12:49 -0000
1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -75,6 +75,14 @@
+#include <XercesParserLiaison/XercesBridgeTypes.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XercesBridgeNavigator;
@@ -84,8 +92,8 @@
public:
XercesProcessingInstructionBridge(
- const DOM_ProcessingInstruction&
theXercesDOMProcessingInstruction,
- const XercesBridgeNavigator& theNavigator);
+ const DOM_ProcessingInstructionType&
theXercesDOMProcessingInstruction,
+ const XercesBridgeNavigator&
theNavigator);
virtual
~XercesProcessingInstructionBridge();
@@ -479,7 +487,7 @@
*
* @return The Xerces node
*/
- DOM_ProcessingInstruction
+ DOM_ProcessingInstructionType
getXercesNode() const
{
return m_xercesNode;
@@ -497,10 +505,14 @@
operator==(const XercesProcessingInstructionBridge& theRHS)
const;
// Data members...
- DOM_ProcessingInstruction m_xercesNode;
+ DOM_ProcessingInstructionType m_xercesNode;
const XercesBridgeNavigator& m_navigator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +10 -2
xml-xalan/c/src/XercesParserLiaison/XercesProcessingInstructionWrapper.cpp
Index: XercesProcessingInstructionWrapper.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesProcessingInstructionWrapper.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesProcessingInstructionWrapper.cpp 3 Oct 2002 01:32:42 -0000
1.1
+++ XercesProcessingInstructionWrapper.cpp 22 Nov 2002 01:12:49 -0000
1.2
@@ -73,9 +73,13 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesProcessingInstructionWrapper::XercesProcessingInstructionWrapper(
- const DOMProcessingInstruction*
theXercesDOMProcessingInstruction,
- const XercesWrapperNavigator& theNavigator) :
+ const DOMProcessingInstructionType*
theXercesDOMProcessingInstruction,
+ const XercesWrapperNavigator&
theNavigator) :
XalanProcessingInstruction(),
m_xercesNode(theXercesDOMProcessingInstruction),
m_navigator(theNavigator)
@@ -340,3 +344,7 @@
{
throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +17 -6
xml-xalan/c/src/XercesParserLiaison/XercesProcessingInstructionWrapper.hpp
Index: XercesProcessingInstructionWrapper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesProcessingInstructionWrapper.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesProcessingInstructionWrapper.hpp 3 Oct 2002 01:32:42 -0000
1.1
+++ XercesProcessingInstructionWrapper.hpp 22 Nov 2002 01:12:49 -0000
1.2
@@ -67,7 +67,14 @@
-class DOMProcessingInstruction;
+#include <XercesParserLiaison/XercesWrapperTypes.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XercesWrapperNavigator;
@@ -77,8 +84,8 @@
public:
XercesProcessingInstructionWrapper(
- const DOMProcessingInstruction*
theXercesDOMProcessingInstruction,
- const XercesWrapperNavigator& theNavigator);
+ const DOMProcessingInstructionType*
theXercesDOMProcessingInstruction,
+ const XercesWrapperNavigator&
theNavigator);
virtual
~XercesProcessingInstructionWrapper();
@@ -472,7 +479,7 @@
*
* @return The Xerces node
*/
- const DOMProcessingInstruction*
+ const DOMProcessingInstructionType*
getXercesNode() const
{
return m_xercesNode;
@@ -490,10 +497,14 @@
operator==(const XercesProcessingInstructionWrapper& theRHS)
const;
// Data members...
- const DOMProcessingInstruction* const m_xercesNode;
+ const DOMProcessingInstructionType* const m_xercesNode;
- const XercesWrapperNavigator& m_navigator;
+ const XercesWrapperNavigator& m_navigator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +9 -1 xml-xalan/c/src/XercesParserLiaison/XercesTextBridge.cpp
Index: XercesTextBridge.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesTextBridge.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XercesTextBridge.cpp 10 Jul 2002 00:40:00 -0000 1.7
+++ XercesTextBridge.cpp 22 Nov 2002 01:12:49 -0000 1.8
@@ -73,8 +73,12 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesTextBridge::XercesTextBridge(
- const DOM_Text&
theXercesText,
+ const DOM_TextType&
theXercesText,
const XercesBridgeNavigator& theNavigator) :
XalanText(),
m_xercesNode(theXercesText),
@@ -403,3 +407,7 @@
{
return isXMLWhitespace(getData());
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +12 -2 xml-xalan/c/src/XercesParserLiaison/XercesTextBridge.hpp
Index: XercesTextBridge.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesTextBridge.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XercesTextBridge.hpp 10 Jul 2002 00:40:00 -0000 1.7
+++ XercesTextBridge.hpp 22 Nov 2002 01:12:49 -0000 1.8
@@ -78,6 +78,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XercesBridgeNavigator;
@@ -86,8 +90,10 @@
{
public:
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Text DOM_TextType;
+
XercesTextBridge(
- const DOM_Text&
theXercesText,
+ const DOM_TextType&
theXercesText,
const XercesBridgeNavigator& theNavigator);
virtual
@@ -601,7 +607,7 @@
*
* @return The Xerces node
*/
- DOM_Text
+ DOM_TextType
getXercesNode() const
{
return m_xercesNode;
@@ -623,6 +629,10 @@
const XercesBridgeNavigator& m_navigator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +10 -2
xml-xalan/c/src/XercesParserLiaison/XercesTextBridgeAllocator.cpp
Index: XercesTextBridgeAllocator.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesTextBridgeAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesTextBridgeAllocator.cpp 10 Aug 2000 18:03:35 -0000 1.1
+++ XercesTextBridgeAllocator.cpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesTextBridgeAllocator::XercesTextBridgeAllocator(size_type
theBlockCount) :
m_allocator(theBlockCount)
{
@@ -75,7 +79,7 @@
XercesTextBridgeAllocator::ObjectType*
XercesTextBridgeAllocator::create(
- const DOM_Text&
theXercesText,
+ const DOM_TextType&
theXercesText,
const XercesBridgeNavigator& theNavigator)
{
ObjectType* const theBlock = m_allocator.allocateBlock();
@@ -95,3 +99,7 @@
{
m_allocator.reset();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +11 -2
xml-xalan/c/src/XercesParserLiaison/XercesTextBridgeAllocator.hpp
Index: XercesTextBridgeAllocator.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesTextBridgeAllocator.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesTextBridgeAllocator.hpp 22 Aug 2000 20:19:23 -0000 1.2
+++ XercesTextBridgeAllocator.hpp 22 Nov 2002 01:12:49 -0000 1.3
@@ -72,11 +72,16 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_XERCESPARSERLIAISON_EXPORT XercesTextBridgeAllocator
{
public:
- typedef XercesTextBridge
ObjectType;
+ typedef XercesTextBridge ObjectType;
+
#if defined(XALAN_NO_DEFAULT_TEMPLATE_ARGUMENTS)
typedef ArenaBlock<ObjectType>
ArenaBlockType;
@@ -108,7 +113,7 @@
*/
ObjectType*
create(
- const DOM_Text&
theXercesText,
+ const DOM_TextType&
theXercesText,
const XercesBridgeNavigator& theNavigator);
/**
@@ -151,6 +156,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/XercesParserLiaison/XercesTextWrapper.cpp
Index: XercesTextWrapper.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesTextWrapper.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesTextWrapper.cpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesTextWrapper.cpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -77,8 +77,12 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesTextWrapper::XercesTextWrapper(
- const DOMText*
theXercesText,
+ const DOMTextType*
theXercesText,
const XercesWrapperNavigator& theNavigator) :
XalanText(),
m_xercesNode(theXercesText),
@@ -402,3 +406,7 @@
{
return isXMLWhitespace(getData());
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +12 -5 xml-xalan/c/src/XercesParserLiaison/XercesTextWrapper.hpp
Index: XercesTextWrapper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesTextWrapper.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesTextWrapper.hpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesTextWrapper.hpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -67,11 +67,14 @@
-#include <XercesParserLiaison/XercesDOM_NodeHack.hpp>
+#include <XercesParserLiaison/XercesWrapperTypes.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
-class DOMText;
class XercesWrapperNavigator;
@@ -81,7 +84,7 @@
public:
XercesTextWrapper(
- const DOMText*
theXercesText,
+ const DOMTextType*
theXercesText,
const XercesWrapperNavigator& theNavigator);
virtual
@@ -595,7 +598,7 @@
*
* @return The Xerces node
*/
- const DOMText*
+ const DOMTextType*
getXercesNode() const
{
return m_xercesNode;
@@ -613,10 +616,14 @@
operator==(const XercesTextWrapper& theRHS) const;
// Data members...
- const DOMText* const m_xercesNode;
+ const DOMTextType* const m_xercesNode;
const XercesWrapperNavigator& m_navigator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1
xml-xalan/c/src/XercesParserLiaison/XercesTextWrapperAllocator.cpp
Index: XercesTextWrapperAllocator.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesTextWrapperAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesTextWrapperAllocator.cpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesTextWrapperAllocator.cpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesTextWrapperAllocator::XercesTextWrapperAllocator(size_type
theBlockCount) :
m_allocator(theBlockCount)
{
@@ -75,7 +79,7 @@
XercesTextWrapperAllocator::ObjectType*
XercesTextWrapperAllocator::create(
- const DOMText*
theXercesText,
+ const DOMTextType*
theXercesText,
const XercesWrapperNavigator& theNavigator)
{
ObjectType* const theBlock = m_allocator.allocateBlock();
@@ -95,3 +99,7 @@
{
m_allocator.reset();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +10 -1
xml-xalan/c/src/XercesParserLiaison/XercesTextWrapperAllocator.hpp
Index: XercesTextWrapperAllocator.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesTextWrapperAllocator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesTextWrapperAllocator.hpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesTextWrapperAllocator.hpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -69,6 +69,11 @@
#include <XercesParserLiaison/XercesTextWrapper.hpp>
+#include <XercesParserLiaison/XercesWrapperTypes.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
@@ -108,7 +113,7 @@
*/
ObjectType*
create(
- const DOMText*
theXercesText,
+ const DOMTextType*
theXercesText,
const XercesWrapperNavigator& theNavigator);
/**
@@ -151,6 +156,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +18 -11
xml-xalan/c/src/XercesParserLiaison/XercesToXalanNodeMap.cpp
Index: XercesToXalanNodeMap.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesToXalanNodeMap.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XercesToXalanNodeMap.cpp 10 Jul 2002 00:40:00 -0000 1.8
+++ XercesToXalanNodeMap.cpp 22 Nov 2002 01:12:49 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -77,6 +77,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesToXalanNodeMap::XercesToXalanNodeMap() :
m_xalanMap(),
m_xercesMap()
@@ -93,10 +97,10 @@
void
XercesToXalanNodeMap::addAssociation(
- const DOM_Node& theXercesNode,
- XalanNode* theXalanNode)
+ const DOM_NodeType& theXercesNode,
+ XalanNode* theXalanNode)
{
- NodeImpl* const theImpl =
XercesDOM_NodeHack::getImpl(theXercesNode);
+ NodeImplType* const theImpl =
XercesDOM_NodeHack::getImpl(theXercesNode);
m_xercesMap.insert(XercesNodeMapType::value_type(theImpl,
theXalanNode));
}
@@ -112,17 +116,16 @@
-NodeImpl*
+XercesToXalanNodeMap::NodeImplType*
XercesToXalanNodeMap::getNodeImpl(const XalanNode* theXalanNode) const
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::find_if;
-#endif
+ XALAN_USING_STD(find_if)
const XercesNodeMapType::const_iterator i =
- find_if(m_xercesMap.begin(),
- m_xercesMap.end(),
- NameMapEqualsFunctor(theXalanNode));
+ find_if(
+ m_xercesMap.begin(),
+ m_xercesMap.end(),
+ NameMapEqualsFunctor(theXalanNode));
if (i != m_xercesMap.end())
{
@@ -133,3 +136,7 @@
return 0;
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +29 -15
xml-xalan/c/src/XercesParserLiaison/XercesToXalanNodeMap.hpp
Index: XercesToXalanNodeMap.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesToXalanNodeMap.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XercesToXalanNodeMap.hpp 10 Jul 2002 00:40:00 -0000 1.7
+++ XercesToXalanNodeMap.hpp 22 Nov 2002 01:12:49 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -79,7 +79,14 @@
-class NodeImpl;
+XALAN_DECLARE_XERCES_CLASS(NodeImpl)
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanNode;
@@ -88,14 +95,17 @@
{
public:
-#if defined(XALAN_NO_NAMESPACES)
- typedef map<XalanNode*, NodeImpl*, less<XalanNode*> >
XalanNodeMapType;
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Node DOM_NodeType;
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER NodeImpl NodeImplType;
+
+#if defined(XALAN_NO_STD_NAMESPACE)
+ typedef map<XalanNode*, NodeImplType*, less<XalanNode*> >
XalanNodeMapType;
- typedef map<NodeImpl*, XalanNode*, less<NodeImpl*> >
XercesNodeMapType;
+ typedef map<NodeImplType*, XalanNode*, less<NodeImplType*> >
XercesNodeMapType;
#else
- typedef std::map<XalanNode*, NodeImpl*> XalanNodeMapType;
+ typedef std::map<XalanNode*, NodeImplType*>
XalanNodeMapType;
- typedef std::map<NodeImpl*, XalanNode*> XercesNodeMapType;
+ typedef std::map<NodeImplType*, XalanNode*>
XercesNodeMapType;
#endif
XercesToXalanNodeMap();
@@ -104,20 +114,20 @@
void
addAssociation(
- const DOM_Node& theXercesNode,
- XalanNode* theXalanNode);
+ const DOM_NodeType& theXercesNode,
+ XalanNode* theXalanNode);
void
clear();
XalanNode*
- getNode(const DOM_Node& theXercesNode) const
+ getNode(const DOM_NodeType& theXercesNode) const
{
return getNode(XercesDOM_NodeHack::getImpl(theXercesNode));
}
XalanNode*
- getNode(NodeImpl* theXercesNodeImpl) const
+ getNode(NodeImplType* theXercesNodeImpl) const
{
const XercesNodeMapType::const_iterator i =
m_xercesMap.find(theXercesNodeImpl);
@@ -132,13 +142,13 @@
}
}
- DOM_Node
+ DOM_NodeType
getNode(const XalanNode* theXalanNode) const
{
return XercesDOM_NodeHack(getNodeImpl(theXalanNode));
}
- NodeImpl*
+ NodeImplType*
getNodeImpl(const XalanNode* theXalanNode) const;
class NameMapEqualsFunctor
@@ -161,8 +171,8 @@
const XalanNode* m_value;
};
- NodeImpl*
- getNodeImpl(const DOM_Node& theXercesNode) const
+ NodeImplType*
+ getNodeImpl(const DOM_NodeType& theXercesNode) const
{
return XercesDOM_NodeHack::getImpl(theXercesNode);
}
@@ -173,6 +183,10 @@
XercesNodeMapType m_xercesMap;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +15 -7 xml-xalan/c/src/XercesParserLiaison/XercesTreeWalker.cpp
Index: XercesTreeWalker.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesTreeWalker.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XercesTreeWalker.cpp 10 Jul 2002 00:40:00 -0000 1.3
+++ XercesTreeWalker.cpp 22 Nov 2002 01:12:49 -0000 1.4
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesTreeWalker::XercesTreeWalker()
{
}
@@ -81,15 +85,15 @@
void
-XercesTreeWalker::traverse(const DOM_Node& pos)
+XercesTreeWalker::traverse(const DOM_NodeType& pos)
{
- DOM_Node thePos(pos);
+ DOM_NodeType thePos(pos);
while(thePos != 0)
{
startNode(thePos);
- DOM_Node nextNode = thePos.getFirstChild();
+ DOM_NodeType nextNode = thePos.getFirstChild();
while(nextNode == 0)
{
@@ -118,16 +122,16 @@
void
XercesTreeWalker::traverse(
- const DOM_Node& pos,
- const DOM_Node& parent)
+ const DOM_NodeType& pos,
+ const DOM_NodeType& parent)
{
- DOM_Node thePos(pos);
+ DOM_NodeType thePos(pos);
while(parent != thePos)
{
startNode(thePos);
- DOM_Node nextNode = thePos.getFirstChild();
+ DOM_NodeType nextNode = thePos.getFirstChild();
while(nextNode == 0)
{
@@ -151,3 +155,7 @@
thePos = nextNode;
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +14 -6 xml-xalan/c/src/XercesParserLiaison/XercesTreeWalker.hpp
Index: XercesTreeWalker.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesTreeWalker.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesTreeWalker.hpp 10 Aug 2000 18:38:33 -0000 1.1
+++ XercesTreeWalker.hpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -63,7 +63,11 @@
-class DOM_Node;
+#include <XercesParserLiaison/XercesBridgeTypes.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
@@ -83,24 +87,28 @@
* Perform a pre-order traversal non-recursive style.
*/
virtual void
- traverse(const DOM_Node& pos);
+ traverse(const DOM_NodeType& pos);
/**
* Perform a pre-order traversal non-recursive style.
*/
virtual void
traverse(
- const DOM_Node& pos,
- const DOM_Node& parent);
+ const DOM_NodeType& pos,
+ const DOM_NodeType& parent);
protected:
virtual void
- startNode(const DOM_Node& node) = 0;
+ startNode(const DOM_NodeType& node) = 0;
virtual void
- endNode(const DOM_Node& node) = 0;
+ endNode(const DOM_NodeType& node) = 0;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +13 -5
xml-xalan/c/src/XercesParserLiaison/XercesWrapperHelper.cpp
Index: XercesWrapperHelper.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesWrapperHelper.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesWrapperHelper.cpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesWrapperHelper.cpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -68,9 +68,13 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
bool
XercesWrapperHelper::isSupported(
- const DOMNode* theXercesNode,
+ const DOMNodeType* theXercesNode,
const XalanDOMString& feature,
const XalanDOMString& version)
{
@@ -85,9 +89,9 @@
const XalanDOMString
XercesWrapperHelper::substringData(
- const DOMCharacterData* theXercesNode,
- unsigned int offset,
- unsigned int count)
+ const DOMCharacterDataType* theXercesNode,
+ unsigned int offset,
+ unsigned int count)
{
assert(theXercesNode != 0);
@@ -97,8 +101,12 @@
return XalanDOMString(theString,
XalanDOMString::length(theString));
}
- catch(const DOMException& theException)
+ catch(const DOMExceptionType& theException)
{
throw XercesDOMWrapperException(theException);
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +10 -6
xml-xalan/c/src/XercesParserLiaison/XercesWrapperHelper.hpp
Index: XercesWrapperHelper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesWrapperHelper.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesWrapperHelper.hpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesWrapperHelper.hpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -76,11 +76,11 @@
#include <XercesParserLiaison/XercesBridgeNavigator.hpp>
+#include <XercesParserLiaison/XercesWrapperTypes.hpp>
-class DOMCharacterData;
-class DOMNode;
+XALAN_CPP_NAMESPACE_BEGIN
@@ -100,15 +100,15 @@
static bool
isSupported(
- const DOMNode* theXercesNode,
+ const DOMNodeType* theXercesNode,
const XalanDOMString& feature,
const XalanDOMString& version);
static const XalanDOMString
substringData(
- const DOMCharacterData* theXercesNode,
- unsigned int offset,
- unsigned int count);
+ const DOMCharacterDataType* theXercesNode,
+ unsigned int offset,
+ unsigned int count);
private:
@@ -117,6 +117,10 @@
XercesWrapperHelper(const XercesWrapperHelper&);
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +18 -10
xml-xalan/c/src/XercesParserLiaison/XercesWrapperNavigator.cpp
Index: XercesWrapperNavigator.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesWrapperNavigator.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XercesWrapperNavigator.cpp 4 Oct 2002 01:35:42 -0000 1.3
+++ XercesWrapperNavigator.cpp 22 Nov 2002 01:12:49 -0000 1.4
@@ -70,6 +70,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
const XalanDOMString XercesWrapperNavigator::s_emptyString;
@@ -110,7 +114,7 @@
XalanNode*
-XercesWrapperNavigator::mapNode(const DOMNode* theXercesNode) const
+XercesWrapperNavigator::mapNode(const DOMNodeType* theXercesNode) const
{
return m_ownerDocument->mapNode(theXercesNode);
}
@@ -118,14 +122,14 @@
XalanAttr*
-XercesWrapperNavigator::mapNode(const DOMAttr* theXercesNode) const
+XercesWrapperNavigator::mapNode(const DOMAttrType* theXercesNode) const
{
return m_ownerDocument->mapNode(theXercesNode);
}
-const DOMNode*
+const DOMNodeType*
XercesWrapperNavigator::mapNode(XalanNode* theXalanNode) const
{
return m_ownerDocument->mapNode(theXalanNode);
@@ -133,7 +137,7 @@
-const DOMAttr*
+const DOMAttrType*
XercesWrapperNavigator::mapNode(XalanAttr* theXalanNode) const
{
return m_ownerDocument->mapNode(theXalanNode);
@@ -142,7 +146,7 @@
XalanNode*
-XercesWrapperNavigator::getParentNode(const DOMNode* theXercesNode) const
+XercesWrapperNavigator::getParentNode(const DOMNodeType* theXercesNode)
const
{
if (m_parentNode == 0)
{
@@ -157,7 +161,7 @@
XalanNode*
-XercesWrapperNavigator::getPreviousSibling(const DOMNode* theXercesNode)
const
+XercesWrapperNavigator::getPreviousSibling(const DOMNodeType*
theXercesNode) const
{
if (m_previousSibling == 0)
{
@@ -172,7 +176,7 @@
XalanNode*
-XercesWrapperNavigator::getNextSibling(const DOMNode* theXercesNode)
const
+XercesWrapperNavigator::getNextSibling(const DOMNodeType* theXercesNode)
const
{
if (m_nextSibling == 0)
{
@@ -187,7 +191,7 @@
XalanNode*
-XercesWrapperNavigator::getFirstChild(const DOMNode* theXercesNode) const
+XercesWrapperNavigator::getFirstChild(const DOMNodeType* theXercesNode)
const
{
if (m_firstChild == 0)
{
@@ -202,7 +206,7 @@
XalanNode*
-XercesWrapperNavigator::getLastChild(const DOMNode* theXercesNode) const
+XercesWrapperNavigator::getLastChild(const DOMNodeType*
theXercesNode) const
{
if (m_lastChild == 0)
{
@@ -217,7 +221,7 @@
XalanElement*
-XercesWrapperNavigator::getOwnerElement(const DOMAttr* theXercesAttr)
const
+XercesWrapperNavigator::getOwnerElement(const DOMAttrType* theXercesAttr)
const
{
assert(theXercesAttr != 0);
@@ -251,3 +255,7 @@
return m_ownerDocument->getPooledString(theString,
XalanDOMString::length(theString));
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +22 -13
xml-xalan/c/src/XercesParserLiaison/XercesWrapperNavigator.hpp
Index: XercesWrapperNavigator.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesWrapperNavigator.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XercesWrapperNavigator.hpp 4 Oct 2002 03:38:31 -0000 1.4
+++ XercesWrapperNavigator.hpp 22 Nov 2002 01:12:49 -0000 1.5
@@ -75,14 +75,19 @@
-class DOMAttr;
-class DOMNode;
+#include <XercesParserLiaison/XercesWrapperTypes.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XercesDocumentWrapper;
class XalanAttr;
class XalanElement;
class XalanNode;
class XalanText;
-class DOMText;
@@ -114,15 +119,15 @@
}
XalanNode*
- mapNode(const DOMNode* theXercesNode) const;
+ mapNode(const DOMNodeType* theXercesNode) const;
XalanAttr*
- mapNode(const DOMAttr* theXercesNode) const;
+ mapNode(const DOMAttrType* theXercesNode) const;
- const DOMNode*
+ const DOMNodeType*
mapNode(XalanNode* theXalanNode) const;
- const DOMAttr*
+ const DOMAttrType*
mapNode(XalanAttr* theXercesNode) const;
unsigned long
@@ -138,7 +143,7 @@
}
XalanNode*
- getParentNode(const DOMNode* theXercesNode) const;
+ getParentNode(const DOMNodeType* theXercesNode) const;
XalanNode*
getParentNode() const
@@ -153,7 +158,7 @@
}
XalanNode*
- getPreviousSibling(const DOMNode* theXercesNode) const;
+ getPreviousSibling(const DOMNodeType* theXercesNode) const;
XalanNode*
getPreviousSibling() const
@@ -168,7 +173,7 @@
}
XalanNode*
- getNextSibling(const DOMNode* theXercesNode) const;
+ getNextSibling(const DOMNodeType* theXercesNode) const;
XalanNode*
getNextSibling() const
@@ -183,7 +188,7 @@
}
XalanNode*
- getFirstChild(const DOMNode* theXercesNode) const;
+ getFirstChild(const DOMNodeType* theXercesNode) const;
XalanNode*
getFirstChild() const
@@ -198,7 +203,7 @@
}
XalanNode*
- getLastChild(const DOMNode* theXercesNode) const;
+ getLastChild(const DOMNodeType* theXercesNode) const;
XalanNode*
getLastChild() const
@@ -213,7 +218,7 @@
}
XalanElement*
- getOwnerElement(const DOMAttr* theXercesAttr) const;
+ getOwnerElement(const DOMAttrType* theXercesAttr) const;
/**
* Get a pooled string. If the string is not in the pool,
@@ -248,6 +253,10 @@
static const XalanDOMString s_emptyString;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +12 -4
xml-xalan/c/src/XercesParserLiaison/XercesWrapperToXalanNodeMap.cpp
Index: XercesWrapperToXalanNodeMap.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesWrapperToXalanNodeMap.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesWrapperToXalanNodeMap.cpp 3 Oct 2002 01:32:42 -0000 1.1
+++ XercesWrapperToXalanNodeMap.cpp 22 Nov 2002 01:12:49 -0000 1.2
@@ -71,6 +71,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XercesWrapperToXalanNodeMap::XercesWrapperToXalanNodeMap() :
m_xalanMap(),
m_xercesMap()
@@ -87,8 +91,8 @@
void
XercesWrapperToXalanNodeMap::addAssociation(
- const DOMNode* theXercesNode,
- XalanNode* theXalanNode)
+ const DOMNodeType* theXercesNode,
+ XalanNode* theXalanNode)
{
m_xercesMap.insert(XercesNodeMapType::value_type(theXercesNode,
theXalanNode));
m_xalanMap.insert(XalanNodeMapType::value_type(theXalanNode,
theXercesNode));
@@ -106,7 +110,7 @@
XalanNode*
-XercesWrapperToXalanNodeMap::getNode(const DOMNode* theXercesNode)
const
+XercesWrapperToXalanNodeMap::getNode(const DOMNodeType*
theXercesNode) const
{
const XercesNodeMapType::const_iterator i =
m_xercesMap.find(theXercesNode);
@@ -123,7 +127,7 @@
-const DOMNode*
+const DOMNodeType*
XercesWrapperToXalanNodeMap::getNode(XalanNode* theXalanNode)
const
{
const XalanNodeMapType::const_iterator i =
@@ -138,3 +142,7 @@
return 0;
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +21 -10
xml-xalan/c/src/XercesParserLiaison/XercesWrapperToXalanNodeMap.hpp
Index: XercesWrapperToXalanNodeMap.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesWrapperToXalanNodeMap.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XercesWrapperToXalanNodeMap.hpp 3 Oct 2002 03:57:44 -0000 1.2
+++ XercesWrapperToXalanNodeMap.hpp 22 Nov 2002 01:12:49 -0000 1.3
@@ -67,7 +67,14 @@
-class DOMNode;
+#include <XercesParserLiaison/XercesWrapperTypes.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanNode;
@@ -76,14 +83,14 @@
{
public:
-#if defined(XALAN_NO_NAMESPACES)
- typedef map<XalanNode*, const DOMNode*, less<XalanNode*> >
XalanNodeMapType;
+#if defined(XALAN_NO_STD_NAMESPACE)
+ typedef map<XalanNode*, const DOMNodeType*, less<XalanNode*> >
XalanNodeMapType;
- typedef map<const DOMNode*, XalanNode*, less<const DOMNode*> >
XercesNodeMapType;
+ typedef map<const DOMNodeType*, XalanNode*, less<const DOMNodeType*> >
XercesNodeMapType;
#else
- typedef std::map<XalanNode*, const DOMNode*> XalanNodeMapType;
+ typedef std::map<XalanNode*, const DOMNodeType*>
XalanNodeMapType;
- typedef std::map<const DOMNode*, XalanNode*> XercesNodeMapType;
+ typedef std::map<const DOMNodeType*, XalanNode*>
XercesNodeMapType;
#endif
XercesWrapperToXalanNodeMap();
@@ -92,16 +99,16 @@
void
addAssociation(
- const DOMNode* theXercesNode,
- XalanNode* theXalanNode);
+ const DOMNodeType* theXercesNode,
+ XalanNode* theXalanNode);
void
clear();
XalanNode*
- getNode(const DOMNode* theXercesNode) const;
+ getNode(const DOMNodeType* theXercesNode) const;
- const DOMNode*
+ const DOMNodeType*
getNode(XalanNode* theXalanNode) const;
private:
@@ -110,6 +117,10 @@
XercesNodeMapType m_xercesMap;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.1 xml-xalan/c/src/XercesParserLiaison/XercesBridgeTypes.hpp
Index: XercesBridgeTypes.hpp
===================================================================
/*
* The Apache Software License, Version 1.1
*
*
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Xalan" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
* software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation and was
* originally based on software copyright (c) 1999, International
* Business Machines, Inc., http://www.ibm.com. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
#if !defined(XERCESBRIDGETYPES_HEADER_GUARD_1357924680)
#define XERCESBRIDGETYPES_HEADER_GUARD_1357924680
#include <XercesParserLiaison/XercesParserLiaisonDefinitions.hpp>
XALAN_DECLARE_XERCES_CLASS(DOM_Attr)
XALAN_DECLARE_XERCES_CLASS(DOM_CharacterData)
XALAN_DECLARE_XERCES_CLASS(DOM_Comment)
XALAN_DECLARE_XERCES_CLASS(DOM_CDATASection)
XALAN_DECLARE_XERCES_CLASS(DOM_Document)
XALAN_DECLARE_XERCES_CLASS(DOM_DocumentFragment)
XALAN_DECLARE_XERCES_CLASS(DOM_DOMImplementation)
XALAN_DECLARE_XERCES_CLASS(DOM_Element)
XALAN_DECLARE_XERCES_CLASS(DOM_Entity)
XALAN_DECLARE_XERCES_CLASS(DOM_EntityReference)
XALAN_DECLARE_XERCES_CLASS(DOM_Node)
XALAN_DECLARE_XERCES_CLASS(DOM_Text)
XALAN_DECLARE_XERCES_CLASS(DOM_NamedNodeMap)
XALAN_DECLARE_XERCES_CLASS(DOM_NodeList)
XALAN_DECLARE_XERCES_CLASS(DOM_Notation)
XALAN_DECLARE_XERCES_CLASS(DOM_ProcessingInstruction)
XALAN_DECLARE_XERCES_CLASS(DOM_Text)
XALAN_DECLARE_XERCES_CLASS(DOM_DocumentType)
XALAN_DECLARE_XERCES_CLASS(DOM_DOMException)
XALAN_DECLARE_XERCES_CLASS(DOMString)
XALAN_DECLARE_XERCES_CLASS(AttrImpl)
XALAN_DECLARE_XERCES_CLASS(ElementImpl)
XALAN_DECLARE_XERCES_CLASS(NodeImpl)
XALAN_DECLARE_XERCES_CLASS(TextImpl)
XALAN_CPP_NAMESPACE_BEGIN
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Attr
DOM_AttrType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_CharacterData
DOM_CharacterDataType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Comment
DOM_CommentType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_CDATASection
DOM_CDATASectionType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Document
DOM_DocumentType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_DocumentFragment
DOM_DocumentFragmentType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_DOMImplementation
DOM_DOMImplementationType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Element
DOM_ElementType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Entity
DOM_EntityType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_EntityReference
DOM_EntityReferenceType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Node
DOM_NodeType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Text
DOM_TextType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_NamedNodeMap
DOM_NamedNodeMapType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_NodeList
DOM_NodeListType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Notation
DOM_NotationType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_ProcessingInstruction
DOM_ProcessingInstructionType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_Text
DOM_TextType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_DocumentType
DOM_DocumentTypeType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOM_DOMException
DOM_DOMExceptionType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER AttrImpl
AttrImplType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER ElementImpl
ElementImplType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER NodeImpl
NodeImplType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER TextImpl
TextImplType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMString
DOMStringType;
XALAN_CPP_NAMESPACE_END
#endif // !defined(XERCESBRIDGETYPES_HEADER_GUARD_1357924680)
1.1
xml-xalan/c/src/XercesParserLiaison/XercesWrapperTypes.hpp
Index: XercesWrapperTypes.hpp
===================================================================
/*
* The Apache Software License, Version 1.1
*
*
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Xalan" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
* software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation and was
* originally based on software copyright (c) 1999, International
* Business Machines, Inc., http://www.ibm.com. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
#if !defined(XERCESWRAPPERTYPES_HEADER_GUARD_1357924680)
#define XERCESWRAPPERTYPES_HEADER_GUARD_1357924680
#include <XercesParserLiaison/XercesParserLiaisonDefinitions.hpp>
XALAN_DECLARE_XERCES_CLASS(DOMAttr)
XALAN_DECLARE_XERCES_CLASS(DOMCharacterData)
XALAN_DECLARE_XERCES_CLASS(DOMComment)
XALAN_DECLARE_XERCES_CLASS(DOMCDATASection)
XALAN_DECLARE_XERCES_CLASS(DOMDocument)
XALAN_DECLARE_XERCES_CLASS(DOMDocumentFragment)
XALAN_DECLARE_XERCES_CLASS(DOMImplementation)
XALAN_DECLARE_XERCES_CLASS(DOMElement)
XALAN_DECLARE_XERCES_CLASS(DOMEntity)
XALAN_DECLARE_XERCES_CLASS(DOMEntityReference)
XALAN_DECLARE_XERCES_CLASS(DOMNode)
XALAN_DECLARE_XERCES_CLASS(DOMText)
XALAN_DECLARE_XERCES_CLASS(DOMNamedNodeMap)
XALAN_DECLARE_XERCES_CLASS(DOMNodeList)
XALAN_DECLARE_XERCES_CLASS(DOMNotation)
XALAN_DECLARE_XERCES_CLASS(DOMProcessingInstruction)
XALAN_DECLARE_XERCES_CLASS(DOMText)
XALAN_DECLARE_XERCES_CLASS(DOMDocumentType)
XALAN_DECLARE_XERCES_CLASS(DOMException)
XALAN_CPP_NAMESPACE_BEGIN
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMAttr
DOMAttrType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMCharacterData
DOMCharacterDataType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMComment
DOMCommentType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMCDATASection
DOMCDATASectionType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument
DOMDocumentType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMDocumentFragment
DOMDocumentFragmentType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMImplementation
DOMImplementationType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMElement
DOMElementType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMEntity
DOMEntityType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMEntityReference
DOMEntityReferenceType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMNode
DOMNodeType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMText
DOMTextType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMNamedNodeMap
DOMNamedNodeMapType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMNodeList
DOMNodeListType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMNotation
DOMNotationType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMProcessingInstruction
DOMProcessingInstructionType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMText
DOMTextType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMDocumentType
DOMDocumentTypeType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER DOMException
DOMExceptionType;
XALAN_CPP_NAMESPACE_END
#endif // !defined(XERCESWRAPPERTYPES_HEADER_GUARD_1357924680)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
