diff --git a/samples/DOMCount/DOMCount.cpp b/samples/DOMCount/DOMCount.cpp
index c00b379ab00cc8aeba646cee7c4d7d5e14369074..443a5573999433955694847962fbb9ee860ba1b8 100644
--- a/samples/DOMCount/DOMCount.cpp
+++ b/samples/DOMCount/DOMCount.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/samples/DOMPrint/DOMPrint.cpp b/samples/DOMPrint/DOMPrint.cpp
index 81983661c25a1440209273cc6c35459a23130029..f52b4dd52177c22dd89996e9baf2356835ba24a4 100644
--- a/samples/DOMPrint/DOMPrint.cpp
+++ b/samples/DOMPrint/DOMPrint.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/samples/DOMPrint/DOMTreeErrorReporter.cpp b/samples/DOMPrint/DOMTreeErrorReporter.cpp
index 7bb6cd68ea5c0b8c644e9c054457b1e1d1805326..df6d7ba35166e48f010a1ce66bafbfe30d43b4f5 100644
--- a/samples/DOMPrint/DOMTreeErrorReporter.cpp
+++ b/samples/DOMPrint/DOMTreeErrorReporter.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2001/05/11 13:24:53 tng
+ * Copyright update.
+ *
* Revision 1.8 2001/05/04 19:01:05 tng
* DOMPrint fix. Check error before continuing.
*
diff --git a/samples/DOMPrint/DOMTreeErrorReporter.hpp b/samples/DOMPrint/DOMTreeErrorReporter.hpp
index adde0ec56ed62dd16a9113dabe687b0665ece769..25a2e8c0fb2d7450fc4106a81be3c37a40909a6b 100644
--- a/samples/DOMPrint/DOMTreeErrorReporter.hpp
+++ b/samples/DOMPrint/DOMTreeErrorReporter.hpp
@@ -2,7 +2,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -57,6 +57,9 @@
/*
* $Log$
+ * Revision 1.6 2001/05/11 13:24:53 tng
+ * Copyright update.
+ *
* Revision 1.5 2001/05/04 19:01:07 tng
* DOMPrint fix. Check error before continuing.
*
diff --git a/samples/EnumVal/EnumVal.cpp b/samples/EnumVal/EnumVal.cpp
index 4f9ab11c857fc9093615925f2ab3ac8260fb389a..1257e771b4265d48203e498808940f2b60f9cd3c 100644
--- a/samples/EnumVal/EnumVal.cpp
+++ b/samples/EnumVal/EnumVal.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.12 2001/05/11 13:24:54 tng
+ * Copyright update.
+ *
* Revision 1.11 2001/04/19 18:16:46 tng
* Schema: SchemaValidator update, and use QName in Content Model
*
@@ -202,7 +205,7 @@ int main(int argC, char* argV[])
XMLPlatformUtils::Terminate();
return 1;
}
-
+
// We only have one required parameter, which is the file to process
if ((argC == 2) && (*(argV[1]) == '-'))
{
@@ -210,7 +213,7 @@ int main(int argC, char* argV[])
XMLPlatformUtils::Terminate();
return 2;
}
-
+
const char* xmlFile = argV[1];
SAXParser::ValSchemes valScheme = SAXParser::Val_Auto;
diff --git a/samples/MemParse/MemParse.cpp b/samples/MemParse/MemParse.cpp
index f32c0d6a68e87b9ae8352c8700c971be980f339a..8594fd306d51a2662e50b7e69ca5e74742635e4f 100644
--- a/samples/MemParse/MemParse.cpp
+++ b/samples/MemParse/MemParse.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -57,6 +57,9 @@
/*
* $Log$
+ * Revision 1.9 2001/05/11 13:24:55 tng
+ * Copyright update.
+ *
* Revision 1.8 2001/05/03 15:59:40 tng
* Schema: samples update with schema
*
diff --git a/samples/PParse/PParse.cpp b/samples/PParse/PParse.cpp
index 6e7d81c659cc40e42306d5ab413381ecc17f2fbd..18b447ed08dec602f3c24510fd5d6bb951672b5e 100644
--- a/samples/PParse/PParse.cpp
+++ b/samples/PParse/PParse.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2001/05/11 13:24:55 tng
+ * Copyright update.
+ *
* Revision 1.8 2001/05/03 15:59:48 tng
* Schema: samples update with schema
*
diff --git a/samples/SAX2Count/SAX2Count.cpp b/samples/SAX2Count/SAX2Count.cpp
index 02cc2dbfb1c4b3b568fe0ee905835f704c0cd7ae..8b460e4274a44093ced74ec6c0b788cedbf023a5 100644
--- a/samples/SAX2Count/SAX2Count.cpp
+++ b/samples/SAX2Count/SAX2Count.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
-* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+* Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+* Revision 1.5 2001/05/11 13:24:56 tng
+* Copyright update.
+*
* Revision 1.4 2001/05/03 15:59:55 tng
* Schema: samples update with schema
*
diff --git a/samples/SAX2Print/SAX2PrintHandlers.cpp b/samples/SAX2Print/SAX2PrintHandlers.cpp
index 033865536b47ee8fa5b0112e483235bbf5cad420..576ea32492c26338a5a9dae2141c64cfd745a402 100644
--- a/samples/SAX2Print/SAX2PrintHandlers.cpp
+++ b/samples/SAX2Print/SAX2PrintHandlers.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2001/05/11 13:24:57 tng
+ * Copyright update.
+ *
* Revision 1.4 2001/05/03 16:00:03 tng
* Schema: samples update with schema
*
diff --git a/samples/SAXCount/SAXCount.cpp b/samples/SAXCount/SAXCount.cpp
index 534b7d99e535c8a22b3102f4a41096ce2ffcafc6..ec5b814472d006f8aa574554cb2eca17d067c540 100644
--- a/samples/SAXCount/SAXCount.cpp
+++ b/samples/SAXCount/SAXCount.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
-* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+* Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+* Revision 1.11 2001/05/11 13:24:57 tng
+* Copyright update.
+*
* Revision 1.10 2001/05/03 16:00:12 tng
* Schema: samples update with schema
*
diff --git a/samples/SAXPrint/SAXPrint.cpp b/samples/SAXPrint/SAXPrint.cpp
index 28e2b3282924ca894d140f0f77b435c4522796d5..7887595ea16f0fd9ade3c1c9188f3b32637e1b34 100644
--- a/samples/SAXPrint/SAXPrint.cpp
+++ b/samples/SAXPrint/SAXPrint.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.14 2001/05/11 13:24:58 tng
+ * Copyright update.
+ *
* Revision 1.13 2001/05/03 16:00:21 tng
* Schema: samples update with schema
*
diff --git a/samples/SAXPrint/SAXPrintHandlers.cpp b/samples/SAXPrint/SAXPrintHandlers.cpp
index 0183c2c92081c86bdcc8b8833cd877f3a9991f3b..0d46a3f5de5149ffbe92010cb2356a52f78421e3 100644
--- a/samples/SAXPrint/SAXPrintHandlers.cpp
+++ b/samples/SAXPrint/SAXPrintHandlers.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.14 2001/05/11 13:24:58 tng
+ * Copyright update.
+ *
* Revision 1.13 2001/05/03 16:00:25 tng
* Schema: samples update with schema
*
diff --git a/samples/StdInParse/StdInParse.cpp b/samples/StdInParse/StdInParse.cpp
index 85be955ea692a6a30589a41a1761261b2167d368..765ddd7a5dc158417e2cd2adea5a5eacb3a5d817 100644
--- a/samples/StdInParse/StdInParse.cpp
+++ b/samples/StdInParse/StdInParse.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2001/05/11 13:24:59 tng
+ * Copyright update.
+ *
* Revision 1.8 2001/05/03 16:00:32 tng
* Schema: samples update with schema
*
diff --git a/scripts/sanityTest.pl b/scripts/sanityTest.pl
index dbf627ad8c005765e712b069298e659c97a188d8..3fcf89413d69ded69065c6f8117ac3bba47483e9 100644
--- a/scripts/sanityTest.pl
+++ b/scripts/sanityTest.pl
@@ -2,7 +2,7 @@
#
# The Apache Software License, Version 1.1
#
-# Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+# Copyright (c) 1999-2001 The Apache Software Foundation. All rights
# reserved.
#
# Redistribution and use in source and binary forms, with or without
diff --git a/src/com/IXMLDOMNodeImpl.h b/src/com/IXMLDOMNodeImpl.h
index 6eac71b4f69a1c11bce88bf91a5b973dd7e04c4c..929296115d13437f507de89fc7cfe35a3ee78e23 100644
--- a/src/com/IXMLDOMNodeImpl.h
+++ b/src/com/IXMLDOMNodeImpl.h
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2001/05/11 13:25:00 tng
+ * Copyright update.
+ *
* Revision 1.5 2001/01/19 15:17:54 tng
* COM Updates by Curt Arnold: changed 1.3 to 1.4, updated the GUID's so
* both can coexist and fixed a new minor bugs. Most of the changes involved
@@ -95,7 +98,7 @@
template <class T, const IID* piid, const GUID* plibid = &CComModule::m_libid, WORD wMajor = 1,
WORD wMinor = 0, class tihclass = CComTypeInfoHolder>
-class ATL_NO_VTABLE IXMLDOMNodeImpl:
+class ATL_NO_VTABLE IXMLDOMNodeImpl:
public IDispatchImpl<T,piid,plibid,wMajor,wMinor,tihclass>,
public IIBMXMLDOMNodeIdentity,
public ISupportErrorInfo
@@ -106,7 +109,7 @@ public:
:m_pIXMLDOMDocument(NULL)
{}
- virtual DOM_Node& get_DOM_Node() = 0;
+ virtual DOM_Node& get_DOM_Node() = 0;
virtual DOMNodeType get_DOMNodeType() const = 0;
void SetOwnerDoc(IXMLDOMDocument *p)
@@ -116,7 +119,7 @@ public:
m_pIXMLDOMDocument->AddRef();
}
- // IIBMXMLDOMNodeIdentity
+ // IIBMXMLDOMNodeIdentity
STDMETHOD(get_NodeId)(long *pVal)
{
ATLTRACE(_T("IXMLDOMNodeImpl::get_NodeId\n"));
@@ -132,7 +135,7 @@ public:
HRESULT STDMETHODCALLTYPE InterfaceSupportsErrorInfo(REFIID iid);
- // IXMLDOMNode
+ // IXMLDOMNode
STDMETHOD(get_nodeName)(BSTR *pVal);
STDMETHOD(get_nodeValue)(VARIANT *pVal);
STDMETHOD(put_nodeValue)(VARIANT newVal);
diff --git a/src/com/XMLDOMAttribute.cpp b/src/com/XMLDOMAttribute.cpp
index 821e13a91e51f7357370e39e33620ac5c80ea1df..223a494cf599fc461a81642e4a2ad8e579f3556a 100644
--- a/src/com/XMLDOMAttribute.cpp
+++ b/src/com/XMLDOMAttribute.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
diff --git a/src/com/XMLDOMAttribute.h b/src/com/XMLDOMAttribute.h
index a43c89cc697d35806c6bd96955f76257440f77b8..0508b62c20eda13ab94e00cae691217200d2f6bc 100644
--- a/src/com/XMLDOMAttribute.h
+++ b/src/com/XMLDOMAttribute.h
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -64,7 +64,7 @@
#include <dom/DOM_Attr.hpp>
#include "IXMLDOMNodeImpl.h"
-class ATL_NO_VTABLE CXMLDOMAttribute :
+class ATL_NO_VTABLE CXMLDOMAttribute :
public CComObjectRootEx<CComSingleThreadModel>,
public IXMLDOMNodeImpl<IXMLDOMAttribute, &IID_IXMLDOMAttribute, &LIBID_Xerces>
{
@@ -77,7 +77,7 @@ public:
ReleaseOwnerDoc();
}
- virtual DOM_Node& get_DOM_Node() { return attr;}
+ virtual DOM_Node& get_DOM_Node() { return attr;}
virtual DOMNodeType get_DOMNodeType() const { return NODE_ATTRIBUTE; }
DECLARE_NOT_AGGREGATABLE(CXMLDOMAttribute)
diff --git a/src/com/XMLDOMCDATASection.h b/src/com/XMLDOMCDATASection.h
index 7bdaa28b5b5d6c674db9426241ce828e525211c8..206c5ba0136b3dc55d803c443a3f1012d1017c01 100644
--- a/src/com/XMLDOMCDATASection.h
+++ b/src/com/XMLDOMCDATASection.h
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2001/05/11 13:25:02 tng
+ * Copyright update.
+ *
* Revision 1.4 2001/01/19 15:18:04 tng
* COM Updates by Curt Arnold: changed 1.3 to 1.4, updated the GUID's so
* both can coexist and fixed a new minor bugs. Most of the changes involved
@@ -76,7 +79,7 @@
#include <dom/DOM_CDATASection.hpp>
#include "IXMLDOMTextImpl.h"
-class ATL_NO_VTABLE CXMLDOMCDATASection :
+class ATL_NO_VTABLE CXMLDOMCDATASection :
public CComObjectRootEx<CComSingleThreadModel>,
public IXMLDOMTextImpl<IXMLDOMCDATASection, &IID_IXMLDOMCDATASection, &LIBID_Xerces>
{
@@ -89,7 +92,7 @@ public:
ReleaseOwnerDoc();
}
- virtual DOM_Text& get_DOM_Text() { return cdataSection;}
+ virtual DOM_Text& get_DOM_Text() { return cdataSection;}
virtual DOMNodeType get_DOMNodeType() const { return NODE_CDATA_SECTION; }
DECLARE_NOT_AGGREGATABLE(CXMLDOMCDATASection)
diff --git a/src/com/XMLDOMComment.h b/src/com/XMLDOMComment.h
index 4045d2c55281c6a0dd808c4982b72c2ea3b98b2e..8c933c0a77c24a4f43a4118f69b06a806d5df54a 100644
--- a/src/com/XMLDOMComment.h
+++ b/src/com/XMLDOMComment.h
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2001/05/11 13:25:02 tng
+ * Copyright update.
+ *
* Revision 1.4 2001/01/19 15:18:05 tng
* COM Updates by Curt Arnold: changed 1.3 to 1.4, updated the GUID's so
* both can coexist and fixed a new minor bugs. Most of the changes involved
@@ -76,7 +79,7 @@
#include <dom/DOM_Comment.hpp>
#include "IXMLDOMCharacterDataImpl.h"
-class ATL_NO_VTABLE CXMLDOMComment :
+class ATL_NO_VTABLE CXMLDOMComment :
public CComObjectRootEx<CComSingleThreadModel>,
public IXMLDOMCharacterDataImpl<IXMLDOMComment, &IID_IXMLDOMComment, &LIBID_Xerces>
{
@@ -89,7 +92,7 @@ public:
ReleaseOwnerDoc();
}
- virtual DOM_CharacterData& get_DOM_CharacterData() { return comment;}
+ virtual DOM_CharacterData& get_DOM_CharacterData() { return comment;}
virtual DOMNodeType get_DOMNodeType() const { return NODE_COMMENT; }
DECLARE_NOT_AGGREGATABLE(CXMLDOMComment)
diff --git a/src/com/XMLDOMDocument.cpp b/src/com/XMLDOMDocument.cpp
index dc203c4a99ec637f990c56497f315cac17264e9a..667a8d125e275a65ca198e8d76b97f12a765b056 100644
--- a/src/com/XMLDOMDocument.cpp
+++ b/src/com/XMLDOMDocument.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -138,7 +138,7 @@ HRESULT CXMLDOMDocument::FinalConstruct()
return E_FAIL;
HRESULT hr = CXMLDOMParseErrorObj::CreateInstance(&m_pParseError);
- if (S_OK != hr)
+ if (S_OK != hr)
return hr;
m_pParseError->AddRef();
@@ -180,7 +180,7 @@ void CXMLDOMDocument::FinalRelease()
void CXMLDOMDocument::warning(const SAXParseException& exception)
{
- // ignore warnings
+ // ignore warnings
}
void CXMLDOMDocument::error(const SAXParseException& exception)
@@ -265,7 +265,7 @@ STDMETHODIMP CXMLDOMDocument::get_doctype(IXMLDOMDocumentType **pVal)
CXMLDOMDocumentTypeObj *pObj = NULL;
HRESULT hr = CXMLDOMDocumentTypeObj::CreateInstance(&pObj);
- if (S_OK != hr)
+ if (S_OK != hr)
return hr;
pObj->AddRef();
@@ -277,12 +277,12 @@ STDMETHODIMP CXMLDOMDocument::get_doctype(IXMLDOMDocumentType **pVal)
}
catch(...)
{
- pObj->Release();
+ pObj->Release();
return E_FAIL;
}
hr = pObj->QueryInterface(IID_IXMLDOMDocumentType, reinterpret_cast<LPVOID*> (pVal));
- if (S_OK != hr)
+ if (S_OK != hr)
*pVal = NULL;
pObj->Release();
@@ -300,13 +300,13 @@ STDMETHODIMP CXMLDOMDocument::get_implementation(IXMLDOMImplementation **pVal)
CXMLDOMImplementationObj *pObj = NULL;
HRESULT hr = CXMLDOMImplementationObj::CreateInstance(&pObj);
- if (S_OK != hr)
+ if (S_OK != hr)
return hr;
pObj->AddRef();
hr = pObj->QueryInterface(IID_IXMLDOMImplementation, reinterpret_cast<LPVOID*> (pVal));
- if (S_OK != hr)
+ if (S_OK != hr)
*pVal = NULL;
pObj->Release();
@@ -324,7 +324,7 @@ STDMETHODIMP CXMLDOMDocument::get_documentElement(IXMLDOMElement * *pVal)
CXMLDOMElementObj *pObj = NULL;
HRESULT hr = CXMLDOMElementObj::CreateInstance(&pObj);
- if (S_OK != hr)
+ if (S_OK != hr)
return S_OK;
pObj->AddRef();
@@ -334,19 +334,19 @@ STDMETHODIMP CXMLDOMDocument::get_documentElement(IXMLDOMElement * *pVal)
{
pObj->element = m_Document.getDocumentElement();
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
pObj->Release();
return MakeHRESULT(ex);
}
catch(...)
{
- pObj->Release();
+ pObj->Release();
return S_OK;
}
hr = pObj->QueryInterface(IID_IXMLDOMElement, reinterpret_cast<LPVOID*> (pVal));
- if (S_OK != hr)
+ if (S_OK != hr)
*pVal = NULL;
pObj->Release();
@@ -367,7 +367,7 @@ STDMETHODIMP CXMLDOMDocument::putref_documentElement(IXMLDOMElement *newVal)
return S_OK;
}
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
return MakeHRESULT(ex);
}
@@ -396,7 +396,7 @@ STDMETHODIMP CXMLDOMDocument::putref_documentElement(IXMLDOMElement *newVal)
else
m_Document.replaceChild(*pNewValNode, elem);
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
return MakeHRESULT(ex);
}
@@ -419,7 +419,7 @@ STDMETHODIMP CXMLDOMDocument::createElement(BSTR tagName, IXMLDOMElement **pVal
CXMLDOMElementObj *pObj = NULL;
HRESULT hr = CXMLDOMElementObj::CreateInstance(&pObj);
- if (S_OK != hr)
+ if (S_OK != hr)
return hr;
pObj->AddRef();
@@ -429,19 +429,19 @@ STDMETHODIMP CXMLDOMDocument::createElement(BSTR tagName, IXMLDOMElement **pVal
{
pObj->element = m_Document.createElement(tagName);
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
pObj->Release();
return MakeHRESULT(ex);
}
catch(...)
{
- pObj->Release();
+ pObj->Release();
return E_FAIL;
}
hr = pObj->QueryInterface(IID_IXMLDOMElement, reinterpret_cast<LPVOID*> (pVal));
- if (S_OK != hr)
+ if (S_OK != hr)
*pVal = NULL;
pObj->Release();
@@ -459,7 +459,7 @@ STDMETHODIMP CXMLDOMDocument::createDocumentFragment(IXMLDOMDocumentFragment **
CXMLDOMDocumentFragmentObj *pObj = NULL;
HRESULT hr = CXMLDOMDocumentFragmentObj::CreateInstance(&pObj);
- if (S_OK != hr)
+ if (S_OK != hr)
return hr;
pObj->AddRef();
@@ -469,19 +469,19 @@ STDMETHODIMP CXMLDOMDocument::createDocumentFragment(IXMLDOMDocumentFragment **
{
pObj->documentFragment = m_Document.createDocumentFragment();
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
pObj->Release();
return MakeHRESULT(ex);
}
catch(...)
{
- pObj->Release();
+ pObj->Release();
return E_FAIL;
}
hr = pObj->QueryInterface(IID_IXMLDOMDocumentFragment, reinterpret_cast<LPVOID*> (docFrag));
- if (S_OK != hr)
+ if (S_OK != hr)
*docFrag = NULL;
pObj->Release();
@@ -499,7 +499,7 @@ STDMETHODIMP CXMLDOMDocument::createTextNode(BSTR data, IXMLDOMText **pVal)
CXMLDOMTextObj *pObj = NULL;
HRESULT hr = CXMLDOMTextObj::CreateInstance(&pObj);
- if (S_OK != hr)
+ if (S_OK != hr)
return hr;
pObj->AddRef();
@@ -509,19 +509,19 @@ STDMETHODIMP CXMLDOMDocument::createTextNode(BSTR data, IXMLDOMText **pVal)
{
pObj->text = m_Document.createTextNode(data);
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
pObj->Release();
return MakeHRESULT(ex);
}
catch(...)
{
- pObj->Release();
+ pObj->Release();
return E_FAIL;
}
hr = pObj->QueryInterface(IID_IXMLDOMText, reinterpret_cast<LPVOID*> (pVal));
- if (S_OK != hr)
+ if (S_OK != hr)
*pVal = NULL;
pObj->Release();
@@ -539,7 +539,7 @@ STDMETHODIMP CXMLDOMDocument::createComment(BSTR data, IXMLDOMComment **comment
CXMLDOMCommentObj *pObj = NULL;
HRESULT hr = CXMLDOMCommentObj::CreateInstance(&pObj);
- if (S_OK != hr)
+ if (S_OK != hr)
return hr;
pObj->AddRef();
@@ -549,19 +549,19 @@ STDMETHODIMP CXMLDOMDocument::createComment(BSTR data, IXMLDOMComment **comment
{
pObj->comment = m_Document.createComment(data);
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
pObj->Release();
return MakeHRESULT(ex);
}
catch(...)
{
- pObj->Release();
+ pObj->Release();
return E_FAIL;
}
hr = pObj->QueryInterface(IID_IXMLDOMComment, reinterpret_cast<LPVOID*> (comment));
- if (S_OK != hr)
+ if (S_OK != hr)
*comment = NULL;
pObj->Release();
@@ -579,7 +579,7 @@ STDMETHODIMP CXMLDOMDocument::createCDATASection(BSTR data, IXMLDOMCDATASection
CXMLDOMCDATASectionObj *pObj = NULL;
HRESULT hr = CXMLDOMCDATASectionObj::CreateInstance(&pObj);
- if (S_OK != hr)
+ if (S_OK != hr)
return hr;
pObj->AddRef();
@@ -589,19 +589,19 @@ STDMETHODIMP CXMLDOMDocument::createCDATASection(BSTR data, IXMLDOMCDATASection
{
pObj->cdataSection = m_Document.createCDATASection(data);
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
pObj->Release();
return MakeHRESULT(ex);
}
catch(...)
{
- pObj->Release();
+ pObj->Release();
return E_FAIL;
}
hr = pObj->QueryInterface(IID_IXMLDOMCDATASection, reinterpret_cast<LPVOID*> (cdata));
- if (S_OK != hr)
+ if (S_OK != hr)
*cdata = NULL;
pObj->Release();
@@ -619,7 +619,7 @@ STDMETHODIMP CXMLDOMDocument::createProcessingInstruction(BSTR target, BSTR data
CXMLDOMProcessingInstructionObj *pObj = NULL;
HRESULT hr = CXMLDOMProcessingInstructionObj::CreateInstance(&pObj);
- if (S_OK != hr)
+ if (S_OK != hr)
return hr;
pObj->AddRef();
@@ -629,19 +629,19 @@ STDMETHODIMP CXMLDOMDocument::createProcessingInstruction(BSTR target, BSTR data
{
pObj->processingInstruction = m_Document.createProcessingInstruction(target, data);
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
pObj->Release();
return MakeHRESULT(ex);
}
catch(...)
{
- pObj->Release();
+ pObj->Release();
return E_FAIL;
}
hr = pObj->QueryInterface(IID_IXMLDOMProcessingInstruction, reinterpret_cast<LPVOID*> (pVal));
- if (S_OK != hr)
+ if (S_OK != hr)
*pVal = NULL;
pObj->Release();
@@ -659,7 +659,7 @@ STDMETHODIMP CXMLDOMDocument::createAttribute(BSTR name, IXMLDOMAttribute **att
CXMLDOMAttributeObj *pObj = NULL;
HRESULT hr = CXMLDOMAttributeObj::CreateInstance(&pObj);
- if (S_OK != hr)
+ if (S_OK != hr)
return hr;
pObj->AddRef();
@@ -669,19 +669,19 @@ STDMETHODIMP CXMLDOMDocument::createAttribute(BSTR name, IXMLDOMAttribute **att
{
pObj->attr = m_Document.createAttribute(name);
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
pObj->Release();
return MakeHRESULT(ex);
}
catch(...)
{
- pObj->Release();
+ pObj->Release();
return E_FAIL;
}
hr = pObj->QueryInterface(IID_IXMLDOMAttribute, reinterpret_cast<LPVOID*> (attr));
- if (S_OK != hr)
+ if (S_OK != hr)
*attr = NULL;
pObj->Release();
@@ -699,7 +699,7 @@ STDMETHODIMP CXMLDOMDocument::createEntityReference(BSTR name, IXMLDOMEntityRefe
CXMLDOMEntityReferenceObj *pObj = NULL;
HRESULT hr = CXMLDOMEntityReferenceObj::CreateInstance(&pObj);
- if (S_OK != hr)
+ if (S_OK != hr)
return hr;
pObj->AddRef();
@@ -709,19 +709,19 @@ STDMETHODIMP CXMLDOMDocument::createEntityReference(BSTR name, IXMLDOMEntityRefe
{
pObj->entityReference = m_Document.createEntityReference(name);
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
pObj->Release();
return MakeHRESULT(ex);
}
catch(...)
{
- pObj->Release();
+ pObj->Release();
return E_FAIL;
}
hr = pObj->QueryInterface(IID_IXMLDOMEntityReference, reinterpret_cast<LPVOID*> (entityRef));
- if (S_OK != hr)
+ if (S_OK != hr)
*entityRef = NULL;
pObj->Release();
@@ -739,7 +739,7 @@ STDMETHODIMP CXMLDOMDocument::getElementsByTagName(BSTR tagName, IXMLDOMNodeList
CXMLDOMNodeListObj *pObj = NULL;
HRESULT hr = CXMLDOMNodeListObj::CreateInstance(&pObj);
- if (S_OK != hr)
+ if (S_OK != hr)
return hr;
pObj->AddRef();
@@ -749,19 +749,19 @@ STDMETHODIMP CXMLDOMDocument::getElementsByTagName(BSTR tagName, IXMLDOMNodeList
{
pObj->m_container = m_Document.getElementsByTagName(tagName);
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
pObj->Release();
return MakeHRESULT(ex);
}
catch(...)
{
- pObj->Release();
+ pObj->Release();
return E_FAIL;
}
hr = pObj->QueryInterface(IID_IXMLDOMNodeList, reinterpret_cast<LPVOID*> (pVal));
- if (S_OK != hr)
+ if (S_OK != hr)
*pVal = NULL;
pObj->Release();
@@ -776,7 +776,7 @@ STDMETHODIMP CXMLDOMDocument::createNode(VARIANT TYPE, BSTR name, BSTR namespace
if (NULL == pVal)
return E_POINTER;
- *pVal = NULL;
+ *pVal = NULL;
VARIANT type;
::VariantInit(&type);
@@ -788,7 +788,7 @@ STDMETHODIMP CXMLDOMDocument::createNode(VARIANT TYPE, BSTR name, BSTR namespace
if (S_OK != hr)
return hr;
- DOMNodeType nodeType = NODE_INVALID;
+ DOMNodeType nodeType = NODE_INVALID;
if (VT_I4 == V_VT(&type))
nodeType = static_cast<DOMNodeType> (V_I4(&type));
else {
@@ -830,7 +830,7 @@ STDMETHODIMP CXMLDOMDocument::createNode(VARIANT TYPE, BSTR name, BSTR namespace
if (SysStringLen(namespaceURI) > 0)
node = m_Document.createAttributeNS(namespaceURI,name);
else
- node = m_Document.createAttribute(name);
+ node = m_Document.createAttribute(name);
hr = wrapNode(m_pIXMLDOMDocument,node,IID_IXMLDOMNode,reinterpret_cast<LPVOID *> (pVal));
break;
@@ -872,11 +872,11 @@ STDMETHODIMP CXMLDOMDocument::createNode(VARIANT TYPE, BSTR name, BSTR namespace
break;
}
default:
- hr = E_FAIL;
+ hr = E_FAIL;
break;
}
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
hr = MakeHRESULT(ex);
}
@@ -902,7 +902,7 @@ STDMETHODIMP CXMLDOMDocument::nodeFromID(BSTR idString, IXMLDOMNode **pVal)
{
hr = wrapNode(m_pIXMLDOMDocument, m_Document.getElementById(idString),IID_IXMLDOMNode,reinterpret_cast<LPVOID *> (pVal));
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
return MakeHRESULT(ex);
}
@@ -923,18 +923,18 @@ STDMETHODIMP CXMLDOMDocument::load(VARIANT xmlSource, VARIANT_BOOL *isSuccessfu
*isSuccessful = VARIANT_FALSE;
- if (V_VT(&xmlSource) != VT_BSTR &&
+ if (V_VT(&xmlSource) != VT_BSTR &&
V_VT(&xmlSource) != VT_DISPATCH &&
V_VT(&xmlSource) != (VT_ARRAY | VT_VARIANT) &&
V_VT(&xmlSource) != (VT_ARRAY | VT_UI1) &&
V_VT(&xmlSource) != VT_UNKNOWN)
return E_INVALIDARG;
- // do not start another thread if there is another active
+ // do not start another thread if there is another active
if (NULL != m_hParseThread) {
DWORD exitCode = 0;
BOOL rc = ::GetExitCodeThread(m_hParseThread, &exitCode);
- if (!rc || STILL_ACTIVE == exitCode)
+ if (!rc || STILL_ACTIVE == exitCode)
return S_OK;
::CloseHandle(m_hParseThread);
@@ -965,7 +965,7 @@ STDMETHODIMP CXMLDOMDocument::load(VARIANT xmlSource, VARIANT_BOOL *isSuccessfu
*loc = _T('/');
loc = _tcschr(m_FileName,_T('\\'));
}
- m_FileName = baseURL + _T("/") + m_FileName;
+ m_FileName = baseURL + _T("/") + m_FileName;
}
}
}
@@ -1023,7 +1023,7 @@ STDMETHODIMP CXMLDOMDocument::load(VARIANT xmlSource, VARIANT_BOOL *isSuccessfu
return hr;
if (lUBoundVar >= lLBoundVar) {
- VARIANT *pIndex = NULL;
+ VARIANT *pIndex = NULL;
hr = ::SafeArrayAccessData(pArray, reinterpret_cast<void **> (&pIndex));
if (S_OK != hr)
return hr;
@@ -1036,7 +1036,7 @@ STDMETHODIMP CXMLDOMDocument::load(VARIANT xmlSource, VARIANT_BOOL *isSuccessfu
hr = E_INVALIDARG;
break;
}
- body[i] = V_UI1(&var);
+ body[i] = V_UI1(&var);
}
body[length-1] = 0;
@@ -1073,7 +1073,7 @@ STDMETHODIMP CXMLDOMDocument::load(VARIANT xmlSource, VARIANT_BOOL *isSuccessfu
return hr;
if (lUBoundVar >= lLBoundVar) {
- BYTE *pIndex = NULL;
+ BYTE *pIndex = NULL;
hr = ::SafeArrayAccessData(pArray, reinterpret_cast<void **> (&pIndex));
if (S_OK != hr)
return hr;
@@ -1083,7 +1083,7 @@ STDMETHODIMP CXMLDOMDocument::load(VARIANT xmlSource, VARIANT_BOOL *isSuccessfu
for (long i = 0; i <= lUBoundVar-lLBoundVar; ++i)
body[i] = pIndex[i];
- body[length-1] = 0;
+ body[length-1] = 0;
::SafeArrayUnaccessData(pArray);
m_xml = reinterpret_cast<char*> (body);
delete [] body;
@@ -1096,10 +1096,10 @@ STDMETHODIMP CXMLDOMDocument::load(VARIANT xmlSource, VARIANT_BOOL *isSuccessfu
m_hParseThread = reinterpret_cast<HANDLE> (_beginthreadex(NULL,
0,
CXMLDOMDocument::ParseThread,
- (void *) this,
+ (void *) this,
0,
&nthreadID));
- if (NULL == m_hParseThread)
+ if (NULL == m_hParseThread)
return S_OK;
if (m_bAsync) {
@@ -1117,7 +1117,7 @@ STDMETHODIMP CXMLDOMDocument::load(VARIANT xmlSource, VARIANT_BOOL *isSuccessfu
case WAIT_OBJECT_0 + 1:
{
MSG msg;
- while(::PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE)) {
+ while(::PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE)) {
if (WM_CLOSE == msg.message || WM_QUIT == msg.message) {
bWait = false;
m_bAbort = true;
@@ -1125,7 +1125,7 @@ STDMETHODIMP CXMLDOMDocument::load(VARIANT xmlSource, VARIANT_BOOL *isSuccessfu
}
else {
PeekMessage(&msg, NULL, 0, 0, PM_REMOVE);
- TranslateMessage(&msg);
+ TranslateMessage(&msg);
DispatchMessage(&msg);
}
}
@@ -1172,7 +1172,7 @@ HRESULT CXMLDOMDocument::GetBaseURL(_bstr_t &baseURL)
if (S_OK != hr)
return hr;
- TCHAR url[MAX_PATH] = _T("");
+ TCHAR url[MAX_PATH] = _T("");
lstrcat(url,_bstr_t(b));
// look for last slash and remove the filename after it
@@ -1257,11 +1257,11 @@ STDMETHODIMP CXMLDOMDocument::loadXML(BSTR bstrXML, VARIANT_BOOL *isSuccessful)
*isSuccessful = VARIANT_FALSE;
- // do not start another thread if there is another active
+ // do not start another thread if there is another active
if (NULL != m_hParseThread) {
DWORD exitCode = 0;
BOOL rc = ::GetExitCodeThread(m_hParseThread, &exitCode);
- if (!rc || STILL_ACTIVE == exitCode)
+ if (!rc || STILL_ACTIVE == exitCode)
return S_OK;
::CloseHandle(m_hParseThread);
@@ -1283,10 +1283,10 @@ STDMETHODIMP CXMLDOMDocument::loadXML(BSTR bstrXML, VARIANT_BOOL *isSuccessful)
m_hParseThread = reinterpret_cast<HANDLE> (_beginthreadex(NULL,
0,
CXMLDOMDocument::ParseThread,
- (void *) this,
+ (void *) this,
0,
&nthreadID));
- if (NULL == m_hParseThread)
+ if (NULL == m_hParseThread)
return S_OK;
if (m_bAsync) {
@@ -1304,7 +1304,7 @@ STDMETHODIMP CXMLDOMDocument::loadXML(BSTR bstrXML, VARIANT_BOOL *isSuccessful)
case WAIT_OBJECT_0 + 1:
{
MSG msg;
- while(::PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE)) {
+ while(::PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE)) {
if (WM_CLOSE == msg.message || WM_QUIT == msg.message) {
bWait = false;
m_bAbort = true;
@@ -1312,7 +1312,7 @@ STDMETHODIMP CXMLDOMDocument::loadXML(BSTR bstrXML, VARIANT_BOOL *isSuccessful)
}
else {
PeekMessage(&msg, NULL, 0, 0, PM_REMOVE);
- TranslateMessage(&msg);
+ TranslateMessage(&msg);
DispatchMessage(&msg);
}
}
@@ -1351,7 +1351,7 @@ UINT APIENTRY CXMLDOMDocument::ParseThread(void *pParm)
if (!pThis->m_bAbort && pThis->m_FileName.length() > 0) {
CBindStatCallbackObj *pCallbackObj = NULL;
HRESULT hr = CBindStatCallbackObj::CreateInstance(&pCallbackObj);
- if (S_OK != hr)
+ if (S_OK != hr)
pCallbackObj = NULL;
if (pCallbackObj != NULL) {
@@ -1360,10 +1360,10 @@ UINT APIENTRY CXMLDOMDocument::ParseThread(void *pParm)
}
TCHAR name[MAX_PATH] = _T("");
if (pThis->m_bAsync)
- pThis->PostMessage(MSG_READY_STATE_CHANGE,1);
+ pThis->PostMessage(MSG_READY_STATE_CHANGE,1);
hr = URLDownloadToCacheFile(NULL,pThis->m_FileName,name,URLOSTRM_GETNEWESTVERSION,0,pCallbackObj);
- if (pCallbackObj != NULL)
+ if (pCallbackObj != NULL)
pCallbackObj->Release();
if (E_ABORT == hr)
@@ -1381,7 +1381,7 @@ UINT APIENTRY CXMLDOMDocument::ParseThread(void *pParm)
if (S_OK == hr) {
pThis->m_FileName = name;
if (pThis->m_bAsync)
- pThis->PostMessage(MSG_READY_STATE_CHANGE,2);
+ pThis->PostMessage(MSG_READY_STATE_CHANGE,2);
}
}
@@ -1425,7 +1425,7 @@ UINT APIENTRY CXMLDOMDocument::ParseThread(void *pParm)
parser.parse(static_cast<LPCTSTR> (pThis->m_FileName));
else {
XMLByte *pXMLByte = reinterpret_cast<XMLByte*> (static_cast<XMLCh*>(pThis->m_xml));
- MemBufInputSource memBufIS(pXMLByte,pThis->m_xml.length()*sizeof(XMLCh),OLESTR("IBMXMLParser"),false);
+ MemBufInputSource memBufIS(pXMLByte,pThis->m_xml.length()*sizeof(XMLCh),OLESTR("IBMXMLParser"),false);
memBufIS.setEncoding(OLESTR("UTF-16"));
if (!pThis->m_bParseError && !pThis->m_bAbort)
parser.parse(memBufIS);
@@ -1443,7 +1443,7 @@ UINT APIENTRY CXMLDOMDocument::ParseThread(void *pParm)
pThis->m_TmpDocument = parser.getDocument();
if (!pThis->m_bParseError && !pThis->m_bAbort && pThis->m_bAsync)
- pThis->PostMessage(MSG_READY_STATE_CHANGE,4);
+ pThis->PostMessage(MSG_READY_STATE_CHANGE,4);
return 0;
}
@@ -1469,7 +1469,7 @@ STDMETHODIMP CXMLDOMDocument::save(VARIANT location)
GetXML(child,text);
}
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
return MakeHRESULT(ex);
}
@@ -1560,7 +1560,7 @@ STDMETHODIMP CXMLDOMDocument::put_onreadystatechange(VARIANT newVal)
m_pOnReadyStateChange = NULL;
}
m_pOnReadyStateChange = pDisp;
- if (m_pOnReadyStateChange != NULL)
+ if (m_pOnReadyStateChange != NULL)
m_pOnReadyStateChange->AddRef();
return S_OK;
@@ -1583,7 +1583,7 @@ STDMETHODIMP CXMLDOMDocument::put_ondataavailable(VARIANT newVal)
m_pOnDataAvailable = NULL;
}
m_pOnDataAvailable = pDisp;
- if (m_pOnDataAvailable != NULL)
+ if (m_pOnDataAvailable != NULL)
m_pOnDataAvailable->AddRef();
return S_OK;
@@ -1606,7 +1606,7 @@ STDMETHODIMP CXMLDOMDocument::put_ontransformnode(VARIANT newVal)
m_pOnTransformNode = NULL;
}
m_pOnTransformNode = pDisp;
- if (m_pOnTransformNode != NULL)
+ if (m_pOnTransformNode != NULL)
m_pOnTransformNode->AddRef();
return S_OK;
diff --git a/src/com/XMLDOMDocument.h b/src/com/XMLDOMDocument.h
index 2a55fca4c1c020fe4dc0a23bd561936c8ef295b4..641c4d9ba7239bd0d9e54dc8a617e397b0458206 100644
--- a/src/com/XMLDOMDocument.h
+++ b/src/com/XMLDOMDocument.h
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2001/05/11 13:25:03 tng
+ * Copyright update.
+ *
* Revision 1.5 2001/01/19 15:18:10 tng
* COM Updates by Curt Arnold: changed 1.3 to 1.4, updated the GUID's so
* both can coexist and fixed a new minor bugs. Most of the changes involved
@@ -88,7 +91,7 @@
class SAXParseException;
-class ATL_NO_VTABLE CXMLDOMDocument :
+class ATL_NO_VTABLE CXMLDOMDocument :
public CComObjectRootEx<CComSingleThreadModel>,
public CComCoClass<CXMLDOMDocument, &CLSID_DOMDocument>,
public IObjectSafetyImpl<CXMLDOMDocument, INTERFACESAFE_FOR_UNTRUSTED_CALLER>,
@@ -106,7 +109,7 @@ public:
HRESULT FinalConstruct();
void FinalRelease();
- virtual DOM_Node& get_DOM_Node() { return m_Document;}
+ virtual DOM_Node& get_DOM_Node() { return m_Document;}
virtual DOMNodeType get_DOMNodeType() const { return NODE_DOCUMENT; }
virtual void resetErrors() {};
@@ -136,7 +139,7 @@ BEGIN_CONNECTION_POINT_MAP(CXMLDOMDocument)
CONNECTION_POINT_ENTRY(DIID_XMLDOMDocumentEvents)
END_CONNECTION_POINT_MAP()
- DECLARE_WND_CLASS(_T("XMLParseMonitor"))
+ DECLARE_WND_CLASS(_T("XMLParseMonitor"))
BEGIN_MSG_MAP(CMonitorWnd)
MESSAGE_HANDLER(MSG_READY_STATE_CHANGE, OnReadyStateChange)
diff --git a/src/com/XMLDOMDocumentFragment.h b/src/com/XMLDOMDocumentFragment.h
index 125ef745082a9541ef0af238dbc9a156346b5bbd..ae963c0b3adacc28f5b2699a12bcd29f91b5df6f 100644
--- a/src/com/XMLDOMDocumentFragment.h
+++ b/src/com/XMLDOMDocumentFragment.h
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2001/05/11 13:25:03 tng
+ * Copyright update.
+ *
* Revision 1.4 2001/01/19 15:18:11 tng
* COM Updates by Curt Arnold: changed 1.3 to 1.4, updated the GUID's so
* both can coexist and fixed a new minor bugs. Most of the changes involved
@@ -76,7 +79,7 @@
#include <dom/DOM_DocumentFragment.hpp>
#include "IXMLDOMNodeImpl.h"
-class ATL_NO_VTABLE CXMLDOMDocumentFragment :
+class ATL_NO_VTABLE CXMLDOMDocumentFragment :
public CComObjectRootEx<CComSingleThreadModel>,
public IXMLDOMNodeImpl<IXMLDOMDocumentFragment, &IID_IXMLDOMDocumentFragment, &LIBID_Xerces>
{
@@ -89,7 +92,7 @@ public:
ReleaseOwnerDoc();
}
- virtual DOM_Node& get_DOM_Node() { return documentFragment;}
+ virtual DOM_Node& get_DOM_Node() { return documentFragment;}
virtual DOMNodeType get_DOMNodeType() const { return NODE_DOCUMENT_FRAGMENT; }
DECLARE_NOT_AGGREGATABLE(CXMLDOMDocumentFragment)
diff --git a/src/com/XMLDOMDocumentType.cpp b/src/com/XMLDOMDocumentType.cpp
index 7249a5f556e4273b2ffb0a8f8097bd3d66882dd6..231d44e62f0625c638cba181247eefe5c6190453 100644
--- a/src/com/XMLDOMDocumentType.cpp
+++ b/src/com/XMLDOMDocumentType.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -78,7 +78,7 @@ STDMETHODIMP CXMLDOMDocumentType::get_name(BSTR *pVal)
DOMString val = documentType.getName();
*pVal = SysAllocStringLen(val.rawBuffer(),val.length());
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
return MakeHRESULT(ex);
}
@@ -102,7 +102,7 @@ STDMETHODIMP CXMLDOMDocumentType::get_entities(IXMLDOMNamedNodeMap **pVal)
CXMLDOMNamedNodeMapObj *pObj = NULL;
HRESULT hr = CXMLDOMNamedNodeMapObj::CreateInstance(&pObj);
- if (S_OK != hr)
+ if (S_OK != hr)
return hr;
pObj->AddRef();
@@ -112,19 +112,19 @@ STDMETHODIMP CXMLDOMDocumentType::get_entities(IXMLDOMNamedNodeMap **pVal)
{
pObj->m_container = documentType.getEntities();
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
- pObj->Release();
+ pObj->Release();
return MakeHRESULT(ex);
}
catch(...)
{
- pObj->Release();
+ pObj->Release();
return E_FAIL;
}
hr = pObj->QueryInterface(IID_IXMLDOMNamedNodeMap, reinterpret_cast<LPVOID*> (pVal));
- if (S_OK != hr)
+ if (S_OK != hr)
*pVal = NULL;
pObj->Release();
@@ -142,7 +142,7 @@ STDMETHODIMP CXMLDOMDocumentType::get_notations(IXMLDOMNamedNodeMap **pVal)
CXMLDOMNamedNodeMapObj *pObj = NULL;
HRESULT hr = CXMLDOMNamedNodeMapObj::CreateInstance(&pObj);
- if (S_OK != hr)
+ if (S_OK != hr)
return hr;
pObj->AddRef();
@@ -152,19 +152,19 @@ STDMETHODIMP CXMLDOMDocumentType::get_notations(IXMLDOMNamedNodeMap **pVal)
{
pObj->m_container = documentType.getNotations();
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
- pObj->Release();
+ pObj->Release();
return MakeHRESULT(ex);
}
catch(...)
{
- pObj->Release();
+ pObj->Release();
return E_FAIL;
}
hr = pObj->QueryInterface(IID_IXMLDOMNamedNodeMap, reinterpret_cast<LPVOID*> (pVal));
- if (S_OK != hr)
+ if (S_OK != hr)
*pVal = NULL;
pObj->Release();
diff --git a/src/com/XMLDOMDocumentType.h b/src/com/XMLDOMDocumentType.h
index 047bc06f467f302b39334afa07d316792079c6ca..5560853fa386d0113090504ce499eb28430f659c 100644
--- a/src/com/XMLDOMDocumentType.h
+++ b/src/com/XMLDOMDocumentType.h
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2001/05/11 13:25:04 tng
+ * Copyright update.
+ *
* Revision 1.4 2001/01/19 15:18:15 tng
* COM Updates by Curt Arnold: changed 1.3 to 1.4, updated the GUID's so
* both can coexist and fixed a new minor bugs. Most of the changes involved
@@ -76,7 +79,7 @@
#include <dom/DOM_DocumentType.hpp>
#include "IXMLDOMNodeImpl.h"
-class ATL_NO_VTABLE CXMLDOMDocumentType :
+class ATL_NO_VTABLE CXMLDOMDocumentType :
public CComObjectRootEx<CComSingleThreadModel>,
public IXMLDOMNodeImpl<IXMLDOMDocumentType, &IID_IXMLDOMDocumentType, &LIBID_Xerces>
{
@@ -89,7 +92,7 @@ public:
ReleaseOwnerDoc();
}
- virtual DOM_Node& get_DOM_Node() { return documentType;}
+ virtual DOM_Node& get_DOM_Node() { return documentType;}
virtual DOMNodeType get_DOMNodeType() const { return NODE_DOCUMENT_TYPE; }
DECLARE_NOT_AGGREGATABLE(CXMLDOMDocumentType)
diff --git a/src/com/XMLDOMElement.cpp b/src/com/XMLDOMElement.cpp
index 1e7e25d11a6b6dd23b7be30a8bf1b606897a8c04..25f7a56210d7f51453dcc5457cf8d8a24185746b 100644
--- a/src/com/XMLDOMElement.cpp
+++ b/src/com/XMLDOMElement.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -79,7 +79,7 @@ STDMETHODIMP CXMLDOMElement::get_tagName(BSTR *pVal)
DOMString val = element.getTagName();
*pVal = SysAllocStringLen(val.rawBuffer(),val.length());
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
return MakeHRESULT(ex);
}
@@ -107,7 +107,7 @@ STDMETHODIMP CXMLDOMElement::getAttribute(BSTR name, VARIANT *pVal)
V_VT(pVal) = VT_BSTR;
V_BSTR(pVal) = SysAllocStringLen(a.rawBuffer(),a.length());
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
return MakeHRESULT(ex);
}
@@ -132,7 +132,7 @@ STDMETHODIMP CXMLDOMElement::setAttribute(BSTR name, VARIANT value)
element.setAttribute(name,(BSTR) (_bstr_t) value);
}
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
return MakeHRESULT(ex);
}
@@ -153,7 +153,7 @@ STDMETHODIMP CXMLDOMElement::removeAttribute(BSTR name)
{
element.removeAttribute(name);
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
return MakeHRESULT(ex);
}
@@ -180,7 +180,7 @@ STDMETHODIMP CXMLDOMElement::getAttributeNode(BSTR name, IXMLDOMAttribute **att
CXMLDOMAttributeObj *pObj = NULL;
HRESULT hr = CXMLDOMAttributeObj::CreateInstance(&pObj);
- if (S_OK != hr)
+ if (S_OK != hr)
return hr;
pObj->AddRef();
@@ -190,19 +190,19 @@ STDMETHODIMP CXMLDOMElement::getAttributeNode(BSTR name, IXMLDOMAttribute **att
{
pObj->attr = attrNode;
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
- pObj->Release();
+ pObj->Release();
return MakeHRESULT(ex);
}
catch(...)
{
- pObj->Release();
+ pObj->Release();
return E_FAIL;
}
hr = pObj->QueryInterface(IID_IXMLDOMAttribute, reinterpret_cast<LPVOID*> (attr));
- if (S_OK != hr)
+ if (S_OK != hr)
*attr = NULL;
pObj->Release();
@@ -263,7 +263,7 @@ STDMETHODIMP CXMLDOMElement::setAttributeNode(IXMLDOMAttribute *attr, IXMLDOMAt
}
}
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
return MakeHRESULT(ex);
}
@@ -287,7 +287,7 @@ STDMETHODIMP CXMLDOMElement::removeAttributeNode(IXMLDOMAttribute *attr, IXMLDO
CXMLDOMAttributeObj *pObj = NULL;
HRESULT hr = CXMLDOMAttributeObj::CreateInstance(&pObj);
- if (S_OK != hr)
+ if (S_OK != hr)
return hr;
pObj->AddRef();
@@ -303,19 +303,19 @@ STDMETHODIMP CXMLDOMElement::removeAttributeNode(IXMLDOMAttribute *attr, IXMLDO
}
pObj->attr = element.removeAttributeNode(*((DOM_Attr*) id));
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
- pObj->Release();
+ pObj->Release();
return MakeHRESULT(ex);
}
catch(...)
{
- pObj->Release();
+ pObj->Release();
return E_FAIL;
}
hr = pObj->QueryInterface(IID_IXMLDOMAttribute, reinterpret_cast<LPVOID*> (attributeNode));
- if (S_OK != hr)
+ if (S_OK != hr)
*attributeNode = NULL;
pObj->Release();
@@ -333,7 +333,7 @@ STDMETHODIMP CXMLDOMElement::getElementsByTagName(BSTR tagName, IXMLDOMNodeList
CXMLDOMNodeListObj *pObj = NULL;
HRESULT hr = CXMLDOMNodeListObj::CreateInstance(&pObj);
- if (S_OK != hr)
+ if (S_OK != hr)
return hr;
pObj->AddRef();
@@ -343,19 +343,19 @@ STDMETHODIMP CXMLDOMElement::getElementsByTagName(BSTR tagName, IXMLDOMNodeList
{
pObj->m_container = element.getElementsByTagName(tagName);
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
- pObj->Release();
+ pObj->Release();
return MakeHRESULT(ex);
}
catch(...)
{
- pObj->Release();
+ pObj->Release();
return E_FAIL;
}
hr = pObj->QueryInterface(IID_IXMLDOMNodeList, reinterpret_cast<LPVOID*> (pVal));
- if (S_OK != hr)
+ if (S_OK != hr)
*pVal = NULL;
pObj->Release();
@@ -370,7 +370,7 @@ STDMETHODIMP CXMLDOMElement::normalize(void)
{
element.normalize();
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
return MakeHRESULT(ex);
}
diff --git a/src/com/XMLDOMElement.h b/src/com/XMLDOMElement.h
index e15747e12c695a7be0d7aa64c461514329210ca1..14d187222cdf71a036ca800187d57e01b2d30279 100644
--- a/src/com/XMLDOMElement.h
+++ b/src/com/XMLDOMElement.h
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2001/05/11 13:25:05 tng
+ * Copyright update.
+ *
* Revision 1.4 2001/01/19 15:18:18 tng
* COM Updates by Curt Arnold: changed 1.3 to 1.4, updated the GUID's so
* both can coexist and fixed a new minor bugs. Most of the changes involved
@@ -76,7 +79,7 @@
#include <dom/DOM_Element.hpp>
#include "IXMLDOMNodeImpl.h"
-class ATL_NO_VTABLE CXMLDOMElement :
+class ATL_NO_VTABLE CXMLDOMElement :
public CComObjectRootEx<CComSingleThreadModel>,
public IXMLDOMNodeImpl<IXMLDOMElement, &IID_IXMLDOMElement, &LIBID_Xerces>
{
@@ -89,7 +92,7 @@ public:
ReleaseOwnerDoc();
}
- virtual DOM_Node& get_DOM_Node() { return element;}
+ virtual DOM_Node& get_DOM_Node() { return element;}
virtual DOMNodeType get_DOMNodeType() const { return NODE_ELEMENT; }
DECLARE_NOT_AGGREGATABLE(CXMLDOMElement)
diff --git a/src/com/XMLDOMEntity.cpp b/src/com/XMLDOMEntity.cpp
index aec9c8d2fb9106cbc483a479405818bc988d12d3..c3050bf468591f304acd93b8098fc2f6d16d540a 100644
--- a/src/com/XMLDOMEntity.cpp
+++ b/src/com/XMLDOMEntity.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -75,11 +75,11 @@ STDMETHODIMP CXMLDOMEntity::get_publicId(VARIANT *pVal)
try
{
DOMString val = entity.getPublicId();
- if(val == NULL)
+ if(val == NULL)
{
V_VT(pVal) = VT_NULL;
}
- else
+ else
{
V_VT(pVal) = VT_BSTR;
V_BSTR(pVal) = SysAllocStringLen(val.rawBuffer(),val.length());
@@ -108,11 +108,11 @@ STDMETHODIMP CXMLDOMEntity::get_systemId(VARIANT *pVal)
try
{
DOMString val = entity.getSystemId();
- if(val == NULL)
+ if(val == NULL)
{
V_VT(pVal) = VT_NULL;
}
- else
+ else
{
V_VT(pVal) = VT_BSTR;
V_BSTR(pVal) = SysAllocStringLen(val.rawBuffer(),val.length());
@@ -136,7 +136,7 @@ STDMETHODIMP CXMLDOMEntity::get_notationName(BSTR *pVal)
if (NULL == pVal)
return E_POINTER;
- *pVal = NULL;
+ *pVal = NULL;
try
{
diff --git a/src/com/XMLDOMEntityReference.h b/src/com/XMLDOMEntityReference.h
index 1505e50b1dc7d96688d8e789d37e0b37eabbd42e..b4121830616937578e2fb8220dc4ce0ac4d6625e 100644
--- a/src/com/XMLDOMEntityReference.h
+++ b/src/com/XMLDOMEntityReference.h
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2001/05/11 13:25:05 tng
+ * Copyright update.
+ *
* Revision 1.4 2001/01/19 15:18:23 tng
* COM Updates by Curt Arnold: changed 1.3 to 1.4, updated the GUID's so
* both can coexist and fixed a new minor bugs. Most of the changes involved
@@ -76,7 +79,7 @@
#include <dom/DOM_EntityReference.hpp>
#include "IXMLDOMNodeImpl.h"
-class ATL_NO_VTABLE CXMLDOMEntityReference :
+class ATL_NO_VTABLE CXMLDOMEntityReference :
public CComObjectRootEx<CComSingleThreadModel>,
public IXMLDOMNodeImpl<IXMLDOMEntityReference, &IID_IXMLDOMEntityReference, &LIBID_Xerces>
{
@@ -89,7 +92,7 @@ public:
ReleaseOwnerDoc();
}
- virtual DOM_Node& get_DOM_Node() { return entityReference;}
+ virtual DOM_Node& get_DOM_Node() { return entityReference;}
virtual DOMNodeType get_DOMNodeType() const { return NODE_ENTITY_REFERENCE; }
DECLARE_NOT_AGGREGATABLE(CXMLDOMEntityReference)
diff --git a/src/com/XMLDOMNamedNodeMap.cpp b/src/com/XMLDOMNamedNodeMap.cpp
index 47d23f7cedca765d48e6ef9eb7fb5258290241c3..603cf795093c3c077631e7b87b10b224831aa3ee 100644
--- a/src/com/XMLDOMNamedNodeMap.cpp
+++ b/src/com/XMLDOMNamedNodeMap.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -86,7 +86,7 @@ STDMETHODIMP CXMLDOMNamedNodeMap::getNamedItem(BSTR name, IXMLDOMNode **pVal)
if(!n.isNull())
hr = wrapNode(m_pIXMLDOMDocument,n,IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (pVal));
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
return MakeHRESULT(ex);
}
@@ -105,7 +105,7 @@ STDMETHODIMP CXMLDOMNamedNodeMap::setNamedItem(IXMLDOMNode *newItem, IXMLDOMNod
if (NULL == pVal)
return E_POINTER;
- *pVal = NULL;
+ *pVal = NULL;
if (m_container == 0)
return S_OK;
@@ -136,7 +136,7 @@ STDMETHODIMP CXMLDOMNamedNodeMap::setNamedItem(IXMLDOMNode *newItem, IXMLDOMNod
if(!n.isNull())
hr = wrapNode(m_pIXMLDOMDocument,n,IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (pVal));
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
return MakeHRESULT(ex);
}
@@ -196,7 +196,7 @@ STDMETHODIMP CXMLDOMNamedNodeMap::get_item(long index, IXMLDOMNode **pVal)
if (index < length)
hr = wrapNode(m_pIXMLDOMDocument,m_container.item(index),IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (pVal));
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
return MakeHRESULT(ex);
}
@@ -224,7 +224,7 @@ STDMETHODIMP CXMLDOMNamedNodeMap::get_length(long *pVal)
{
*pVal = m_container.getLength();
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
return MakeHRESULT(ex);
}
@@ -256,7 +256,7 @@ STDMETHODIMP CXMLDOMNamedNodeMap::getQualifiedItem(BSTR baseName, BSTR namespace
if(!n.isNull())
hr = wrapNode(m_pIXMLDOMDocument,n,IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (pVal));
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
return MakeHRESULT(ex);
}
@@ -288,7 +288,7 @@ STDMETHODIMP CXMLDOMNamedNodeMap::removeQualifiedItem(BSTR baseName, BSTR namesp
if(!n.isNull())
hr = wrapNode(m_pIXMLDOMDocument,n,IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (pVal));
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
return MakeHRESULT(ex);
}
@@ -326,7 +326,7 @@ STDMETHODIMP CXMLDOMNamedNodeMap::nextNode(IXMLDOMNode **pVal)
if(!n.isNull())
hr = wrapNode(m_pIXMLDOMDocument,n,IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (pVal));
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
return MakeHRESULT(ex);
}
@@ -374,7 +374,7 @@ STDMETHODIMP CXMLDOMNamedNodeMap::get__newEnum(IUnknown **pVal)
return hr;
}
-HRESULT CXMLDOMNamedNodeMap::InterfaceSupportsErrorInfo(REFIID riid)
+HRESULT CXMLDOMNamedNodeMap::InterfaceSupportsErrorInfo(REFIID riid)
{
if(riid == IID_IXMLDOMNamedNodeMap) return S_OK;
return S_FALSE;
diff --git a/src/com/XMLDOMNamedNodeMap.h b/src/com/XMLDOMNamedNodeMap.h
index 451a9c4de41968c0f263509acf99467244b27f48..d40fe03bd0bb0445a13e00563451a6e3a74d898a 100644
--- a/src/com/XMLDOMNamedNodeMap.h
+++ b/src/com/XMLDOMNamedNodeMap.h
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2001/05/11 13:25:06 tng
+ * Copyright update.
+ *
* Revision 1.4 2001/01/19 15:18:26 tng
* COM Updates by Curt Arnold: changed 1.3 to 1.4, updated the GUID's so
* both can coexist and fixed a new minor bugs. Most of the changes involved
@@ -76,7 +79,7 @@
#include <dom/DOM_NamedNodeMap.hpp>
#include "NodeContainerImpl.h"
-class ATL_NO_VTABLE CXMLDOMNamedNodeMap :
+class ATL_NO_VTABLE CXMLDOMNamedNodeMap :
public CComObjectRootEx<CComSingleThreadModel>,
public IDispatchImpl<IXMLDOMNamedNodeMap, &IID_IXMLDOMNamedNodeMap, &LIBID_Xerces>,
public NodeContainerImpl<DOM_NamedNodeMap>,
@@ -99,7 +102,7 @@ BEGIN_COM_MAP(CXMLDOMNamedNodeMap)
COM_INTERFACE_ENTRY(IDispatch)
COM_INTERFACE_ENTRY(ISupportErrorInfo)
END_COM_MAP()
-
+
// ISupportErrorInfo
HRESULT STDMETHODCALLTYPE InterfaceSupportsErrorInfo(REFIID iid);
diff --git a/src/com/XMLDOMNodeList.cpp b/src/com/XMLDOMNodeList.cpp
index 65036157897a2730d6f96502a37a0cfcd199df32..8558028dbf0f030ff6eac97551ccd112f47cb12d 100644
--- a/src/com/XMLDOMNodeList.cpp
+++ b/src/com/XMLDOMNodeList.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -82,7 +82,7 @@ STDMETHODIMP CXMLDOMNodeList::get_item(long index, IXMLDOMNode **pVal)
if (m_container == 0 || index < 0)
return E_INVALIDARG;
- long length = m_container.getLength();
+ long length = m_container.getLength();
//
// if index is beyond end
// return a null object not an exception
@@ -90,7 +90,7 @@ STDMETHODIMP CXMLDOMNodeList::get_item(long index, IXMLDOMNode **pVal)
if (index < length)
hr = wrapNode(m_pIXMLDOMDocument,m_container.item(index),IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (pVal));
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
return MakeHRESULT(ex);
}
@@ -119,7 +119,7 @@ STDMETHODIMP CXMLDOMNodeList::get_length(long *pVal)
{
*pVal = m_container.getLength();
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
return MakeHRESULT(ex);
}
@@ -157,7 +157,7 @@ STDMETHODIMP CXMLDOMNodeList::nextNode(IXMLDOMNode **pVal)
{
hr = wrapNode(m_pIXMLDOMDocument,m_container.item(m_NextNodeIndex),IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (pVal));
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
return MakeHRESULT(ex);
}
@@ -206,7 +206,7 @@ STDMETHODIMP CXMLDOMNodeList::get__newEnum(IUnknown **pVal)
}
-HRESULT CXMLDOMNodeList::InterfaceSupportsErrorInfo(REFIID riid)
+HRESULT CXMLDOMNodeList::InterfaceSupportsErrorInfo(REFIID riid)
{
if(riid == IID_IXMLDOMNodeList) return S_OK;
return S_FALSE;
diff --git a/src/com/XMLDOMNodeList.h b/src/com/XMLDOMNodeList.h
index 341a883660d8590031771692f9e219f88100db1b..1fd9ea5cfcf9fe4be1c920d9d137586c0f4ac03d 100644
--- a/src/com/XMLDOMNodeList.h
+++ b/src/com/XMLDOMNodeList.h
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2001/05/11 13:25:06 tng
+ * Copyright update.
+ *
* Revision 1.4 2001/01/19 15:18:28 tng
* COM Updates by Curt Arnold: changed 1.3 to 1.4, updated the GUID's so
* both can coexist and fixed a new minor bugs. Most of the changes involved
@@ -76,7 +79,7 @@
#include <dom/DOM_NodeList.hpp>
#include "NodeContainerImpl.h"
-class ATL_NO_VTABLE CXMLDOMNodeList :
+class ATL_NO_VTABLE CXMLDOMNodeList :
public CComObjectRootEx<CComSingleThreadModel>,
public IDispatchImpl<IXMLDOMNodeList, &IID_IXMLDOMNodeList, &LIBID_Xerces>,
public NodeContainerImpl<DOM_NodeList>,
diff --git a/src/com/XMLDOMNotation.cpp b/src/com/XMLDOMNotation.cpp
index 105e2115b65db11bb7dfe4fb65974e99a59f12e5..2803c17a3901d1dd5cf7d00a3d5cd774d3ffde3d 100644
--- a/src/com/XMLDOMNotation.cpp
+++ b/src/com/XMLDOMNotation.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -74,17 +74,17 @@ STDMETHODIMP CXMLDOMNotation::get_publicId(VARIANT *pVal)
try
{
DOMString val = notation.getPublicId();
- if(val == NULL)
+ if(val == NULL)
{
V_VT(pVal) = VT_NULL;
}
- else
+ else
{
V_VT(pVal) = VT_BSTR;
V_BSTR(pVal) = SysAllocStringLen(val.rawBuffer(),val.length());
}
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
return MakeHRESULT(ex);
}
@@ -109,17 +109,17 @@ STDMETHODIMP CXMLDOMNotation::get_systemId(VARIANT *pVal)
try
{
DOMString val = notation.getSystemId();
- if(val == NULL)
+ if(val == NULL)
{
V_VT(pVal) = VT_NULL;
}
- else
+ else
{
V_VT(pVal) = VT_BSTR;
V_BSTR(pVal) = SysAllocStringLen(val.rawBuffer(),val.length());
}
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
return MakeHRESULT(ex);
}
diff --git a/src/com/XMLDOMNotation.h b/src/com/XMLDOMNotation.h
index 4fd7b27c7a34ead0069a08df561b6a34096c7942..61b46ae0e7b59edd719c8ebd0195e1fc1570000c 100644
--- a/src/com/XMLDOMNotation.h
+++ b/src/com/XMLDOMNotation.h
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2001/05/11 13:25:07 tng
+ * Copyright update.
+ *
* Revision 1.4 2001/01/19 15:18:30 tng
* COM Updates by Curt Arnold: changed 1.3 to 1.4, updated the GUID's so
* both can coexist and fixed a new minor bugs. Most of the changes involved
@@ -76,7 +79,7 @@
#include <dom/DOM_Notation.hpp>
#include "IXMLDOMNodeImpl.h"
-class ATL_NO_VTABLE CXMLDOMNotation :
+class ATL_NO_VTABLE CXMLDOMNotation :
public CComObjectRootEx<CComSingleThreadModel>,
public IXMLDOMNodeImpl<IXMLDOMNotation, &IID_IXMLDOMNotation, &LIBID_Xerces>
{
@@ -89,7 +92,7 @@ public:
ReleaseOwnerDoc();
}
- virtual DOM_Node& get_DOM_Node() { return notation;}
+ virtual DOM_Node& get_DOM_Node() { return notation;}
virtual DOMNodeType get_DOMNodeType() const { return NODE_NOTATION; }
DECLARE_NOT_AGGREGATABLE(CXMLDOMNotation)
diff --git a/src/com/XMLDOMProcessingInstruction.cpp b/src/com/XMLDOMProcessingInstruction.cpp
index 5360ee6dab9e24f5a3a2d3813382f2ceab61837e..544a2f151735723980defde230ff3e243fa51120 100644
--- a/src/com/XMLDOMProcessingInstruction.cpp
+++ b/src/com/XMLDOMProcessingInstruction.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -77,7 +77,7 @@ STDMETHODIMP CXMLDOMProcessingInstruction::get_target(BSTR *pVal)
DOMString val = processingInstruction.getTarget();
*pVal = SysAllocStringLen(val.rawBuffer(),val.length());
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
return MakeHRESULT(ex);
}
@@ -104,7 +104,7 @@ STDMETHODIMP CXMLDOMProcessingInstruction::get_data(BSTR *pVal)
DOMString val = processingInstruction.getData();
*pVal = SysAllocStringLen(val.rawBuffer(),val.length());
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
return MakeHRESULT(ex);
}
@@ -125,7 +125,7 @@ STDMETHODIMP CXMLDOMProcessingInstruction::put_data(BSTR newVal)
{
processingInstruction.setData(newVal);
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
return MakeHRESULT(ex);
}
diff --git a/src/com/XMLDOMProcessingInstruction.h b/src/com/XMLDOMProcessingInstruction.h
index 269e619ee82ba7e9b5bdc13803077d6f027cc5ba..fc0642ad7bfbedf897bff8db843ba992678bd51f 100644
--- a/src/com/XMLDOMProcessingInstruction.h
+++ b/src/com/XMLDOMProcessingInstruction.h
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2001/05/11 13:25:07 tng
+ * Copyright update.
+ *
* Revision 1.4 2001/01/19 15:18:33 tng
* COM Updates by Curt Arnold: changed 1.3 to 1.4, updated the GUID's so
* both can coexist and fixed a new minor bugs. Most of the changes involved
@@ -76,7 +79,7 @@
#include <dom/DOM_ProcessingInstruction.hpp>
#include "IXMLDOMNodeImpl.h"
-class ATL_NO_VTABLE CXMLDOMProcessingInstruction :
+class ATL_NO_VTABLE CXMLDOMProcessingInstruction :
public CComObjectRootEx<CComSingleThreadModel>,
public IXMLDOMNodeImpl<IXMLDOMProcessingInstruction, &IID_IXMLDOMProcessingInstruction, &LIBID_Xerces>
{
@@ -89,7 +92,7 @@ public:
ReleaseOwnerDoc();
}
- virtual DOM_Node& get_DOM_Node() { return processingInstruction;}
+ virtual DOM_Node& get_DOM_Node() { return processingInstruction;}
virtual DOMNodeType get_DOMNodeType() const { return NODE_PROCESSING_INSTRUCTION; }
DECLARE_NOT_AGGREGATABLE(CXMLDOMProcessingInstruction)
diff --git a/src/com/XMLDOMText.h b/src/com/XMLDOMText.h
index 808c5103fbe05a94e7ca23389a93c90292913ce0..f76771f571b3734ac1eb3d17487ed493f2361497 100644
--- a/src/com/XMLDOMText.h
+++ b/src/com/XMLDOMText.h
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2001/05/11 13:25:07 tng
+ * Copyright update.
+ *
* Revision 1.4 2001/01/19 15:18:34 tng
* COM Updates by Curt Arnold: changed 1.3 to 1.4, updated the GUID's so
* both can coexist and fixed a new minor bugs. Most of the changes involved
@@ -76,7 +79,7 @@
#include <dom/DOM_Text.hpp>
#include "IXMLDOMTextImpl.h"
-class ATL_NO_VTABLE CXMLDOMText :
+class ATL_NO_VTABLE CXMLDOMText :
public CComObjectRootEx<CComSingleThreadModel>,
public IXMLDOMTextImpl<IXMLDOMText, &IID_IXMLDOMText, &LIBID_Xerces>
{
@@ -89,7 +92,7 @@ public:
ReleaseOwnerDoc();
}
- virtual DOM_Text& get_DOM_Text() { return text;}
+ virtual DOM_Text& get_DOM_Text() { return text;}
virtual DOMNodeType get_DOMNodeType() const { return NODE_TEXT; }
DECLARE_NOT_AGGREGATABLE(CXMLDOMText)
diff --git a/src/com/XMLDOMUtil.cpp b/src/com/XMLDOMUtil.cpp
index 87c31b8b3412442cc887d0d8602f920e1d27cc3f..9a84e7fe91cedb827c01cd22257abe448f331b49 100644
--- a/src/com/XMLDOMUtil.cpp
+++ b/src/com/XMLDOMUtil.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -78,7 +78,7 @@
#include <util/XMLUniDefs.hpp>
-const OLECHAR* g_DomNodeName[] =
+const OLECHAR* g_DomNodeName[] =
{
OLESTR("invalid"),
OLESTR("element"),
@@ -94,7 +94,7 @@ const OLECHAR* g_DomNodeName[] =
OLESTR("documentfragment"),
OLESTR("notation")
};
-
+
const int g_DomNodeNameSize = sizeof(g_DomNodeName) / sizeof(OLECHAR*);
DOMString GetText(const DOM_Node& node)
@@ -102,13 +102,13 @@ DOMString GetText(const DOM_Node& node)
DOM_Node::NodeType type = static_cast<DOM_Node::NodeType> (node.getNodeType());
DOMString val;
- if (DOM_Node::DOCUMENT_TYPE_NODE == type ||
+ if (DOM_Node::DOCUMENT_TYPE_NODE == type ||
DOM_Node::NOTATION_NODE == type)
return val;
- if (DOM_Node::CDATA_SECTION_NODE == type ||
+ if (DOM_Node::CDATA_SECTION_NODE == type ||
DOM_Node::COMMENT_NODE == type ||
- DOM_Node::PROCESSING_INSTRUCTION_NODE == type ||
+ DOM_Node::PROCESSING_INSTRUCTION_NODE == type ||
DOM_Node::TEXT_NODE == type) {
val = node.getNodeValue();
return val;
@@ -116,8 +116,8 @@ DOMString GetText(const DOM_Node& node)
DOM_NodeList l = node.getChildNodes();
int length = l.getLength();
- if (length > 0) {
- for (int i = 0; i < length; ++i)
+ if (length > 0) {
+ for (int i = 0; i < length; ++i)
val.appendData(GetText(l.item(i)));
}
else {
@@ -330,7 +330,7 @@ HRESULT wrapNode(IXMLDOMDocument *pDoc, DOM_Node& node, REFIID iid, LPVOID *pVal
{
CXMLDOMElement *pObj = NULL;
hr = CPooledXMLDOMElementObj::CreateInstance(&pObj);
- if (S_OK != hr)
+ if (S_OK != hr)
return hr;
pObj->AddRef();
@@ -340,19 +340,19 @@ HRESULT wrapNode(IXMLDOMDocument *pDoc, DOM_Node& node, REFIID iid, LPVOID *pVal
{
pObj->element = *(static_cast<DOM_Element*> (&node));
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
- pObj->Release();
+ pObj->Release();
return MakeHRESULT(ex);
}
catch(...)
{
- pObj->Release();
+ pObj->Release();
return E_FAIL;
}
hr = pObj->QueryInterface(iid, pVal);
- if (S_OK != hr)
+ if (S_OK != hr)
*pVal = NULL;
pObj->Release();
@@ -362,7 +362,7 @@ HRESULT wrapNode(IXMLDOMDocument *pDoc, DOM_Node& node, REFIID iid, LPVOID *pVal
{
CXMLDOMAttribute *pObj = NULL;
hr = CPooledXMLDOMAttributeObj::CreateInstance(&pObj);
- if (S_OK != hr)
+ if (S_OK != hr)
return hr;
pObj->AddRef();
@@ -372,19 +372,19 @@ HRESULT wrapNode(IXMLDOMDocument *pDoc, DOM_Node& node, REFIID iid, LPVOID *pVal
{
pObj->attr = *(static_cast<DOM_Attr*> (&node));
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
- pObj->Release();
+ pObj->Release();
return MakeHRESULT(ex);
}
catch(...)
{
- pObj->Release();
+ pObj->Release();
return E_FAIL;
}
hr = pObj->QueryInterface(iid, pVal);
- if (S_OK != hr)
+ if (S_OK != hr)
*pVal = NULL;
pObj->Release();
@@ -394,7 +394,7 @@ HRESULT wrapNode(IXMLDOMDocument *pDoc, DOM_Node& node, REFIID iid, LPVOID *pVal
{
CXMLDOMText *pObj = NULL;
hr = CPooledXMLDOMTextObj::CreateInstance(&pObj);
- if (S_OK != hr)
+ if (S_OK != hr)
return hr;
pObj->AddRef();
@@ -404,19 +404,19 @@ HRESULT wrapNode(IXMLDOMDocument *pDoc, DOM_Node& node, REFIID iid, LPVOID *pVal
{
pObj->text = *(static_cast<DOM_Text*> (&node));
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
- pObj->Release();
+ pObj->Release();
return MakeHRESULT(ex);
}
catch(...)
{
- pObj->Release();
+ pObj->Release();
return E_FAIL;
}
hr = pObj->QueryInterface(iid, pVal);
- if (S_OK != hr)
+ if (S_OK != hr)
*pVal = NULL;
pObj->Release();
@@ -426,7 +426,7 @@ HRESULT wrapNode(IXMLDOMDocument *pDoc, DOM_Node& node, REFIID iid, LPVOID *pVal
{
CXMLDOMCDATASection *pObj = NULL;
hr = CPooledXMLDOMCDATASectionObj::CreateInstance(&pObj);
- if (S_OK != hr)
+ if (S_OK != hr)
return hr;
pObj->AddRef();
@@ -436,19 +436,19 @@ HRESULT wrapNode(IXMLDOMDocument *pDoc, DOM_Node& node, REFIID iid, LPVOID *pVal
{
pObj->cdataSection = *(static_cast<DOM_CDATASection*> (&node));
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
- pObj->Release();
+ pObj->Release();
return MakeHRESULT(ex);
}
catch(...)
{
- pObj->Release();
+ pObj->Release();
return E_FAIL;
}
hr = pObj->QueryInterface(iid, pVal);
- if (S_OK != hr)
+ if (S_OK != hr)
*pVal = NULL;
pObj->Release();
@@ -458,7 +458,7 @@ HRESULT wrapNode(IXMLDOMDocument *pDoc, DOM_Node& node, REFIID iid, LPVOID *pVal
{
CXMLDOMEntityReference *pObj = NULL;
hr = CPooledXMLDOMEntityReferenceObj::CreateInstance(&pObj);
- if (S_OK != hr)
+ if (S_OK != hr)
return hr;
pObj->AddRef();
@@ -468,19 +468,19 @@ HRESULT wrapNode(IXMLDOMDocument *pDoc, DOM_Node& node, REFIID iid, LPVOID *pVal
{
pObj->entityReference = *(static_cast<DOM_EntityReference*> (&node));
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
- pObj->Release();
+ pObj->Release();
return MakeHRESULT(ex);
}
catch(...)
{
- pObj->Release();
+ pObj->Release();
return E_FAIL;
}
hr = pObj->QueryInterface(iid, pVal);
- if (S_OK != hr)
+ if (S_OK != hr)
*pVal = NULL;
pObj->Release();
@@ -490,7 +490,7 @@ HRESULT wrapNode(IXMLDOMDocument *pDoc, DOM_Node& node, REFIID iid, LPVOID *pVal
{
CXMLDOMEntity *pObj = NULL;
hr = CPooledXMLDOMEntityObj::CreateInstance(&pObj);
- if (S_OK != hr)
+ if (S_OK != hr)
return hr;
pObj->AddRef();
@@ -500,19 +500,19 @@ HRESULT wrapNode(IXMLDOMDocument *pDoc, DOM_Node& node, REFIID iid, LPVOID *pVal
{
pObj->entity = *(static_cast<DOM_Entity*> (&node));
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
- pObj->Release();
+ pObj->Release();
return MakeHRESULT(ex);
}
catch(...)
{
- pObj->Release();
+ pObj->Release();
return E_FAIL;
}
hr = pObj->QueryInterface(iid, pVal);
- if (S_OK != hr)
+ if (S_OK != hr)
*pVal = NULL;
pObj->Release();
@@ -522,7 +522,7 @@ HRESULT wrapNode(IXMLDOMDocument *pDoc, DOM_Node& node, REFIID iid, LPVOID *pVal
{
CXMLDOMProcessingInstruction *pObj = NULL;
hr = CPooledXMLDOMProcessingInstructionObj::CreateInstance(&pObj);
- if (S_OK != hr)
+ if (S_OK != hr)
return hr;
pObj->AddRef();
@@ -532,19 +532,19 @@ HRESULT wrapNode(IXMLDOMDocument *pDoc, DOM_Node& node, REFIID iid, LPVOID *pVal
{
pObj->processingInstruction = *(static_cast<DOM_ProcessingInstruction*> (&node));
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
- pObj->Release();
+ pObj->Release();
return MakeHRESULT(ex);
}
catch(...)
{
- pObj->Release();
+ pObj->Release();
return E_FAIL;
}
hr = pObj->QueryInterface(iid, pVal);
- if (S_OK != hr)
+ if (S_OK != hr)
*pVal = NULL;
pObj->Release();
@@ -554,7 +554,7 @@ HRESULT wrapNode(IXMLDOMDocument *pDoc, DOM_Node& node, REFIID iid, LPVOID *pVal
{
CXMLDOMComment *pObj = NULL;
hr = CPooledXMLDOMCommentObj::CreateInstance(&pObj);
- if (S_OK != hr)
+ if (S_OK != hr)
return hr;
pObj->AddRef();
@@ -564,19 +564,19 @@ HRESULT wrapNode(IXMLDOMDocument *pDoc, DOM_Node& node, REFIID iid, LPVOID *pVal
{
pObj->comment = *(static_cast<DOM_Comment*> (&node));
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
- pObj->Release();
+ pObj->Release();
return MakeHRESULT(ex);
}
catch(...)
{
- pObj->Release();
+ pObj->Release();
return E_FAIL;
}
hr = pObj->QueryInterface(iid, pVal);
- if (S_OK != hr)
+ if (S_OK != hr)
*pVal = NULL;
pObj->Release();
@@ -586,7 +586,7 @@ HRESULT wrapNode(IXMLDOMDocument *pDoc, DOM_Node& node, REFIID iid, LPVOID *pVal
{
CXMLDOMDocumentObj *pObj = NULL;
hr = CXMLDOMDocumentObj::CreateInstance(&pObj);
- if (S_OK != hr)
+ if (S_OK != hr)
return hr;
pObj->AddRef();
@@ -596,19 +596,19 @@ HRESULT wrapNode(IXMLDOMDocument *pDoc, DOM_Node& node, REFIID iid, LPVOID *pVal
{
pObj->m_Document = *(static_cast<DOM_Document*> (&node));
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
- pObj->Release();
+ pObj->Release();
return MakeHRESULT(ex);
}
catch(...)
{
- pObj->Release();
+ pObj->Release();
return E_FAIL;
}
hr = pObj->QueryInterface(iid, pVal);
- if (S_OK != hr)
+ if (S_OK != hr)
*pVal = NULL;
pObj->Release();
@@ -618,7 +618,7 @@ HRESULT wrapNode(IXMLDOMDocument *pDoc, DOM_Node& node, REFIID iid, LPVOID *pVal
{
CXMLDOMDocumentTypeObj *pObj = NULL;
hr = CXMLDOMDocumentTypeObj::CreateInstance(&pObj);
- if (S_OK != hr)
+ if (S_OK != hr)
return hr;
pObj->AddRef();
@@ -628,19 +628,19 @@ HRESULT wrapNode(IXMLDOMDocument *pDoc, DOM_Node& node, REFIID iid, LPVOID *pVal
{
pObj->documentType = *(static_cast<DOM_DocumentType*> (&node));
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
- pObj->Release();
+ pObj->Release();
return MakeHRESULT(ex);
}
catch(...)
{
- pObj->Release();
+ pObj->Release();
return E_FAIL;
}
hr = pObj->QueryInterface(iid, pVal);
- if (S_OK != hr)
+ if (S_OK != hr)
*pVal = NULL;
pObj->Release();
@@ -650,7 +650,7 @@ HRESULT wrapNode(IXMLDOMDocument *pDoc, DOM_Node& node, REFIID iid, LPVOID *pVal
{
CXMLDOMDocumentFragmentObj *pObj = NULL;
hr = CXMLDOMDocumentFragmentObj::CreateInstance(&pObj);
- if (S_OK != hr)
+ if (S_OK != hr)
return hr;
pObj->AddRef();
@@ -660,19 +660,19 @@ HRESULT wrapNode(IXMLDOMDocument *pDoc, DOM_Node& node, REFIID iid, LPVOID *pVal
{
pObj->documentFragment = *(static_cast<DOM_DocumentFragment*> (&node));
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
- pObj->Release();
+ pObj->Release();
return MakeHRESULT(ex);
}
catch(...)
{
- pObj->Release();
+ pObj->Release();
return E_FAIL;
}
hr = pObj->QueryInterface(iid, pVal);
- if (S_OK != hr)
+ if (S_OK != hr)
*pVal = NULL;
pObj->Release();
@@ -682,7 +682,7 @@ HRESULT wrapNode(IXMLDOMDocument *pDoc, DOM_Node& node, REFIID iid, LPVOID *pVal
{
CXMLDOMNotationObj *pObj = NULL;
hr = CXMLDOMNotationObj::CreateInstance(&pObj);
- if (S_OK != hr)
+ if (S_OK != hr)
return hr;
pObj->AddRef();
@@ -692,19 +692,19 @@ HRESULT wrapNode(IXMLDOMDocument *pDoc, DOM_Node& node, REFIID iid, LPVOID *pVal
{
pObj->notation = *(static_cast<DOM_Notation*> (&node));
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
- pObj->Release();
+ pObj->Release();
return MakeHRESULT(ex);
}
catch(...)
{
- pObj->Release();
+ pObj->Release();
return E_FAIL;
}
hr = pObj->QueryInterface(iid, pVal);
- if (S_OK != hr)
+ if (S_OK != hr)
*pVal = NULL;
pObj->Release();
@@ -715,7 +715,7 @@ HRESULT wrapNode(IXMLDOMDocument *pDoc, DOM_Node& node, REFIID iid, LPVOID *pVal
{
CXMLDOMXMLDeclObj *pObj = NULL;
hr = CXMLDOMXMLDeclObj::CreateInstance(&pObj);
- if (S_OK != hr)
+ if (S_OK != hr)
return hr;
pObj->AddRef();
@@ -725,19 +725,19 @@ HRESULT wrapNode(IXMLDOMDocument *pDoc, DOM_Node& node, REFIID iid, LPVOID *pVal
{
pObj->xmlDecl = *(static_cast<DOM_XMLDecl*> (&node));
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
- pObj->Release();
+ pObj->Release();
return MakeHRESULT(ex);
}
catch(...)
{
- pObj->Release();
+ pObj->Release();
return E_FAIL;
}
hr = pObj->QueryInterface(iid, pVal);
- if (S_OK != hr)
+ if (S_OK != hr)
*pVal = NULL;
pObj->Release();
@@ -843,10 +843,10 @@ private:
// ---------------------------------------------------------------------------
void outputContent(xmlstream& target, const DOMString &toWrite)
{
-
+
int length = toWrite.length();
const XMLCh* chars = toWrite.rawBuffer();
-
+
int index;
for (index = 0; index < length; index++)
{
@@ -855,19 +855,19 @@ void outputContent(xmlstream& target, const DOMString &toWrite)
case chAmpersand :
target << XMLStrL("&");
break;
-
+
case chOpenAngle :
target << XMLStrL("<");
break;
-
+
case chCloseAngle:
target << XMLStrL(">");
break;
-
+
case chDoubleQuote :
target << XMLStrL(""");
break;
-
+
default:
// If it is none of the special characters, print it as such
target << toWrite.substringData(index, 1);
@@ -908,7 +908,7 @@ xmlstream& operator<<(xmlstream& target, const DOM_Node& toWrite)
//
// Bug here: we need to find a way to get the encoding name
// for the default code page on the system where the program
- // is running, and plug that in for the encoding name.
+ // is running, and plug that in for the encoding name.
//
//target << "<?xml version='1.0' encoding='ISO-8859-1' ?>\n";
DOM_Node child = toWrite.getFirstChild();
@@ -999,7 +999,7 @@ xmlstream& operator<<(xmlstream& target, const DOM_Node& toWrite)
id = doctype.getSystemId();
if (id != 0)
target << XMLStrL(" SYSTEM \"") << id << XMLStrL("\"");
- id = doctype.getInternalSubset();
+ id = doctype.getInternalSubset();
if (id !=0)
target << XMLStrL(" [ ") << id << XMLStrL("]");
target << XMLStrL(">");
diff --git a/src/com/XMLDOMXMLDecl.cpp b/src/com/XMLDOMXMLDecl.cpp
index b21adcd3cf3a18ef616acb4c2a03ec838a3f62b5..ccef81f41b1375b26e115598490d760fab4339dc 100644
--- a/src/com/XMLDOMXMLDecl.cpp
+++ b/src/com/XMLDOMXMLDecl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -103,7 +103,7 @@ STDMETHODIMP CXMLDOMXMLDecl::get_data(BSTR *pVal)
DOMString standalone(xmlDecl.getStandalone());
len = standalone.length();
if(len > 0) {
- if(totalLen > 0)
+ if(totalLen > 0)
totalLen += len + 14;
else
totalLen = len + 13;
@@ -151,7 +151,7 @@ STDMETHODIMP CXMLDOMXMLDecl::get_data(BSTR *pVal)
}
}
- catch(DOM_DOMException& ex)
+ catch(DOM_DOMException& ex)
{
return MakeHRESULT(ex);
}
diff --git a/src/com/xml4com.cpp b/src/com/xml4com.cpp
index 58ee26204ab17ea6c1c5141717fee13c62b9fe26..22d11801b2343f96af5c186fb3adeb5bbaa266d9 100644
--- a/src/com/xml4com.cpp
+++ b/src/com/xml4com.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2001/05/11 13:25:08 tng
+ * Copyright update.
+ *
* Revision 1.5 2001/01/19 15:18:39 tng
* COM Updates by Curt Arnold: changed 1.3 to 1.4, updated the GUID's so
* both can coexist and fixed a new minor bugs. Most of the changes involved
@@ -76,24 +79,24 @@
// xml4com.cpp : Implementation of DLL Exports.
// Note: Proxy/Stub Information
-// To merge the proxy/stub code into the object DLL, add the file
-// dlldatax.c to the project. Make sure precompiled headers
-// are turned off for this file, and add _MERGE_PROXYSTUB to the
-// defines for the project.
+// To merge the proxy/stub code into the object DLL, add the file
+// dlldatax.c to the project. Make sure precompiled headers
+// are turned off for this file, and add _MERGE_PROXYSTUB to the
+// defines for the project.
//
// If you are not running WinNT4.0 or Win95 with DCOM, then you
// need to remove the following define from dlldatax.c
// #define _WIN32_WINNT 0x0400
//
-// Further, if you are running MIDL without /Oicf switch, you also
+// Further, if you are running MIDL without /Oicf switch, you also
// need to remove the following define from dlldatax.c.
// #define USE_STUBLESS_PROXY
//
-// Modify the custom build rule for xml4com.idl by adding the following
+// Modify the custom build rule for xml4com.idl by adding the following
// files to the Outputs.
// xml4com_p.c
// dlldata.c
-// To build a separate proxy/stub DLL,
+// To build a separate proxy/stub DLL,
// run nmake -f xml4comps.mk in the project directory.
#include "stdafx.h"
@@ -317,32 +320,32 @@ static LPOLESTR Msgs[] =
//
// makes an HRESULT with a code based on the DOM error code
//
-HRESULT MakeHRESULT(DOM_DOMException& ex)
+HRESULT MakeHRESULT(DOM_DOMException& ex)
{
ICreateErrorInfo* pCErr = NULL;
HRESULT sc = CreateErrorInfo(&pCErr);
if(SUCCEEDED(sc)) {
DOMString msg = ex.msg;
- if(msg == NULL)
+ if(msg == NULL)
{
if(ex.code >= DOM_DOMException::INDEX_SIZE_ERR &&
- ex.code <= DOM_DOMException::INVALID_ACCESS_ERR)
+ ex.code <= DOM_DOMException::INVALID_ACCESS_ERR)
{
sc = pCErr->SetDescription(Msgs[ex.code]);
}
- else
+ else
{
sc = pCErr->SetDescription(Msgs[0]);
}
}
- else
+ else
{
sc = pCErr->SetDescription((BSTR) ex.msg.rawBuffer());
}
IErrorInfo* pErr = NULL;
sc = pCErr->QueryInterface(IID_IErrorInfo,(void**) &pErr);
- if(SUCCEEDED(sc))
+ if(SUCCEEDED(sc))
{
sc = SetErrorInfo(0,pErr);
pErr->Release();
diff --git a/src/com/xml4com.rc b/src/com/xml4com.rc
index 4aae3be914aac6211338beda2f40ac94b6db8323..280b331f2fa8cb5099d024b29158c833221640c2 100644
--- a/src/com/xml4com.rc
+++ b/src/com/xml4com.rc
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -84,18 +84,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// TEXTINCLUDE
//
-1 TEXTINCLUDE DISCARDABLE
+1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
-2 TEXTINCLUDE DISCARDABLE
+2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""winres.h""\r\n"
"\0"
END
-3 TEXTINCLUDE DISCARDABLE
+3 TEXTINCLUDE DISCARDABLE
BEGIN
"1 TYPELIB ""..\\..\\..\\..\\..\\Build\\Win32\\xml4com\\xml4com.tlb""\r\n"
"\0"
@@ -164,7 +164,7 @@ IDR_XMLHTTPREQUEST REGISTRY DISCARDABLE "xmlhttprequest.rgs"
// String Table
//
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_PROJNAME "xml4com"
END
diff --git a/src/dom/AttrImpl.cpp b/src/dom/AttrImpl.cpp
index 69c7e1572714f2e9951b3b2a98231b6693f3b099..989f17542a8e5cb39dd5192031371d6320dc9c12 100644
--- a/src/dom/AttrImpl.cpp
+++ b/src/dom/AttrImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -84,7 +84,7 @@
* ... use of *x which is the DOMString ...
*/
-AttrImpl::AttrImpl(DocumentImpl *ownerDoc, const DOMString &aName)
+AttrImpl::AttrImpl(DocumentImpl *ownerDoc, const DOMString &aName)
: NodeImpl (ownerDoc)
{
name = aName.clone();
@@ -114,7 +114,7 @@ AttrImpl::AttrImpl(const AttrImpl &other, bool deep)
isIdAttr(true);
this->getOwnerDocument()->getNodeIDMap()->add(this);
}
-
+
// take care of case where there are kids
if (!hasStringValue()) {
cloneChildren(other);
@@ -165,7 +165,7 @@ void AttrImpl::makeChildNode() {
}
}
-NodeImpl * AttrImpl::cloneNode(bool deep)
+NodeImpl * AttrImpl::cloneNode(bool deep)
{
return new AttrImpl(*this, deep);
};
@@ -193,7 +193,7 @@ DOMString AttrImpl::getNodeValue()
};
-bool AttrImpl::getSpecified()
+bool AttrImpl::getSpecified()
{
return isSpecified();
};
@@ -201,7 +201,7 @@ bool AttrImpl::getSpecified()
-DOMString AttrImpl::getValue()
+DOMString AttrImpl::getValue()
{
if (value == null) {
return 0; // return "";
@@ -220,14 +220,14 @@ DOMString AttrImpl::getValue()
int length = 0;
for (node = firstChild; node != null; node = node->nextSibling)
length += node->getNodeValue().length();
-
+
DOMString retString;
retString.reserve(length);
for (node = firstChild; node != null; node = node->nextSibling)
{
retString.appendData(node->getNodeValue());
};
-
+
return retString;
};
@@ -261,7 +261,7 @@ void AttrImpl::setValue(const DOMString &newvalue)
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null
);
}
-
+
// If this attribute was of type ID and in the map, take it out,
// then put it back in with the new name. For now, we don't worry
// about what happens if the new name conflicts
@@ -290,7 +290,7 @@ void AttrImpl::setValue(const DOMString &newvalue)
hasStringValue(true);
isSpecified(true);
changed();
-
+
if (isIdAttr())
this->getOwnerDocument()->getNodeIDMap()->add(this);
@@ -301,7 +301,7 @@ void AttrImpl::setValue(const DOMString &newvalue)
DOMString AttrImpl::toString()
{
DOMString retString;
-
+
retString.appendData(name);
retString.appendData(DOMString("=\""));
retString.appendData(getValue());
@@ -331,9 +331,9 @@ void AttrImpl::setOwnerElement(ElementImpl *ownerElem)
// ParentNode stuff
void AttrImpl::cloneChildren(const NodeImpl &other) {
- // for (NodeImpl *mykid = other.getFirstChild();
- for (NodeImpl *mykid = ((NodeImpl&)other).getFirstChild();
- mykid != null;
+ // for (NodeImpl *mykid = other.getFirstChild();
+ for (NodeImpl *mykid = ((NodeImpl&)other).getFirstChild();
+ mykid != null;
mykid = mykid->getNextSibling()) {
this->appendChild(mykid->cloneNode(true));
}
@@ -381,14 +381,14 @@ unsigned int AttrImpl::getLength() {
}
bool AttrImpl::hasChildNodes()
-{
+{
return value != null;
-};
+};
NodeImpl *AttrImpl::insertBefore(NodeImpl *newChild, NodeImpl *refChild) {
-
+
DocumentImpl *ownerDocument = getOwnerDocument();
bool errorChecking = ownerDocument->getErrorChecking();
@@ -420,7 +420,7 @@ NodeImpl *AttrImpl::insertBefore(NodeImpl *newChild, NodeImpl *refChild) {
null);
}
}
- }
+ }
while (newChild->hasChildNodes()) { // Move
insertBefore(newChild->getFirstChild(), refChild);
@@ -467,7 +467,7 @@ NodeImpl *AttrImpl::insertBefore(NodeImpl *newChild, NodeImpl *refChild) {
makeChildNode(); // make sure we have a node and not a string
- // Convert to internal type, to avoid repeated casting
+ // Convert to internal type, to avoid repeated casting
ChildNode * newInternal = (ChildNode *)newChild;
NodeImpl *oldparent = newInternal->getParentNode();
@@ -481,7 +481,7 @@ NodeImpl *AttrImpl::insertBefore(NodeImpl *newChild, NodeImpl *refChild) {
// Attach up
newInternal->ownerNode = this;
newInternal->isOwned(true);
-
+
// Attach before and after
// Note: firstChild.previousSibling == lastChild!!
ChildNode *firstChild = (ChildNode *) value;
@@ -536,8 +536,8 @@ NodeImpl *AttrImpl::insertBefore(NodeImpl *newChild, NodeImpl *refChild) {
return newInternal;
}
-
-
+
+
NodeImpl *AttrImpl::item(unsigned int index) {
if (hasStringValue()) {
@@ -550,15 +550,15 @@ NodeImpl *AttrImpl::item(unsigned int index) {
}
}
ChildNode *nodeListNode = (ChildNode *) value;
- for (unsigned int nodeListIndex = 0;
- nodeListIndex < index && nodeListNode != null;
+ for (unsigned int nodeListIndex = 0;
+ nodeListIndex < index && nodeListNode != null;
nodeListIndex++) {
nodeListNode = nodeListNode->nextSibling;
}
return nodeListNode;
}
-
-
+
+
NodeImpl *AttrImpl::removeChild(NodeImpl *oldChild) {
DocumentImpl *ownerDocument = getOwnerDocument();
@@ -580,15 +580,15 @@ NodeImpl *AttrImpl::removeChild(NodeImpl *oldChild) {
unsigned int sz = ranges->size();
if (sz != 0) {
for (unsigned int i =0; i<sz; i++) {
- if (ranges->elementAt(i) != null)
+ if (ranges->elementAt(i) != null)
ranges->elementAt(i)->updateRangeForDeletedNode(oldChild);
}
}
}
}
-
+
ChildNode * oldInternal = (ChildNode *) oldChild;
-
+
// Patch linked list around oldChild
// Note: lastChild == firstChild->previousSibling
if (oldInternal == value) {
@@ -634,27 +634,27 @@ NodeImpl *AttrImpl::replaceChild(NodeImpl *newChild, NodeImpl *oldChild) {
// changed() already done.
return oldChild;
}
-
+
void AttrImpl::setReadOnly(bool readOnl, bool deep) {
NodeImpl::setReadOnly(readOnl, deep);
-
+
if (deep) {
if (hasStringValue()) {
return;
}
// Recursively set kids
- for (ChildNode *mykid = (ChildNode *) value;
- mykid != null;
+ for (ChildNode *mykid = (ChildNode *) value;
+ mykid != null;
mykid = mykid->nextSibling)
if(! (mykid->isEntityReference()))
mykid->setReadOnly(readOnl,true);
}
}
-
-
+
+
//Introduced in DOM Level 2
-
+
void AttrImpl::normalize()
{
if (hasStringValue()) {
@@ -664,11 +664,11 @@ void AttrImpl::normalize()
for (kid = (ChildNode *) value; kid != null; kid = next)
{
next = kid->nextSibling;
-
+
// If kid and next are both Text nodes (but _not_ CDATASection,
// which is a subclass of Text), they can be merged.
- if (next != null &&
- kid->isTextImpl() && !(kid->isCDATASectionImpl()) &&
+ if (next != null &&
+ kid->isTextImpl() && !(kid->isCDATASectionImpl()) &&
next->isTextImpl() && !(next->isCDATASectionImpl()) )
{
((TextImpl *) kid)->appendData(((TextImpl *) next)->getData());
@@ -677,13 +677,13 @@ void AttrImpl::normalize()
deleteIf(next);
next = kid; // Don't advance; there might be another.
}
-
- // Otherwise it might be an Element, which is handled recursively
+
+ // Otherwise it might be an Element, which is handled recursively
else
if (kid->isElementImpl())
kid->normalize();
};
-
+
// changed() will have occurred when the removeChild() was done,
// so does not have to be reissued.
};
diff --git a/src/dom/AttrImpl.hpp b/src/dom/AttrImpl.hpp
index 5894556428e0a88f0e4ab5c9e812c469637a749c..d640e57da38c26a60f7924b3d83632d6536d497d 100644
--- a/src/dom/AttrImpl.hpp
+++ b/src/dom/AttrImpl.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -48,7 +48,7 @@
* 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
@@ -145,7 +145,7 @@
class ElementImpl;
class CDOM_EXPORT AttrImpl: public NodeImpl {
-
+
public:
DOMString name;
diff --git a/src/dom/AttrNSImpl.cpp b/src/dom/AttrNSImpl.cpp
index 57f82806a86e1b916718edd0b8935cb6c16ec90f..d3f4aacbe61a1dfa2fe767d1b12128b81f883248 100644
--- a/src/dom/AttrNSImpl.cpp
+++ b/src/dom/AttrNSImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -103,7 +103,7 @@ AttrNSImpl::AttrNSImpl(DocumentImpl *ownerDoc,
const DOMString& URI = xmlnsAlone ?
xmlnsURI : mapPrefix(prefix, fNamespaceURI, DOM_Node::ATTRIBUTE_NODE);
this -> namespaceURI = URI == null ? DOMString(null) : URI.clone();
-};
+};
AttrNSImpl::AttrNSImpl(const AttrNSImpl &other, bool deep) :
AttrImpl(other, deep)
@@ -112,7 +112,7 @@ AttrNSImpl::AttrNSImpl(const AttrNSImpl &other, bool deep) :
this->localName = other.localName.clone(); //DOM Level 2
};
-NodeImpl * AttrNSImpl::cloneNode(bool deep)
+NodeImpl * AttrNSImpl::cloneNode(bool deep)
{
return new AttrNSImpl(*this, deep);
};
diff --git a/src/dom/ChildNode.cpp b/src/dom/ChildNode.cpp
index cb26141399a6443bafe2c5c628a83863f701fe2f..0174b24f11e3be780fb2212a4dfce36eb82ed698 100644
--- a/src/dom/ChildNode.cpp
+++ b/src/dom/ChildNode.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -67,7 +67,7 @@ ChildNode::ChildNode(DocumentImpl *ownerDoc)
{
this->previousSibling = null;
this->nextSibling = null;
-};
+};
// This only makes a shallow copy, cloneChildren must also be called for a
// deep clone
@@ -85,17 +85,17 @@ ChildNode::~ChildNode() {
NodeImpl * ChildNode::getNextSibling() {
return nextSibling;
-};
+};
NodeImpl * ChildNode::getParentNode()
{
// if we have an owner, ownerNode is our parent, otherwise it's
// our ownerDocument and we don't have a parent
return isOwned() ? ownerNode : null;
-};
+};
NodeImpl * ChildNode::getPreviousSibling() {
// if we are the firstChild, previousSibling actually refers to our
// parent's lastChild, but we hide that
return isFirstChild() ? null : previousSibling;
-};
+};
diff --git a/src/dom/DOMString.cpp b/src/dom/DOMString.cpp
index 2579db3ea3672d5d97eaf07cd3f4b6413fecb851..5ab6b41162036534b3b3ff581c58ee9e011459e1 100644
--- a/src/dom/DOMString.cpp
+++ b/src/dom/DOMString.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.20 2001/05/11 13:25:19 tng
+ * Copyright update.
+ *
* Revision 1.19 2001/01/25 19:22:50 tng
* Some bug fixes + Cleanup. Fixed by Khaled Noaman.
*
@@ -157,7 +160,7 @@
#include <assert.h>
#include <string.h>
-
+
//----------------------------------------------
//
// Forward decls
@@ -266,7 +269,7 @@ XMLMutex& DOMStringHandle::getMutex()
delete tmpMutex;
}
}
-
+
return *DOMStringHandleMutex;
}
@@ -281,14 +284,14 @@ void *DOMStringHandle::operator new(size_t sizeToAlloc)
void *retPtr;
XMLMutexLock lock(&getMutex()); // Lock the DOMStringHandle mutex for
// the duration of this function.
-
- if (freeListPtr == 0)
+
+ if (freeListPtr == 0)
{
// Uncommon case. The free list of string handles is empty
- // Allocate a new batch of them, using the system's
+ // Allocate a new batch of them, using the system's
// operator new to get a chunk of memory.
//
- DOMStringHandle *dsg =
+ DOMStringHandle *dsg =
::new DOMStringHandle[allocGroupSize];
// Link the block itself into the list of blocks. The purpose of this is to
@@ -299,23 +302,23 @@ void *DOMStringHandle::operator new(size_t sizeToAlloc)
// Link all of the new storage for StringHandles into the StringHandle free list
- int i; // Start with index 1; index 0 is reserved for linking the
+ int i; // Start with index 1; index 0 is reserved for linking the
// larger allocation blocks together.
for (i=1; i<allocGroupSize-1; i++) {
*(void **)&dsg[i] = freeListPtr;
freeListPtr = &dsg[i];
}
}
-
+
retPtr = freeListPtr;
freeListPtr = *(void **)freeListPtr;
-
+
return retPtr;
};
//
-// Operator delete for DOMStringHandles. Called implicitly from the
+// Operator delete for DOMStringHandles. Called implicitly from the
// Destructor for DOMStringHandle.
//
void DOMStringHandle::operator delete(void *pMem)
@@ -326,7 +329,7 @@ void DOMStringHandle::operator delete(void *pMem)
*(void **)pMem = freeListPtr;
freeListPtr = pMem;
}
-
+
// If ALL of the string handles are gone, delete the storage blocks used for the
// handles as well. This will generally only happen on PlatFormUtils::Terminate(),
// since any use of the DOM will cache some commonly used DOMStrings
@@ -344,8 +347,8 @@ void DOMStringHandle::operator delete(void *pMem)
DOMStringTerminate(); // Clean up everything else related to DOMString.
}
-
-
+
+
};
@@ -425,7 +428,7 @@ DOMString::DOMString(const XMLCh *data)
unsigned int dataLength = 0;
while (data[dataLength] != 0)
++dataLength;
-
+
if (dataLength != 0)
{
fHandle = DOMStringHandle::createNewStringHandle(dataLength+1);
@@ -471,7 +474,7 @@ DOMString::DOMString(const XMLCh *data, unsigned int dataLength)
static XMLLCPTranscoder* gDomConverter = 0;
XMLLCPTranscoder* getDomConverter()
{
- if (!gDomConverter)
+ if (!gDomConverter)
{
XMLLCPTranscoder* transcoder =
XMLPlatformUtils::fgTransService->makeNewLCPTranscoder();
@@ -491,7 +494,7 @@ XMLLCPTranscoder* getDomConverter()
//
// Create a DOMString from a char * string in the default code page
// of the system on which we are executing.
-//
+//
//
DOMString::DOMString(const char *srcString)
{
@@ -544,7 +547,7 @@ DOMString & DOMString::operator =(const DOMString &other)
fHandle->removeRef();
fHandle = other.fHandle;
-
+
if (fHandle)
fHandle->addRef();
@@ -630,7 +633,7 @@ void DOMString::appendData(const DOMString &other)
unsigned int i;
for (i=0; i<fHandle->fLength; ++i)
newP[i] = oldP[i];
-
+
fHandle->fDSData->removeRef();
fHandle->fDSData = newBuf;
}
@@ -660,7 +663,7 @@ void DOMString::appendData(XMLCh ch)
}
else
newLength = fHandle->fLength + 1;
-
+
if (newLength >= fHandle->fDSData->fBufferLength ||
fHandle->fDSData->fRefCount > 1)
{
@@ -674,7 +677,7 @@ void DOMString::appendData(XMLCh ch)
unsigned int i;
for (i=0; i<fHandle->fLength; ++i)
newP[i] = oldP[i];
-
+
fHandle->fDSData->removeRef();
fHandle->fDSData = newBuf;
}
@@ -790,7 +793,7 @@ void DOMString::deleteData(unsigned int offset, unsigned int delLength)
fHandle->fLength = newStringLength;
}
- else
+ else
{
// The deletion continues to the end of the string.
// Simply reset the length. We don't need to worry
@@ -874,11 +877,11 @@ bool DOMString::equals(const XMLCh *other) const
// At this point, we know that at least one of the strings had a null
// data pointer.
if (fHandle && fHandle->fLength != 0)
- return false;
-
+ return false;
+
if (other && *other != 0)
return false;
-
+
return true; // Both strings are empty. DOMString treats zero-length
// and a null data pointer as equivalent.
};
@@ -889,7 +892,7 @@ void DOMString::insertData(unsigned int offset, const DOMString &src)
unsigned int origStrLength = this->length();
if (offset > origStrLength)
throw DOM_DOMException(DOM_DOMException::INDEX_SIZE_ERR, 0);
-
+
if (fHandle == 0)
{
*this = src.clone();
@@ -920,7 +923,7 @@ void DOMString::insertData(unsigned int offset, const DOMString &src)
for (i=0; i<srcLength; i++)
newP[i+offset] = srcP[i];
-
+
for (i=offset; i<origStrLength; i++)
newP[i+srcLength] = oldP[i];
@@ -1030,11 +1033,11 @@ char *DOMString::transcode() const
// The data in the DOMString itself happens to be null terminated.
// Just use it in place.
srcP = DOMStrData;
- }
+ }
else if (fHandle->fLength < localBufLen-1)
{
// The data is not null terminated, but does fit in the
- // local buffer (fast allocation). Copy it over, and add
+ // local buffer (fast allocation). Copy it over, and add
// the null termination,
memcpy(localBuf, DOMStrData, fHandle->fLength * sizeof(XMLCh));
srcP = localBuf;
@@ -1111,22 +1114,22 @@ DOMString DOMString::substringData(unsigned int offset, unsigned int count) cons
{
if (count == 0)
return DOMString();
-
+
unsigned int thisLen = length();
if (offset >= thisLen)
throw DOM_DOMException(DOM_DOMException::INDEX_SIZE_ERR, 0);
-
+
// Cap count to the string length to eliminate overflow
// problems when we get passed bogus values, like -1.
if (count > thisLen)
- count = thisLen;
-
+ count = thisLen;
+
// If the count extends past the end of the string, cut it
// back so that the returned string will stop at the end
// of the source string.
if (offset + count >= thisLen)
count = thisLen - offset;
-
+
// If the substring starts at the beginning of the original string
// we do not need to copy the data, but can set up a new
// string handle with the shorter length.
@@ -1141,7 +1144,7 @@ DOMString DOMString::substringData(unsigned int offset, unsigned int count) cons
// Create a completely new DOMString. No buffer sharing is possible.
XMLCh *data = fHandle->fDSData->fData;
return DOMString(data+offset, count);
-
+
};
@@ -1190,7 +1193,7 @@ static void DOMStringTerminate() // Termination function cleans up all la
// know this from reference counting.)
delete DOMStringHandleMutex; // Delete the synchronization mutex,
- DOMStringHandleMutex = 0;
+ DOMStringHandleMutex = 0;
delete gDomConverter; // Delete the local code page converter.
gDomConverter = 0;
diff --git a/src/dom/DOM_Document.cpp b/src/dom/DOM_Document.cpp
index c87238d63e8ecc17a245fa46384165bb6f3ff4f5..15b9a8581e952b1c45fda29fffb1605cd04d6fda 100644
--- a/src/dom/DOM_Document.cpp
+++ b/src/dom/DOM_Document.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -247,7 +247,7 @@ DOM_XMLDecl DOM_Document::createXMLDecl(const DOMString& version, const DOMStrin
return DOM_XMLDecl( ((DocumentImpl *)fImpl)->createXMLDecl(version, encoding, standalone));
}
-DOM_Range DOM_Document::createRange()
+DOM_Range DOM_Document::createRange()
{
return DOM_Range( ((DocumentImpl *)fImpl)->createRange() );
}
diff --git a/src/dom/DOM_Document.hpp b/src/dom/DOM_Document.hpp
index 88342aa9067df9829ba113b6db3624581f921f17..d152431899936dd45632a0be9055a845644e791d 100644
--- a/src/dom/DOM_Document.hpp
+++ b/src/dom/DOM_Document.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -214,10 +214,10 @@ public:
*
* @param tagName The name of the element type to instantiate, as
* a null-terminated unicode string.
- * @return A new <CODE>DOM_Element</CODE>
- * object with the <CODE>nodeName</CODE> attribute set to
- * <CODE>tagName</CODE>, and <CODE>localName</CODE>,
- * <CODE>prefix</CODE>, and <CODE>namespaceURI</CODE> set to
+ * @return A new <CODE>DOM_Element</CODE>
+ * object with the <CODE>nodeName</CODE> attribute set to
+ * <CODE>tagName</CODE>, and <CODE>localName</CODE>,
+ * <CODE>prefix</CODE>, and <CODE>namespaceURI</CODE> set to
* <CODE>null</CODE>.
*/
DOM_Element createElement(const XMLCh *tagName);
@@ -304,10 +304,10 @@ public:
* <code>Attr</code> instance can then be attached to an Element
* using the <code>DOMElement::setAttribute()</code> method.
* @param name The name of the attribute.
- * @return A new <CODE>DOM_Attr</CODE>
- * object with the <CODE>nodeName</CODE> attribute set to
- * <CODE>name</CODE>, and <CODE>localName</CODE>, <CODE>prefix</CODE>,
- * and <CODE>namespaceURI</CODE> set to
+ * @return A new <CODE>DOM_Attr</CODE>
+ * object with the <CODE>nodeName</CODE> attribute set to
+ * <CODE>name</CODE>, and <CODE>localName</CODE>, <CODE>prefix</CODE>,
+ * and <CODE>namespaceURI</CODE> set to
* <CODE>null</CODE>.
* @exception DOMException
* INVALID_CHARACTER_ERR: Raised if the specified name contains an
@@ -336,7 +336,7 @@ public:
* document subtree governed by a particular node, the results of a query, or any other set of nodes.
* The set of nodes to be iterated is determined by the implementation of the NodeIterator. DOM Level 2
* specifies a single NodeIterator implementation for document-order traversal of a document subtree.
- * Instances of these iterators are created by calling <code>DocumentTraversal.createNodeIterator()</code>.
+ * Instances of these iterators are created by calling <code>DocumentTraversal.createNodeIterator()</code>.
*
* To produce a view of the document that has entity references expanded and does not
* expose the entity reference node itself, use the <code>whatToShow</code> flags to hide the entity
@@ -354,9 +354,9 @@ public:
* visible to the iterator. If false, they will be skipped over.
*/
- DOM_NodeIterator createNodeIterator(DOM_Node root,
- unsigned long whatToShow,
- DOM_NodeFilter* filter,
+ DOM_NodeIterator createNodeIterator(DOM_Node root,
+ unsigned long whatToShow,
+ DOM_NodeFilter* filter,
bool entityReferenceExpansion);
/**
* Creates a TreeWalker object. (DOM2)
@@ -389,9 +389,9 @@ public:
* visible to the tree-walker. If false, they will be skipped over.
*/
- DOM_TreeWalker createTreeWalker(DOM_Node root,
- unsigned long whatToShow,
- DOM_NodeFilter* filter,
+ DOM_TreeWalker createTreeWalker(DOM_Node root,
+ unsigned long whatToShow,
+ DOM_NodeFilter* filter,
bool entityReferenceExpansion);
/**
@@ -414,16 +414,16 @@ public:
const DOMString& standalone);
/**
- * To create the range consisting of boundary-points and offset of the
+ * To create the range consisting of boundary-points and offset of the
* selected contents
*
- * @return The initial state of the Range such that both the boundary-points
- * are positioned at the beginning of the corresponding DOM_DOcument, before
- * any content. The range returned can only be used to select content
- * associated with this document, or with documentFragments and Attrs for
+ * @return The initial state of the Range such that both the boundary-points
+ * are positioned at the beginning of the corresponding DOM_DOcument, before
+ * any content. The range returned can only be used to select content
+ * associated with this document, or with documentFragments and Attrs for
* which this document is the ownerdocument
*/
- DOM_Range createRange();
+ DOM_Range createRange();
//@}
/** @name Getter functions */
@@ -473,31 +473,31 @@ public:
//@{
/**
- * Imports a node from another document to this document.
- * The returned node has no parent (<CODE>parentNode</CODE> is
- * <CODE>null</CODE>). The source node is not altered or removed from the
- * original document; this method creates a new copy of the source
- * node.<BR>For all nodes, importing a node creates a node object owned by
- * the importing document, with attribute values identical to the source
- * node's <CODE>nodeName</CODE> and <CODE>nodeType</CODE>, plus the
+ * Imports a node from another document to this document.
+ * The returned node has no parent (<CODE>parentNode</CODE> is
+ * <CODE>null</CODE>). The source node is not altered or removed from the
+ * original document; this method creates a new copy of the source
+ * node.<BR>For all nodes, importing a node creates a node object owned by
+ * the importing document, with attribute values identical to the source
+ * node's <CODE>nodeName</CODE> and <CODE>nodeType</CODE>, plus the
* attributes related to namespaces (prefix and namespaces URI).
*
* <p><b>"Experimental - subject to change"</b></p>
*
* @param importedNode The node to import.
- * @param deep If <CODE>true</CODE>, recursively import the subtree under the
- * specified node; if <CODE>false</CODE>, import only the node itself,
- * as explained above. This does not apply to <CODE>DOM_Attr</CODE>,
+ * @param deep If <CODE>true</CODE>, recursively import the subtree under the
+ * specified node; if <CODE>false</CODE>, import only the node itself,
+ * as explained above. This does not apply to <CODE>DOM_Attr</CODE>,
* <CODE>DOM_EntityReference</CODE>, and <CODE>DOM_Notation</CODE> nodes.
* @return The imported node that belongs to this <CODE>DOM_Document</CODE>.
* @exception DOMException
- * NOT_SUPPORTED_ERR: Raised if the type of node being imported is
+ * NOT_SUPPORTED_ERR: Raised if the type of node being imported is
* not supported.
*/
DOM_Node importNode(const DOM_Node &importedNode, bool deep);
/**
- * Creates an element of the given qualified name and
+ * Creates an element of the given qualified name and
* namespace URI.
*
* <p><b>"Experimental - subject to change"</b></p>
@@ -511,11 +511,11 @@ public:
* INVALID_CHARACTER_ERR: Raised if the specified qualified name contains
* an illegal character.
* <br>
- * NAMESPACE_ERR: Raised if the <CODE>qualifiedName</CODE> is
- * malformed, if the <CODE>qualifiedName</CODE> has a prefix and the
- * <CODE>namespaceURI</CODE> is <CODE>null</CODE> or an empty string,
- * or if the <CODE>qualifiedName</CODE> has a prefix that is "xml" and
- * the <CODE>namespaceURI</CODE> is different from
+ * NAMESPACE_ERR: Raised if the <CODE>qualifiedName</CODE> is
+ * malformed, if the <CODE>qualifiedName</CODE> has a prefix and the
+ * <CODE>namespaceURI</CODE> is <CODE>null</CODE> or an empty string,
+ * or if the <CODE>qualifiedName</CODE> has a prefix that is "xml" and
+ * the <CODE>namespaceURI</CODE> is different from
* "http://www.w3.org/XML/1998/namespace".
*/
DOM_Element createElementNS(const DOMString &namespaceURI,
@@ -536,17 +536,17 @@ public:
* INVALID_CHARACTER_ERR: Raised if the specified qualified name contains
* an illegal character.
* <br>
- * NAMESPACE_ERR: Raised if the <CODE>qualifiedName</CODE> is
- * malformed, if the <CODE>qualifiedName</CODE> has a prefix and the
- * <CODE>namespaceURI</CODE> is <CODE>null</CODE> or an empty string,
- * if the <CODE>qualifiedName</CODE> has a prefix that is "xml" and the
- * <CODE>namespaceURI</CODE> is different from
- * "http://www.w3.org/XML/1998/namespace", if the
- * <CODE>qualifiedName</CODE> has a prefix that is "xmlns" and the
- * <CODE>namespaceURI</CODE> is different from
- * "http://www.w3.org/2000/xmlns/", or if the
- * <CODE>qualifiedName</CODE> is "xmlns" and the
- * <CODE>namespaceURI</CODE> is different from
+ * NAMESPACE_ERR: Raised if the <CODE>qualifiedName</CODE> is
+ * malformed, if the <CODE>qualifiedName</CODE> has a prefix and the
+ * <CODE>namespaceURI</CODE> is <CODE>null</CODE> or an empty string,
+ * if the <CODE>qualifiedName</CODE> has a prefix that is "xml" and the
+ * <CODE>namespaceURI</CODE> is different from
+ * "http://www.w3.org/XML/1998/namespace", if the
+ * <CODE>qualifiedName</CODE> has a prefix that is "xmlns" and the
+ * <CODE>namespaceURI</CODE> is different from
+ * "http://www.w3.org/2000/xmlns/", or if the
+ * <CODE>qualifiedName</CODE> is "xmlns" and the
+ * <CODE>namespaceURI</CODE> is different from
* "http://www.w3.org/2000/xmlns/".
*/
DOM_Attr createAttributeNS(const DOMString &namespaceURI,
@@ -575,10 +575,10 @@ public:
* Returns the <code>DOM_Element</code> whose ID is given by <code>elementId</code>.
* If no such element exists, returns <code>null</code>.
* Behavior is not defined if more than one element has this <code>ID</code>.
- * <P><B>Note:</B> The DOM implementation must have information that says
- * which attributes are of type ID. Attributes with the name "ID" are not of
- * type ID unless so defined. Implementations that do not know whether
- * attributes are of type ID or not are expected to return
+ * <P><B>Note:</B> The DOM implementation must have information that says
+ * which attributes are of type ID. Attributes with the name "ID" are not of
+ * type ID unless so defined. Implementations that do not know whether
+ * attributes are of type ID or not are expected to return
* <CODE>null</CODE>.</P>
*
* <p><b>"Experimental - subject to change"</b></p>
@@ -588,7 +588,7 @@ public:
*/
DOM_Element getElementById(const DOMString &elementId);
- /**
+ /**
* Sets whether the DOM implementation performs error checking
* upon operations. Turning off error checking only affects
* the following DOM checks:
diff --git a/src/dom/DOM_Element.hpp b/src/dom/DOM_Element.hpp
index 5a7927975e5cbeee749e96b13ca442b822378284..8da29a76b7341e35ec9254dab414035eb255c644 100644
--- a/src/dom/DOM_Element.hpp
+++ b/src/dom/DOM_Element.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2001/05/11 13:25:20 tng
+ * Copyright update.
+ *
* Revision 1.8 2001/05/03 19:17:26 knoaman
* TraverseSchema Part II.
*
@@ -104,27 +107,27 @@ class DOM_NodeList;
class ElementImpl;
/**
- * By far the vast majority of objects (apart from text) that authors
- * encounter when traversing a document are <code>DOM_Element</code> nodes.
+ * By far the vast majority of objects (apart from text) that authors
+ * encounter when traversing a document are <code>DOM_Element</code> nodes.
*
- * Assume the following XML document:<elementExample id="demo">
- * <subelement1/>
+ * Assume the following XML document:<elementExample id="demo">
+ * <subelement1/>
* <subelement2><subsubelement/></subelement2>
- * </elementExample>
- * <p>When represented using DOM, the top node is an <code>DOM_Element</code> node
- * for "elementExample", which contains two child <code>DOM_Element</code> nodes,
- * one for "subelement1" and one for "subelement2". "subelement1" contains no
+ * </elementExample>
+ * <p>When represented using DOM, the top node is an <code>DOM_Element</code> node
+ * for "elementExample", which contains two child <code>DOM_Element</code> nodes,
+ * one for "subelement1" and one for "subelement2". "subelement1" contains no
* child nodes.
- * <p>Elements may have attributes associated with them; since the
+ * <p>Elements may have attributes associated with them; since the
* <code>DOM_Element</code> interface inherits from <code>DOM_Node</code>, the generic
- * <code>DOM_Node</code> interface method <code>getAttributes</code> may be used
+ * <code>DOM_Node</code> interface method <code>getAttributes</code> may be used
* to retrieve the set of all attributes for an element. There are methods on
* the <code>DOM_Element</code> interface to retrieve either an <code>DOM_Attr</code>
- * object by name or an attribute value by name. In XML, where an attribute
- * value may contain entity references, an <code>DOM_Attr</code> object should be
- * retrieved to examine the possibly fairly complex sub-tree representing the
- * attribute value. On the other hand, in HTML, where all attributes have
- * simple string values, methods to directly access an attribute value can
+ * object by name or an attribute value by name. In XML, where an attribute
+ * value may contain entity references, an <code>DOM_Attr</code> object should be
+ * retrieved to examine the possibly fairly complex sub-tree representing the
+ * attribute value. On the other hand, in HTML, where all attributes have
+ * simple string values, methods to directly access an attribute value can
* safely be used as a convenience.
*/
@@ -189,12 +192,12 @@ public:
//@{
/**
- * The name of the element.
+ * The name of the element.
*
- * For example, in: <elementExample
- * id="demo"> ... </elementExample> , <code>tagName</code> has
- * the value <code>"elementExample"</code>. Note that this is
- * case-preserving in XML, as are all of the operations of the DOM.
+ * For example, in: <elementExample
+ * id="demo"> ... </elementExample> , <code>tagName</code> has
+ * the value <code>"elementExample"</code>. Note that this is
+ * case-preserving in XML, as are all of the operations of the DOM.
*/
DOMString getTagName() const;
@@ -202,7 +205,7 @@ public:
* Retrieves an attribute value by name.
*
* @param name The name of the attribute to retrieve.
- * @return The <code>DOM_Attr</code> value as a string, or the empty string if
+ * @return The <code>DOM_Attr</code> value as a string, or the empty string if
* that attribute does not have a specified or default value.
*/
DOMString getAttribute(const DOMString &name) const;
@@ -211,17 +214,17 @@ public:
* Retrieves an <code>DOM_Attr</code> node by name.
*
* @param name The name (<CODE>nodeName</CODE>) of the attribute to retrieve.
- * @return The <code>DOM_Attr</code> node with the specified name (<CODE>nodeName</CODE>) or
+ * @return The <code>DOM_Attr</code> node with the specified name (<CODE>nodeName</CODE>) or
* <code>null</code> if there is no such attribute.
*/
DOM_Attr getAttributeNode(const DOMString &name) const;
/**
- * Returns a <code>NodeList</code> of all descendant elements with a given
- * tag name, in the order in which they would be encountered in a preorder
+ * Returns a <code>NodeList</code> of all descendant elements with a given
+ * tag name, in the order in which they would be encountered in a preorder
* traversal of the <code>DOM_Element</code> tree.
*
- * @param name The name of the tag to match on. The special value "*"
+ * @param name The name of the tag to match on. The special value "*"
* matches all tags.
* @return A list of matching <code>DOM_Element</code> nodes.
*/
@@ -232,45 +235,45 @@ public:
//@{
/**
- * Adds a new attribute.
- *
- * If an attribute with that name is already present
- * in the element, its value is changed to be that of the value parameter.
- * This value is a simple string, it is not parsed as it is being set. So
- * any markup (such as syntax to be recognized as an entity reference) is
- * treated as literal text, and needs to be appropriately escaped by the
- * implementation when it is written out. In order to assign an attribute
- * value that contains entity references, the user must create an
- * <code>DOM_Attr</code> node plus any <code>Text</code> and
- * <code>EntityReference</code> nodes, build the appropriate subtree, and
- * use <code>setAttributeNode</code> to assign it as the value of an
+ * Adds a new attribute.
+ *
+ * If an attribute with that name is already present
+ * in the element, its value is changed to be that of the value parameter.
+ * This value is a simple string, it is not parsed as it is being set. So
+ * any markup (such as syntax to be recognized as an entity reference) is
+ * treated as literal text, and needs to be appropriately escaped by the
+ * implementation when it is written out. In order to assign an attribute
+ * value that contains entity references, the user must create an
+ * <code>DOM_Attr</code> node plus any <code>Text</code> and
+ * <code>EntityReference</code> nodes, build the appropriate subtree, and
+ * use <code>setAttributeNode</code> to assign it as the value of an
* attribute.
* @param name The name of the attribute to create or alter.
* @param value Value to set in string form.
* @exception DOMException
- * INVALID_CHARACTER_ERR: Raised if the specified name contains an
+ * INVALID_CHARACTER_ERR: Raised if the specified name contains an
* illegal character.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
*/
- void setAttribute(const DOMString &name,
+ void setAttribute(const DOMString &name,
const DOMString &value);
/**
- * Adds a new attribute.
- *
- * If an attribute with that name (<CODE>nodeName</CODE>) is already present
+ * Adds a new attribute.
+ *
+ * If an attribute with that name (<CODE>nodeName</CODE>) is already present
* in the element, it is replaced by the new one.
* @param newAttr The <code>DOM_Attr</code> node to add to the attribute list.
- * @return If the <code>newAttr</code> attribute replaces an existing
+ * @return If the <code>newAttr</code> attribute replaces an existing
* attribute, the replaced
- * <code>DOM_Attr</code> node is returned, otherwise <code>null</code> is
+ * <code>DOM_Attr</code> node is returned, otherwise <code>null</code> is
* returned.
* @exception DOMException
- * WRONG_DOCUMENT_ERR: Raised if <code>newAttr</code> was created from a
+ * WRONG_DOCUMENT_ERR: Raised if <code>newAttr</code> was created from a
* different document than the one that created the element.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
- * <br>INUSE_ATTRIBUTE_ERR: Raised if <code>newAttr</code> is already an
- * attribute of another <code>DOM_Element</code> object. The DOM user must
- * explicitly clone <code>DOM_Attr</code> nodes to re-use them in other
+ * <br>INUSE_ATTRIBUTE_ERR: Raised if <code>newAttr</code> is already an
+ * attribute of another <code>DOM_Element</code> object. The DOM user must
+ * explicitly clone <code>DOM_Attr</code> nodes to re-use them in other
* elements.
*/
DOM_Attr setAttributeNode(DOM_Attr newAttr);
@@ -281,27 +284,27 @@ public:
/**
* Removes the specified attribute node.
* If the removed <CODE>DOM_Attr</CODE>
- * has a default value it is immediately replaced. The replacing attribute
- * has the same namespace URI and local name, as well as the original prefix,
+ * has a default value it is immediately replaced. The replacing attribute
+ * has the same namespace URI and local name, as well as the original prefix,
* when applicable.
*
- * @param oldAttr The <code>DOM_Attr</code> node to remove from the attribute
+ * @param oldAttr The <code>DOM_Attr</code> node to remove from the attribute
* list.
* @return The <code>DOM_Attr</code> node that was removed.
* @exception DOMException
* NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
- * <br>NOT_FOUND_ERR: Raised if <code>oldAttr</code> is not an attribute
+ * <br>NOT_FOUND_ERR: Raised if <code>oldAttr</code> is not an attribute
* of the element.
*/
DOM_Attr removeAttributeNode(DOM_Attr oldAttr);
/**
- * Removes an attribute by name.
+ * Removes an attribute by name.
*
- * If the removed attribute
- * is known to have a default value, an attribute immediately appears
- * containing the default value as well as the corresponding namespace URI,
- * local name, and prefix when applicable.<BR>To remove an attribute by local
+ * If the removed attribute
+ * is known to have a default value, an attribute immediately appears
+ * containing the default value as well as the corresponding namespace URI,
+ * local name, and prefix when applicable.<BR>To remove an attribute by local
* name and namespace URI, use the <CODE>removeAttributeNS</CODE> method.
* @param name The name of the attribute to remove.
* @exception DOMException
@@ -329,18 +332,18 @@ public:
const DOMString &localName) const;
/**
- * Adds a new attribute. If an attribute with the same
- * local name and namespace URI is already present on the element, its prefix
- * is changed to be the prefix part of the <CODE>qualifiedName</CODE>, and
- * its value is changed to be the <CODE>value</CODE> parameter. This value is
- * a simple string, it is not parsed as it is being set. So any markup (such
- * as syntax to be recognized as an entity reference) is treated as literal
- * text, and needs to be appropriately escaped by the implementation when it
- * is written out. In order to assign an attribute value that contains entity
+ * Adds a new attribute. If an attribute with the same
+ * local name and namespace URI is already present on the element, its prefix
+ * is changed to be the prefix part of the <CODE>qualifiedName</CODE>, and
+ * its value is changed to be the <CODE>value</CODE> parameter. This value is
+ * a simple string, it is not parsed as it is being set. So any markup (such
+ * as syntax to be recognized as an entity reference) is treated as literal
+ * text, and needs to be appropriately escaped by the implementation when it
+ * is written out. In order to assign an attribute value that contains entity
* references, the user must create an <CODE>DOM_Attr</CODE>
* node plus any <CODE>DOM_Text</CODE> and <CODE>DOM_EntityReference</CODE>
- * nodes, build the appropriate subtree, and use
- * <CODE>setAttributeNodeNS</CODE> or <CODE>setAttributeNode</CODE> to assign
+ * nodes, build the appropriate subtree, and use
+ * <CODE>setAttributeNodeNS</CODE> or <CODE>setAttributeNode</CODE> to assign
* it as the value of an attribute.
*
* <p><b>"Experimental - subject to change"</b></p>
@@ -351,21 +354,21 @@ public:
* attribute to create or alter.
* @param value The value to set in string form.
* @exception DOMException
- * INVALID_CHARACTER_ERR: Raised if the specified qualified name contains an
+ * INVALID_CHARACTER_ERR: Raised if the specified qualified name contains an
* illegal character.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
* <br>
- * NAMESPACE_ERR: Raised if the <CODE>qualifiedName</CODE> is
- * malformed, if the <CODE>qualifiedName</CODE> has a prefix and the
- * <CODE>namespaceURI</CODE> is <CODE>null</CODE> or an empty string,
- * if the <CODE>qualifiedName</CODE> has a prefix that is "xml" and the
- * <CODE>namespaceURI</CODE> is different from
- * "http://www.w3.org/XML/1998/namespace", if the
- * <CODE>qualifiedName</CODE> has a prefix that is "xmlns" and the
- * <CODE>namespaceURI</CODE> is different from
- * "http://www.w3.org/2000/xmlns/", or if the
- * <CODE>qualifiedName</CODE> is "xmlns" and the
- * <CODE>namespaceURI</CODE> is different from
+ * NAMESPACE_ERR: Raised if the <CODE>qualifiedName</CODE> is
+ * malformed, if the <CODE>qualifiedName</CODE> has a prefix and the
+ * <CODE>namespaceURI</CODE> is <CODE>null</CODE> or an empty string,
+ * if the <CODE>qualifiedName</CODE> has a prefix that is "xml" and the
+ * <CODE>namespaceURI</CODE> is different from
+ * "http://www.w3.org/XML/1998/namespace", if the
+ * <CODE>qualifiedName</CODE> has a prefix that is "xmlns" and the
+ * <CODE>namespaceURI</CODE> is different from
+ * "http://www.w3.org/2000/xmlns/", or if the
+ * <CODE>qualifiedName</CODE> is "xmlns" and the
+ * <CODE>namespaceURI</CODE> is different from
* "http://www.w3.org/2000/xmlns/".
*/
void setAttributeNS(const DOMString &namespaceURI,
@@ -374,7 +377,7 @@ public:
/**
* Removes an attribute by local name and namespace URI. If the
* removed attribute has a default value it is immediately replaced.
- * The replacing attribute has the same namespace URI and local name, as well as
+ * The replacing attribute has the same namespace URI and local name, as well as
* the original prefix.
*
* <p><b>"Experimental - subject to change"</b></p>
@@ -405,9 +408,9 @@ public:
const DOMString &localName) const;
/**
- * Adds a new attribute.
- *
- * If an attribute with that local name and namespace URI is already present
+ * Adds a new attribute.
+ *
+ * If an attribute with that local name and namespace URI is already present
* in the element, it is replaced by the new one.
*
* <p><b>"Experimental - subject to change"</b></p>
@@ -418,12 +421,12 @@ public:
* the replaced <code>DOM_Attr</code> node is
* returned, otherwise <code>null</code> is returned.
* @exception DOMException
- * WRONG_DOCUMENT_ERR: Raised if <code>newAttr</code> was created from a
+ * WRONG_DOCUMENT_ERR: Raised if <code>newAttr</code> was created from a
* different document than the one that created the element.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
- * <br>INUSE_ATTRIBUTE_ERR: Raised if <code>newAttr</code> is already an
- * attribute of another <code>DOM_Element</code> object. The DOM user must
- * explicitly clone <code>DOM_Attr</code> nodes to re-use them in other
+ * <br>INUSE_ATTRIBUTE_ERR: Raised if <code>newAttr</code> is already an
+ * attribute of another <code>DOM_Element</code> object. The DOM user must
+ * explicitly clone <code>DOM_Attr</code> nodes to re-use them in other
* elements.
*/
DOM_Attr setAttributeNodeNS(DOM_Attr newAttr);
diff --git a/src/dom/DOM_Node.hpp b/src/dom/DOM_Node.hpp
index 6210ad62dc5205fd446d899662af9a41588d191d..fefee362eb900592ec52fe540108b7cff1348056 100644
--- a/src/dom/DOM_Node.hpp
+++ b/src/dom/DOM_Node.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -496,19 +496,19 @@ class CDOM_EXPORT DOM_Node {
//@{
/**
- * Puts all <CODE>DOM_Text</CODE>
- * nodes in the full depth of the sub-tree underneath this <CODE>DOM_Node</CODE>,
- * including attribute nodes, into a "normal" form where only markup (e.g.,
- * tags, comments, processing instructions, CDATA sections, and entity
+ * Puts all <CODE>DOM_Text</CODE>
+ * nodes in the full depth of the sub-tree underneath this <CODE>DOM_Node</CODE>,
+ * including attribute nodes, into a "normal" form where only markup (e.g.,
+ * tags, comments, processing instructions, CDATA sections, and entity
* references) separates <CODE>DOM_Text</CODE>
* nodes, i.e., there are neither adjacent <CODE>DOM_Text</CODE>
* nodes nor empty <CODE>DOM_Text</CODE>
- * nodes. This can be used to ensure that the DOM view of a document is the
- * same as if it were saved and re-loaded, and is useful when operations
- * (such as XPointer lookups) that depend on a particular document tree
+ * nodes. This can be used to ensure that the DOM view of a document is the
+ * same as if it were saved and re-loaded, and is useful when operations
+ * (such as XPointer lookups) that depend on a particular document tree
* structure are to be used.
- * <P><B>Note:</B> In cases where the document contains <CODE>DOM_CDATASections</CODE>,
- * the normalize operation alone may not be sufficient, since XPointers do
+ * <P><B>Note:</B> In cases where the document contains <CODE>DOM_CDATASections</CODE>,
+ * the normalize operation alone may not be sufficient, since XPointers do
* not differentiate between <CODE>DOM_Text</CODE>
* nodes and <CODE>DOM_CDATASection</CODE>
* nodes.</P>
@@ -545,8 +545,8 @@ class CDOM_EXPORT DOM_Node {
* based on an examination of the namespace declarations in scope. It is
* merely the namespace URI given at creation time.
* <p>
- * For nodes of any type other than <CODE>ELEMENT_NODE</CODE> and
- * <CODE>ATTRIBUTE_NODE</CODE> and nodes created with a DOM Level 1 method,
+ * For nodes of any type other than <CODE>ELEMENT_NODE</CODE> and
+ * <CODE>ATTRIBUTE_NODE</CODE> and nodes created with a DOM Level 1 method,
* such as <CODE>createElement</CODE> from the <CODE>DOM_Document</CODE>
* interface, this is always <CODE>null</CODE>.
*
@@ -579,15 +579,15 @@ class CDOM_EXPORT DOM_Node {
/**
* Set the <em>namespace prefix</em> of this node.
* <p>
- * Note that setting this attribute, when permitted, changes
- * the <CODE>nodeName</CODE> attribute, which holds the <EM>qualified
- * name</EM>, as well as the <CODE>tagName</CODE> and <CODE>name</CODE>
+ * Note that setting this attribute, when permitted, changes
+ * the <CODE>nodeName</CODE> attribute, which holds the <EM>qualified
+ * name</EM>, as well as the <CODE>tagName</CODE> and <CODE>name</CODE>
* attributes of the <CODE>DOM_Element</CODE> and <CODE>DOM_Attr</CODE>
* interfaces, when applicable.
* <p>
- * Note also that changing the prefix of an
- * attribute, that is known to have a default value, does not make a new
- * attribute with the default value and the original prefix appear, since the
+ * Note also that changing the prefix of an
+ * attribute, that is known to have a default value, does not make a new
+ * attribute with the default value and the original prefix appear, since the
* <CODE>namespaceURI</CODE> and <CODE>localName</CODE> do not change.
*
* <p><b>"Experimental - subject to change"</b></p>
@@ -599,14 +599,14 @@ class CDOM_EXPORT DOM_Node {
* <br>
* NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
* <br>
- * NAMESPACE_ERR: Raised if the specified <CODE>prefix</CODE> is
- * malformed, if the <CODE>namespaceURI</CODE> of this node is
- * <CODE>null</CODE>, if the specified prefix is "xml" and the
- * <CODE>namespaceURI</CODE> of this node is different from
- * "http://www.w3.org/XML/1998/namespace", if this node is an attribute
- * and the specified prefix is "xmlns" and the
- * <CODE>namespaceURI</CODE> of this node is different from
- * "http://www.w3.org/2000/xmlns/", or if this node is an attribute and
+ * NAMESPACE_ERR: Raised if the specified <CODE>prefix</CODE> is
+ * malformed, if the <CODE>namespaceURI</CODE> of this node is
+ * <CODE>null</CODE>, if the specified prefix is "xml" and the
+ * <CODE>namespaceURI</CODE> of this node is different from
+ * "http://www.w3.org/XML/1998/namespace", if this node is an attribute
+ * and the specified prefix is "xmlns" and the
+ * <CODE>namespaceURI</CODE> of this node is different from
+ * "http://www.w3.org/2000/xmlns/", or if this node is an attribute and
* the <CODE>qualifiedName</CODE> of this node is "xmlns".
*/
void setPrefix(const DOMString &prefix);
diff --git a/src/dom/DocumentImpl.cpp b/src/dom/DocumentImpl.cpp
index abdd4aae455eb785f14d0d395aba46188eae3941..5be7dfb60c1dba6d0d4e8de29c4ae39a26218324 100644
--- a/src/dom/DocumentImpl.cpp
+++ b/src/dom/DocumentImpl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -115,7 +115,7 @@ DocumentImpl::DocumentImpl(const DOMString &fNamespaceURI,
: ParentNode(this)
{
docType=null;
-
+
setDocumentType(doctype);
docElement=null;
@@ -138,7 +138,7 @@ void DocumentImpl::setDocumentType(DocumentTypeImpl *doctype)
if (doctype->getOwnerDocument() != null)
throw DOM_DOMException( //one doctype can belong to only one DocumentImpl
DOM_DOMException::WRONG_DOCUMENT_ERR, null);
-
+
doctype->setOwnerDocument(this);
doctype->getEntities()->ownerNode->setOwnerDocument(this);
doctype->getNotations()->ownerNode->setOwnerDocument(this);
@@ -151,7 +151,7 @@ void DocumentImpl::setDocumentType(DocumentTypeImpl *doctype)
appendChild(doctype);
-
+
}
DocumentImpl::~DocumentImpl()
@@ -170,7 +170,7 @@ DocumentImpl::~DocumentImpl()
delete ranges;
ranges = 0;
}
-
+
if (userData) {
// make sure we won't access userData any further
hasUserData(false);
@@ -680,7 +680,7 @@ AttrImpl *DocumentImpl::createAttributeNS(const DOMString &fNamespaceURI,
if (!isXMLName(qualifiedName)) {
throw DOM_DOMException(DOM_DOMException::INVALID_CHARACTER_ERR,null);
}
- return new AttrNSImpl(this, fNamespaceURI, qualifiedName);
+ return new AttrNSImpl(this, fNamespaceURI, qualifiedName);
}
@@ -745,7 +745,7 @@ RangeImpls* DocumentImpl::getRanges()
return ranges;
}
-void DocumentImpl::removeRange(RangeImpl* range)
+void DocumentImpl::removeRange(RangeImpl* range)
{
if (ranges != null) {
unsigned int sz = ranges->size();
@@ -770,37 +770,37 @@ void DocumentImpl::removeRange(RangeImpl* range)
bool DocumentImpl::isKidOK(NodeImpl *parent, NodeImpl *child)
{
static int kidOK[14];
-
+
if (kidOK[DOM_Node::DOCUMENT_NODE] == 0)
{
- kidOK[DOM_Node::DOCUMENT_NODE] =
+ kidOK[DOM_Node::DOCUMENT_NODE] =
1 << DOM_Node::ELEMENT_NODE |
- 1 << DOM_Node::PROCESSING_INSTRUCTION_NODE |
- 1 << DOM_Node::COMMENT_NODE |
+ 1 << DOM_Node::PROCESSING_INSTRUCTION_NODE |
+ 1 << DOM_Node::COMMENT_NODE |
1 << DOM_Node::DOCUMENT_TYPE_NODE |
1 << DOM_Node::XML_DECL_NODE;
-
- kidOK[DOM_Node::DOCUMENT_FRAGMENT_NODE] =
- kidOK[DOM_Node::ENTITY_NODE] =
- kidOK[DOM_Node::ENTITY_REFERENCE_NODE] =
- kidOK[DOM_Node::ELEMENT_NODE] =
+
+ kidOK[DOM_Node::DOCUMENT_FRAGMENT_NODE] =
+ kidOK[DOM_Node::ENTITY_NODE] =
+ kidOK[DOM_Node::ENTITY_REFERENCE_NODE] =
+ kidOK[DOM_Node::ELEMENT_NODE] =
1 << DOM_Node::ELEMENT_NODE |
- 1 << DOM_Node::PROCESSING_INSTRUCTION_NODE |
+ 1 << DOM_Node::PROCESSING_INSTRUCTION_NODE |
1 << DOM_Node::COMMENT_NODE |
1 << DOM_Node::TEXT_NODE |
1 << DOM_Node::CDATA_SECTION_NODE |
1 << DOM_Node::ENTITY_REFERENCE_NODE |
1 << DOM_Node::XML_DECL_NODE;
- kidOK[DOM_Node::ATTRIBUTE_NODE] =
+ kidOK[DOM_Node::ATTRIBUTE_NODE] =
1 << DOM_Node::TEXT_NODE |
1 << DOM_Node::ENTITY_REFERENCE_NODE;
-
- kidOK[DOM_Node::PROCESSING_INSTRUCTION_NODE] =
- kidOK[DOM_Node::COMMENT_NODE] =
- kidOK[DOM_Node::TEXT_NODE] =
- kidOK[DOM_Node::CDATA_SECTION_NODE] =
- kidOK[DOM_Node::NOTATION_NODE] =
+
+ kidOK[DOM_Node::PROCESSING_INSTRUCTION_NODE] =
+ kidOK[DOM_Node::COMMENT_NODE] =
+ kidOK[DOM_Node::TEXT_NODE] =
+ kidOK[DOM_Node::CDATA_SECTION_NODE] =
+ kidOK[DOM_Node::NOTATION_NODE] =
0;
};
int p=parent->getNodeType();
@@ -838,7 +838,7 @@ void DocumentImpl::setUserData(void* val)
hasUserData(true);
else
hasUserData(false);
-};
+};
/**
* Denotes that this node has changed.
diff --git a/src/dom/DocumentImpl.hpp b/src/dom/DocumentImpl.hpp
index d116781d1d28b20752de2972234b86f6db94de35..9ac8c323ce41fb15c6d0dfa535ceb2cda53702b6 100644
--- a/src/dom/DocumentImpl.hpp
+++ b/src/dom/DocumentImpl.hpp
@@ -4,7 +4,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -237,7 +237,7 @@ public:
virtual void changed();
virtual int changes();
- /**
+ /**
* Sets whether the DOM implementation performs error checking
* upon operations. Turning off error checking only affects
* the following DOM checks:
diff --git a/src/dom/DocumentTypeImpl.cpp b/src/dom/DocumentTypeImpl.cpp
index 0084058005af91ba03e8a67bc3ae760210b69156..9ba0cf3be3a24b38f1b936a395b5ddbfb19543a1 100644
--- a/src/dom/DocumentTypeImpl.cpp
+++ b/src/dom/DocumentTypeImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -66,7 +66,7 @@
DocumentTypeImpl::DocumentTypeImpl(DocumentImpl *ownerDoc,
- const DOMString &dtName)
+ const DOMString &dtName)
: ParentNode(ownerDoc),
publicId(null), systemId(null), internalSubset(null) //DOM Level 2
, intSubsetReading(false)
@@ -75,7 +75,7 @@ DocumentTypeImpl::DocumentTypeImpl(DocumentImpl *ownerDoc,
entities = new NamedNodeMapImpl(this);
notations = new NamedNodeMapImpl(this);
elements = new NamedNodeMapImpl(this);
-
+
};
@@ -94,7 +94,7 @@ DocumentTypeImpl::DocumentTypeImpl(DocumentImpl *ownerDoc,
entities = new NamedNodeMapImpl(this);
notations= new NamedNodeMapImpl(this);
- elements = new NamedNodeMapImpl(this);
+ elements = new NamedNodeMapImpl(this);
};
@@ -107,7 +107,7 @@ DocumentTypeImpl::DocumentTypeImpl(const DocumentTypeImpl &other, bool deep)
entities = other.entities->cloneMap(this);
notations= other.notations->cloneMap(this);
elements = other.elements->cloneMap(this);
-
+
//DOM Level 2
publicId = other.publicId.clone();
systemId = other.systemId.clone();
diff --git a/src/dom/DocumentTypeImpl.hpp b/src/dom/DocumentTypeImpl.hpp
index dbbb3cf1655c83f284dc608de5b8ad0c4cdbb5be..1f16e209fb767af8f8da0c60faf309e59275fd85 100644
--- a/src/dom/DocumentTypeImpl.hpp
+++ b/src/dom/DocumentTypeImpl.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -48,7 +48,7 @@
* 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
@@ -95,7 +95,7 @@ private:
bool isIntSubsetReading();
friend class DOMParser;
-
+
public:
DocumentTypeImpl(DocumentImpl *, const DOMString &);
DocumentTypeImpl(DocumentImpl *,
@@ -104,7 +104,7 @@ public:
DocumentTypeImpl(const DocumentTypeImpl &other, bool deep=false);
virtual ~DocumentTypeImpl();
virtual bool isDocumentTypeImpl();
-
+
virtual NodeImpl * cloneNode(bool deep);
virtual void setOwnerDocument(DocumentImpl *doc);
virtual DOMString getNodeName();
@@ -113,11 +113,11 @@ public:
virtual DOMString getName();
virtual NamedNodeMapImpl * getNotations();
virtual NamedNodeMapImpl * getElements();
- virtual void setNodeValue(const DOMString &arg);
+ virtual void setNodeValue(const DOMString &arg);
virtual void setReadOnly(bool readOnly, bool deep);
-
+
//Introduced in DOM Level 2
-
+
virtual DOMString getPublicId();
virtual DOMString getSystemId();
virtual DOMString getInternalSubset();
diff --git a/src/dom/ElementDefinitionImpl.cpp b/src/dom/ElementDefinitionImpl.cpp
index 31f45da3232080431fffb8013158bfd16de9d9d0..e5f5781b6a2119f4278a5859bf4ca62215100414 100644
--- a/src/dom/ElementDefinitionImpl.cpp
+++ b/src/dom/ElementDefinitionImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -65,7 +65,7 @@
ElementDefinitionImpl::ElementDefinitionImpl(DocumentImpl *ownerDoc,
const DOMString &nam)
- : NodeImpl(ownerDoc)
+ : NodeImpl(ownerDoc)
{
name = nam.clone();
attributes = 0;
@@ -85,7 +85,7 @@ ElementDefinitionImpl::ElementDefinitionImpl(
};
-ElementDefinitionImpl::~ElementDefinitionImpl()
+ElementDefinitionImpl::~ElementDefinitionImpl()
{
};
diff --git a/src/dom/ElementImpl.cpp b/src/dom/ElementImpl.cpp
index 1b826ed311bc128eba89a69a1a80b01aa88fdd80..2efa41c1ab8c08aa7252f2873ebe4bfe1a3f7e4f 100644
--- a/src/dom/ElementImpl.cpp
+++ b/src/dom/ElementImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -57,7 +57,7 @@
/*
* $Id$
*/
-
+
#include "DeepNodeListImpl.hpp"
#include "DocumentImpl.hpp"
#include "DocumentTypeImpl.hpp"
@@ -163,7 +163,7 @@ DeepNodeListImpl *ElementImpl::getElementsByTagName(const DOMString &tagname)
DOMString ElementImpl::getTagName()
{
return name;
-}
+}
bool ElementImpl::isElementImpl()
@@ -179,7 +179,7 @@ void ElementImpl::removeAttribute(const DOMString &nam)
null);
}
if (attributes != null)
- {
+ {
AttrImpl *att = (AttrImpl *) attributes->getNamedItem(nam);
// Remove it
if (att != null)
@@ -202,9 +202,9 @@ AttrImpl *ElementImpl::removeAttributeNode(AttrImpl *oldAttr)
if (attributes != null)
{
AttrImpl *found = (AttrImpl *) attributes->getNamedItem(oldAttr->getName());
-
+
// If it is in fact the right object, remove it.
-
+
if (found == oldAttr)
attributes->removeNamedItem(oldAttr->getName());
else
@@ -255,10 +255,10 @@ AttrImpl * ElementImpl::setAttributeNode(AttrImpl *newAttr)
(AttrImpl *) attributes->getNamedItem(newAttr->getName());
// This will throw INUSE if necessary
attributes->setNamedItem(newAttr);
-
+
// Attr node reference counting note:
// If oldAttr's refcount is zero at this point, here's what happens...
- //
+ //
// oldAttr is returned from this function to DOM_Attr::setAttributeNode,
// which wraps a DOM_Attr around the returned pointer and sends it
// up to application code, incrementing the reference count in the process.
@@ -325,10 +325,10 @@ void ElementImpl::removeAttributeNS(const DOMString &fNamespaceURI,
null);
}
if (attributes != null)
- {
+ {
AttrImpl *att =
(AttrImpl *) attributes->getNamedItemNS(fNamespaceURI, fLocalName);
- // Remove it
+ // Remove it
if (att != null) {
attributes->removeNamedItemNS(fNamespaceURI, fLocalName);
if (att->nodeRefCount == 0)
@@ -361,13 +361,13 @@ AttrImpl *ElementImpl::setAttributeNodeNS(AttrImpl *newAttr)
attributes = new AttrMapImpl(this, null);
}
AttrImpl *oldAttr = (AttrImpl *) attributes->getNamedItemNS(newAttr->getNamespaceURI(), newAttr->getLocalName());
-
+
// This will throw INUSE if necessary
attributes->setNamedItemNS(newAttr);
-
+
// Attr node reference counting note:
// If oldAttr's refcount is zero at this point, here's what happens...
- //
+ //
// oldAttr is returned from this function to DOM_Attr::setAttributeNode,
// which wraps a DOM_Attr around the returned pointer and sends it
// up to application code, incrementing the reference count in the process.
@@ -385,7 +385,7 @@ DeepNodeListImpl *ElementImpl::getElementsByTagNameNS(const DOMString &fNamespac
}
// DOM_NamedNodeMap UTILITIES
-NamedNodeMapImpl *ElementImpl::NNM_cloneMap(NodeImpl *nnm_ownerNode)
+NamedNodeMapImpl *ElementImpl::NNM_cloneMap(NodeImpl *nnm_ownerNode)
{
return (getAttributes() == null) ? null : nnm_ownerNode->getAttributes()->cloneMap(nnm_ownerNode);
}
@@ -410,7 +410,7 @@ NodeImpl *ElementImpl::NNM_item(unsigned int nnm_index)
return (getAttributes() == null) ? null : getAttributes()->item(nnm_index);
}
-void ElementImpl::NNM_removeAll()
+void ElementImpl::NNM_removeAll()
{
if (getAttributes() != null)
getAttributes()->removeAll();
@@ -496,6 +496,6 @@ void ElementImpl::setupDefaultAttributes()
delete attributes;
AttrMapImpl* defAttrs = getDefaultAttributes();
- if (defAttrs)
+ if (defAttrs)
attributes = new AttrMapImpl(this, defAttrs);
}
diff --git a/src/dom/ElementImpl.hpp b/src/dom/ElementImpl.hpp
index 90b2be0fc4dbcc619ab2b7a17d39b85134dedd93..af6758160c7a078804046d0a4ecd4007e538647d 100644
--- a/src/dom/ElementImpl.hpp
+++ b/src/dom/ElementImpl.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -48,7 +48,7 @@
* 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
@@ -82,12 +82,12 @@ class CDOM_EXPORT ElementImpl: public ParentNode {
protected:
DOMString name;
AttrMapImpl *attributes;
-
+
public:
ElementImpl(DocumentImpl *ownerDoc, const DOMString &name);
ElementImpl(const ElementImpl &other, bool deep=false);
virtual ~ElementImpl();
-
+
virtual bool isElementImpl();
virtual NodeImpl * cloneNode(bool deep);
virtual DOMString getNodeName();
@@ -136,7 +136,7 @@ public:
virtual NodeImpl *NNM_setNamedItemNS(NodeImpl *nnm_arg);
virtual NodeImpl *NNM_removeNamedItemNS(const DOMString &nnm_namespaceURI, const DOMString &nnm_localName);
virtual void NNM_setOwnerDocument(DocumentImpl *nnm_doc);
-
+
// default attribute helper functions
virtual AttrMapImpl *getDefaultAttributes();
virtual void setupDefaultAttributes();
diff --git a/src/dom/ElementNSImpl.cpp b/src/dom/ElementNSImpl.cpp
index 6df8014ca8e97947625e92d6054b899ff7993290..80b5b60eabc2d1639310d00a7ed01ad8c7461a13 100644
--- a/src/dom/ElementNSImpl.cpp
+++ b/src/dom/ElementNSImpl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/dom/EntityReferenceImpl.cpp b/src/dom/EntityReferenceImpl.cpp
index 344fe65a7f230419b36ff56658ca205d0101d205..57c40108ec66ee58ef2b9b32339d641da23dadca 100644
--- a/src/dom/EntityReferenceImpl.cpp
+++ b/src/dom/EntityReferenceImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -71,13 +71,13 @@
* Similarly, non-validating XML processors are not required to read
* or process entity declarations made in the external subset or
* declared in external parameter entities. Hence, some applications
-* may not make the replacement value available for Parsed Entities
+* may not make the replacement value available for Parsed Entities
* of these types.
* <P>
-* EntityReference behaves as a read-only node, and the children of
+* EntityReference behaves as a read-only node, and the children of
* the EntityReference (which reflect those of the Entity, and should
-* also be read-only) give its replacement value, if any. They are
-* supposed to automagically stay in synch if the DocumentType is
+* also be read-only) give its replacement value, if any. They are
+* supposed to automagically stay in synch if the DocumentType is
* updated with new values for the Entity.
* <P>
* The defined behavior makes efficient storage difficult for the DOM
@@ -105,7 +105,7 @@
* changes in the Entity. And it can take advantage of the same
* structure-change-monitoring code I implemented to support
* DeepNodeList.
-*
+*
* @author Rania Y. Khalaf
* @author Joseph Kesselman
* @since PR-DOM-Level-1-19980818.
@@ -146,7 +146,7 @@ EntityReferenceImpl::EntityReferenceImpl(const EntityReferenceImpl &other,
-EntityReferenceImpl::~EntityReferenceImpl()
+EntityReferenceImpl::~EntityReferenceImpl()
{
}
@@ -189,7 +189,7 @@ void EntityReferenceImpl::setNodeValue(const DOMString &x)
* that will throw a NO_MODIFICATION_ALLOWED_ERR DOMException.
* <P>
* If you want to alter its contents, edit the Entity definition.
-*
+*
* @param readOnly boolean
*/
void EntityReferenceImpl::setReadOnly(bool readOnl,bool deep)
diff --git a/src/dom/EntityReferenceImpl.hpp b/src/dom/EntityReferenceImpl.hpp
index 727c34a84986e51f4d45e991482c6aa08ebe66c4..a9356914008ceae8d872a0fd59fb0219c18d48a1 100644
--- a/src/dom/EntityReferenceImpl.hpp
+++ b/src/dom/EntityReferenceImpl.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -48,7 +48,7 @@
* 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
@@ -78,7 +78,7 @@ class CDOM_EXPORT EntityReferenceImpl: public ParentNode
private:
DOMString name;
int entityChanges;
-
+
public:
EntityReferenceImpl(DocumentImpl *ownerDoc, const DOMString &entityName);
EntityReferenceImpl(const EntityReferenceImpl &other, bool deep=false);
diff --git a/src/dom/Makefile.in b/src/dom/Makefile.in
index fb0905ed5d6cc25af300c04fb158d57a5f31fb24..3959761a8f0e6c1885981d38b9e4f6dc708c9217 100644
--- a/src/dom/Makefile.in
+++ b/src/dom/Makefile.in
@@ -1,7 +1,7 @@
#
# The Apache Software License, Version 1.1
#
-# Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+# Copyright (c) 1999-2001 The Apache Software Foundation. All rights
# reserved.
#
# Redistribution and use in source and binary forms, with or without
diff --git a/src/dom/NamedNodeMapImpl.cpp b/src/dom/NamedNodeMapImpl.cpp
index 64cbe8093c11588c609d5a8ca6fb81802c7cd37e..ae199ea02939968aac917fe706236da28f8f4c7f 100644
--- a/src/dom/NamedNodeMapImpl.cpp
+++ b/src/dom/NamedNodeMapImpl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -321,7 +321,7 @@ int NamedNodeMapImpl::findNamePoint(const DOMString &namespaceURI,
return -1;
// This is a linear search through the same nodes Vector.
// The Vector is sorted on the DOM Level 1 nodename.
- // The DOM Level 2 NS keys are namespaceURI and Localname,
+ // The DOM Level 2 NS keys are namespaceURI and Localname,
// so we must linear search thru it.
// In addition, to get this to work with nodes without any namespace
// (namespaceURI and localNames are both null) we then use the nodeName
diff --git a/src/dom/NodeImpl.cpp b/src/dom/NodeImpl.cpp
index bbd936c9f0d68a5dc27156acd836895531417814..1568b2c49b1ffa66cf136e4c793f4e606a5011a5 100644
--- a/src/dom/NodeImpl.cpp
+++ b/src/dom/NodeImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -97,29 +97,29 @@ NodeImpl::NodeImpl(DocumentImpl *ownerDoc)
this->flags = 0;
// as long as we do not have any owner, ownerNode is our ownerDocument
this->ownerNode = ownerDoc;
-
+
this->nodeRefCount = 0;
- NodeImpl::gLiveNodeImpls++;
+ NodeImpl::gLiveNodeImpls++;
NodeImpl::gTotalNodeImpls++;
-};
+};
// This only makes a shallow copy, cloneChildren must also be called for a
// deep clone
NodeImpl::NodeImpl(const NodeImpl &other) {
this->flags = other.flags;
this->isReadOnly(false);
-
+
this->nodeRefCount = 0;
- NodeImpl::gLiveNodeImpls++;
+ NodeImpl::gLiveNodeImpls++;
NodeImpl::gTotalNodeImpls++;
-
+
// Need to break the association w/ original parent
// this->ownerNode = other.getOwnerDocument(); this doesn't work???
this->ownerNode = ((NodeImpl*)&other)->getOwnerDocument();
this->isOwned(false);
};
-
+
int NodeImpl::gLiveNodeImpls = 0; // Counters for debug & tuning.
int NodeImpl::gTotalNodeImpls= 0;
@@ -158,10 +158,10 @@ int NodeImpl::changes()
// have a global indicator on the Document. Doing otherwise cost us too
// much for little gain.
return getDocument()->changes();
-};
+};
-NodeImpl * NodeImpl::appendChild(NodeImpl *newChild)
+NodeImpl * NodeImpl::appendChild(NodeImpl *newChild)
{
return insertBefore(newChild, null);
};
@@ -180,7 +180,7 @@ void NodeImpl::deleteIf(NodeImpl *thisNode)
if (thisNode->isOwned())
return;
-
+
// Delete this node. There should be no siblings, as the DOM
// supports no node operations that would detach a node from
// its parent while retaining siblings.
@@ -226,13 +226,13 @@ NodeListImpl *NodeImpl::getChildNodes() {
NodeImpl * NodeImpl::getFirstChild() {
return 0; // overridden in ParentNode
-};
+};
NodeImpl * NodeImpl::getLastChild()
{
return 0; // overridden in ParentNode
-};
+};
unsigned int NodeImpl::getLength() {
@@ -242,7 +242,7 @@ unsigned int NodeImpl::getLength() {
NodeImpl * NodeImpl::getNextSibling() {
return null; // overridden in ChildNode
-};
+};
@@ -261,7 +261,7 @@ DocumentImpl *NodeImpl::getOwnerDocument()
} else {
return (DocumentImpl *) ownerNode;
}
-};
+};
// unlike getOwnerDocument this is not overriden by DocumentImpl to return null
DocumentImpl *NodeImpl::getDocument()
@@ -273,7 +273,7 @@ DocumentImpl *NodeImpl::getDocument()
} else {
return (DocumentImpl *) ownerNode;
}
-};
+};
void NodeImpl::setOwnerDocument(DocumentImpl *doc) {
@@ -287,25 +287,25 @@ void NodeImpl::setOwnerDocument(DocumentImpl *doc) {
NodeImpl * NodeImpl::getParentNode()
{
return null; // overridden in ChildNode
-};
+};
NodeImpl* NodeImpl::getPreviousSibling()
{
return null; // overridden in ChildNode
-};
+};
void *NodeImpl::getUserData()
{
return (hasUserData()) ? getOwnerDocument()->getUserData(this) : null;
-};
+};
bool NodeImpl::hasChildNodes()
-{
+{
return false;
-};
+};
@@ -313,19 +313,19 @@ NodeImpl *NodeImpl::insertBefore(NodeImpl *newChild, NodeImpl *refChild) {
throw DOM_DOMException(DOM_DOMException::HIERARCHY_REQUEST_ERR,null);
return 0;
};
-
+
NodeImpl *NodeImpl::item(unsigned int index) {
return 0;
};
-NodeImpl *NodeImpl::removeChild(NodeImpl *oldChild)
+NodeImpl *NodeImpl::removeChild(NodeImpl *oldChild)
{
throw DOM_DOMException(DOM_DOMException::NOT_FOUND_ERR, null);
return 0;
};
-
-
+
+
NodeImpl *NodeImpl::replaceChild(NodeImpl *newChild, NodeImpl *oldChild)
{
throw DOM_DOMException(DOM_DOMException::HIERARCHY_REQUEST_ERR,null);
@@ -337,21 +337,21 @@ NodeImpl *NodeImpl::replaceChild(NodeImpl *newChild, NodeImpl *oldChild)
{
RefCountedImpl::addRef(this->getOwnerDocument());
};
-
-
+
+
//
// unreferenced will be called whenever the refernce count on
// this node goes from 1 to 0. This node will only be
- // directly deleted here (by deleteIf) if it is outside
- // of the document tree.
+ // directly deleted here (by deleteIf) if it is outside
+ // of the document tree.
//
void NodeImpl::unreferenced()
{
DocumentImpl *doc = this->getOwnerDocument();
deleteIf(this); // This gets nodes outside of the document -
// deleteIf() deletes only if the parent
- // node is null.
-
+ // node is null.
+
// If this was the last external reference within the document,
// the entire document will be deleted as well.
RefCountedImpl::removeRef(doc);
@@ -383,7 +383,7 @@ void NodeImpl::setUserData(void * val)
hasUserData(true);
else
hasUserData(false);
-};
+};
@@ -391,10 +391,10 @@ DOMString NodeImpl::toString()
{
return DOMString("[")+getNodeName()+": "+getNodeValue()+"]";
// return getNodeName();
-};
-
+};
+
//Introduced in DOM Level 2
-
+
void NodeImpl::normalize()
{
// does nothing by default, overridden by subclasses
@@ -462,7 +462,7 @@ const DOMString& NodeImpl::mapPrefix(const DOMString &prefix,
DOMString xmlURI = DStringPool::getStaticString("http://www.w3.org/XML/1998/namespace", &s_xmlURI);
DOMString xmlns = DStringPool::getStaticString("xmlns", &s_xmlns);
DOMString xmlnsURI = DStringPool::getStaticString("http://www.w3.org/2000/xmlns/", &s_xmlnsURI);
-
+
if (prefix == null)
return namespaceURI;
if (prefix.equals(xml)) {
diff --git a/src/dom/NodeImpl.hpp b/src/dom/NodeImpl.hpp
index e131aecda9685791320462216e244368e72f7002..03951624be6007801c818e3ff920e6ec6dc54f23 100644
--- a/src/dom/NodeImpl.hpp
+++ b/src/dom/NodeImpl.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -48,7 +48,7 @@
* 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
@@ -97,7 +97,7 @@ class NamedNodeMapImpl;
class NodeListImpl;
class DocumentImpl;
-// define 'null' is used extensively in the DOM implementation code,
+// define 'null' is used extensively in the DOM implementation code,
// as a consequence of its Java origins.
// MSVC 5.0 compiler has problems with overloaded function resolution
// when using the const int definition.
@@ -136,7 +136,7 @@ public:
NodeImpl(DocumentImpl *ownerDocument);
NodeImpl(const NodeImpl &other);
virtual ~NodeImpl();
-
+
// Dynamic Cast replacement functions.
virtual bool isAttrImpl();
virtual bool isCDATASectionImpl();
@@ -270,15 +270,15 @@ public: // should really be protected - ALH
inline void setValueCalled(bool value) {
flags = (value ? flags | SETVALUE : flags & ~SETVALUE);
}
-
+
inline bool isIdAttr() const {
return (flags & ID_ATTR) != 0;
}
-
+
inline void isIdAttr(bool value) {
flags = (value ? flags | ID_ATTR : flags & ~ID_ATTR);
}
-
+
inline bool hasUserData() const {
return (flags & USERDATA) != 0;
}
@@ -286,7 +286,7 @@ public: // should really be protected - ALH
inline void hasUserData(bool value) {
flags = (value ? flags | USERDATA : flags & ~USERDATA);
}
-
+
inline bool hasStringValue() const {
return (flags & HASSTRING) != 0;
}
diff --git a/src/dom/ParentNode.cpp b/src/dom/ParentNode.cpp
index bd65ae1982dc0c41bdcc7f4162925a7ce3ef1c22..64fe262d21247d31200d4482c11fcba15c32b7e5 100644
--- a/src/dom/ParentNode.cpp
+++ b/src/dom/ParentNode.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -78,7 +78,7 @@ ParentNode::ParentNode(DocumentImpl *ownerDoc)
fCachedLength = -1;
fCachedChild = null;
fCachedChildIndex = -1;
-};
+};
// This only makes a shallow copy, cloneChildren must also be called for a
// deep clone
@@ -96,10 +96,10 @@ ParentNode::ParentNode(const ParentNode &other)
};
-void ParentNode::cloneChildren(const NodeImpl &other) {
- // for (NodeImpl *mykid = other.getFirstChild();
- for (NodeImpl *mykid = ((NodeImpl&)other).getFirstChild();
- mykid != null;
+void ParentNode::cloneChildren(const NodeImpl &other) {
+ // for (NodeImpl *mykid = other.getFirstChild();
+ for (NodeImpl *mykid = ((NodeImpl&)other).getFirstChild();
+ mykid != null;
mykid = mykid->getNextSibling()) {
this->appendChild(mykid->cloneNode(true));
}
@@ -130,19 +130,19 @@ NodeListImpl *ParentNode::getChildNodes() {
NodeImpl * ParentNode::getFirstChild() {
return firstChild;
-};
+};
NodeImpl * ParentNode::getLastChild()
{
return lastChild();
-};
+};
ChildNode * ParentNode::lastChild()
{
// last child is stored as the previous sibling of first child
return firstChild != null ? firstChild->previousSibling : null;
-};
+};
void ParentNode::lastChild(ChildNode *node) {
// store lastChild as previous sibling of first child
@@ -173,14 +173,14 @@ unsigned int ParentNode::getLength() {
bool ParentNode::hasChildNodes()
-{
+{
return firstChild!=null;
-};
+};
NodeImpl *ParentNode::insertBefore(NodeImpl *newChild, NodeImpl *refChild) {
-
+
bool errorChecking = ownerDocument->getErrorChecking();
if (newChild->isDocumentFragmentImpl()) {
@@ -211,7 +211,7 @@ NodeImpl *ParentNode::insertBefore(NodeImpl *newChild, NodeImpl *refChild) {
null);
}
}
- }
+ }
while (newChild->hasChildNodes()) { // Move
insertBefore(newChild->getFirstChild(),refChild);
@@ -256,7 +256,7 @@ NodeImpl *ParentNode::insertBefore(NodeImpl *newChild, NodeImpl *refChild) {
}
}
- // Convert to internal type, to avoid repeated casting
+ // Convert to internal type, to avoid repeated casting
ChildNode * newInternal = (ChildNode *)newChild;
NodeImpl *oldparent = newInternal->getParentNode();
@@ -340,8 +340,8 @@ NodeImpl *ParentNode::insertBefore(NodeImpl *newChild, NodeImpl *refChild) {
return newInternal;
};
-
-
+
+
NodeImpl *ParentNode::item(unsigned int index) {
// short way
if (fCachedChildIndex != -1 && fCachedChild != null) {
@@ -362,16 +362,16 @@ NodeImpl *ParentNode::item(unsigned int index) {
// long way
fCachedChild = firstChild;
- for (fCachedChildIndex = 0;
- fCachedChildIndex < index && fCachedChild != null;
+ for (fCachedChildIndex = 0;
+ fCachedChildIndex < index && fCachedChild != null;
fCachedChildIndex++) {
fCachedChild = fCachedChild->nextSibling;
}
return fCachedChild;
};
-
-
-NodeImpl *ParentNode::removeChild(NodeImpl *oldChild)
+
+
+NodeImpl *ParentNode::removeChild(NodeImpl *oldChild)
{
if (ownerDocument->getErrorChecking()) {
if (isReadOnly()) {
@@ -391,15 +391,15 @@ NodeImpl *ParentNode::removeChild(NodeImpl *oldChild)
unsigned int sz = ranges->size();
if (sz != 0) {
for (unsigned int i =0; i<sz; i++) {
- if (ranges->elementAt(i) != null)
+ if (ranges->elementAt(i) != null)
ranges->elementAt(i)->updateRangeForDeletedNode(oldChild);
}
}
}
}
-
+
ChildNode * oldInternal = (ChildNode *) oldChild;
-
+
// update cached length if we have any
if (fCachedLength != -1) {
fCachedLength--;
@@ -460,35 +460,35 @@ NodeImpl *ParentNode::replaceChild(NodeImpl *newChild, NodeImpl *oldChild)
// changed() already done.
return oldChild;
};
-
+
void ParentNode::setReadOnly(bool readOnl, bool deep)
{
NodeImpl::setReadOnly(readOnl, deep);
-
+
if (deep)
// Recursively set kids
- for (ChildNode *mykid = firstChild;
- mykid != null;
+ for (ChildNode *mykid = firstChild;
+ mykid != null;
mykid = mykid->nextSibling)
if(! (mykid->isEntityReference()))
mykid->setReadOnly(readOnl,true);
};
-
-
+
+
//Introduced in DOM Level 2
-
+
void ParentNode::normalize()
{
ChildNode *kid, *next;
for (kid = firstChild; kid != null; kid = next)
{
next = kid->nextSibling;
-
+
// If kid and next are both Text nodes (but _not_ CDATASection,
// which is a subclass of Text), they can be merged.
- if (next != null &&
- kid->isTextImpl() && !(kid->isCDATASectionImpl()) &&
+ if (next != null &&
+ kid->isTextImpl() && !(kid->isCDATASectionImpl()) &&
next->isTextImpl() && !(next->isCDATASectionImpl()) )
{
((TextImpl *) kid)->appendData(((TextImpl *) next)->getData());
@@ -497,13 +497,13 @@ void ParentNode::normalize()
deleteIf(next);
next = kid; // Don't advance; there might be another.
}
-
- // Otherwise it might be an Element, which is handled recursively
+
+ // Otherwise it might be an Element, which is handled recursively
else
if (kid->isElementImpl())
kid->normalize();
};
-
+
// changed() will have occurred when the removeChild() was done,
// so does not have to be reissued.
};
diff --git a/src/dom/ParentNode.hpp b/src/dom/ParentNode.hpp
index a63a6508a6a6700b86356cc52b1ae1b8c8f292e0..229a27d970d7eef7b3d0a90a950e8560e1d5b721 100644
--- a/src/dom/ParentNode.hpp
+++ b/src/dom/ParentNode.hpp
@@ -2,38 +2,38 @@
#define ParentNode_HEADER_GUARD_
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -47,7 +47,7 @@
* 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
@@ -110,7 +110,7 @@ public:
public:
ParentNode(DocumentImpl *ownerDocument);
ParentNode(const ParentNode &other);
-
+
virtual DocumentImpl * getOwnerDocument();
virtual void setOwnerDocument(DocumentImpl *doc);
diff --git a/src/framework/XMLAttDef.cpp b/src/framework/XMLAttDef.cpp
index 3c375ddec61803e2690f4633705bf1fa33a9a313..38124bebbdffbbd9f40b6347c22f152a595432db 100644
--- a/src/framework/XMLAttDef.cpp
+++ b/src/framework/XMLAttDef.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/framework/XMLAttDef.hpp b/src/framework/XMLAttDef.hpp
index a7d1e2065a5fa0fdda88952aca408ea2f90799a0..95222d1ce7680b342355c955a898a64bee1ba7d4 100644
--- a/src/framework/XMLAttDef.hpp
+++ b/src/framework/XMLAttDef.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.10 2001/05/11 13:25:31 tng
+ * Copyright update.
+ *
* Revision 1.9 2001/02/27 18:48:20 tng
* Schema: Add SchemaAttDef, SchemaElementDecl, SchemaAttDefList.
*
diff --git a/src/framework/XMLAttr.cpp b/src/framework/XMLAttr.cpp
index b2faa89db72a18bbdf077f048da0a1f4b955e0cf..e9ea8587f9f463e2c15be2c33f736e8264716dc5 100644
--- a/src/framework/XMLAttr.cpp
+++ b/src/framework/XMLAttr.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/framework/XMLAttr.hpp b/src/framework/XMLAttr.hpp
index c88b0e76d3ef27a24f380e9f4f3f075ea55eaa3e..97f2e31c569e8259dfcef8053f9179b7a99a9d04 100644
--- a/src/framework/XMLAttr.hpp
+++ b/src/framework/XMLAttr.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2001/05/11 13:25:31 tng
+ * Copyright update.
+ *
* Revision 1.7 2001/02/27 18:33:55 tng
* Schema: Use QName in XMLAttr.
*
diff --git a/src/framework/XMLContentModel.hpp b/src/framework/XMLContentModel.hpp
index cf17197d5a5dd930b870d1bcd97eff0c09302601..d705d4772685861dba3035ab217156f996413b8d 100644
--- a/src/framework/XMLContentModel.hpp
+++ b/src/framework/XMLContentModel.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.10 2001/05/11 13:25:31 tng
+ * Copyright update.
+ *
* Revision 1.9 2001/05/03 21:02:23 tng
* Schema: Add SubstitutionGroupComparator and update exception messages. By Pei Yong Zhang.
*
diff --git a/src/framework/XMLElementDecl.cpp b/src/framework/XMLElementDecl.cpp
index bd9a7a33ddcd5d4bbbcbfefe75eb2578164a7e15..de0f072cecfa71cc831789ae6b819593e90d9a51 100644
--- a/src/framework/XMLElementDecl.cpp
+++ b/src/framework/XMLElementDecl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/framework/XMLElementDecl.hpp b/src/framework/XMLElementDecl.hpp
index cec72af75850399878b774a189f4a9e62a539e91..eca569ffa272f4608fb4243d2cc6a897ddf79236 100644
--- a/src/framework/XMLElementDecl.hpp
+++ b/src/framework/XMLElementDecl.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.15 2001/05/11 13:25:32 tng
+ * Copyright update.
+ *
* Revision 1.14 2001/05/03 20:34:22 tng
* Schema: SchemaValidator update
*
diff --git a/src/framework/XMLErrorReporter.hpp b/src/framework/XMLErrorReporter.hpp
index d0700ec35aeaf49a04ad9a40aae6c07921491bc9..58ff70db8300a0a975aee9a3407542478eabf320 100644
--- a/src/framework/XMLErrorReporter.hpp
+++ b/src/framework/XMLErrorReporter.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.11 2001/05/11 13:25:32 tng
+ * Copyright update.
+ *
* Revision 1.10 2001/05/03 19:08:56 knoaman
* Support Warning/Error/FatalError messaging.
* Validity constraints errors are treated as errors, with the ability by user to set
@@ -181,7 +184,7 @@ public:
* fully qualified.
*
* @param publicId The optional public id of the entity were the error
- * occured. It can be an empty string if non was provided.
+ * occured. It can be an empty string if non was provided.
*
* @param lineNum The line number within the source XML of the error.
*
@@ -213,7 +216,7 @@ public:
protected :
-
+
/** @name Constructor */
//@{
diff --git a/src/framework/XMLRecognizer.cpp b/src/framework/XMLRecognizer.cpp
index 0abf2771ee54ad6b11bfbd19e80eb708c80677f0..40a3f442d6f6dd336d7d1afbb78636fe9de7c075 100644
--- a/src/framework/XMLRecognizer.cpp
+++ b/src/framework/XMLRecognizer.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/framework/XMLValidator.cpp b/src/framework/XMLValidator.cpp
index 1f55cd93e6e4e6281bbe0452ddc2b54f085e5fe7..6e9bda322275171da87d5163b63edb924e5cc5ce 100644
--- a/src/framework/XMLValidator.cpp
+++ b/src/framework/XMLValidator.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/**
* $Log$
+ * Revision 1.9 2001/05/11 13:25:33 tng
+ * Copyright update.
+ *
* Revision 1.8 2001/05/03 19:08:58 knoaman
* Support Warning/Error/FatalError messaging.
* Validity constraints errors are treated as errors, with the ability by user to set
diff --git a/src/framework/XMLValidator.hpp b/src/framework/XMLValidator.hpp
index ba40dfb9b5beab99e76b820b4edc0c1b5dc2a7f5..7e48d0f900ff532e68c49776a96876940d530558 100644
--- a/src/framework/XMLValidator.hpp
+++ b/src/framework/XMLValidator.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.13 2001/05/11 13:25:33 tng
+ * Copyright update.
+ *
* Revision 1.12 2001/05/03 20:34:22 tng
* Schema: SchemaValidator update
*
diff --git a/src/idom/IDAttrImpl.cpp b/src/idom/IDAttrImpl.cpp
index aa052c41bc50829005f4054a49c82342d6d21de0..9c05380c9e5567dd67d0b5e51bb456c710f33a36 100644
--- a/src/idom/IDAttrImpl.cpp
+++ b/src/idom/IDAttrImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -67,7 +67,7 @@
#include "IDCasts.hpp"
-IDAttrImpl::IDAttrImpl(IDOM_Document *ownerDoc, const XMLCh *aName)
+IDAttrImpl::IDAttrImpl(IDOM_Document *ownerDoc, const XMLCh *aName)
: fNode(ownerDoc), fParent (ownerDoc)
{
IDDocumentImpl *docImpl = (IDDocumentImpl *)ownerDoc;
@@ -91,7 +91,7 @@ IDAttrImpl::IDAttrImpl(const IDAttrImpl &other, bool deep)
IDDocumentImpl *doc = (IDDocumentImpl *)this->getOwnerDocument();
doc->getNodeIDMap()->add(this);
}
-
+
fParent.cloneChildren(&other);
};
@@ -148,7 +148,7 @@ const XMLCh * IDAttrImpl::getValue() const
int length = 0;
for (node = fParent.fFirstChild; node != 0; node = castToChildImpl(node)->nextSibling)
length += XMLString::stringLen(node->getNodeValue());
-
+
// idom_revisit - Come up with some way of not allocating a new string each
// time we do this. But it's not an immediate pressing problem,
// becuase we only allocate a new string when we have attribute
@@ -160,7 +160,7 @@ const XMLCh * IDAttrImpl::getValue() const
{
XMLString::catString(retString, node->getNodeValue());
};
-
+
return retString;
};
@@ -187,7 +187,7 @@ void IDAttrImpl::setValue(const XMLCh *val)
throw IDOM_DOMException (
IDOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, 0);
}
-
+
// If this attribute was of type ID and in the map, take it out,
// then put it back in with the new name. For now, we don't worry
// about what happens if the new name conflicts
@@ -206,7 +206,7 @@ void IDAttrImpl::setValue(const XMLCh *val)
appendChild(doc->createTextNode(val));
fNode.isSpecified(true);
fParent.changed();
-
+
if (fNode.isIdAttr())
doc->getNodeIDMap()->add(this);
diff --git a/src/idom/IDAttrImpl.hpp b/src/idom/IDAttrImpl.hpp
index e6ea9efc57e2e75cef3cd44465fbc963670db907..bbad6b02e88d636aa4a24a087c1c0ca123b9320d 100644
--- a/src/idom/IDAttrImpl.hpp
+++ b/src/idom/IDAttrImpl.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -48,10 +48,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -81,7 +81,7 @@ class IDDocumentImpl;
class IDElementImpl;
class CDOM_EXPORT IDAttrImpl: public IDOM_Attr {
-
+
public:
IDNodeImpl fNode;
IDParentNode fParent;
diff --git a/src/idom/IDAttrMapImpl.cpp b/src/idom/IDAttrMapImpl.cpp
index a4b513fe19e004711e6447c7c74e36dd83795f09..0baf6c636c80f8edbb98e6000751b5d142094981 100644
--- a/src/idom/IDAttrMapImpl.cpp
+++ b/src/idom/IDAttrMapImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -77,14 +77,14 @@ IDAttrMapImpl::IDAttrMapImpl(IDOM_Node *ownerNod, const IDNamedNodeMapImpl *defa
: IDNamedNodeMapImpl(ownerNod)
{
hasDefaults(false);
- if (defaults != 0)
+ if (defaults != 0)
{
- if (defaults->getLength() > 0)
+ if (defaults->getLength() > 0)
{
hasDefaults(true);
cloneContent(defaults);
}
- }
+ }
}
IDAttrMapImpl::~IDAttrMapImpl()
diff --git a/src/idom/IDAttrMapImpl.hpp b/src/idom/IDAttrMapImpl.hpp
index 0fd1d919c765c39c65867bbffb8323837c8c36e4..47290b0d31d7a48a84559f3c92d49af534643df3 100644
--- a/src/idom/IDAttrMapImpl.hpp
+++ b/src/idom/IDAttrMapImpl.hpp
@@ -3,38 +3,39 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -48,10 +49,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -76,7 +77,7 @@
class IDOM_Node;
class IDOM_NamedNodeMap;
-class CDOM_EXPORT IDAttrMapImpl : public IDNamedNodeMapImpl
+class CDOM_EXPORT IDAttrMapImpl : public IDNamedNodeMapImpl
{
private:
// bool attrDefaults; // idom_revisit. Move up to the owning element level.
diff --git a/src/idom/IDAttrNSImpl.cpp b/src/idom/IDAttrNSImpl.cpp
index db693ee317c44ca9cea3ca01fd8821102a6b2930..462a1e5d474f54b358a59e63628527c8886b724d 100644
--- a/src/idom/IDAttrNSImpl.cpp
+++ b/src/idom/IDAttrNSImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -84,7 +84,7 @@ IDAttrImpl(ownerDoc, qualifiedName)
const XMLCh * xmlns = IDNodeImpl::getXmlnsString();
const XMLCh * xmlnsURI = IDNodeImpl::getXmlnsURIString();
this->fName = ((IDDocumentImpl *)ownerDoc)->getPooledString(qualifiedName);
-
+
int index = IDDocumentImpl::indexofQualifiedName(qualifiedName);
const XMLCh * prefix;
if (index < 0)
@@ -108,11 +108,11 @@ IDAttrImpl(ownerDoc, qualifiedName)
this -> localName = ((IDDocumentImpl *)ownerDoc)->getPooledString(fName+index+1);
// this->fName.substringData(index+1, this->fName.length()-index-1);
}
-
+
const XMLCh * URI = xmlnsAlone ?
xmlnsURI : IDNodeImpl::mapPrefix(prefix, fNamespaceURI, IDOM_Node::ATTRIBUTE_NODE);
this -> namespaceURI = URI == 0 ? kEmptyString : ((IDDocumentImpl *)ownerDoc)->getPooledString(URI);
-};
+};
IDAttrNSImpl::IDAttrNSImpl(const IDAttrNSImpl &other, bool deep) :
IDAttrImpl(other, deep)
@@ -136,11 +136,11 @@ const XMLCh * IDAttrNSImpl::getPrefix() const
// idom_revisit. Get fPrefix set correctly at the start of time.
if (fPrefix)
return fPrefix;
-
+
int index = IDDocumentImpl::indexofQualifiedName(fName);
if (index == 0)
return 0;
-
+
IDAttrNSImpl *This = (IDAttrNSImpl *)this; // cast off const.
This->fPrefix = new (getOwnerDocument()) XMLCh[index+1];
XMLString::copyNString(fPrefix, fName, index);
@@ -160,31 +160,31 @@ void IDAttrNSImpl::setPrefix(const XMLCh *prefix)
const XMLCh * xmlURI = IDOM_Node::getXmlURIString();
const XMLCh * xmlns = IDOM_Node::getXmlnsString();
const XMLCh * xmlnsURI = IDOM_Node::getXmlnsURIString();
-
+
if (fNode.isReadOnly())
throw IDOM_DOMException(IDOM_DOMException::NO_MODIFICATION_ALLOWED_ERR,
0);
if (namespaceURI == 0 || localName.equals(xmlns))
throw IDOM_DOMException(IDOM_DOMException::NAMESPACE_ERR, 0);
-
+
if (prefix != 0 && !DocumentImpl::isXMLName(prefix))
throw IDOM_DOMException(IDOM_DOMException::INVALID_CHARACTER_ERR,0);
-
+
if (prefix == 0 || prefix.length() == 0) {
name = localName;
return;
}
-
+
if (prefix.equals(xml) && !namespaceURI.equals(xmlURI) ||
prefix.equals(xmlns) && !namespaceURI.equals(xmlnsURI))
throw IDOM_DOMException(IDOM_DOMException::NAMESPACE_ERR, 0);
-
+
const XMLCh *p = prefix.rawBuffer();
for (int i = prefix.length(); --i >= 0;) {
if (*p++ == chColon) //prefix is malformed
throw IDOM_DOMException(IDOM_DOMException::NAMESPACE_ERR, 0);
}
-
+
name = prefix + chColon + localName; //nodeName is changed too
#endif
assert(false); // idom_revisit setPrefix not implemented yet.
diff --git a/src/idom/IDAttrNSImpl.hpp b/src/idom/IDAttrNSImpl.hpp
index 137f133c96e74de36a9827bb40e94885c8c30bfe..3bf09931be2a4c2b8157c9c44a84819e94c427db 100644
--- a/src/idom/IDAttrNSImpl.hpp
+++ b/src/idom/IDAttrNSImpl.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -48,15 +48,19 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
+/*
+ * $Id$
+ */
+
//
// This file is part of the internal implementation of the C++ XML DOM.
// It should NOT be included or used directly by application programs.
@@ -78,13 +82,13 @@ protected:
XMLCh * fPrefix; // prefix part of qualified name
// idom_revisit - can return local part
// by pointing into the qualified (L1) name.
-
+
public:
IDAttrNSImpl(IDOM_Document *ownerDoc, const XMLCh *name);
IDAttrNSImpl(IDOM_Document *ownerDoc, //DOM Level 2
const XMLCh *namespaceURI, const XMLCh *qualifiedName);
IDAttrNSImpl(const IDAttrNSImpl &other, bool deep=false);
-
+
virtual IDOM_Node * cloneNode(bool deep) const;
//Introduced in DOM Level 2
virtual const XMLCh * getNamespaceURI() const;
diff --git a/src/idom/IDCDATASectionImpl.cpp b/src/idom/IDCDATASectionImpl.cpp
index dc355b636bdf25eb978fbeeb79cd7a1ce177273a..a9f7851174b8ed02f088ef31f074f2983b9af690 100644
--- a/src/idom/IDCDATASectionImpl.cpp
+++ b/src/idom/IDCDATASectionImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -90,12 +90,12 @@ IDCDATASectionImpl::~IDCDATASectionImpl()
IDOM_Node *IDCDATASectionImpl::cloneNode(bool deep) const
{
return new (this->getOwnerDocument()) IDCDATASectionImpl(*this, deep);
-};
+};
const XMLCh * IDCDATASectionImpl::getNodeName() const {
static const XMLCh gcdata_section[] = {chPound, chLatin_c, chLatin_d, chLatin_a, chLatin_t, chLatin_a,
- chDash, chLatin_s, chLatin_e, chLatin_c, chLatin_t, chLatin_i, chLatin_o, chLatin_n, 0};
+ chDash, chLatin_s, chLatin_e, chLatin_c, chLatin_t, chLatin_i, chLatin_o, chLatin_n, 0};
return gcdata_section;
};
@@ -125,8 +125,8 @@ IDOM_Text *IDCDATASectionImpl::splitText(unsigned int offset)
unsigned int len = XMLString::stringLen(fCharacterData.fData);
if (offset > len)
throw IDOM_DOMException(IDOM_DOMException::INDEX_SIZE_ERR, 0);
-
- IDOM_Text *newText =
+
+ IDOM_Text *newText =
getOwnerDocument()->createCDATASection(
this->substringData(offset, len - offset));
@@ -137,7 +137,7 @@ IDOM_Text *IDCDATASectionImpl::splitText(unsigned int offset)
XMLCh *wData = (XMLCh *)(fCharacterData.fData); // Cast off const.
wData[offset] = 0; // idom_revisit - could change a string that
// application code has. Do we want to do this?
-
+
#ifdef idom_revisit
if (this->getOwnerDocument() != null) {
@@ -196,11 +196,11 @@ IDOM_Text *IDCDATASectionImpl::splitText(unsigned int offset)
const XMLCh * IDCDATASectionImpl::getData() const {return fCharacterData.getData();};
- unsigned int IDCDATASectionImpl::getLength() const {return fCharacterData.getLength();};
+ unsigned int IDCDATASectionImpl::getLength() const {return fCharacterData.getLength();};
const XMLCh * IDCDATASectionImpl::substringData(unsigned int offset, unsigned int count) const
- {return fCharacterData.substringData(offset, count);};
- void IDCDATASectionImpl::appendData(const XMLCh *arg) {fCharacterData.appendData(this, arg);};
- void IDCDATASectionImpl::insertData(unsigned int offset, const XMLCh *arg)
+ {return fCharacterData.substringData(offset, count);};
+ void IDCDATASectionImpl::appendData(const XMLCh *arg) {fCharacterData.appendData(this, arg);};
+ void IDCDATASectionImpl::insertData(unsigned int offset, const XMLCh *arg)
{fCharacterData.insertData(offset, arg);};
void IDCDATASectionImpl::deleteData(unsigned int offset, unsigned int count)
{fCharacterData.deleteData(this, offset, count);};
diff --git a/src/idom/IDCDATASectionImpl.hpp b/src/idom/IDCDATASectionImpl.hpp
index 6625f13771f4e5bf8f63b99a88170457479384ba..d7b149727aed2b23f374b126da13a9f0d96b70e8 100644
--- a/src/idom/IDCDATASectionImpl.hpp
+++ b/src/idom/IDCDATASectionImpl.hpp
@@ -2,38 +2,38 @@
#define IDCDATASectionImpl_HEADER_GUARD_
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -47,10 +47,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -89,7 +89,7 @@ private:
public:
IDCDATASectionImpl(IDOM_Document *ownerDoc, const XMLCh * data);
IDCDATASectionImpl(const IDCDATASectionImpl &other, bool deep = false);
-
+
virtual ~IDCDATASectionImpl();
// Functions inherited from TEXT
@@ -100,19 +100,19 @@ public:
// Declare all of the functions from IDOM_Node.
IDOM_NODE_FUNCTIONS;
-
-
+
+
// Functions introduced by IDOM_CharacterData
virtual const XMLCh * getData() const;
- virtual unsigned int getLength() const;
- virtual const XMLCh * substringData(unsigned int offset,
- unsigned int count) const;
- virtual void appendData(const XMLCh *arg);
+ virtual unsigned int getLength() const;
+ virtual const XMLCh * substringData(unsigned int offset,
+ unsigned int count) const;
+ virtual void appendData(const XMLCh *arg);
virtual void insertData(unsigned int offset, const XMLCh *arg);
- virtual void deleteData(unsigned int offset,
+ virtual void deleteData(unsigned int offset,
unsigned int count);
- virtual void replaceData(unsigned int offset,
- unsigned int count,
+ virtual void replaceData(unsigned int offset,
+ unsigned int count,
const XMLCh *arg);
virtual void setData(const XMLCh *data);
diff --git a/src/idom/IDCasts.hpp b/src/idom/IDCasts.hpp
index 8d1b75be02a2f37ac9afa421b519c692c5530c0b..9fb1c1cebc9ac2fdd4ae8758f1e52bd5d4f585e0 100644
--- a/src/idom/IDCasts.hpp
+++ b/src/idom/IDCasts.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -48,15 +48,18 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
+/*
+ * $Id$
+ */
//
// This file is part of the internal implementation of the C++ XML DOM.
@@ -112,7 +115,7 @@
// These functions also cast off const. It was either do that, or make
// a second overloaded set that took and returned const arguements.
//
-
+
#include "IDElementImpl.hpp"
#include "IDTextImpl.hpp"
diff --git a/src/idom/IDCharacterDataImpl.cpp b/src/idom/IDCharacterDataImpl.cpp
index 6c6551248681297d69c449552588d0a84ffc6111..7e10633158d6eec7fe168f1e36d577ac3456b4c5 100644
--- a/src/idom/IDCharacterDataImpl.cpp
+++ b/src/idom/IDCharacterDataImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -117,7 +117,7 @@ void IDCharacterDataImpl::appendData(const IDOM_Node *node, const XMLCh *dat)
if(castToNodeImpl(node)->isReadOnly())
throw IDOM_DOMException(
IDOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, 0);
-
+
#ifdef idom_revist
this->data.appendData(dat);
#endif
@@ -131,7 +131,7 @@ void IDCharacterDataImpl::deleteData(const IDOM_Node *node, unsigned int offset,
// Note: the C++ XMLCh * operation throws the correct DOMExceptions
// when parameter values are bad.
- //
+ //
unsigned int len = XMLString::stringLen(this->fData);
if (offset >= len)
@@ -157,7 +157,7 @@ void IDCharacterDataImpl::deleteData(const IDOM_Node *node, unsigned int offset,
XMLString::copyString(newString+offset, fData+offset+len);
fData = newString;
-
+
// We don't delete the old string (doesn't work), or alter
// the old string (may be shared)
// It just hangs around, possibly orphaned.
@@ -182,7 +182,7 @@ void IDCharacterDataImpl::deleteData(const IDOM_Node *node, unsigned int offset,
const XMLCh *IDCharacterDataImpl::getData() const
{
- return fData;
+ return fData;
};
@@ -191,21 +191,21 @@ const XMLCh *IDCharacterDataImpl::getData() const
//
unsigned int IDCharacterDataImpl::getLength() const
{
- return XMLString::stringLen(fData);
+ return XMLString::stringLen(fData);
};
-void IDCharacterDataImpl::insertData(unsigned int offset, const XMLCh *dat)
+void IDCharacterDataImpl::insertData(unsigned int offset, const XMLCh *dat)
{
#ifdef idom_revist
if (isReadOnly())
throw DOM_DOMException(
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
-
+
// Note: the C++ XMLCh * operation throws the correct DOMExceptions
// when parameter values are bad.
- //
+ //
this->data.insertData(offset, dat);
#endif
}
@@ -248,7 +248,7 @@ const XMLCh * IDCharacterDataImpl::substringData(unsigned int offset,
// Note: the C++ XMLCh * operation throws the correct DOMExceptions
// when parameter values are bad.
- //
+ //
return data.substringData(offset, count);
#endif
return 0;
diff --git a/src/idom/IDCharacterDataImpl.hpp b/src/idom/IDCharacterDataImpl.hpp
index 39f3bc9759e44703963e03750e53543d0c153ad5..576cc799f20fd0c52d1c194168dd1b0db61c2e61 100644
--- a/src/idom/IDCharacterDataImpl.hpp
+++ b/src/idom/IDCharacterDataImpl.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -48,10 +48,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -102,7 +102,7 @@ public:
const XMLCh * substringData(unsigned int offset, unsigned int count) const;
-
+
};
diff --git a/src/idom/IDChildAndParentNode.cpp b/src/idom/IDChildAndParentNode.cpp
index 303e24a977fc9a018334698e21c5b70507e4df02..704134845f0dc47a177b135dfd5093257a349c1d 100644
--- a/src/idom/IDChildAndParentNode.cpp
+++ b/src/idom/IDChildAndParentNode.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/idom/IDChildAndParentNode.hpp b/src/idom/IDChildAndParentNode.hpp
index 5e088f38976001473349e46912c62e414dd13482..273fbc34a8a22250170e778d7bf15a86651957a7 100644
--- a/src/idom/IDChildAndParentNode.hpp
+++ b/src/idom/IDChildAndParentNode.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -48,10 +48,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/idom/IDChildNode.cpp b/src/idom/IDChildNode.cpp
index f5f6184e2206609e201fd035ab4f7d58d186f054..855eb2028c3e87023a77bd3ca565b3b8e48cebc0 100644
--- a/src/idom/IDChildNode.cpp
+++ b/src/idom/IDChildNode.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -69,7 +69,7 @@ IDChildNode::IDChildNode()
{
this->previousSibling = 0;
this->nextSibling = 0;
-};
+};
// This only makes a shallow copy, cloneChildren must also be called for a
// deep clone
@@ -86,7 +86,7 @@ IDChildNode::~IDChildNode() {
IDOM_Node * IDChildNode::getNextSibling() const {
return nextSibling;
-};
+};
//
// Note: for getParentNode and getPreviousSibling(), below, an
@@ -97,15 +97,15 @@ IDOM_Node * IDChildNode::getNextSibling() const {
// practical way to tell, so we just take an extra parameter instead.
IDOM_Node * IDChildNode::getParentNode(const IDOM_Node *thisNode) const
-{
+{
// if we have an owner, ownerNode is our parent, otherwise it's
// our ownerDocument and we don't have a parent
IDNodeImpl *thisNodeImpl = castToNodeImpl(thisNode);
return thisNodeImpl->isOwned() ? thisNodeImpl->fOwnerNode : 0;
-};
+};
IDOM_Node * IDChildNode::getPreviousSibling(const IDOM_Node *thisNode) const {
// if we are the firstChild, previousSibling actually refers to our
// parent's lastChild, but we hide that
return castToNodeImpl(thisNode)->isFirstChild() ? 0 : previousSibling;
-};
+};
diff --git a/src/idom/IDChildNode.hpp b/src/idom/IDChildNode.hpp
index 6ed4dfd67083f4530b23664657e68a0cad7a042e..5aac54caf22e6d29dea9fbf900f6bfc3e4eb1e66 100644
--- a/src/idom/IDChildNode.hpp
+++ b/src/idom/IDChildNode.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -48,10 +48,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -91,7 +91,7 @@ public:
IDChildNode();
IDChildNode(const IDChildNode &other);
~IDChildNode();
-
+
IDOM_Node * getNextSibling() const;
IDOM_Node * getParentNode(const IDOM_Node *thisNode) const;
IDOM_Node * getPreviousSibling(const IDOM_Node *thisNode) const;
diff --git a/src/idom/IDCommentImpl.cpp b/src/idom/IDCommentImpl.cpp
index e6fecee8569eaf3ba890cf12c8a8278afc423543..917b2e19b701f3da46b75a0d472727f836b178fb 100644
--- a/src/idom/IDCommentImpl.cpp
+++ b/src/idom/IDCommentImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -62,7 +62,7 @@
* Represents an XML (or HTML) comment.
*
* @author Rania Y. Khalaf
- * @author Joseph Kesselman
+ * @author Joseph Kesselman
* @since PR-DOM-Level-1-19980818.
*/
@@ -102,8 +102,8 @@ IDOM_Node * IDCommentImpl::cloneNode(bool deep) const
const XMLCh * IDCommentImpl::getNodeName() const {
- static const XMLCh gComment[] =
- {chPound, chLatin_c, chLatin_o, chLatin_m, chLatin_m, chLatin_e,chLatin_n, chLatin_t, 0};
+ static const XMLCh gComment[] =
+ {chPound, chLatin_c, chLatin_o, chLatin_m, chLatin_m, chLatin_e,chLatin_n, chLatin_t, 0};
return gComment;
}
@@ -146,11 +146,11 @@ short IDCommentImpl::getNodeType() const {
const XMLCh * IDCommentImpl::getData() const {return fCharacterData.getData();};
- unsigned int IDCommentImpl::getLength() const {return fCharacterData.getLength();};
+ unsigned int IDCommentImpl::getLength() const {return fCharacterData.getLength();};
const XMLCh * IDCommentImpl::substringData(unsigned int offset, unsigned int count) const
- {return fCharacterData.substringData(offset, count);};
- void IDCommentImpl::appendData(const XMLCh *arg) {fCharacterData.appendData(this, arg);};
- void IDCommentImpl::insertData(unsigned int offset, const XMLCh *arg)
+ {return fCharacterData.substringData(offset, count);};
+ void IDCommentImpl::appendData(const XMLCh *arg) {fCharacterData.appendData(this, arg);};
+ void IDCommentImpl::insertData(unsigned int offset, const XMLCh *arg)
{fCharacterData.insertData(offset, arg);};
void IDCommentImpl::deleteData(unsigned int offset, unsigned int count)
{fCharacterData.deleteData(this, offset, count);};
diff --git a/src/idom/IDCommentImpl.hpp b/src/idom/IDCommentImpl.hpp
index 347aa8b7ddfdd984502d0337c87f91c681924aeb..6e78e563299b0a6db64040b70b3a4b6fee6a5e10 100644
--- a/src/idom/IDCommentImpl.hpp
+++ b/src/idom/IDCommentImpl.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -48,10 +48,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -88,11 +88,11 @@ public:
IDCommentImpl(IDOM_Document *, const XMLCh *);
IDCommentImpl(const IDCommentImpl &other, bool deep);
virtual ~IDCommentImpl();
-
+
// Declare all of the functions from IDOM_Node.
IDOM_NODE_FUNCTIONS;
-
-
+
+
// Functions from IDOM_CharacterData
virtual void appendData(const XMLCh *data);
virtual void deleteData(unsigned int offset, unsigned int count);
@@ -106,4 +106,4 @@ public:
};
#endif
-
+
diff --git a/src/idom/IDCommonParentNode.cpp b/src/idom/IDCommonParentNode.cpp
index 946d9c22d82fec2995a9d4339077283ca1169030..8189cbb2e790952e1907b099dfd148784531314e 100644
--- a/src/idom/IDCommonParentNode.cpp
+++ b/src/idom/IDCommonParentNode.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -67,7 +67,7 @@ THIS_CLASS::THIS_CLASS(DocumentImpl *ownerDoc)
this->firstChild = null;
fChanges = 0;
-};
+};
// This only makes a shallow copy, cloneChildren must also be called for a
// deep clone
@@ -83,10 +83,10 @@ THIS_CLASS::THIS_CLASS(const THIS_CLASS &other)
};
-void THIS_CLASS::cloneChildren(const NodeImpl &other) {
- // for (NodeImpl *mykid = other.getFirstChild();
- for (NodeImpl *mykid = ((NodeImpl&)other).getFirstChild();
- mykid != null;
+void THIS_CLASS::cloneChildren(const NodeImpl &other) {
+ // for (NodeImpl *mykid = other.getFirstChild();
+ for (NodeImpl *mykid = ((NodeImpl&)other).getFirstChild();
+ mykid != null;
mykid = mykid->getNextSibling()) {
this->appendChild(mykid->cloneNode(true));
}
@@ -117,12 +117,12 @@ void THIS_CLASS::changed()
if (parentNode != null) {
parentNode->changed();
}
-};
+};
int THIS_CLASS::changes()
{
return fChanges;
-};
+};
NodeListImpl *THIS_CLASS::getChildNodes() {
@@ -132,19 +132,19 @@ NodeListImpl *THIS_CLASS::getChildNodes() {
NodeImpl * THIS_CLASS::getFirstChild() {
return firstChild;
-};
+};
NodeImpl * THIS_CLASS::getLastChild()
{
return lastChild();
-};
+};
ChildNode * THIS_CLASS::lastChild()
{
// last child is stored as the previous sibling of first child
return firstChild != null ? firstChild->previousSibling : null;
-};
+};
void THIS_CLASS::lastChild(ChildNode *node) {
// store lastChild as previous sibling of first child
@@ -167,9 +167,9 @@ unsigned int THIS_CLASS::getLength() {
bool THIS_CLASS::hasChildNodes()
-{
+{
return firstChild!=null;
-};
+};
@@ -177,13 +177,13 @@ NodeImpl *THIS_CLASS::insertBefore(NodeImpl *newChild, NodeImpl *refChild) {
if (isReadOnly())
throw DOM_DOMException(
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
-
+
if (newChild->getOwnerDocument() != ownerDocument)
throw DOM_DOMException(DOM_DOMException::WRONG_DOCUMENT_ERR, null);
-
- // Convert to internal type, to avoid repeated casting
+
+ // Convert to internal type, to avoid repeated casting
ChildNode * newInternal= (ChildNode *)newChild;
-
+
// Prevent cycles in the tree
bool treeSafe=true;
for(NodeImpl *a=this->getParentNode();
@@ -192,11 +192,11 @@ NodeImpl *THIS_CLASS::insertBefore(NodeImpl *newChild, NodeImpl *refChild) {
treeSafe=(newInternal!=a);
if(!treeSafe)
throw DOM_DOMException(DOM_DOMException::HIERARCHY_REQUEST_ERR,null);
-
+
// refChild must in fact be a child of this node (or null)
if (refChild!=null && refChild->getParentNode() != this)
throw DOM_DOMException(DOM_DOMException::NOT_FOUND_ERR,null);
-
+
if (newInternal->isDocumentFragmentImpl())
{
// SLOW BUT SAFE: We could insert the whole subtree without
@@ -205,7 +205,7 @@ NodeImpl *THIS_CLASS::insertBefore(NodeImpl *newChild, NodeImpl *refChild) {
// ends of the list.) But we know some subclasses have special-
// case behavior they add to insertBefore(), so we don't risk it.
// This approch also takes fewer bytecodes.
-
+
// NOTE: If one of the children is not a legal child of this
// node, throw HIERARCHY_REQUEST_ERR before _any_ of the children
// have been transferred. (Alternative behaviors would be to
@@ -213,7 +213,7 @@ NodeImpl *THIS_CLASS::insertBefore(NodeImpl *newChild, NodeImpl *refChild) {
// which are acceptable to the target node, neither of which is
// as robust. PR-DOM-0818 isn't entirely clear on which it
// recommends?????
-
+
// No need to check kids for right-document; if they weren't,
// they wouldn't be kids of that DocFrag.
for(NodeImpl *kid=newInternal->getFirstChild(); // Prescan
@@ -222,14 +222,14 @@ NodeImpl *THIS_CLASS::insertBefore(NodeImpl *newChild, NodeImpl *refChild) {
{
if (!DocumentImpl::isKidOK(this, kid))
throw DOM_DOMException(DOM_DOMException::HIERARCHY_REQUEST_ERR,null);
- }
+ }
while(newInternal->hasChildNodes()) // Move
insertBefore(newInternal->getFirstChild(),refChild);
}
-
+
else if (!DocumentImpl::isKidOK(this, newInternal))
throw DOM_DOMException(DOM_DOMException::HIERARCHY_REQUEST_ERR,null);
-
+
else
{
NodeImpl *oldparent=newInternal->getParentNode();
@@ -243,7 +243,7 @@ NodeImpl *THIS_CLASS::insertBefore(NodeImpl *newChild, NodeImpl *refChild) {
// Attach up
newInternal->ownerNode = this;
newInternal->isOwned(true);
-
+
// Attach before and after
// Note: firstChild.previousSibling == lastChild!!
if (firstChild == null) {
@@ -281,7 +281,7 @@ NodeImpl *THIS_CLASS::insertBefore(NodeImpl *newChild, NodeImpl *refChild) {
}
changed();
-
+
if (this->getOwnerDocument() != null) {
typedef RefVectorOf<RangeImpl> RangeImpls;
RangeImpls* ranges = this->getOwnerDocument()->getRanges();
@@ -297,25 +297,25 @@ NodeImpl *THIS_CLASS::insertBefore(NodeImpl *newChild, NodeImpl *refChild) {
return newInternal;
};
-
-
+
+
NodeImpl *THIS_CLASS::item(unsigned int index) {
ChildNode *node = firstChild;
for(unsigned int i=0; i<index && node!=null; ++i)
node = node->nextSibling;
return node;
};
-
-
-NodeImpl *THIS_CLASS::removeChild(NodeImpl *oldChild)
+
+
+NodeImpl *THIS_CLASS::removeChild(NodeImpl *oldChild)
{
if (isReadOnly())
throw DOM_DOMException(
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
-
+
if (oldChild != null && oldChild->getParentNode() != this)
throw DOM_DOMException(DOM_DOMException::NOT_FOUND_ERR, null);
-
+
//fix other ranges for change before deleting the node
if (this->getOwnerDocument() != null ) {
typedef RefVectorOf<RangeImpl> RangeImpls;
@@ -324,15 +324,15 @@ NodeImpl *THIS_CLASS::removeChild(NodeImpl *oldChild)
unsigned int sz = ranges->size();
if (sz != 0) {
for (unsigned int i =0; i<sz; i++) {
- if (ranges->elementAt(i) != null)
+ if (ranges->elementAt(i) != null)
ranges->elementAt(i)->updateRangeForDeletedNode(oldChild);
}
}
}
}
-
+
ChildNode * oldInternal = (ChildNode *) oldChild;
-
+
// Patch linked list around oldChild
// Note: lastChild == firstChild->previousSibling
if (oldInternal == firstChild) {
@@ -374,35 +374,35 @@ NodeImpl *THIS_CLASS::replaceChild(NodeImpl *newChild, NodeImpl *oldChild)
// changed() already done.
return removeChild(oldChild);
};
-
+
void THIS_CLASS::setReadOnly(bool readOnl, bool deep)
{
NodeImpl::setReadOnly(readOnl, deep);
-
+
if (deep)
// Recursively set kids
- for (ChildNode *mykid = firstChild;
- mykid != null;
+ for (ChildNode *mykid = firstChild;
+ mykid != null;
mykid = mykid->nextSibling)
if(! (mykid->isEntityReference()))
mykid->setReadOnly(readOnl,true);
};
-
-
+
+
//Introduced in DOM Level 2
-
+
void THIS_CLASS::normalize()
{
ChildNode *kid, *next;
for (kid = firstChild; kid != null; kid = next)
{
next = kid->nextSibling;
-
+
// If kid and next are both Text nodes (but _not_ CDATASection,
// which is a subclass of Text), they can be merged.
- if (next != null &&
- kid->isTextImpl() && !(kid->isCDATASectionImpl()) &&
+ if (next != null &&
+ kid->isTextImpl() && !(kid->isCDATASectionImpl()) &&
next->isTextImpl() && !(next->isCDATASectionImpl()) )
{
((TextImpl *) kid)->appendData(((TextImpl *) next)->getData());
@@ -411,13 +411,13 @@ void THIS_CLASS::normalize()
deleteIf(next);
next = kid; // Don't advance; there might be another.
}
-
- // Otherwise it might be an Element, which is handled recursively
+
+ // Otherwise it might be an Element, which is handled recursively
else
if (kid->isElementImpl())
kid->normalize();
};
-
+
// changed() will have occurred when the removeChild() was done,
// so does not have to be reissued.
};
diff --git a/src/idom/IDCommonParentNode.hpp b/src/idom/IDCommonParentNode.hpp
index f0075f7ba87b5ae34e99984c4886ba4bca866f89..ce1103ab3e0cf1b9d70669e32cf986a6daca758f 100644
--- a/src/idom/IDCommonParentNode.hpp
+++ b/src/idom/IDCommonParentNode.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -90,7 +90,7 @@ public:
public:
THIS_CLASS(DocumentImpl *ownerDocument);
THIS_CLASS(const THIS_CLASS &other);
-
+
virtual DocumentImpl * getOwnerDocument();
virtual void setOwnerDocument(DocumentImpl *doc);
diff --git a/src/idom/IDDOMImplementation.cpp b/src/idom/IDDOMImplementation.cpp
index ab6eb9b99c6000e39872b465ea594ddf3efd7da2..8a39b5c3ee56f437333e4376a37731389474638c 100644
--- a/src/idom/IDDOMImplementation.cpp
+++ b/src/idom/IDDOMImplementation.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,64 +56,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:21 andyh
- * Initial revision
- *
- * Revision 1.9 2000/05/09 00:22:31 andyh
- * Memory Cleanup. XMLPlatformUtils::Terminate() deletes all lazily
- * allocated memory; memory leak checking tools will no longer report
- * that leaks exist. (DOM GetElementsByTagID temporarily removed
- * as part of this.)
- *
- * Revision 1.8 2000/04/27 02:52:42 lehors
- * global reorganization similar to what I've done in Java,
- * nodes now are much smaller.
- * The main changes are:
- * renamed NodeContainer to ParentNode,
- * introduced ChildNode and ChildAndParentNode,
- * all the boolean attributes have been changed to bit flags,
- * ownerDocument is no longer an attribute of NodeImpl, only Parent nodes have
- * it, leave nodes rely on their parent to get it, or get it from ownerNode when
- * they do not have a parent,
- * parent Nodes no longer have a direct pointer to the last child
- * instead the last child is stored as the previous sibling of
- * the first child.
- * I also added support for importing a DocumentType as it's done in Java,
- * and got the importNode mechanism back in sync with Java as well.
+ * Revision 1.2 2001/05/11 13:25:40 tng
+ * Copyright update.
*
- * Here are the most significant changes in size:
- * ElementImpl 52 -> 48
- * TextImpl 44 -> 32
- * AttrImpl 52 -> 36
- *
- * Revision 1.7 2000/03/02 19:53:54 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.6 2000/02/10 23:35:10 andyh
- * Update IDDOMImplementation::CreateDocumentType and
- * DOM_DocumentType to match latest from W3C
- *
- * Revision 1.5 2000/02/06 07:47:28 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.4 2000/01/19 21:39:19 andyh
- * DOM L2, fix problems with new style createDocument.
- *
- * Revision 1.3 2000/01/05 01:16:07 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.2 1999/11/30 21:16:25 roddey
- * Changes to add the transcode() method to const XMLCh *, which returns a transcoded
- * version (to local code page) of the DOM string contents. And I changed all of the
- * exception 'throw by pointer' to 'throw by value' style.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:56 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:44:15 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:21 andyh
+ * IDOM
*
*/
@@ -137,17 +84,17 @@ static IDDOMImplementation *gDomimp; // Points to the singleton instance
// by any call to getImplementation().
static const XMLCh gXML[] = // Points to "XML"
- {chLatin_X, chLatin_M, chLatin_L, 0};
+ {chLatin_X, chLatin_M, chLatin_L, 0};
static const XMLCh gxml[] = // Points to "xml"
- {chLatin_x, chLatin_m, chLatin_l, 0};
+ {chLatin_x, chLatin_m, chLatin_l, 0};
static const XMLCh g1_0[] = // Points to "1.0"
- {chDigit_1, chPeriod, chDigit_0, 0};
+ {chDigit_1, chPeriod, chDigit_0, 0};
static const XMLCh g2_0[] = // Points to "2.0"
- {chDigit_2, chPeriod, chDigit_0, 0};
+ {chDigit_2, chPeriod, chDigit_0, 0};
static const XMLCh gTrav[] = // Points to "Traversal"
{chLatin_T, chLatin_r, chLatin_a, chLatin_v, chLatin_e,chLatin_r,
- chLatin_s, chLatin_a, chLatin_l, 0};
+ chLatin_s, chLatin_a, chLatin_l, 0};
IDDOMImplementation::IDDOMImplementation() {
@@ -189,13 +136,13 @@ IDOM_DOMImplementation *IDDOMImplementation::getImplementation() {
}
else
{
-
+
XMLPlatformUtils::registerLazyData
(
new XMLDeleterFor<IDDOMImplementation>(gDomimp)
);
}
-
+
}
return gDomimp;
};
@@ -211,7 +158,7 @@ IDOM_DOMImplementation *IDOM_DOMImplementation::getImplementation()
-bool IDDOMImplementation::hasFeature(const XMLCh * feature, const XMLCh * version)
+bool IDDOMImplementation::hasFeature(const XMLCh * feature, const XMLCh * version)
{
// Currently, we support only XML Level 1 version 1.0
if (XMLString::compareIString(feature, gXML) == 0)
diff --git a/src/idom/IDDOMImplementation.hpp b/src/idom/IDDOMImplementation.hpp
index 9bd956a14b5f438407b1cac51619cfbab2f419dc..9c83d3002f25fc8e765ae21af589c817a38e5680 100644
--- a/src/idom/IDDOMImplementation.hpp
+++ b/src/idom/IDDOMImplementation.hpp
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -50,7 +50,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -58,64 +58,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:21 andyh
- * Initial revision
+ * Revision 1.2 2001/05/11 13:25:40 tng
+ * Copyright update.
*
- * Revision 1.9 2000/05/09 00:22:31 andyh
- * Memory Cleanup. XMLPlatformUtils::Terminate() deletes all lazily
- * allocated memory; memory leak checking tools will no longer report
- * that leaks exist. (DOM GetElementsByTagID temporarily removed
- * as part of this.)
- *
- * Revision 1.8 2000/04/27 02:52:42 lehors
- * global reorganization similar to what I've done in Java,
- * nodes now are much smaller.
- * The main changes are:
- * renamed NodeContainer to ParentNode,
- * introduced ChildNode and ChildAndParentNode,
- * all the boolean attributes have been changed to bit flags,
- * ownerDocument is no longer an attribute of NodeImpl, only Parent nodes have
- * it, leave nodes rely on their parent to get it, or get it from ownerNode when
- * they do not have a parent,
- * parent Nodes no longer have a direct pointer to the last child
- * instead the last child is stored as the previous sibling of
- * the first child.
- * I also added support for importing a DocumentType as it's done in Java,
- * and got the importNode mechanism back in sync with Java as well.
- *
- * Here are the most significant changes in size:
- * ElementImpl 52 -> 48
- * TextImpl 44 -> 32
- * AttrImpl 52 -> 36
- *
- * Revision 1.7 2000/03/02 19:53:54 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.6 2000/02/10 23:35:10 andyh
- * Update DOM_DOMImplementation::CreateDocumentType and
- * DOM_DocumentType to match latest from W3C
- *
- * Revision 1.5 2000/02/06 07:47:28 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.4 2000/01/19 21:39:19 andyh
- * DOM L2, fix problems with new style createDocument.
- *
- * Revision 1.3 2000/01/05 01:16:07 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.2 1999/11/30 21:16:25 roddey
- * Changes to add the transcode() method to DOMString, which returns a transcoded
- * version (to local code page) of the DOM string contents. And I changed all of the
- * exception 'throw by pointer' to 'throw by value' style.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:56 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:44:15 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:21 andyh
+ * IDOM
*
*/
@@ -123,7 +70,7 @@
#include "IDOM_DOMImplementation.hpp"
class IDDOMImplementation: public IDOM_DOMImplementation {
-private:
+private:
IDDOMImplementation();
IDDOMImplementation(const IDDOMImplementation & other);
IDDOMImplementation & operator = (const IDDOMImplementation & other);
diff --git a/src/idom/IDDeepNodeListImpl.cpp b/src/idom/IDDeepNodeListImpl.cpp
index 58c03b6323b675275f40e1c67fac445becb5ab65..fce6de2bb783846a9a8c0dcddb34278a0a1ad31a 100644
--- a/src/idom/IDDeepNodeListImpl.cpp
+++ b/src/idom/IDDeepNodeListImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,49 +56,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:20 andyh
- * Initial revision
- *
- * Revision 1.6 2000/04/27 02:52:42 lehors
- * global reorganization similar to what I've done in Java,
- * nodes now are much smaller.
- * The main changes are:
- * renamed NodeContainer to ParentNode,
- * introduced ChildNode and ChildAndParentNode,
- * all the boolean attributes have been changed to bit flags,
- * ownerDocument is no longer an attribute of NodeImpl, only Parent nodes have
- * it, leave nodes rely on their parent to get it, or get it from ownerNode when
- * they do not have a parent,
- * parent Nodes no longer have a direct pointer to the last child
- * instead the last child is stored as the previous sibling of
- * the first child.
- * I also added support for importing a DocumentType as it's done in Java,
- * and got the importNode mechanism back in sync with Java as well.
+ * Revision 1.2 2001/05/11 13:25:40 tng
+ * Copyright update.
*
- * Here are the most significant changes in size:
- * ElementImpl 52 -> 48
- * TextImpl 44 -> 32
- * AttrImpl 52 -> 36
- *
- * Revision 1.5 2000/03/02 19:53:59 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.4 2000/02/06 07:47:31 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.3 2000/02/04 01:49:30 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.2 2000/01/22 01:38:29 andyh
- * Remove compiler warnings in DOM impl classes
- *
- * Revision 1.1.1.1 1999/11/09 01:08:42 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:44:23 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:20 andyh
+ * IDOM
*
*/
@@ -192,13 +154,13 @@ IDOM_Node *IDDeepNodeListImpl::item(unsigned int index) const
{
#ifdef idom_revisit
NodeImpl *thisNode;
-
+
if(rootNode->changes() != changes)
{
nodes->reset(); // Tree changed. Do it all from scratch!
changes = rootNode->changes();
}
-
+
if(index< nodes->size()) // In the cache
return nodes->elementAt((int) index);
else // Not yet seen
@@ -259,7 +221,7 @@ IDOM_Node *IDDeepNodeListImpl::nextMatchingElementAfter(IDOM_Node *current)
current = next;
}
}
-
+
// Have we found an Element with the right tagName?
// ("*" matches anything.)
if (current != 0 && current != rootNode && current->isElementImpl()) {
@@ -273,7 +235,7 @@ IDOM_Node *IDDeepNodeListImpl::nextMatchingElementAfter(IDOM_Node *current)
return current;
}
}
-
+
// Otherwise continue walking the tree
}
// Fell out of tree-walk; no more instances found
diff --git a/src/idom/IDDeepNodeListImpl.hpp b/src/idom/IDDeepNodeListImpl.hpp
index 67b36e0ffb180d4b3347b887db1a4fe2946c7dbd..2f7178a2a299e3a829b9e5fe7cae35980929efda 100644
--- a/src/idom/IDDeepNodeListImpl.hpp
+++ b/src/idom/IDDeepNodeListImpl.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -48,10 +48,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -59,38 +59,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:20 andyh
- * Initial revision
+ * Revision 1.2 2001/05/11 13:25:40 tng
+ * Copyright update.
*
- * Revision 1.7 2000/03/02 19:53:59 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.6 2000/02/24 20:11:29 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.5 2000/02/06 07:47:31 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.4 2000/02/04 01:49:30 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.3 2000/01/22 01:38:29 andyh
- * Remove compiler warnings in DOM impl classes
- *
- * Revision 1.2 1999/12/21 07:47:06 robweir
- * Patches to support Xalan, where we need to create a
- * "special" DOM with subclassed Nodes.
- *
- * 1. Export the NodeImpl-derived classes
- * 2. Ensure that their constructors have at least protected access
- *
- * Revision 1.1.1.1 1999/11/09 01:08:42 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:44:23 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:20 andyh
+ * IDOM
*
*/
@@ -111,8 +84,8 @@ class IDOM_Node;
class CDOM_EXPORT IDDeepNodeListImpl: public IDOM_NodeList {
private:
- const IDOM_Node *fRootNode;
- const XMLCh *fTagName;
+ const IDOM_Node *fRootNode;
+ const XMLCh *fTagName;
bool fMatchAll;
int fChanges;
IDOM_Node *fCurrentNode;
@@ -122,7 +95,7 @@ private:
const XMLCh * fNamespaceURI;
bool fMatchAllURI;
bool fMatchURIandTagname; //match both namespaceURI and tagName
-
+
private:
IDDeepNodeListImpl(const IDOM_Node *rootNode, const XMLCh *tagName);
IDDeepNodeListImpl(const IDOM_Node *rootNode, //DOM Level 2
@@ -130,7 +103,7 @@ private:
const XMLCh *localName);
public:
- // Factory methods for getting/creating node lists.
+ // Factory methods for getting/creating node lists.
// Because nothing is ever deleted, the implementation caches and recycles
// previously used instances of IDDeepNodeList
//
diff --git a/src/idom/IDDocumentFragmentImpl.cpp b/src/idom/IDDocumentFragmentImpl.cpp
index 0e6a810b968bae3a8c8e3826761cde881c5e68a5..24c2586eac1c6b229c787c981a49d5d0cba70cd6 100644
--- a/src/idom/IDDocumentFragmentImpl.cpp
+++ b/src/idom/IDDocumentFragmentImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -72,7 +72,7 @@ IDDocumentFragmentImpl::IDDocumentFragmentImpl(IDOM_Document *masterDoc)
: fNode(masterDoc), fParent(masterDoc)
{
};
-
+
IDDocumentFragmentImpl::IDDocumentFragmentImpl(const IDDocumentFragmentImpl &other,
bool deep)
@@ -88,7 +88,7 @@ IDDocumentFragmentImpl::~IDDocumentFragmentImpl()
};
-
+
IDOM_Node *IDDocumentFragmentImpl::cloneNode(bool deep) const
{
return new (castToNodeImpl(this)->getOwnerDocument()) IDDocumentFragmentImpl(*this, deep);
@@ -98,7 +98,7 @@ IDOM_Node *IDDocumentFragmentImpl::cloneNode(bool deep) const
const XMLCh * IDDocumentFragmentImpl::getNodeName() const {
static const XMLCh name[] = {chPound, chLatin_d, chLatin_o, chLatin_c, chLatin_u, chLatin_m,
chLatin_e, chLatin_n, chLatin_t, chDash,
- chLatin_f, chLatin_r, chLatin_a, chLatin_g, chLatin_m, chLatin_e, chLatin_n, chLatin_t, 0};
+ chLatin_f, chLatin_r, chLatin_a, chLatin_g, chLatin_m, chLatin_e, chLatin_n, chLatin_t, 0};
return name;
}
diff --git a/src/idom/IDDocumentFragmentImpl.hpp b/src/idom/IDDocumentFragmentImpl.hpp
index ef5a065c5a9afa6878d523d3555656bc5db22ddd..45af8d4e00bec2d781d17ed2fc5200df21c89a41 100644
--- a/src/idom/IDDocumentFragmentImpl.hpp
+++ b/src/idom/IDDocumentFragmentImpl.hpp
@@ -2,38 +2,38 @@
#define IDDocumentFragmentImpl_HEADER_GUARD_
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -47,10 +47,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -87,7 +87,7 @@ protected:
private:
IDDocumentFragmentImpl(const IDDocumentFragmentImpl &other, bool deep);
friend class IDDocumentImpl;
-
+
public:
virtual ~IDDocumentFragmentImpl();
diff --git a/src/idom/IDDocumentImpl.cpp b/src/idom/IDDocumentImpl.cpp
index bdbac29532176cec915fe3583fbc9a7322118fa3..6e0743806befd33ec272b647ceb4fa83cb041e2b 100644
--- a/src/idom/IDDocumentImpl.cpp
+++ b/src/idom/IDDocumentImpl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,16 +48,15 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-
-//
-// file IDDocumentImpl.cpp
-//
+/*
+ * $Id$
+ */
#include <util/XMLUniDefs.hpp>
@@ -113,7 +112,7 @@ class IDOM_NodeFilter;
//
IDDocumentImpl::IDDocumentImpl()
: fNode(this), fParent(this) ,
- fCurrentBlock(0), fFreePtr(0), fFreeBytesRemaining(0)
+ fCurrentBlock(0), fFreePtr(0), fFreeBytesRemaining(0)
{
fDocType = 0;
fDocElement = 0;
@@ -131,11 +130,11 @@ IDDocumentImpl::IDDocumentImpl()
IDDocumentImpl::IDDocumentImpl(const XMLCh *fNamespaceURI,
const XMLCh *qualifiedName,
IDOM_DocumentType *doctype)
- : fNode(this), fParent(this),
- fCurrentBlock(0), fFreePtr(0), fFreeBytesRemaining(0)
+ : fNode(this), fParent(this),
+ fCurrentBlock(0), fFreePtr(0), fFreeBytesRemaining(0)
{
fDocType=0;
-
+
setDocumentType(doctype);
fDocElement=0;
@@ -160,7 +159,7 @@ void IDDocumentImpl::setDocumentType(IDOM_DocumentType *doctype)
if (doctype->getOwnerDocument() != 0 && doctype->getOwnerDocument() != this)
throw IDOM_DOMException( //one doctype can belong to only one IDDocumentImpl
IDOM_DOMException::WRONG_DOCUMENT_ERR, 0);
-
+
castToNodeImpl(doctype)->setOwnerDocument(this);
// The doctype can not have any Entities or Notations yet, because they can not
@@ -168,7 +167,7 @@ void IDDocumentImpl::setDocumentType(IDOM_DocumentType *doctype)
// idom_revisit. What if this doctype is already a child of the document?
appendChild(doctype);
-
+
}
IDDocumentImpl::~IDDocumentImpl()
@@ -491,7 +490,7 @@ void IDDocumentImpl::setNodeValue(const XMLCh *x)
IDOM_Node *IDDocumentImpl::importNode(IDOM_Node *source, bool deep)
{
IDOM_Node *newnode=0;
-
+
switch (source->getNodeType())
{
case IDOM_Node::ELEMENT_NODE :
@@ -601,12 +600,12 @@ IDOM_Node *IDDocumentImpl::importNode(IDOM_Node *source, bool deep)
// No name, no value
break;
}
-
+
case IDOM_Node::DOCUMENT_NODE : // Document can't be child of Document
default: // Unknown node type
throw IDOM_DOMException(IDOM_DOMException::NOT_SUPPORTED_ERR, 0);
}
-
+
// If deep, replicate and attach the kids.
if (deep)
for (IDOM_Node *srckid = source->getFirstChild();
@@ -617,7 +616,7 @@ IDOM_Node *IDDocumentImpl::importNode(IDOM_Node *source, bool deep)
if (newnode->getNodeType() == IDOM_Node::ENTITY_REFERENCE_NODE
|| newnode->getNodeType() == IDOM_Node::ENTITY_REFERENCE_NODE)
castToNodeImpl(newnode)->isReadOnly(true);
-
+
return newnode;
}
@@ -637,7 +636,7 @@ IDOM_Attr *IDDocumentImpl::createAttributeNS(const XMLCh *fNamespaceURI,
{
if(!isXMLName(qualifiedName))
throw IDOM_DOMException(IDOM_DOMException::INVALID_CHARACTER_ERR,0);
- return new (this) IDAttrNSImpl(this, fNamespaceURI, qualifiedName);
+ return new (this) IDAttrNSImpl(this, fNamespaceURI, qualifiedName);
}
@@ -713,7 +712,7 @@ IDOM_Range* IDDocumentImpl::getRanges() const
return 0;
}
-void IDDocumentImpl::removeRange(IDOM_Range* range)
+void IDDocumentImpl::removeRange(IDOM_Range* range)
{
#ifdef idom_revisit
if (fRanges != 0) {
@@ -740,37 +739,37 @@ void IDDocumentImpl::removeRange(IDOM_Range* range)
bool IDDocumentImpl::isKidOK(IDOM_Node *parent, IDOM_Node *child)
{
static int kidOK[14];
-
+
if (kidOK[IDOM_Node::ATTRIBUTE_NODE] == 0)
{
- kidOK[IDOM_Node::DOCUMENT_NODE] =
+ kidOK[IDOM_Node::DOCUMENT_NODE] =
1 << IDOM_Node::ELEMENT_NODE |
- 1 << IDOM_Node::PROCESSING_INSTRUCTION_NODE |
- 1 << IDOM_Node::COMMENT_NODE |
+ 1 << IDOM_Node::PROCESSING_INSTRUCTION_NODE |
+ 1 << IDOM_Node::COMMENT_NODE |
1 << IDOM_Node::DOCUMENT_TYPE_NODE |
1 << IDOM_Node::XML_DECL_NODE;
-
- kidOK[IDOM_Node::DOCUMENT_FRAGMENT_NODE] =
- kidOK[IDOM_Node::ENTITY_NODE] =
- kidOK[IDOM_Node::ENTITY_REFERENCE_NODE] =
- kidOK[IDOM_Node::ELEMENT_NODE] =
+
+ kidOK[IDOM_Node::DOCUMENT_FRAGMENT_NODE] =
+ kidOK[IDOM_Node::ENTITY_NODE] =
+ kidOK[IDOM_Node::ENTITY_REFERENCE_NODE] =
+ kidOK[IDOM_Node::ELEMENT_NODE] =
1 << IDOM_Node::ELEMENT_NODE |
- 1 << IDOM_Node::PROCESSING_INSTRUCTION_NODE |
+ 1 << IDOM_Node::PROCESSING_INSTRUCTION_NODE |
1 << IDOM_Node::COMMENT_NODE |
1 << IDOM_Node::TEXT_NODE |
1 << IDOM_Node::CDATA_SECTION_NODE |
1 << IDOM_Node::ENTITY_REFERENCE_NODE |
1 << IDOM_Node::XML_DECL_NODE;
- kidOK[IDOM_Node::ATTRIBUTE_NODE] =
+ kidOK[IDOM_Node::ATTRIBUTE_NODE] =
1 << IDOM_Node::TEXT_NODE |
1 << IDOM_Node::ENTITY_REFERENCE_NODE;
-
- kidOK[IDOM_Node::PROCESSING_INSTRUCTION_NODE] =
- kidOK[IDOM_Node::COMMENT_NODE] =
- kidOK[IDOM_Node::TEXT_NODE] =
- kidOK[IDOM_Node::CDATA_SECTION_NODE] =
- kidOK[IDOM_Node::NOTATION_NODE] =
+
+ kidOK[IDOM_Node::PROCESSING_INSTRUCTION_NODE] =
+ kidOK[IDOM_Node::COMMENT_NODE] =
+ kidOK[IDOM_Node::TEXT_NODE] =
+ kidOK[IDOM_Node::CDATA_SECTION_NODE] =
+ kidOK[IDOM_Node::NOTATION_NODE] =
0;
};
int p=parent->getNodeType();
@@ -808,12 +807,12 @@ void IDDocumentImpl::setUserData(void* val)
fNode.hasUserData(true);
else
fNode.hasUserData(false);
-};
+};
-void IDDocumentImpl::changed()
+void IDDocumentImpl::changed()
{
fChanges++;
}
diff --git a/src/idom/IDDocumentImpl.hpp b/src/idom/IDDocumentImpl.hpp
index 65d5703cfca480b3c03b9921ccc57b7ac042981d..03fdcfc9a96e5ae0f509a1a7c4f7ec99fc9b8c35 100644
--- a/src/idom/IDDocumentImpl.hpp
+++ b/src/idom/IDDocumentImpl.hpp
@@ -4,7 +4,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -51,7 +51,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -168,7 +168,7 @@ public:
public:
IDDocumentImpl();
IDDocumentImpl(const XMLCh *namespaceURI, //DOM Level 2
- const XMLCh *qualifiedName,
+ const XMLCh *qualifiedName,
IDOM_DocumentType *doctype);
virtual ~IDDocumentImpl();
diff --git a/src/idom/IDDocumentTypeImpl.cpp b/src/idom/IDDocumentTypeImpl.cpp
index e0b9271a8d86a50cd668936ba77350cdebe9d778..aeed3c4ddda893fe9c56f933da8b1abca132edd1 100644
--- a/src/idom/IDDocumentTypeImpl.cpp
+++ b/src/idom/IDDocumentTypeImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -67,7 +67,7 @@
IDDocumentTypeImpl::IDDocumentTypeImpl(IDOM_Document *ownerDoc,
- const XMLCh *dtName)
+ const XMLCh *dtName)
: fNode(ownerDoc), fParent(ownerDoc),
publicId(0), systemId(0), internalSubset(0) //DOM Level 2
, intSubsetReading(false)
@@ -75,7 +75,7 @@ IDDocumentTypeImpl::IDDocumentTypeImpl(IDOM_Document *ownerDoc,
name = ((IDDocumentImpl *)ownerDoc)->getPooledString(dtName);
entities = new (ownerDoc) IDNamedNodeMapImpl(this);
notations = new (ownerDoc) IDNamedNodeMapImpl(this);
-
+
};
@@ -110,7 +110,7 @@ IDDocumentTypeImpl::IDDocumentTypeImpl(const IDDocumentTypeImpl &other, bool dee
fParent.cloneChildren(&other);
entities = ((IDNamedNodeMapImpl *)other.entities)->cloneMap(this);
notations= ((IDNamedNodeMapImpl *)other.notations)->cloneMap(this);
-
+
//DOM Level 2
publicId = other.publicId;
systemId = other.systemId;
diff --git a/src/idom/IDDocumentTypeImpl.hpp b/src/idom/IDDocumentTypeImpl.hpp
index f289546f2db9af508ce85a7d863528aeb2945d55..26d92f739a9518019e8b0b5a3e978b853d1bcedc 100644
--- a/src/idom/IDDocumentTypeImpl.hpp
+++ b/src/idom/IDDocumentTypeImpl.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -48,10 +48,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -104,7 +104,7 @@ private:
bool isIntSubsetReading() const;
friend class IDOMParser;
-
+
public:
IDDocumentTypeImpl(IDOM_Document *, const XMLCh *);
IDDocumentTypeImpl(IDOM_Document *,
@@ -121,9 +121,9 @@ public:
virtual const XMLCh * getName() const;
virtual IDOM_NamedNodeMap * getNotations() const;
virtual void setReadOnly(bool readOnly, bool deep);
-
+
//Introduced in DOM Level 2
-
+
virtual const XMLCh * getPublicId() const;
virtual const XMLCh * getSystemId() const;
virtual const XMLCh * getInternalSubset() const;
diff --git a/src/idom/IDElementImpl.cpp b/src/idom/IDElementImpl.cpp
index c321742c0a57351b32a54095019565c973bedd39..3588c604ddb9318ea85dac7968f05fc34d720c07 100644
--- a/src/idom/IDElementImpl.cpp
+++ b/src/idom/IDElementImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -69,7 +69,7 @@
#include "IDParentNode.hpp"
#include "IDStringPool.hpp"
-
+
//#include "IDDeepNodeListImpl.hpp"
//#include "IDDocumentImpl.hpp"
//#include "IDDocumentTypeImpl.hpp"
@@ -92,7 +92,7 @@ IDElementImpl::IDElementImpl(IDOM_Document *ownerDoc, const XMLCh *eName)
IDElementImpl::IDElementImpl(const IDElementImpl &other, bool deep)
: fNode(other.getOwnerDocument()),
- fParent(other.getOwnerDocument()),
+ fParent(other.getOwnerDocument()),
fAttributes(this, &other.fAttributes)
{
fName = other.fName;
@@ -170,7 +170,7 @@ IDOM_NodeList *IDElementImpl::getElementsByTagName(const XMLCh *tagname) const
const XMLCh * IDElementImpl::getTagName() const
{
return fName;
-}
+}
void IDElementImpl::removeAttribute(const XMLCh *nam)
@@ -178,7 +178,7 @@ void IDElementImpl::removeAttribute(const XMLCh *nam)
if (fNode.isReadOnly())
throw IDOM_DOMException(
IDOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, 0);
-
+
IDOM_Node *att = fAttributes.getNamedItem(nam);
if (att != 0)
{
@@ -188,23 +188,23 @@ void IDElementImpl::removeAttribute(const XMLCh *nam)
-IDOM_Attr *IDElementImpl::removeAttributeNode(IDOM_Attr *oldAttr)
+IDOM_Attr *IDElementImpl::removeAttributeNode(IDOM_Attr *oldAttr)
{
if (fNode.isReadOnly())
throw IDOM_DOMException(
IDOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, 0);
-
+
IDOM_Node *found = fAttributes.getNamedItem(oldAttr->getName());
-
+
// If it is in fact the right object, remove it.
-
+
if (found == oldAttr)
fAttributes.removeNamedItem(oldAttr->getName());
else
throw IDOM_DOMException(IDOM_DOMException::NOT_FOUND_ERR, 0);
-
+
return (IDOM_Attr *)found;
-
+
};
@@ -214,7 +214,7 @@ void IDElementImpl::setAttribute(const XMLCh *nam, const XMLCh *val)
if (fNode.isReadOnly())
throw IDOM_DOMException(
IDOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, 0);
-
+
IDOM_Attr* newAttr = getAttributeNode(nam);
if (!newAttr)
{
@@ -222,7 +222,7 @@ void IDElementImpl::setAttribute(const XMLCh *nam, const XMLCh *val)
fAttributes.setNamedItem(newAttr);
}
- newAttr->setNodeValue(val);
+ newAttr->setNodeValue(val);
};
@@ -232,7 +232,7 @@ IDOM_Attr * IDElementImpl::setAttributeNode(IDOM_Attr *newAttr)
if (fNode.isReadOnly())
throw IDOM_DOMException(
IDOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, 0);
-
+
if (newAttr->getNodeType() != IDOM_Node::ATTRIBUTE_NODE)
throw IDOM_DOMException(IDOM_DOMException::WRONG_DOCUMENT_ERR, 0);
// idom_revisit. Exception doesn't match test.
@@ -241,7 +241,7 @@ IDOM_Attr * IDElementImpl::setAttributeNode(IDOM_Attr *newAttr)
(IDOM_Attr *) fAttributes.getNamedItem(newAttr->getName());
// This will throw INUSE if necessary
fAttributes.setNamedItem(newAttr);
-
+
return oldAttr;
};
@@ -276,7 +276,7 @@ void IDElementImpl::setAttributeNS(const XMLCh *fNamespaceURI,
if (fNode.isReadOnly())
throw IDOM_DOMException(
IDOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, 0);
-
+
IDOM_Attr *newAttr =
this->fNode.getOwnerDocument()->createAttributeNS(fNamespaceURI, qualifiedName);
newAttr->setNodeValue(fValue);
@@ -290,10 +290,10 @@ void IDElementImpl::removeAttributeNS(const XMLCh *fNamespaceURI,
if (fNode.isReadOnly())
throw IDOM_DOMException(
IDOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, 0);
-
+
IDOM_Attr *att =
(IDOM_Attr *)fAttributes.getNamedItemNS(fNamespaceURI, fLocalName);
- // Remove it
+ // Remove it
if (att != 0) {
fAttributes.removeNamedItemNS(fNamespaceURI, fLocalName);
}
@@ -312,15 +312,15 @@ IDOM_Attr *IDElementImpl::setAttributeNodeNS(IDOM_Attr *newAttr)
if (fNode.isReadOnly())
throw IDOM_DOMException(
IDOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, 0);
-
+
if (newAttr -> getOwnerDocument() != this -> getOwnerDocument())
throw IDOM_DOMException(IDOM_DOMException::WRONG_DOCUMENT_ERR, 0);
IDOM_Attr *oldAttr = (IDOM_Attr *) fAttributes.getNamedItemNS(newAttr->getNamespaceURI(), newAttr->getLocalName());
-
+
// This will throw INUSE if necessary
fAttributes.setNamedItemNS(newAttr);
-
+
return oldAttr;
}
@@ -335,7 +335,7 @@ IDOM_NodeList *IDElementImpl::getElementsByTagNameNS(const XMLCh *fNamespaceURI,
// DOM_NamedNodeMap UTILITIES
#ifdef idom_revisit
-NamedNodeMapImpl *IDElementImpl::NNM_cloneMap(IDOM_Node *nnm_ownerNode)
+NamedNodeMapImpl *IDElementImpl::NNM_cloneMap(IDOM_Node *nnm_ownerNode)
{
return (getAttributes() == 0) ? 0 : nnm_ownerNode->getAttributes()->cloneMap(nnm_ownerNode);
}
@@ -360,7 +360,7 @@ IDOM_Node *IDElementImpl::NNM_item(unsigned int nnm_index)
return (getAttributes() == 0) ? 0 : getAttributes()->item(nnm_index);
}
-void IDElementImpl::NNM_removeAll()
+void IDElementImpl::NNM_removeAll()
{
if (getAttributes() != 0)
getAttributes()->removeAll();
@@ -444,7 +444,7 @@ void IDElementImpl::setupDefaultAttributes()
#ifdef idom_revisit
AttrMapImpl* defAttrs = getDefaultAttributes();
- if (defAttrs)
+ if (defAttrs)
fAttributes = new (getOwnderDocument()) AttrMapImpl(this, defAttrs);
#endif
diff --git a/src/idom/IDElementImpl.hpp b/src/idom/IDElementImpl.hpp
index d2e832d15810c1cb61ca846eb748dcfdda4639be..ad3d88383d38c6d784c5498bc15308f150157aec 100644
--- a/src/idom/IDElementImpl.hpp
+++ b/src/idom/IDElementImpl.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -48,10 +48,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -92,16 +92,16 @@ class CDOM_EXPORT IDElementImpl: public IDOM_Element {
public:
IDNodeImpl fNode;
IDParentNode fParent;
- IDChildNode fChild;
- IDAttrMapImpl fAttributes;
+ IDChildNode fChild;
+ IDAttrMapImpl fAttributes;
const XMLCh *fName;
-
+
public:
IDElementImpl(IDOM_Document *ownerDoc, const XMLCh *name);
-
+
IDElementImpl(const IDElementImpl &other, bool deep=false);
virtual ~IDElementImpl();
-
+
// Declare functions from IDOM_Node. They all must be implemented by this class
IDOM_NODE_FUNCTIONS;
@@ -151,7 +151,7 @@ public:
virtual NodeImpl *NNM_removeNamedItemNS(const XMLCh *nnm_namespaceURI, const XMLCh *nnm_localName);
virtual void NNM_setOwnerDocument(DocumentImpl *nnm_doc);
#endif //idom_revisit
-
+
// default attribute helper functions
virtual IDAttrMapImpl *getDefaultAttributes();
diff --git a/src/idom/IDElementNSImpl.cpp b/src/idom/IDElementNSImpl.cpp
index c759d4d2dc36106d6efeb7864f1ca99f4640c744..d658f4102920ae87ad8915a6280e66f1e3c21aa0 100644
--- a/src/idom/IDElementNSImpl.cpp
+++ b/src/idom/IDElementNSImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -105,10 +105,10 @@ IDElementNSImpl::IDElementNSImpl(IDOM_Document *ownerDoc,
nonConstfName[index] = t; // put what is probably the ':' back into the
// original name.
}
-
+
const XMLCh *pooledURI = ((IDDocumentImpl *)ownerDoc)->getPooledString(namespaceURI);
fNamespaceURI = IDNodeImpl::mapPrefix(prefix, pooledURI, IDOM_Node::ELEMENT_NODE);
-};
+};
IDElementNSImpl::IDElementNSImpl(const IDElementNSImpl &other, bool deep) :
IDElementImpl(other, deep)
@@ -179,7 +179,7 @@ void IDElementNSImpl::setPrefix(const XMLCh *prefix)
if (XMLString::indexOf(prefix, chColon) != -1) {
throw IDOM_DOMException(IDOM_DOMException::NAMESPACE_ERR, 0);
}
-
+
// node name is changed too, to be "newPrefix:localName"
// idom_revisit. Add code for case when names are too long to be held
// in the temp stack buffer.
diff --git a/src/idom/IDElementNSImpl.hpp b/src/idom/IDElementNSImpl.hpp
index e179bd01d26f6daca1d2bc228f1676b9ff3e7f4c..4f01b106dddca8c7c48bbe04653a265115d2cd7a 100644
--- a/src/idom/IDElementNSImpl.hpp
+++ b/src/idom/IDElementNSImpl.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -48,10 +48,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -79,14 +79,14 @@ protected:
//Introduced in DOM Level 2
const XMLCh * fNamespaceURI; //namespace URI of this node
const XMLCh * fLocalName; //local part of qualified name
-
-
+
+
public:
IDElementNSImpl(IDOM_Document *ownerDoc, const XMLCh *name);
IDElementNSImpl(IDOM_Document *ownerDoc, //DOM Level 2
const XMLCh *namespaceURI, const XMLCh *qualifiedName);
IDElementNSImpl(const IDElementNSImpl &other, bool deep=false);
-
+
virtual IDOM_Node * cloneNode(bool deep) const;
//Introduced in DOM Level 2
virtual const XMLCh *getNamespaceURI() const;
diff --git a/src/idom/IDEntityImpl.cpp b/src/idom/IDEntityImpl.cpp
index 895a426aaec75b33e55363633a3c57ee7c6fe8c8..eb2ce8cf8e1a414edb47089946f0e4045052ac25 100644
--- a/src/idom/IDEntityImpl.cpp
+++ b/src/idom/IDEntityImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -112,18 +112,18 @@ short IDEntityImpl::getNodeType() const {
const XMLCh * IDEntityImpl::getNotationName() const
{
return fNotationName;
-};
+};
const XMLCh * IDEntityImpl::getPublicId() const {
return fPublicId;
-};
+};
const XMLCh * IDEntityImpl::getSystemId() const
{
return fSystemId;
-};
+};
void IDEntityImpl::setNodeValue(const XMLCh *arg)
@@ -170,13 +170,13 @@ void IDEntityImpl::cloneEntityRefTree() const
// called from a bunch of logically const methods, like
// getFirstChild().
IDEntityImpl *ncThis = (IDEntityImpl *)this;
- //lazily clone the entityRef tree to this entity
+ //lazily clone the entityRef tree to this entity
if (fParent.fFirstChild != 0)
return;
-
+
if (!fRefEntity)
return;
-
+
ncThis->fNode.isReadOnly(false);
ncThis->fParent.cloneChildren(fRefEntity);
ncThis->fNode.isReadOnly(true);
diff --git a/src/idom/IDEntityImpl.hpp b/src/idom/IDEntityImpl.hpp
index 78bca3b03cdf5741a7a139c11ceb5248049c6c24..bbba019fcb21c87992d1e9e658941a66c8803dc8 100644
--- a/src/idom/IDEntityImpl.hpp
+++ b/src/idom/IDEntityImpl.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -48,10 +48,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -95,7 +95,7 @@ public:
IDEntityImpl(IDOM_Document *doc, const XMLCh *eName);
IDEntityImpl(const IDEntityImpl &other, bool deep=false);
virtual ~IDEntityImpl();
-
+
// Declare all of the functions from IDOM_Node.
IDOM_NODE_FUNCTIONS;
diff --git a/src/idom/IDEntityReferenceImpl.cpp b/src/idom/IDEntityReferenceImpl.cpp
index 609b3d2516181c4f5fe842f090065a4de65c5d5d..8603be5104e972db1221bdf7813fd3385c4c7a70 100644
--- a/src/idom/IDEntityReferenceImpl.cpp
+++ b/src/idom/IDEntityReferenceImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -71,13 +71,13 @@
* Similarly, non-validating XML processors are not required to read
* or process entity declarations made in the external subset or
* declared in external parameter entities. Hence, some applications
-* may not make the replacement value available for Parsed Entities
+* may not make the replacement value available for Parsed Entities
* of these types.
* <P>
-* EntityReference behaves as a read-only node, and the children of
+* EntityReference behaves as a read-only node, and the children of
* the EntityReference (which reflect those of the Entity, and should
-* also be read-only) give its replacement value, if any. They are
-* supposed to automagically stay in synch if the DocumentType is
+* also be read-only) give its replacement value, if any. They are
+* supposed to automagically stay in synch if the DocumentType is
* updated with new values for the Entity.
* <P>
* The defined behavior makes efficient storage difficult for the DOM
@@ -105,7 +105,7 @@
* changes in the Entity. And it can take advantage of the same
* structure-change-monitoring code I implemented to support
* DeepNodeList.
-*
+*
* @author Rania Y. Khalaf
* @author Joseph Kesselman
* @since PR-DOM-Level-1-19980818.
@@ -144,7 +144,7 @@ IDEntityReferenceImpl::IDEntityReferenceImpl(const IDEntityReferenceImpl &other,
-IDEntityReferenceImpl::~IDEntityReferenceImpl()
+IDEntityReferenceImpl::~IDEntityReferenceImpl()
{
}
@@ -182,7 +182,7 @@ void IDEntityReferenceImpl::setNodeValue(const XMLCh *x)
* that will throw a NO_MODIFICATION_ALLOWED_ERR DOMException.
* <P>
* If you want to alter its contents, edit the Entity definition.
-*
+*
* @param readOnly boolean
*/
void IDEntityReferenceImpl::setReadOnly(bool readOnl,bool deep)
diff --git a/src/idom/IDEntityReferenceImpl.hpp b/src/idom/IDEntityReferenceImpl.hpp
index e14ea3517fb71873398d1c5fa9eed11920c5681f..8599f17bffe757a0c31e6ac9e36480b1642a49de 100644
--- a/src/idom/IDEntityReferenceImpl.hpp
+++ b/src/idom/IDEntityReferenceImpl.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -48,10 +48,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -86,7 +86,7 @@ private:
const XMLCh *fName;
friend class IDOMParser;
-
+
public:
IDEntityReferenceImpl(IDOM_Document *ownerDoc, const XMLCh *entityName);
IDEntityReferenceImpl(const IDEntityReferenceImpl &other, bool deep=false);
@@ -94,7 +94,7 @@ public:
// Declare all of the functions from IDOM_Node.
IDOM_NODE_FUNCTIONS;
-
+
virtual void setReadOnly(bool readOnly,bool deep);
};
diff --git a/src/idom/IDNameNodeFilter.hpp b/src/idom/IDNameNodeFilter.hpp
index 025b521a98bb96557cbe5fd87e34ede65fbcc965..a21c161f7949401c8fce5ada161477cc642f2a02 100644
--- a/src/idom/IDNameNodeFilter.hpp
+++ b/src/idom/IDNameNodeFilter.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,25 +56,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:24 andyh
- * Initial revision
+ * Revision 1.2 2001/05/11 13:25:44 tng
+ * Copyright update.
*
- * Revision 1.4 2000/02/24 20:11:30 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.3 2000/02/15 23:17:37 andyh
- * Update Doc++ API comments
- * NameSpace bugfix and update to track W3C
- * Chih Hsiang Chou
- *
- * Revision 1.2 2000/02/06 07:47:33 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.1.1.1 1999/11/09 01:09:12 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:28 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:24 andyh
+ * IDOM
*
*/
diff --git a/src/idom/IDNamedNodeMapImpl.cpp b/src/idom/IDNamedNodeMapImpl.cpp
index 2bf14b836c6597f7e3b1f97c9dc9435c81b4e493..a0f75a9ed69a65ed1b804b20717d731a0f25b492 100644
--- a/src/idom/IDNamedNodeMapImpl.cpp
+++ b/src/idom/IDNamedNodeMapImpl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -299,7 +299,7 @@ int IDNamedNodeMapImpl::findNamePoint(const XMLCh *namespaceURI,
return -1;
// This is a linear search through the same fNodes Vector.
// The Vector is sorted on the DOM Level 1 nodename.
- // The DOM Level 2 NS keys are namespaceURI and Localname,
+ // The DOM Level 2 NS keys are namespaceURI and Localname,
// so we must linear search thru it.
// In addition, to get this to work with fNodes without any namespace
// (namespaceURI and localNames are both 0) we then use the nodeName
@@ -356,7 +356,7 @@ IDOM_Node * IDNamedNodeMapImpl::setNamedItemNS(IDOM_Node *arg)
throw IDOM_DOMException(IDOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, 0);
if (castToNodeImpl(arg)->isOwned())
throw IDOM_DOMException(IDOM_DOMException::INUSE_ATTRIBUTE_ERR,0);
-
+
castToNodeImpl(arg)->fOwnerNode = fOwnerNode;
castToNodeImpl(arg)->isOwned(true);
int i=findNamePoint(arg->getNamespaceURI(), arg->getLocalName());
@@ -374,7 +374,7 @@ IDOM_Node * IDNamedNodeMapImpl::setNamedItemNS(IDOM_Node *arg)
castToNodeImpl(previous)->fOwnerNode = fOwnerNode->getOwnerDocument();
castToNodeImpl(previous)->isOwned(false);
}
-
+
return previous;
};
@@ -393,7 +393,7 @@ IDOM_Node *IDNamedNodeMapImpl::removeNamedItemNS(const XMLCh *namespaceURI,
int i = findNamePoint(namespaceURI, localName);
if (i < 0)
throw IDOM_DOMException(IDOM_DOMException::NOT_FOUND_ERR, 0);
-
+
IDOM_Node * n = fNodes -> elementAt(i);
fNodes -> removeElementAt(i); //remove n from nodes
castToNodeImpl(n)->fOwnerNode = fOwnerNode->getOwnerDocument();
diff --git a/src/idom/IDNamedNodeMapImpl.hpp b/src/idom/IDNamedNodeMapImpl.hpp
index 1bb2403e70a831de531de2d3c65914c5e659357b..7b8b039659e1be02fa58d25afb8f7d26a20875c9 100644
--- a/src/idom/IDNamedNodeMapImpl.hpp
+++ b/src/idom/IDNamedNodeMapImpl.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -48,10 +48,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -91,10 +91,10 @@ protected:
virtual void cloneContent(const IDNamedNodeMapImpl *srcmap);
bool readOnly() {return false;}; // idom_revisit. Look at owner node read-only.
-
+
public:
IDNamedNodeMapImpl(IDOM_Node *ownerNode);
-
+
virtual ~IDNamedNodeMapImpl();
virtual IDNamedNodeMapImpl *cloneMap(IDOM_Node *ownerNode);
virtual int findNamePoint(const XMLCh *name) const;
diff --git a/src/idom/IDNodeIDMap.cpp b/src/idom/IDNodeIDMap.cpp
index 778a40987a098302ad7f3d9f01c7c74a01c04f1e..22af277e3356ebc03d0498dc5b2a69aa5e88a3f9 100644
--- a/src/idom/IDNodeIDMap.cpp
+++ b/src/idom/IDNodeIDMap.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,15 +45,19 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
+/*
+ * $Id$
+ */
+
#include "IDAttrImpl.hpp"
#include "IDDocumentImpl.hpp"
#include "IDNodeIDMap.hpp"
@@ -65,7 +69,7 @@ static const int gPrimes[] = {997, 9973, 99991, 999983, 0 }; // To do - add a f
static const float gMaxFill = 0.8f; // The maximum fraction of the total
// table entries to consume before exanding.
-IDNodeIDMap::IDNodeIDMap(int initialSize, IDOM_Document *doc)
+IDNodeIDMap::IDNodeIDMap(int initialSize, IDOM_Document *doc)
{
fDoc = doc;
@@ -79,7 +83,7 @@ IDNodeIDMap::IDNodeIDMap(int initialSize, IDOM_Document *doc)
throw "IDNodeIDMap::IDNodeIDMap - big trouble.";
}
}
-
+
fSize = gPrimes[fSizeIndex];
fNumEntries = 0;
fMaxEntries = (unsigned long)(float(fSize) * gMaxFill);
@@ -122,7 +126,7 @@ void IDNodeIDMap::add(IDOM_Attr *attr)
//
// Loop looking for an empty slot for this ID.
- // Don't even bother checking to see if the ID is already there -
+ // Don't even bother checking to see if the ID is already there -
// the table is only filled by the parser from valid documents, which
// can not have duplicates. Behavior of invalid docs is not defined.
//
@@ -262,10 +266,10 @@ void IDNodeIDMap::growTable()
if ((oldTable[i] != 0) && (oldTable[i] != (IDOM_Attr *)-1))
add(oldTable[i]);
}
-
+
// delete [] oldTable; (The document owns the storage. The old table will just
// need to leak until until the document is discarded.)
-
+
};
diff --git a/src/idom/IDNodeIDMap.hpp b/src/idom/IDNodeIDMap.hpp
index 17db756e49443078a1c9b6d65ecb72b318a2c70d..3448c9e8e7022019b059515bdd8a07671f8d7f30 100644
--- a/src/idom/IDNodeIDMap.hpp
+++ b/src/idom/IDNodeIDMap.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -48,15 +48,18 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
+/*
+ * $Id$
+ */
//
// This file is part of the internal implementation of the C++ XML DOM.
@@ -107,7 +110,7 @@ private:
private:
IDOM_Attr **fTable;
unsigned int fSizeIndex; // Index of the current table size in the
- // array of possible table sizes.
+ // array of possible table sizes.
unsigned int fSize; // The current size of the table array
// (number of slots, not bytes.)
unsigned int fNumEntries; // The number of entries used.
diff --git a/src/idom/IDNodeImpl.cpp b/src/idom/IDNodeImpl.cpp
index db8dd40973e647cd212fd09cf6f03fd82231036f..4035f00d106a061b91bc1c89f4a8251287cdbafa 100644
--- a/src/idom/IDNodeImpl.cpp
+++ b/src/idom/IDNodeImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -92,25 +92,25 @@ IDNodeImpl::IDNodeImpl(IDOM_Node *ownerNode)
this->flags = 0;
// as long as we do not have any owner, fOwnerNode is our ownerDocument
fOwnerNode = ownerNode;
-};
+};
// This only makes a shallow copy, cloneChildren must also be called for a
// deep clone
IDNodeImpl::IDNodeImpl(const IDNodeImpl &other) {
this->flags = other.flags;
this->isReadOnly(false);
-
+
// Need to break the association w/ original parent
this->fOwnerNode = other.getOwnerDocument();
this->isOwned(false);
};
-
+
IDNodeImpl::~IDNodeImpl() {
//
// Note: With IDOM memory mgmt, destructors are not called for nodes.
-
+
// if (hasUserData())
// {
// setUserData(0);
@@ -130,12 +130,12 @@ int IDParentNode::changes() const
{
IDDocumentImpl *doc = (IDDocumentImpl *)(castToNode(this)->getOwnerDocument());
return doc->changes();
-};
+};
-IDOM_Node * IDNodeImpl::appendChild(IDOM_Node *newChild)
+IDOM_Node * IDNodeImpl::appendChild(IDOM_Node *newChild)
{
// Only node types that don't allow children will use this default function.
// Others will go to IDParentNode::appendChild.
@@ -159,18 +159,18 @@ IDOM_NodeList *IDNodeImpl::getChildNodes() const {
IDOM_Node * IDNodeImpl::getFirstChild() const {
return 0; // overridden in ParentNode
-};
+};
-IDOM_Node * IDNodeImpl::getLastChild() const
+IDOM_Node * IDNodeImpl::getLastChild() const
{
return 0; // overridden in ParentNode
-};
+};
IDOM_Node * IDNodeImpl::getNextSibling() const {
return 0; // overridden in ChildNode
-};
+};
const XMLCh * IDNodeImpl::getNodeValue() const {
@@ -182,7 +182,7 @@ const XMLCh * IDNodeImpl::getNodeValue() const {
// Unlike the external getOwnerDocument, this one returns the owner document
// for document nodes as well as all of the other node types.
//
-IDOM_Document *IDNodeImpl::getOwnerDocument() const
+IDOM_Document *IDNodeImpl::getOwnerDocument() const
{
if (!this->isLeafNode())
{
@@ -197,7 +197,7 @@ IDOM_Document *IDNodeImpl::getOwnerDocument() const
assert (fOwnerNode->getNodeType() == IDOM_Node::DOCUMENT_NODE);
return (IDOM_Document *)fOwnerNode;
}
-};
+};
void IDNodeImpl::setOwnerDocument(IDOM_Document *doc) {
@@ -210,16 +210,16 @@ void IDNodeImpl::setOwnerDocument(IDOM_Document *doc) {
}
}
-IDOM_Node * IDNodeImpl::getParentNode() const
+IDOM_Node * IDNodeImpl::getParentNode() const
{
return 0; // overridden in ChildNode
-};
+};
IDOM_Node* IDNodeImpl::getPreviousSibling() const
{
return 0; // overridden in ChildNode
-};
+};
void *IDNodeImpl::getUserData() const
@@ -234,9 +234,9 @@ void *IDNodeImpl::getUserData() const
};
bool IDNodeImpl::hasChildNodes() const
-{
+{
return false;
-};
+};
@@ -244,15 +244,15 @@ IDOM_Node *IDNodeImpl::insertBefore(IDOM_Node *newChild, IDOM_Node *refChild) {
throw IDOM_DOMException(IDOM_DOMException::HIERARCHY_REQUEST_ERR, 0);
return 0;
};
-
-IDOM_Node *IDNodeImpl::removeChild(IDOM_Node *oldChild)
+
+IDOM_Node *IDNodeImpl::removeChild(IDOM_Node *oldChild)
{
throw IDOM_DOMException(IDOM_DOMException::NOT_FOUND_ERR, 0);
return 0;
};
-
-
+
+
IDOM_Node *IDNodeImpl::replaceChild(IDOM_Node *newChild, IDOM_Node *oldChild)
{
throw IDOM_DOMException(IDOM_DOMException::HIERARCHY_REQUEST_ERR,0);
@@ -273,10 +273,10 @@ void IDNodeImpl::setNodeValue(const XMLCh *val)
void IDNodeImpl::setReadOnly(bool readOnl, bool deep)
{
this->isReadOnly(readOnl);
-
+
if (deep) {
- for (IDOM_Node *mykid = castToNode(this)->getFirstChild();
- mykid != 0;
+ for (IDOM_Node *mykid = castToNode(this)->getFirstChild();
+ mykid != 0;
mykid = mykid->getNextSibling())
if(mykid->getNodeType() != IDOM_Node::ENTITY_REFERENCE_NODE)
castToNodeImpl(mykid)->setReadOnly(readOnl,true);
@@ -293,12 +293,12 @@ void IDNodeImpl::setUserData(void * val)
hasUserData(true);
else
hasUserData(false);
-};
+};
//Introduced in DOM Level 2
-
+
void IDNodeImpl::normalize()
{
// does nothing by default, overridden by subclasses
@@ -347,10 +347,10 @@ static const XMLCh s_xmlns[] = {chLatin_x, chLatin_m, chLatin_l, chLatin_n, chLa
static const XMLCh s_xmlnsURI[] = // "http://www.w3.org/2000/xmlns/"
{ chLatin_h, chLatin_t, chLatin_t, chLatin_p, chColon, chForwardSlash, chForwardSlash,
chLatin_w, chLatin_w, chLatin_w, chPeriod, chLatin_w, chDigit_3, chPeriod,
- chLatin_o, chLatin_r, chLatin_g, chForwardSlash,
+ chLatin_o, chLatin_r, chLatin_g, chForwardSlash,
chDigit_2, chDigit_0, chDigit_0, chDigit_0, chForwardSlash,
chLatin_x, chLatin_m, chLatin_l, chLatin_n, chLatin_s, chForwardSlash, chNull};
-
+
const XMLCh *IDNodeImpl::getXmlString() {return s_xml;};
const XMLCh *IDNodeImpl::getXmlURIString() {return s_xmlURI;};
@@ -382,10 +382,10 @@ const XMLCh* IDNodeImpl::mapPrefix(const XMLCh *prefix,
static const XMLCh s_xmlnsURI[] = // "http://www.w3.org/2000/xmlns/"
{ chLatin_h, chLatin_t, chLatin_t, chLatin_p, chColon, chForwardSlash, chForwardSlash,
chLatin_w, chLatin_w, chLatin_w, chPeriod, chLatin_w, chDigit_3, chPeriod,
- chLatin_o, chLatin_r, chLatin_g, chForwardSlash,
+ chLatin_o, chLatin_r, chLatin_g, chForwardSlash,
chDigit_2, chDigit_0, chDigit_0, chDigit_0, chForwardSlash,
chLatin_x, chLatin_m, chLatin_l, chLatin_n, chLatin_s, chForwardSlash, chNull};
-
+
if (prefix == 0)
return namespaceURI;
diff --git a/src/idom/IDNodeImpl.hpp b/src/idom/IDNodeImpl.hpp
index 379cee9309269e9701744ee64cf94faa55e623e7..b59ebd217e1d683110bfa31a59dbd43997da3d34 100644
--- a/src/idom/IDNodeImpl.hpp
+++ b/src/idom/IDNodeImpl.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -48,10 +48,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -120,7 +120,7 @@ public:
IDNodeImpl(IDOM_Node *ownerDocument);
IDNodeImpl(const IDNodeImpl &other);
~IDNodeImpl();
-
+
void changed();
int changes() const;
@@ -149,7 +149,7 @@ public:
void setReadOnly(bool readOnly, bool deep);
void setUserData(void *value);
bool supports(const XMLCh *feature, const XMLCh *version) const;
-
+
static bool isKidOK(IDOM_Node *parent, IDOM_Node *child);
//Utility, not part of DOM Level 2 API
@@ -234,15 +234,15 @@ public: // should really be protected - ALH
inline void setValue(bool value) {
flags = (value ? flags | SETVALUE : flags & ~SETVALUE);
}
-
+
inline bool isIdAttr() const {
return (flags & ID_ATTR) != 0;
}
-
+
inline void isIdAttr(bool value) {
flags = (value ? flags | ID_ATTR : flags & ~ID_ATTR);
}
-
+
inline bool hasUserData() const {
return (flags & USERDATA) != 0;
}
@@ -253,7 +253,7 @@ public: // should really be protected - ALH
//
// LeafNode is set true for node types that can not be ParentNodes (can't have children)
- // This knowledge is used to allow casting from any unknown node type to the
+ // This knowledge is used to allow casting from any unknown node type to the
// IDParentImpl or IDChildImpl parts of the node.
//
inline bool isLeafNode() const {
@@ -284,7 +284,7 @@ public: // should really be protected - ALH
// be implemented by all node types. Since there is no inheritance of implementation,
// using this macro in the class declaration of the node types make it easier to
// accurately get all of the functions declared.
-//
+//
#define IDOM_NODE_FUNCTIONS \
virtual IDOM_Node *appendChild(IDOM_Node *newChild) ;\
virtual IDOM_Node *cloneNode(bool deep) const ;\
@@ -309,7 +309,7 @@ public: // should really be protected - ALH
virtual IDOM_Node *replaceChild(IDOM_Node *newChild, IDOM_Node *oldChild) ;\
virtual void setNodeValue(const XMLCh *nodeValue) ;\
virtual bool supports(const XMLCh *feature, const XMLCh *version) const ;\
- virtual void setPrefix(const XMLCh * prefix)
+ virtual void setPrefix(const XMLCh * prefix)
/*
diff --git a/src/idom/IDNodeIteratorImpl.cpp b/src/idom/IDNodeIteratorImpl.cpp
index 95160e408fb1e6e568f3a6b628c739638b3a30d1..75eca3ff9914bd9a4161ea68437b3a69bfb1606d 100644
--- a/src/idom/IDNodeIteratorImpl.cpp
+++ b/src/idom/IDNodeIteratorImpl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,50 +56,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:25 andyh
- * Initial revision
+ * Revision 1.2 2001/05/11 13:25:45 tng
+ * Copyright update.
*
- * Revision 1.11 2000/11/01 01:26:30 andyh
- * DOM NodeIterator bug fix - iterators would sometimes continue beyond
- * their starting (root) node. Fix from Tinny Ng.
- *
- * Revision 1.10 2000/07/17 23:00:16 jpolast
- * bug fix for SHOW_ELEMENT flag incorrectly being retreived.
- * contributed by Grace Yan and Joe Kesselman.
- *
- * Revision 1.9 2000/03/02 19:54:03 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.8 2000/02/08 20:26:11 aruna1
- * NodeIterator problem solved
- *
- * Revision 1.7 2000/02/08 01:16:18 aruna1
- * nodeIterator previous tracking problem solved
- *
- * Revision 1.6 2000/02/06 07:47:33 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.5 2000/02/04 01:49:26 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.4 1999/11/30 21:16:25 roddey
- * Changes to add the transcode() method to DOMString, which returns a transcoded
- * version (to local code page) of the DOM string contents. And I changed all of the
- * exception 'throw by pointer' to 'throw by value' style.
- *
- * Revision 1.3 1999/11/23 01:48:16 rahulj
- * Changed 0L to 0. CC under HPUX is happy now.
- *
- * Revision 1.2 1999/11/20 00:56:39 rahulj
- * Source files must end with an un-escaped newline.
- *
- * Revision 1.1.1.1 1999/11/09 01:09:15 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:30 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:25 andyh
+ * IDOM
*
*/
@@ -135,8 +96,8 @@ void NodeIteratorImpl::detach ()
NodeIteratorImpl::NodeIteratorImpl (
- DOM_Node root,
- unsigned long whatToShow,
+ DOM_Node root,
+ unsigned long whatToShow,
DOM_NodeFilter* nodeFilter,
bool expandEntityRef)
: fDetached(false),
@@ -267,7 +228,7 @@ DOM_Node NodeIteratorImpl::previousNode () {
bool accepted = false;
while (!accepted) {
-
+
if (fForward && ! aPreviousNode.isNull()) {
//repeat last node.
@@ -276,7 +237,7 @@ DOM_Node NodeIteratorImpl::previousNode () {
// get previous node in backwards depth first order.
aPreviousNode = previousNode(aPreviousNode);
}
-
+
// we are going backwards
fForward = false;
@@ -346,13 +307,13 @@ DOM_Node NodeIteratorImpl::nextNode (DOM_Node node, bool visitChildren) {
return result;
}
}
-
+
// if hasSibling, return sibling
if (node != fRoot) {
result = node.getNextSibling();
if (! result.isNull()) return result;
-
-
+
+
// return parent's 1st sibling.
DOM_Node parent = node.getParentNode();
while (!parent.isNull() && parent != fRoot) {
@@ -362,7 +323,7 @@ DOM_Node NodeIteratorImpl::nextNode (DOM_Node node, bool visitChildren) {
} else {
parent = parent.getParentNode();
}
-
+
} // while (parent != null && parent != fRoot) {
}
// end of list, return null
diff --git a/src/idom/IDNodeIteratorImpl.hpp b/src/idom/IDNodeIteratorImpl.hpp
index ef16cf76e757627947ff5bd7fd13533cc3fa1327..241ea360a29f15dc3ba2381bf7df364d1df3d67b 100644
--- a/src/idom/IDNodeIteratorImpl.hpp
+++ b/src/idom/IDNodeIteratorImpl.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,28 +56,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:25 andyh
- * Initial revision
+ * Revision 1.2 2001/05/11 13:25:45 tng
+ * Copyright update.
*
- * Revision 1.5 2000/02/24 20:11:30 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.4 2000/02/15 23:17:37 andyh
- * Update Doc++ API comments
- * NameSpace bugfix and update to track W3C
- * Chih Hsiang Chou
- *
- * Revision 1.3 2000/02/06 07:47:33 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/02/04 01:49:26 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.1.1.1 1999/11/09 01:09:16 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:30 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:25 andyh
+ * IDOM
*
*/
@@ -101,8 +84,8 @@ class CDOM_EXPORT NodeIteratorImpl : public RefCountedImpl {
public:
virtual ~NodeIteratorImpl ();
NodeIteratorImpl (
- DOM_Node root,
- unsigned long whatToShow,
+ DOM_Node root,
+ unsigned long whatToShow,
DOM_NodeFilter* nodeFilter,
bool expandEntityRef);
diff --git a/src/idom/IDNodeListImpl.cpp b/src/idom/IDNodeListImpl.cpp
index 17426b11eda7b640f4516ecf36756b0f82ba8940..bb708f055391d4da16891e30f7dfad7cde9c4c0f 100644
--- a/src/idom/IDNodeListImpl.cpp
+++ b/src/idom/IDNodeListImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,22 +56,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:25 andyh
- * Initial revision
- *
- * Revision 1.3 2000/03/02 19:54:03 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.2 2000/02/06 07:47:33 rahulj
- * Year 2K copyright swat.
+ * Revision 1.2 2001/05/11 13:25:45 tng
+ * Copyright update.
*
- * Revision 1.1.1.1 1999/11/09 01:09:16 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:31 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:25 andyh
+ * IDOM
*
*/
@@ -115,6 +104,6 @@ IDOM_Node *IDNodeListImpl::item(unsigned int index) const {
node = castToChildImpl(node)->nextSibling;
return node;
};
-
-
+
+
diff --git a/src/idom/IDNodeListImpl.hpp b/src/idom/IDNodeListImpl.hpp
index 3e78fc74197e9b15b580904f1e7a2fd1001f86aa..414da34c5d5f87468818537fe9b6a2ed9cc926f6 100644
--- a/src/idom/IDNodeListImpl.hpp
+++ b/src/idom/IDNodeListImpl.hpp
@@ -2,38 +2,38 @@
#define IDNodeListImpl_HEADER_GUARD_
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -47,10 +47,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -58,38 +58,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:25 andyh
- * Initial revision
- *
- * Revision 1.7 2000/03/02 19:54:03 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.6 2000/02/24 20:11:30 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.5 2000/02/06 07:47:34 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.4 2000/02/04 01:49:26 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.3 2000/01/22 01:38:30 andyh
- * Remove compiler warnings in DOM impl classes
- *
- * Revision 1.2 1999/12/21 07:47:07 robweir
- * Patches to support Xalan, where we need to create a
- * "special" DOM with subclassed Nodes.
- *
- * 1. Export the NodeImpl-derived classes
- * 2. Ensure that their constructors have at least protected access
- *
- * Revision 1.1.1.1 1999/11/09 01:09:17 twl
- * Initial checkin
+ * Revision 1.2 2001/05/11 13:25:46 tng
+ * Copyright update.
*
- * Revision 1.2 1999/11/08 20:44:31 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:25 andyh
+ * IDOM
*
*/
@@ -104,7 +77,7 @@
-// NodeList implementation class -
+// NodeList implementation class -
// This is for NodeLists returned by GetChildNodes only, not for
// node lists returned by GetElementsByTagName
//
@@ -119,7 +92,7 @@
class IDOM_Node;
-class CDOM_EXPORT IDNodeListImpl: public IDOM_NodeList
+class CDOM_EXPORT IDNodeListImpl: public IDOM_NodeList
{
private:
IDOM_Node *fNode;
diff --git a/src/idom/IDNodeVector.cpp b/src/idom/IDNodeVector.cpp
index aab0bc01011ed424b5743435d50286ffc1ef2b5b..ee8ca20d12534ec4aa28c800df666b8255886f4b 100644
--- a/src/idom/IDNodeVector.cpp
+++ b/src/idom/IDNodeVector.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,33 +56,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:26 andyh
- * Initial revision
- *
- * Revision 1.6 2000/05/22 22:38:12 andyh
- * DOM: GetNodeById(), fixed bad problem with rehash operation that caused
- * creashes.
- *
- * Revision 1.5 2000/03/28 19:43:13 roddey
- * Fixes for signed/unsigned warnings. New work for two way transcoding
- * stuff.
- *
- * Revision 1.4 2000/03/02 19:54:03 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.3 2000/02/06 07:47:34 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/02/04 01:49:25 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.1.1.1 1999/11/09 01:09:17 twl
- * Initial checkin
+ * Revision 1.2 2001/05/11 13:25:46 tng
+ * Copyright update.
*
- * Revision 1.3 1999/11/08 20:44:31 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:26 andyh
+ * IDOM
*
*/
@@ -196,5 +174,5 @@ void IDNodeVector::setElementAt(IDOM_Node *elem, unsigned int index) {
unsigned int IDNodeVector::size() {
return nextFreeSlot;
};
-
+
diff --git a/src/idom/IDNodeVector.hpp b/src/idom/IDNodeVector.hpp
index 670a6f0cfdce0de1aa4f962c5728a2561bf04b4b..7bbf2158c7d983721b188e5c93eae66318bf6cbd 100644
--- a/src/idom/IDNodeVector.hpp
+++ b/src/idom/IDNodeVector.hpp
@@ -2,38 +2,38 @@
#define IDNodeVector_HEADER_GUARD_
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -47,10 +47,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -58,28 +58,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:26 andyh
- * Initial revision
- *
- * Revision 1.5 2000/03/02 19:54:04 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.4 2000/02/24 20:11:30 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.3 2000/02/06 07:47:34 rahulj
- * Year 2K copyright swat.
+ * Revision 1.2 2001/05/11 13:25:46 tng
+ * Copyright update.
*
- * Revision 1.2 2000/02/04 01:49:25 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.1.1.1 1999/11/09 01:09:17 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:31 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:26 andyh
+ * IDOM
*
*/
@@ -105,12 +88,12 @@ private:
unsigned int nextFreeSlot;
void init(IDOM_Document *doc, unsigned int size);
void checkSpace();
-
+
public:
IDNodeVector(IDOM_Document *doc);
IDNodeVector(IDOM_Document *doc, unsigned int size);
~IDNodeVector();
-
+
unsigned int size();
IDOM_Node *elementAt(unsigned int index);
IDOM_Node *lastElement();
diff --git a/src/idom/IDNotationImpl.cpp b/src/idom/IDNotationImpl.cpp
index 66fbaa3a6a3e56fca36bc0c73c70c9ace27f7e1d..47ef3727037bdc2fb264252cf1f8cf4b2a97a371 100644
--- a/src/idom/IDNotationImpl.cpp
+++ b/src/idom/IDNotationImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -76,7 +76,7 @@
* <P>
* Level 1 of the DOM does not support editing Notation contents.
*
-* @author Rania Y. Khalaf
+* @author Rania Y. Khalaf
* @author Joseph Kesselman
* @since PR-DOM-Level-1-19980818.
*/
@@ -150,7 +150,7 @@ void IDNotationImpl::setPublicId(const XMLCh *arg)
if(fNode.isReadOnly())
throw IDOM_DOMException(
IDOM_DOMException::NO_MODIFICATION_ALLOWED_ERR,0);
-
+
fPublicId = ((IDDocumentImpl *)getOwnerDocument())->cloneString(arg);
};
@@ -160,7 +160,7 @@ void IDNotationImpl::setSystemId(const XMLCh *arg)
if(fNode.isReadOnly())
throw IDOM_DOMException(
IDOM_DOMException::NO_MODIFICATION_ALLOWED_ERR,0);
-
+
fSystemId = ((IDDocumentImpl *)getOwnerDocument())->cloneString(arg);
};
diff --git a/src/idom/IDNotationImpl.hpp b/src/idom/IDNotationImpl.hpp
index 78d1555d31044de0e87c2f7dc6172399a24d637f..759b103f0e6efdecc447e29e30cd8f932330dc94 100644
--- a/src/idom/IDNotationImpl.hpp
+++ b/src/idom/IDNotationImpl.hpp
@@ -2,38 +2,38 @@
#define IDNotationImpl_HEADER_GUARD_
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -47,15 +47,18 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
+/*
+ * $Id$
+ */
//
// This file is part of the internal implementation of the C++ XML DOM.
@@ -80,35 +83,35 @@ public:
const XMLCh * fName;
const XMLCh * fPublicId;
const XMLCh * fSystemId;
-
+
public:
IDNotationImpl(IDOM_Document *ownerDoc, const XMLCh *);
IDNotationImpl(const IDNotationImpl &other, bool deep=false);
-
+
virtual ~IDNotationImpl();
-
+
// Declare all of the functions from IDOM_Node.
IDOM_NODE_FUNCTIONS;
-
+
//
// The Public Identifier for this Notation. If no public identifier
- // was specified, this will be null.
+ // was specified, this will be null.
virtual const XMLCh * getPublicId() const;
-
+
// The System Identifier for this Notation. If no system identifier
- // was specified, this will be null.
+ // was specified, this will be null.
virtual const XMLCh * getSystemId() const;
-
-
+
+
// NON-DOM: The Public Identifier for this Notation. If no public
// identifier was specified, this will be null. */
virtual void setPublicId(const XMLCh *arg);
-
-
+
+
// NON-DOM: The System Identifier for this Notation. If no system
// identifier was specified, this will be null. */
virtual void setSystemId(const XMLCh *arg);
-
+
};
-#endif
+#endif
diff --git a/src/idom/IDOM.hpp b/src/idom/IDOM.hpp
index d74b42a9ffae744711e66985c763b92f6b7c704b..20d7cf5c0d2439282ac1b48bcb09952a1021116f 100644
--- a/src/idom/IDOM.hpp
+++ b/src/idom/IDOM.hpp
@@ -4,38 +4,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -49,10 +49,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -60,24 +60,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:26 andyh
- * Initial revision
- *
- * Revision 1.4 2000/04/25 20:29:32 aruna1
- * DOM_XMLDecl type node introduced to get the information of the
- * XML Declaration in a document and store it part of the tree
- *
- * Revision 1.3 2000/02/24 20:11:26 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.2 2000/02/06 07:47:27 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:46 twl
- * Initial checkin
+ * Revision 1.2 2001/05/11 13:25:48 tng
+ * Copyright update.
*
- * Revision 1.2 1999/11/08 20:44:12 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:26 andyh
+ * IDOM
*
*/
diff --git a/src/idom/IDOM_Attr.hpp b/src/idom/IDOM_Attr.hpp
index 46eecbda7baecadf21c59ed67526d43c0a483c1f..83fd01e3243399f870b760abb66132c2e0a21237 100644
--- a/src/idom/IDOM_Attr.hpp
+++ b/src/idom/IDOM_Attr.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -48,10 +48,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -59,36 +59,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:27 andyh
- * Initial revision
- *
- * Revision 1.7 2000/03/11 02:58:38 chchou
- * Fix bug # 18, remove set method of readonly attributes
- *
- * Revision 1.6 2000/03/02 19:53:52 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
+ * Revision 1.2 2001/05/11 13:25:48 tng
+ * Copyright update.
*
- * Revision 1.5 2000/02/24 20:11:27 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.4 2000/02/17 17:47:24 andyh
- * Update Doc++ API comments
- * NameSpace update to track W3C
- * Changes were made by Chih Hsiang Chou
- *
- * Revision 1.3 2000/02/06 07:47:27 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/01/05 01:16:06 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:48 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:44:13 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:27 andyh
+ * IDOM
*
*/
@@ -102,38 +77,38 @@ class IDOM_Element;
/**
* The <code>IDOM_Attr</code> class refers to an attribute of an XML element.
*
-* Typically the allowable values for the
+* Typically the allowable values for the
* attribute are defined in a documenttype definition.
-* <p><code>IDOM_Attr</code> objects inherit the <code>DOM_Node</code> interface, but
-* since attributes are not actually child nodes of the elements they are associated with, the
-* DOM does not consider them part of the document tree. Thus, the
-* <code>DOM_Node</code> attributes <code>parentNode</code>,
-* <code>previousSibling</code>, and <code>nextSibling</code> have a null
-* value for <code>IDOM_Attr</code> objects. The DOM takes the view that
-* attributes are properties of elements rather than having a separate
-* identity from the elements they are associated with; this should make it
-* more efficient to implement such features as default attributes associated
-* with all elements of a given type. Furthermore, attribute nodes
-* may not be immediate children of a <code>DocumentFragment</code>. However,
-* they can be associated with <code>Element</code> nodes contained within a
-* <code>DocumentFragment</code>. In short, users of the DOM
-* need to be aware that <code>Attr</code> nodes have some things in common
-* with other objects inheriting the <code>Node</code> interface, but they
+* <p><code>IDOM_Attr</code> objects inherit the <code>DOM_Node</code> interface, but
+* since attributes are not actually child nodes of the elements they are associated with, the
+* DOM does not consider them part of the document tree. Thus, the
+* <code>DOM_Node</code> attributes <code>parentNode</code>,
+* <code>previousSibling</code>, and <code>nextSibling</code> have a null
+* value for <code>IDOM_Attr</code> objects. The DOM takes the view that
+* attributes are properties of elements rather than having a separate
+* identity from the elements they are associated with; this should make it
+* more efficient to implement such features as default attributes associated
+* with all elements of a given type. Furthermore, attribute nodes
+* may not be immediate children of a <code>DocumentFragment</code>. However,
+* they can be associated with <code>Element</code> nodes contained within a
+* <code>DocumentFragment</code>. In short, users of the DOM
+* need to be aware that <code>Attr</code> nodes have some things in common
+* with other objects inheriting the <code>Node</code> interface, but they
* also are quite distinct.
-*
+*
*/
class CDOM_EXPORT IDOM_Attr: public IDOM_Node {
-
+
protected:
IDOM_Attr() {};
IDOM_Attr(const IDOM_Attr &other) {};
IDOM_Attr & operator = (const IDOM_Attr &other) {return *this;};
-
+
public:
/** @name Destructor */
//@{
-
+
/**
* Destructor. The object being destroyed is a reference to the Attribute
* "node", not the underlying attribute itself.
@@ -141,11 +116,11 @@ public:
*/
virtual ~IDOM_Attr() {};
//@}
-
+
/** @name Getter functions */
//@{
/**
- * Returns the name of this attribute.
+ * Returns the name of this attribute.
*/
virtual const XMLCh * getName() const = 0;
@@ -153,7 +128,7 @@ public:
*
* Returns true if the attribute received its value explicitly in the
* XML document, or if a value was assigned programatically with
- * the setValue function. Returns false if the attribute value
+ * the setValue function. Returns false if the attribute value
* came from the default value declared in the document's DTD.
*/
virtual bool getSpecified() const = 0;
@@ -161,11 +136,11 @@ public:
/**
* Returns the value of the attribute.
*
- * The value of the attribute is returned as a string.
+ * The value of the attribute is returned as a string.
* Character and general entity references are replaced with their values.
*/
virtual const XMLCh * getValue() const = 0;
-
+
//@}
/** @name Setter functions */
//@{
diff --git a/src/idom/IDOM_CDATASection.hpp b/src/idom/IDOM_CDATASection.hpp
index f76d686370db8c73ee3646e70a093095da2050d1..d9dff4931a0732ae2b8a572254e243c80c890f3d 100644
--- a/src/idom/IDOM_CDATASection.hpp
+++ b/src/idom/IDOM_CDATASection.hpp
@@ -4,38 +4,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -49,10 +49,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -60,28 +60,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:27 andyh
- * Initial revision
- *
- * Revision 1.5 2000/03/02 19:53:52 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.4 2000/02/24 20:11:27 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.3 2000/02/06 07:47:28 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/01/05 01:16:06 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:49 twl
- * Initial checkin
+ * Revision 1.2 2001/05/11 13:25:49 tng
+ * Copyright update.
*
- * Revision 1.2 1999/11/08 20:44:13 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:27 andyh
+ * IDOM
*
*/
@@ -91,15 +74,15 @@
/**
* <code>DOM_CDataSection</code> objects refer to the data from an
- * XML CDATA section. These are used to escape blocks of text containing characters
+ * XML CDATA section. These are used to escape blocks of text containing characters
* that would otherwise be regarded as markup.
*
- * <p>Note that the string data associated with the CDATA section may
+ * <p>Note that the string data associated with the CDATA section may
* contain characters that need to be escaped when appearing in an
- * XML document outside of a CDATA section.
- * <p> The <code>IDOM_CDATASection</code> class inherits from the
- * <code>DOM_CharacterData</code> class through the <code>Text</code>
- * interface. Adjacent CDATASection nodes are not merged by use
+ * XML document outside of a CDATA section.
+ * <p> The <code>IDOM_CDATASection</code> class inherits from the
+ * <code>DOM_CharacterData</code> class through the <code>Text</code>
+ * interface. Adjacent CDATASection nodes are not merged by use
* of the Element.normalize() method.
*/
class CDOM_EXPORT IDOM_CDATASection: public IDOM_Text {
diff --git a/src/idom/IDOM_CharacterData.hpp b/src/idom/IDOM_CharacterData.hpp
index 6bdec29fa1866c051953a68d7311bc1cf4c3a431..98d2b3487856e125ee9218606d3faccbd8c5166a 100644
--- a/src/idom/IDOM_CharacterData.hpp
+++ b/src/idom/IDOM_CharacterData.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,33 +56,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:27 andyh
- * Initial revision
- *
- * Revision 1.6 2000/03/02 19:53:53 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.5 2000/02/24 20:11:27 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.4 2000/02/15 23:17:36 andyh
- * Update Doc++ API comments
- * NameSpace bugfix and update to track W3C
- * Chih Hsiang Chou
+ * Revision 1.2 2001/05/11 13:25:49 tng
+ * Copyright update.
*
- * Revision 1.3 2000/02/06 07:47:28 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/02/04 01:49:29 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.1.1.1 1999/11/09 01:08:49 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:13 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:27 andyh
+ * IDOM
*
*/
@@ -94,13 +72,13 @@
/**
- * The <code>IDOM_CharacterData</code> interface extends Node with a set of
+ * The <code>IDOM_CharacterData</code> interface extends Node with a set of
* methods for accessing character data in the DOM.
*
- * For clarity this set is defined here rather than on each class that uses
- * these methods. No DOM objects correspond directly to
- * <code>CharacterData</code>, though <code>Text</code> and others do inherit
- * the interface from it. All <code>offset</code>s in this interface start
+ * For clarity this set is defined here rather than on each class that uses
+ * these methods. No DOM objects correspond directly to
+ * <code>CharacterData</code>, though <code>Text</code> and others do inherit
+ * the interface from it. All <code>offset</code>s in this interface start
* from 0, and index in terms of Unicode 16 bit storage units.
*/
class CDOM_EXPORT IDOM_CharacterData: public IDOM_Node {
@@ -126,27 +104,27 @@ public:
/** @name Getter functions. */
//@{
/**
- * Returns the character data of the node that implements this interface.
+ * Returns the character data of the node that implements this interface.
*
- * The DOM implementation may not put arbitrary limits on the amount of data that
- * may be stored in a <code>CharacterData</code> node. However,
- * implementation limits may mean that the entirety of a node's data may
- * not fit into a single <code>DOMString</code>. In such cases, the user
- * may call <code>substringData</code> to retrieve the data in
+ * The DOM implementation may not put arbitrary limits on the amount of data that
+ * may be stored in a <code>CharacterData</code> node. However,
+ * implementation limits may mean that the entirety of a node's data may
+ * not fit into a single <code>DOMString</code>. In such cases, the user
+ * may call <code>substringData</code> to retrieve the data in
* appropriately sized pieces.
* @exception DOMException
* NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly.
* @exception DOMException
- * DOMSTRING_SIZE_ERR: Raised when it would return more characters than
- * fit in a <code>DOMString</code> variable on the implementation
+ * DOMSTRING_SIZE_ERR: Raised when it would return more characters than
+ * fit in a <code>DOMString</code> variable on the implementation
* platform.
*/
virtual const XMLCh * getData() const = 0;
/**
- * Returns the number of characters that are available through <code>data</code> and
- * the <code>substringData</code> method below.
+ * Returns the number of characters that are available through <code>data</code> and
+ * the <code>substringData</code> method below.
*
- * This may have the value
+ * This may have the value
* zero, i.e., <code>CharacterData</code> nodes may be empty.
*/
virtual unsigned int getLength() const = 0;
@@ -155,17 +133,17 @@ public:
*
* @param offset Start offset of substring to extract.
* @param count The number of characters to extract.
- * @return The specified substring. If the sum of <code>offset</code> and
- * <code>count</code> exceeds the <code>length</code>, then all
+ * @return The specified substring. If the sum of <code>offset</code> and
+ * <code>count</code> exceeds the <code>length</code>, then all
* characters to the end of the data are returned.
* @exception DOMException
- * INDEX_SIZE_ERR: Raised if the specified offset is negative or greater
- * than the number of characters in <code>data</code>, or if the
+ * INDEX_SIZE_ERR: Raised if the specified offset is negative or greater
+ * than the number of characters in <code>data</code>, or if the
* specified <code>count</code> is negative.
- * <br>DOMSTRING_SIZE_ERR: Raised if the specified range of text does not
+ * <br>DOMSTRING_SIZE_ERR: Raised if the specified range of text does not
* fit into a <code>DOMString</code>.
*/
- virtual const XMLCh * substringData(unsigned int offset,
+ virtual const XMLCh * substringData(unsigned int offset,
unsigned int count) const = 0;
//@}
/** @name Functions that set or change data. */
@@ -173,7 +151,7 @@ public:
/**
* Append the string to the end of the character data of the node.
*
- * Upon success, <code>data</code> provides access to the concatenation of
+ * Upon success, <code>data</code> provides access to the concatenation of
* <code>data</code> and the <code>DOMString</code> specified.
* @param arg The <code>DOMString</code> to append.
* @exception DOMException
@@ -186,53 +164,53 @@ public:
* @param offset The character offset at which to insert.
* @param arg The <code>DOMString</code> to insert.
* @exception DOMException
- * INDEX_SIZE_ERR: Raised if the specified offset is negative or greater
+ * INDEX_SIZE_ERR: Raised if the specified offset is negative or greater
* than the number of characters in <code>data</code>.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
*/
virtual void insertData(unsigned int offset, const XMLCh *arg) = 0;
/**
- * Remove a range of characters from the node.
+ * Remove a range of characters from the node.
*
- * Upon success,
+ * Upon success,
* <code>data</code> and <code>length</code> reflect the change.
* @param offset The offset from which to remove characters.
- * @param count The number of characters to delete. If the sum of
- * <code>offset</code> and <code>count</code> exceeds <code>length</code>
- * then all characters from <code>offset</code> to the end of the data
+ * @param count The number of characters to delete. If the sum of
+ * <code>offset</code> and <code>count</code> exceeds <code>length</code>
+ * then all characters from <code>offset</code> to the end of the data
* are deleted.
* @exception DOMException
- * INDEX_SIZE_ERR: Raised if the specified offset is negative or greater
- * than the number of characters in <code>data</code>, or if the
+ * INDEX_SIZE_ERR: Raised if the specified offset is negative or greater
+ * than the number of characters in <code>data</code>, or if the
* specified <code>count</code> is negative.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
*/
- virtual void deleteData(unsigned int offset,
+ virtual void deleteData(unsigned int offset,
unsigned int count) = 0;
/**
- * Replace the characters starting at the specified character offset with
+ * Replace the characters starting at the specified character offset with
* the specified string.
*
* @param offset The offset from which to start replacing.
- * @param count The number of characters to replace. If the sum of
+ * @param count The number of characters to replace. If the sum of
* <code>offset</code> and <code>count</code> exceeds <code>length</code>
- * , then all characters to the end of the data are replaced (i.e., the
- * effect is the same as a <code>remove</code> method call with the same
+ * , then all characters to the end of the data are replaced (i.e., the
+ * effect is the same as a <code>remove</code> method call with the same
* range, followed by an <code>append</code> method invocation).
- * @param arg The <code>DOMString</code> with which the range must be
+ * @param arg The <code>DOMString</code> with which the range must be
* replaced.
* @exception DOMException
- * INDEX_SIZE_ERR: Raised if the specified offset is negative or greater
- * than the number of characters in <code>data</code>, or if the
+ * INDEX_SIZE_ERR: Raised if the specified offset is negative or greater
+ * than the number of characters in <code>data</code>, or if the
* specified <code>count</code> is negative.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
*/
- virtual void replaceData(unsigned int offset,
- unsigned int count,
+ virtual void replaceData(unsigned int offset,
+ unsigned int count,
const XMLCh *arg) = 0;
/**
- * Sets the character data of the node that implements this interface.
+ * Sets the character data of the node that implements this interface.
*
* @param data The <code>DOMString</code> to set.
*/
diff --git a/src/idom/IDOM_Comment.hpp b/src/idom/IDOM_Comment.hpp
index 05d77fd1435f4d033092a10864181639c0afbcd9..6badbdfd79ccdb8f99dd784df55283ec1512eb63 100644
--- a/src/idom/IDOM_Comment.hpp
+++ b/src/idom/IDOM_Comment.hpp
@@ -4,38 +4,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -49,10 +49,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -60,28 +60,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:27 andyh
- * Initial revision
- *
- * Revision 1.5 2000/03/02 19:53:54 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.4 2000/02/24 20:11:27 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.3 2000/02/06 07:47:28 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/01/05 01:16:06 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:50 twl
- * Initial checkin
+ * Revision 1.2 2001/05/11 13:25:49 tng
+ * Copyright update.
*
- * Revision 1.2 1999/11/08 20:44:14 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:27 andyh
+ * IDOM
*
*/
@@ -92,7 +75,7 @@
/**
* Class to refer to XML comment nodes in the DOM.
*
- * <P>The string value contains all of the characters between
+ * <P>The string value contains all of the characters between
* the starting '<code><!--</code>' and ending '<code>--></code>'.
*/
class CDOM_EXPORT IDOM_Comment: public IDOM_CharacterData {
diff --git a/src/idom/IDOM_DOMException.cpp b/src/idom/IDOM_DOMException.cpp
index ca611298218b60de11817dec32f1c63fac832f3d..66712c0ac0ae0f841c0fb0129ac75debf2417b35 100644
--- a/src/idom/IDOM_DOMException.cpp
+++ b/src/idom/IDOM_DOMException.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,22 +56,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:29 andyh
- * Initial revision
- *
- * Revision 1.3 2000/03/02 19:53:54 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.2 2000/02/06 07:47:28 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:53 twl
- * Initial checkin
+ * Revision 1.2 2001/05/11 13:25:50 tng
+ * Copyright update.
*
- * Revision 1.2 1999/11/08 20:44:14 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:29 andyh
+ * IDOM
*
*/
@@ -85,20 +74,20 @@ IDOM_DOMException::IDOM_DOMException()
};
-IDOM_DOMException::IDOM_DOMException(short exCode, const XMLCh *message)
-: msg(message)
+IDOM_DOMException::IDOM_DOMException(short exCode, const XMLCh *message)
+: msg(message)
{
code = (ExceptionCode) exCode;
};
-IDOM_DOMException::IDOM_DOMException(const IDOM_DOMException &other)
+IDOM_DOMException::IDOM_DOMException(const IDOM_DOMException &other)
: msg(other.msg)
{
code = other.code;
};
-IDOM_DOMException::~IDOM_DOMException()
+IDOM_DOMException::~IDOM_DOMException()
{
};
diff --git a/src/idom/IDOM_DOMException.hpp b/src/idom/IDOM_DOMException.hpp
index 11408d9036b8e86091cd6a8cfadac27e2505eb62..2c115f11494a71d680719ff2c033404f1db3d0ac 100644
--- a/src/idom/IDOM_DOMException.hpp
+++ b/src/idom/IDOM_DOMException.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,34 +56,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:29 andyh
- * Initial revision
+ * Revision 1.2 2001/05/11 13:25:50 tng
+ * Copyright update.
*
- * Revision 1.7 2000/03/02 19:53:54 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.6 2000/02/24 20:11:27 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.5 2000/02/10 19:52:08 abagchi
- * Added docs for enum
- *
- * Revision 1.4 2000/02/06 07:47:28 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.3 2000/02/04 05:46:31 andyh
- * Change offsets and lengths form signed to unsigned
- *
- * Revision 1.2 2000/01/05 01:16:06 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:53 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:44:14 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:29 andyh
+ * IDOM
*
*/
diff --git a/src/idom/IDOM_DOMImplementation.hpp b/src/idom/IDOM_DOMImplementation.hpp
index 649b1199c63a70769775bb8c9504735ac7db5f7f..11825274838307148b16a93f88c83fc90d556456 100644
--- a/src/idom/IDOM_DOMImplementation.hpp
+++ b/src/idom/IDOM_DOMImplementation.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,37 +56,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:29 andyh
- * Initial revision
- *
- * Revision 1.7 2000/03/02 19:53:54 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
+ * Revision 1.2 2001/05/11 13:25:50 tng
+ * Copyright update.
*
- * Revision 1.6 2000/02/24 20:11:27 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.5 2000/02/17 17:47:24 andyh
- * Update Doc++ API comments
- * NameSpace update to track W3C
- * Changes were made by Chih Hsiang Chou
- *
- * Revision 1.4 2000/02/10 23:35:11 andyh
- * Update IDOM_DOMImplementation::CreateDocumentType and
- * DOM_DocumentType to match latest from W3C
- *
- * Revision 1.3 2000/02/06 07:47:28 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/01/05 01:16:07 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:57 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:44:15 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:29 andyh
+ * IDOM
*
*/
@@ -120,11 +94,11 @@ class CDOM_EXPORT IDOM_DOMImplementation {
static IDOM_DOMImplementation *getImplementation();
-
+
virtual ~IDOM_DOMImplementation() {};
-
+
virtual bool hasFeature(const XMLCh *feature, const XMLCh *version) = 0;
-
+
// Create a new DocumentType.
diff --git a/src/idom/IDOM_Document.hpp b/src/idom/IDOM_Document.hpp
index 02aae56740494fb37f0d1f6d45913a614503be0c..ceff7643736225c2e91b4fab45dbf8ec149820d2 100644
--- a/src/idom/IDOM_Document.hpp
+++ b/src/idom/IDOM_Document.hpp
@@ -4,7 +4,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -51,7 +51,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -249,10 +249,10 @@ public:
* <code>Attr</code> instance can then be attached to an Element
* using the <code>IDOMElement::setAttribute()</code> method.
* @param name The name of the attribute.
- * @return A new <CODE>IDOM_Attr</CODE>
- * object with the <CODE>nodeName</CODE> attribute set to
- * <CODE>name</CODE>, and <CODE>localName</CODE>, <CODE>prefix</CODE>,
- * and <CODE>namespaceURI</CODE> set to
+ * @return A new <CODE>IDOM_Attr</CODE>
+ * object with the <CODE>nodeName</CODE> attribute set to
+ * <CODE>name</CODE>, and <CODE>localName</CODE>, <CODE>prefix</CODE>,
+ * and <CODE>namespaceURI</CODE> set to
* <CODE>null</CODE>.
* @exception IDOMException
* INVALID_CHARACTER_ERR: Raised if the specified name contains an
@@ -281,7 +281,7 @@ public:
* document subtree governed by a particular node, the results of a query, or any other set of nodes.
* The set of nodes to be iterated is determined by the implementation of the NodeIterator. IDOM Level 2
* specifies a single NodeIterator implementation for document-order traversal of a document subtree.
- * Instances of these iterators are created by calling <code>DocumentTraversal.createNodeIterator()</code>.
+ * Instances of these iterators are created by calling <code>DocumentTraversal.createNodeIterator()</code>.
*
* To produce a view of the document that has entity references expanded and does not
* expose the entity reference node itself, use the <code>whatToShow</code> flags to hide the entity
@@ -299,9 +299,9 @@ public:
* visible to the iterator. If false, they will be skipped over.
*/
- virtual IDOM_NodeIterator *createNodeIterator(IDOM_Node *root,
- unsigned long whatToShow,
- IDOM_NodeFilter* filter,
+ virtual IDOM_NodeIterator *createNodeIterator(IDOM_Node *root,
+ unsigned long whatToShow,
+ IDOM_NodeFilter* filter,
bool entityReferenceExpansion) = 0;
/**
* Creates a TreeWalker object. (IDOM2)
@@ -334,9 +334,9 @@ public:
* visible to the tree-walker. If false, they will be skipped over.
*/
- virtual IDOM_TreeWalker *createTreeWalker(IDOM_Node *root,
- unsigned long whatToShow,
- IDOM_NodeFilter *filter,
+ virtual IDOM_TreeWalker *createTreeWalker(IDOM_Node *root,
+ unsigned long whatToShow,
+ IDOM_NodeFilter *filter,
bool entityReferenceExpansion) = 0;
/**
@@ -359,16 +359,16 @@ public:
const XMLCh * standalone) = 0;
/**
- * To create the range consisting of boundary-points and offset of the
+ * To create the range consisting of boundary-points and offset of the
* selected contents
*
- * @return The initial state of the Range such that both the boundary-points
- * are positioned at the beginning of the corresponding IDOM_DOcument, before
- * any content. The range returned can only be used to select content
- * associated with this document, or with documentFragments and Attrs for
+ * @return The initial state of the Range such that both the boundary-points
+ * are positioned at the beginning of the corresponding IDOM_DOcument, before
+ * any content. The range returned can only be used to select content
+ * associated with this document, or with documentFragments and Attrs for
* which this document is the ownerdocument
*/
- virtual IDOM_Range *createRange() = 0;
+ virtual IDOM_Range *createRange() = 0;
//@}
/** @name Getter functions */
@@ -418,31 +418,31 @@ public:
//@{
/**
- * Imports a node from another document to this document.
- * The returned node has no parent (<CODE>parentNode</CODE> is
- * <CODE>null</CODE>). The source node is not altered or removed from the
- * original document; this method creates a new copy of the source
- * node.<BR>For all nodes, importing a node creates a node object owned by
- * the importing document, with attribute values identical to the source
- * node's <CODE>nodeName</CODE> and <CODE>nodeType</CODE>, plus the
+ * Imports a node from another document to this document.
+ * The returned node has no parent (<CODE>parentNode</CODE> is
+ * <CODE>null</CODE>). The source node is not altered or removed from the
+ * original document; this method creates a new copy of the source
+ * node.<BR>For all nodes, importing a node creates a node object owned by
+ * the importing document, with attribute values identical to the source
+ * node's <CODE>nodeName</CODE> and <CODE>nodeType</CODE>, plus the
* attributes related to namespaces (prefix and namespaces URI).
*
* <p><b>"Experimental - subject to change"</b></p>
*
* @param importedNode The node to import.
- * @param deep If <CODE>true</CODE>, recursively import the subtree under the
- * specified node; if <CODE>false</CODE>, import only the node itself,
- * as explained above. This does not apply to <CODE>IDOM_Attr</CODE>,
+ * @param deep If <CODE>true</CODE>, recursively import the subtree under the
+ * specified node; if <CODE>false</CODE>, import only the node itself,
+ * as explained above. This does not apply to <CODE>IDOM_Attr</CODE>,
* <CODE>IDOM_EntityReference</CODE>, and <CODE>IDOM_Notation</CODE> nodes.
* @return The imported node that belongs to this <CODE>IDOM_Document</CODE>.
* @exception IDOMException
- * NOT_SUPPORTED_ERR: Raised if the type of node being imported is
+ * NOT_SUPPORTED_ERR: Raised if the type of node being imported is
* not supported.
*/
virtual IDOM_Node *importNode(IDOM_Node *importedNode, bool deep) = 0;
/**
- * Creates an element of the given qualified name and
+ * Creates an element of the given qualified name and
* namespace URI.
*
* <p><b>"Experimental - subject to change"</b></p>
@@ -456,11 +456,11 @@ public:
* INVALID_CHARACTER_ERR: Raised if the specified qualified name contains
* an illegal character.
* <br>
- * NAMESPACE_ERR: Raised if the <CODE>qualifiedName</CODE> is
- * malformed, if the <CODE>qualifiedName</CODE> has a prefix and the
- * <CODE>namespaceURI</CODE> is <CODE>null</CODE> or an empty string,
- * or if the <CODE>qualifiedName</CODE> has a prefix that is "xml" and
- * the <CODE>namespaceURI</CODE> is different from
+ * NAMESPACE_ERR: Raised if the <CODE>qualifiedName</CODE> is
+ * malformed, if the <CODE>qualifiedName</CODE> has a prefix and the
+ * <CODE>namespaceURI</CODE> is <CODE>null</CODE> or an empty string,
+ * or if the <CODE>qualifiedName</CODE> has a prefix that is "xml" and
+ * the <CODE>namespaceURI</CODE> is different from
* "http://www.w3.org/XML/1998/namespace".
*/
virtual IDOM_Element *createElementNS(const XMLCh *namespaceURI,
@@ -481,17 +481,17 @@ public:
* INVALID_CHARACTER_ERR: Raised if the specified qualified name contains
* an illegal character.
* <br>
- * NAMESPACE_ERR: Raised if the <CODE>qualifiedName</CODE> is
- * malformed, if the <CODE>qualifiedName</CODE> has a prefix and the
- * <CODE>namespaceURI</CODE> is <CODE>null</CODE> or an empty string,
- * if the <CODE>qualifiedName</CODE> has a prefix that is "xml" and the
- * <CODE>namespaceURI</CODE> is different from
- * "http://www.w3.org/XML/1998/namespace", if the
- * <CODE>qualifiedName</CODE> has a prefix that is "xmlns" and the
- * <CODE>namespaceURI</CODE> is different from
- * "http://www.w3.org/2000/xmlns/", or if the
- * <CODE>qualifiedName</CODE> is "xmlns" and the
- * <CODE>namespaceURI</CODE> is different from
+ * NAMESPACE_ERR: Raised if the <CODE>qualifiedName</CODE> is
+ * malformed, if the <CODE>qualifiedName</CODE> has a prefix and the
+ * <CODE>namespaceURI</CODE> is <CODE>null</CODE> or an empty string,
+ * if the <CODE>qualifiedName</CODE> has a prefix that is "xml" and the
+ * <CODE>namespaceURI</CODE> is different from
+ * "http://www.w3.org/XML/1998/namespace", if the
+ * <CODE>qualifiedName</CODE> has a prefix that is "xmlns" and the
+ * <CODE>namespaceURI</CODE> is different from
+ * "http://www.w3.org/2000/xmlns/", or if the
+ * <CODE>qualifiedName</CODE> is "xmlns" and the
+ * <CODE>namespaceURI</CODE> is different from
* "http://www.w3.org/2000/xmlns/".
*/
virtual IDOM_Attr *createAttributeNS(const XMLCh *namespaceURI,
@@ -520,10 +520,10 @@ public:
* Returns the <code>IDOM_Element</code> whose ID is given by <code>elementId</code>.
* If no such element exists, returns <code>null</code>.
* Behavior is not defined if more than one element has this <code>ID</code>.
- * <P><B>Note:</B> The IDOM implementation must have information that says
- * which attributes are of type ID. Attributes with the name "ID" are not of
- * type ID unless so defined. Implementations that do not know whether
- * attributes are of type ID or not are expected to return
+ * <P><B>Note:</B> The IDOM implementation must have information that says
+ * which attributes are of type ID. Attributes with the name "ID" are not of
+ * type ID unless so defined. Implementations that do not know whether
+ * attributes are of type ID or not are expected to return
* <CODE>null</CODE>.</P>
*
* <p><b>"Experimental - subject to change"</b></p>
diff --git a/src/idom/IDOM_DocumentFragment.hpp b/src/idom/IDOM_DocumentFragment.hpp
index a4a8198df3b452fea078226a2a5cecb5b636037d..a53fb08a3a0440dc72e1957e989f546e559d7968 100644
--- a/src/idom/IDOM_DocumentFragment.hpp
+++ b/src/idom/IDOM_DocumentFragment.hpp
@@ -2,38 +2,38 @@
#define IDOM_DocumentFragment_HEADER_GUARD_
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -47,15 +47,18 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
+/*
+ * $Id$
+ */
#include <util/XercesDefs.hpp>
@@ -63,41 +66,41 @@
/**
- * <code>DocumentFragment</code> is a "lightweight" or "minimal"
- * <code>Document</code> object.
+ * <code>DocumentFragment</code> is a "lightweight" or "minimal"
+ * <code>Document</code> object.
*
- * It is very common to want to be able to
- * extract a portion of a document's tree or to create a new fragment of a
- * document. Imagine implementing a user command like cut or rearranging a
- * document by moving fragments around. It is desirable to have an object
- * which can hold such fragments and it is quite natural to use a Node for
- * this purpose. While it is true that a <code>Document</code> object could
- * fulfil this role, a <code>Document</code> object can potentially be a
- * heavyweight object, depending on the underlying implementation. What is
- * really needed for this is a very lightweight object.
+ * It is very common to want to be able to
+ * extract a portion of a document's tree or to create a new fragment of a
+ * document. Imagine implementing a user command like cut or rearranging a
+ * document by moving fragments around. It is desirable to have an object
+ * which can hold such fragments and it is quite natural to use a Node for
+ * this purpose. While it is true that a <code>Document</code> object could
+ * fulfil this role, a <code>Document</code> object can potentially be a
+ * heavyweight object, depending on the underlying implementation. What is
+ * really needed for this is a very lightweight object.
* <code>DocumentFragment</code> is such an object.
- * <p>Furthermore, various operations -- such as inserting nodes as children
- * of another <code>Node</code> -- may take <code>DocumentFragment</code>
- * objects as arguments; this results in all the child nodes of the
+ * <p>Furthermore, various operations -- such as inserting nodes as children
+ * of another <code>Node</code> -- may take <code>DocumentFragment</code>
+ * objects as arguments; this results in all the child nodes of the
* <code>DocumentFragment</code> being moved to the child list of this node.
- * <p>The children of a <code>DocumentFragment</code> node are zero or more
- * nodes representing the tops of any sub-trees defining the structure of the
- * document. <code>DocumentFragment</code> nodes do not need to be
- * well-formed XML documents (although they do need to follow the rules
- * imposed upon well-formed XML parsed entities, which can have multiple top
- * nodes). For example, a <code>DocumentFragment</code> might have only one
- * child and that child node could be a <code>Text</code> node. Such a
- * structure model represents neither an HTML document nor a well-formed XML
- * document.
- * <p>When a <code>DocumentFragment</code> is inserted into a
- * <code>Document</code> (or indeed any other <code>Node</code> that may take
- * children) the children of the <code>DocumentFragment</code> and not the
- * <code>DocumentFragment</code> itself are inserted into the
- * <code>Node</code>. This makes the <code>DocumentFragment</code> very
- * useful when the user wishes to create nodes that are siblings; the
+ * <p>The children of a <code>DocumentFragment</code> node are zero or more
+ * nodes representing the tops of any sub-trees defining the structure of the
+ * document. <code>DocumentFragment</code> nodes do not need to be
+ * well-formed XML documents (although they do need to follow the rules
+ * imposed upon well-formed XML parsed entities, which can have multiple top
+ * nodes). For example, a <code>DocumentFragment</code> might have only one
+ * child and that child node could be a <code>Text</code> node. Such a
+ * structure model represents neither an HTML document nor a well-formed XML
+ * document.
+ * <p>When a <code>DocumentFragment</code> is inserted into a
+ * <code>Document</code> (or indeed any other <code>Node</code> that may take
+ * children) the children of the <code>DocumentFragment</code> and not the
+ * <code>DocumentFragment</code> itself are inserted into the
+ * <code>Node</code>. This makes the <code>DocumentFragment</code> very
+ * useful when the user wishes to create nodes that are siblings; the
* <code>DocumentFragment</code> acts as the parent of these nodes so that the
- * user can use the standard methods from the <code>Node</code> interface,
- * such as <code>insertBefore()</code> and <code>appendChild()</code>.
+ * user can use the standard methods from the <code>Node</code> interface,
+ * such as <code>insertBefore()</code> and <code>appendChild()</code>.
*/
class CDOM_EXPORT IDOM_DocumentFragment: public IDOM_Node {
@@ -109,7 +112,7 @@ protected:
//@}
/** @name Destructor */
//@{
-
+
public:
virtual ~IDOM_DocumentFragment() {};
diff --git a/src/idom/IDOM_DocumentType.hpp b/src/idom/IDOM_DocumentType.hpp
index d2c9ff13c9ca71a1728736add68ed185bef5a9e2..0370e47f358585f18a9f2c1df0df2aabf6e148fe 100644
--- a/src/idom/IDOM_DocumentType.hpp
+++ b/src/idom/IDOM_DocumentType.hpp
@@ -4,38 +4,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -49,10 +49,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -60,40 +60,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:28 andyh
- * Initial revision
- *
- * Revision 1.8 2000/03/10 02:14:39 chchou
- * add null IDOM_DocumentType constructor
- *
- * Revision 1.7 2000/03/02 19:53:55 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.6 2000/02/24 20:11:27 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.5 2000/02/17 17:47:24 andyh
- * Update Doc++ API comments
- * NameSpace update to track W3C
- * Changes were made by Chih Hsiang Chou
- *
- * Revision 1.4 2000/02/10 23:35:11 andyh
- * Update DOM_DOMImplementation::CreateDocumentType and
- * IDOM_DocumentType to match latest from W3C
- *
- * Revision 1.3 2000/02/06 07:47:29 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/01/05 01:16:07 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:52 twl
- * Initial checkin
+ * Revision 1.2 2001/05/11 13:25:51 tng
+ * Copyright update.
*
- * Revision 1.3 1999/11/08 20:44:16 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:28 andyh
+ * IDOM
*
*/
@@ -103,8 +74,8 @@
class IDOM_NamedNodeMap;
/**
- * Each <code>Document</code> has a <code>doctype</code> whose value
- * is either <code>null</code> or a <code>DocumentType</code> object.
+ * Each <code>Document</code> has a <code>doctype</code> whose value
+ * is either <code>null</code> or a <code>DocumentType</code> object.
*
* The <code>IDOM_DocumentType</code> class provides access
* to the list of entities and notations that are defined for the document.
@@ -125,15 +96,15 @@ public:
/** @name Getter functions. */
//@{
/**
- * The name of DTD; i.e., the name immediately following the
+ * The name of DTD; i.e., the name immediately following the
* <code>DOCTYPE</code> keyword in an XML source document.
*/
virtual const XMLCh * getName() const = 0;
/**
- * This function returns a <code>NamedNodeMap</code> containing the general entities, both
+ * This function returns a <code>NamedNodeMap</code> containing the general entities, both
* external and internal, declared in the DTD. Parameter entities are not contained.
- * Duplicates are discarded.
+ * Duplicates are discarded.
* <p>
* Note: this functionality is not implemented in the initial release
* of the parser, and the returned NamedNodeMap will be empty.
diff --git a/src/idom/IDOM_Element.hpp b/src/idom/IDOM_Element.hpp
index 5dc298fcdf61a1ef5bf59547ce7654c3d8b43eba..d63b8c385d4b267518169c6cb43f6214cd0eae97 100644
--- a/src/idom/IDOM_Element.hpp
+++ b/src/idom/IDOM_Element.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,40 +56,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:29 andyh
- * Initial revision
- *
- * Revision 1.7 2000/03/02 19:53:55 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.6 2000/02/24 20:11:27 abagchi
- * Swat for removing Log from API docs
+ * Revision 1.2 2001/05/11 13:25:52 tng
+ * Copyright update.
*
- * Revision 1.5 2000/02/17 17:47:24 andyh
- * Update Doc++ API comments
- * NameSpace update to track W3C
- * Changes were made by Chih Hsiang Chou
- *
- * Revision 1.4 2000/02/06 07:47:29 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.3 2000/01/05 01:16:07 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.2 1999/12/21 07:47:06 robweir
- * Patches to support Xalan, where we need to create a
- * "special" DOM with subclassed Nodes.
- *
- * 1. Export the NodeImpl-derived classes
- * 2. Ensure that their constructors have at least protected access
- *
- * Revision 1.1.1.1 1999/11/09 01:08:57 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:44:17 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:29 andyh
+ * IDOM
*
*/
@@ -104,27 +75,27 @@ class IDOM_NodeList;
/**
- * By far the vast majority of objects (apart from text) that authors
- * encounter when traversing a document are <code>IDOM_Element</code> nodes.
+ * By far the vast majority of objects (apart from text) that authors
+ * encounter when traversing a document are <code>IDOM_Element</code> nodes.
*
- * Assume the following XML document:<elementExample id="demo">
- * <subelement1/>
+ * Assume the following XML document:<elementExample id="demo">
+ * <subelement1/>
* <subelement2><subsubelement/></subelement2>
- * </elementExample>
- * <p>When represented using DOM, the top node is an <code>IDOM_Element</code> node
- * for "elementExample", which contains two child <code>IDOM_Element</code> nodes,
- * one for "subelement1" and one for "subelement2". "subelement1" contains no
+ * </elementExample>
+ * <p>When represented using DOM, the top node is an <code>IDOM_Element</code> node
+ * for "elementExample", which contains two child <code>IDOM_Element</code> nodes,
+ * one for "subelement1" and one for "subelement2". "subelement1" contains no
* child nodes.
- * <p>Elements may have attributes associated with them; since the
+ * <p>Elements may have attributes associated with them; since the
* <code>IDOM_Element</code> interface inherits from <code>IDOM_Node</code>, the generic
- * <code>IDOM_Node</code> interface method <code>getAttributes</code> may be used
+ * <code>IDOM_Node</code> interface method <code>getAttributes</code> may be used
* to retrieve the set of all attributes for an element. There are methods on
* the <code>IDOM_Element</code> interface to retrieve either an <code>IDOM_Attr</code>
- * object by name or an attribute value by name. In XML, where an attribute
- * value may contain entity references, an <code>IDOM_Attr</code> object should be
- * retrieved to examine the possibly fairly complex sub-tree representing the
- * attribute value. On the other hand, in HTML, where all attributes have
- * simple string values, methods to directly access an attribute value can
+ * object by name or an attribute value by name. In XML, where an attribute
+ * value may contain entity references, an <code>IDOM_Attr</code> object should be
+ * retrieved to examine the possibly fairly complex sub-tree representing the
+ * attribute value. On the other hand, in HTML, where all attributes have
+ * simple string values, methods to directly access an attribute value can
* safely be used as a convenience.
*/
@@ -154,12 +125,12 @@ public:
//@{
/**
- * The name of the element.
+ * The name of the element.
*
- * For example, in: <elementExample
- * id="demo"> ... </elementExample> , <code>tagName</code> has
- * the value <code>"elementExample"</code>. Note that this is
- * case-preserving in XML, as are all of the operations of the DOM.
+ * For example, in: <elementExample
+ * id="demo"> ... </elementExample> , <code>tagName</code> has
+ * the value <code>"elementExample"</code>. Note that this is
+ * case-preserving in XML, as are all of the operations of the DOM.
*/
virtual const XMLCh * getTagName() const = 0;
@@ -167,7 +138,7 @@ public:
* Retrieves an attribute value by name.
*
* @param name The name of the attribute to retrieve.
- * @return The <code>IDOM_Attr</code> value as a string, or the empty string if
+ * @return The <code>IDOM_Attr</code> value as a string, or the empty string if
* that attribute does not have a specified or default value.
*/
virtual const XMLCh * getAttribute(const XMLCh *name) const = 0;
@@ -176,17 +147,17 @@ public:
* Retrieves an <code>IDOM_Attr</code> node by name.
*
* @param name The name (<CODE>nodeName</CODE>) of the attribute to retrieve.
- * @return The <code>IDOM_Attr</code> node with the specified name (<CODE>nodeName</CODE>) or
+ * @return The <code>IDOM_Attr</code> node with the specified name (<CODE>nodeName</CODE>) or
* <code>null</code> if there is no such attribute.
*/
virtual IDOM_Attr * getAttributeNode(const XMLCh *name) const = 0;
/**
- * Returns a <code>NodeList</code> of all descendant elements with a given
- * tag name, in the order in which they would be encountered in a preorder
+ * Returns a <code>NodeList</code> of all descendant elements with a given
+ * tag name, in the order in which they would be encountered in a preorder
* traversal of the <code>IDOM_Element</code> tree.
*
- * @param name The name of the tag to match on. The special value "*"
+ * @param name The name of the tag to match on. The special value "*"
* matches all tags.
* @return A list of matching <code>IDOM_Element</code> nodes.
*/
@@ -197,45 +168,45 @@ public:
//@{
/**
- * Adds a new attribute.
- *
- * If an attribute with that name is already present
- * in the element, its value is changed to be that of the value parameter.
- * This value is a simple string, it is not parsed as it is being set. So
- * any markup (such as syntax to be recognized as an entity reference) is
- * treated as literal text, and needs to be appropriately escaped by the
- * implementation when it is written out. In order to assign an attribute
- * value that contains entity references, the user must create an
- * <code>IDOM_Attr</code> node plus any <code>Text</code> and
- * <code>EntityReference</code> nodes, build the appropriate subtree, and
- * use <code>setAttributeNode</code> to assign it as the value of an
+ * Adds a new attribute.
+ *
+ * If an attribute with that name is already present
+ * in the element, its value is changed to be that of the value parameter.
+ * This value is a simple string, it is not parsed as it is being set. So
+ * any markup (such as syntax to be recognized as an entity reference) is
+ * treated as literal text, and needs to be appropriately escaped by the
+ * implementation when it is written out. In order to assign an attribute
+ * value that contains entity references, the user must create an
+ * <code>IDOM_Attr</code> node plus any <code>Text</code> and
+ * <code>EntityReference</code> nodes, build the appropriate subtree, and
+ * use <code>setAttributeNode</code> to assign it as the value of an
* attribute.
* @param name The name of the attribute to create or alter.
* @param value Value to set in string form.
* @exception DOMException
- * INVALID_CHARACTER_ERR: Raised if the specified name contains an
+ * INVALID_CHARACTER_ERR: Raised if the specified name contains an
* illegal character.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
*/
- virtual void setAttribute(const XMLCh *name,
+ virtual void setAttribute(const XMLCh *name,
const XMLCh *value) = 0;
/**
- * Adds a new attribute.
- *
- * If an attribute with that name (<CODE>nodeName</CODE>) is already present
+ * Adds a new attribute.
+ *
+ * If an attribute with that name (<CODE>nodeName</CODE>) is already present
* in the element, it is replaced by the new one.
* @param newAttr The <code>IDOM_Attr</code> node to add to the attribute list.
- * @return If the <code>newAttr</code> attribute replaces an existing
+ * @return If the <code>newAttr</code> attribute replaces an existing
* attribute, the replaced
- * <code>IDOM_Attr</code> node is returned, otherwise <code>null</code> is
+ * <code>IDOM_Attr</code> node is returned, otherwise <code>null</code> is
* returned.
* @exception DOMException
- * WRONG_DOCUMENT_ERR: Raised if <code>newAttr</code> was created from a
+ * WRONG_DOCUMENT_ERR: Raised if <code>newAttr</code> was created from a
* different document than the one that created the element.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
- * <br>INUSE_ATTRIBUTE_ERR: Raised if <code>newAttr</code> is already an
- * attribute of another <code>IDOM_Element</code> object. The DOM user must
- * explicitly clone <code>IDOM_Attr</code> nodes to re-use them in other
+ * <br>INUSE_ATTRIBUTE_ERR: Raised if <code>newAttr</code> is already an
+ * attribute of another <code>IDOM_Element</code> object. The DOM user must
+ * explicitly clone <code>IDOM_Attr</code> nodes to re-use them in other
* elements.
*/
virtual IDOM_Attr * setAttributeNode(IDOM_Attr *newAttr) = 0;
@@ -246,27 +217,27 @@ public:
/**
* Removes the specified attribute node.
* If the removed <CODE>IDOM_Attr</CODE>
- * has a default value it is immediately replaced. The replacing attribute
- * has the same namespace URI and local name, as well as the original prefix,
+ * has a default value it is immediately replaced. The replacing attribute
+ * has the same namespace URI and local name, as well as the original prefix,
* when applicable.
*
- * @param oldAttr The <code>IDOM_Attr</code> node to remove from the attribute
+ * @param oldAttr The <code>IDOM_Attr</code> node to remove from the attribute
* list.
* @return The <code>IDOM_Attr</code> node that was removed.
* @exception DOMException
* NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
- * <br>NOT_FOUND_ERR: Raised if <code>oldAttr</code> is not an attribute
+ * <br>NOT_FOUND_ERR: Raised if <code>oldAttr</code> is not an attribute
* of the element.
*/
virtual IDOM_Attr * removeAttributeNode(IDOM_Attr *oldAttr) = 0;
/**
- * Removes an attribute by name.
+ * Removes an attribute by name.
*
- * If the removed attribute
- * is known to have a default value, an attribute immediately appears
- * containing the default value as well as the corresponding namespace URI,
- * local name, and prefix when applicable.<BR>To remove an attribute by local
+ * If the removed attribute
+ * is known to have a default value, an attribute immediately appears
+ * containing the default value as well as the corresponding namespace URI,
+ * local name, and prefix when applicable.<BR>To remove an attribute by local
* name and namespace URI, use the <CODE>removeAttributeNS</CODE> method.
* @param name The name of the attribute to remove.
* @exception DOMException
@@ -294,18 +265,18 @@ public:
const XMLCh *localName) const = 0;
/**
- * Adds a new attribute. If an attribute with the same
- * local name and namespace URI is already present on the element, its prefix
- * is changed to be the prefix part of the <CODE>qualifiedName</CODE>, and
- * its value is changed to be the <CODE>value</CODE> parameter. This value is
- * a simple string, it is not parsed as it is being set. So any markup (such
- * as syntax to be recognized as an entity reference) is treated as literal
- * text, and needs to be appropriately escaped by the implementation when it
- * is written out. In order to assign an attribute value that contains entity
+ * Adds a new attribute. If an attribute with the same
+ * local name and namespace URI is already present on the element, its prefix
+ * is changed to be the prefix part of the <CODE>qualifiedName</CODE>, and
+ * its value is changed to be the <CODE>value</CODE> parameter. This value is
+ * a simple string, it is not parsed as it is being set. So any markup (such
+ * as syntax to be recognized as an entity reference) is treated as literal
+ * text, and needs to be appropriately escaped by the implementation when it
+ * is written out. In order to assign an attribute value that contains entity
* references, the user must create an <CODE>IDOM_Attr</CODE>
* node plus any <CODE>IDOM_Text</CODE> and <CODE>IDOM_EntityReference</CODE>
- * nodes, build the appropriate subtree, and use
- * <CODE>setAttributeNodeNS</CODE> or <CODE>setAttributeNode</CODE> to assign
+ * nodes, build the appropriate subtree, and use
+ * <CODE>setAttributeNodeNS</CODE> or <CODE>setAttributeNode</CODE> to assign
* it as the value of an attribute.
*
* <p><b>"Experimental - subject to change"</b></p>
@@ -316,21 +287,21 @@ public:
* attribute to create or alter.
* @param value The value to set in string form.
* @exception DOMException
- * INVALID_CHARACTER_ERR: Raised if the specified qualified name contains an
+ * INVALID_CHARACTER_ERR: Raised if the specified qualified name contains an
* illegal character.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
* <br>
- * NAMESPACE_ERR: Raised if the <CODE>qualifiedName</CODE> is
- * malformed, if the <CODE>qualifiedName</CODE> has a prefix and the
- * <CODE>namespaceURI</CODE> is <CODE>null</CODE> or an empty string,
- * if the <CODE>qualifiedName</CODE> has a prefix that is "xml" and the
- * <CODE>namespaceURI</CODE> is different from
- * "http://www.w3.org/XML/1998/namespace", if the
- * <CODE>qualifiedName</CODE> has a prefix that is "xmlns" and the
- * <CODE>namespaceURI</CODE> is different from
- * "http://www.w3.org/2000/xmlns/", or if the
- * <CODE>qualifiedName</CODE> is "xmlns" and the
- * <CODE>namespaceURI</CODE> is different from
+ * NAMESPACE_ERR: Raised if the <CODE>qualifiedName</CODE> is
+ * malformed, if the <CODE>qualifiedName</CODE> has a prefix and the
+ * <CODE>namespaceURI</CODE> is <CODE>null</CODE> or an empty string,
+ * if the <CODE>qualifiedName</CODE> has a prefix that is "xml" and the
+ * <CODE>namespaceURI</CODE> is different from
+ * "http://www.w3.org/XML/1998/namespace", if the
+ * <CODE>qualifiedName</CODE> has a prefix that is "xmlns" and the
+ * <CODE>namespaceURI</CODE> is different from
+ * "http://www.w3.org/2000/xmlns/", or if the
+ * <CODE>qualifiedName</CODE> is "xmlns" and the
+ * <CODE>namespaceURI</CODE> is different from
* "http://www.w3.org/2000/xmlns/".
*/
virtual void setAttributeNS(const XMLCh *namespaceURI,
@@ -339,7 +310,7 @@ public:
/**
* Removes an attribute by local name and namespace URI. If the
* removed attribute has a default value it is immediately replaced.
- * The replacing attribute has the same namespace URI and local name, as well as
+ * The replacing attribute has the same namespace URI and local name, as well as
* the original prefix.
*
* <p><b>"Experimental - subject to change"</b></p>
@@ -370,9 +341,9 @@ public:
const XMLCh *localName) const = 0;
/**
- * Adds a new attribute.
- *
- * If an attribute with that local name and namespace URI is already present
+ * Adds a new attribute.
+ *
+ * If an attribute with that local name and namespace URI is already present
* in the element, it is replaced by the new one.
*
* <p><b>"Experimental - subject to change"</b></p>
@@ -383,12 +354,12 @@ public:
* the replaced <code>IDOM_Attr</code> node is
* returned, otherwise <code>null</code> is returned.
* @exception DOMException
- * WRONG_DOCUMENT_ERR: Raised if <code>newAttr</code> was created from a
+ * WRONG_DOCUMENT_ERR: Raised if <code>newAttr</code> was created from a
* different document than the one that created the element.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
- * <br>INUSE_ATTRIBUTE_ERR: Raised if <code>newAttr</code> is already an
- * attribute of another <code>IDOM_Element</code> object. The DOM user must
- * explicitly clone <code>IDOM_Attr</code> nodes to re-use them in other
+ * <br>INUSE_ATTRIBUTE_ERR: Raised if <code>newAttr</code> is already an
+ * attribute of another <code>IDOM_Element</code> object. The DOM user must
+ * explicitly clone <code>IDOM_Attr</code> nodes to re-use them in other
* elements.
*/
virtual IDOM_Attr * setAttributeNodeNS(IDOM_Attr *newAttr) = 0;
diff --git a/src/idom/IDOM_Entity.hpp b/src/idom/IDOM_Entity.hpp
index f986b5b0464310b31f010baccfa461b73dd2ac78..f542870f595ae12d213712d424d6ec51f91467ad 100644
--- a/src/idom/IDOM_Entity.hpp
+++ b/src/idom/IDOM_Entity.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -48,10 +48,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -59,37 +59,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:30 andyh
- * Initial revision
- *
- * Revision 1.8 2000/09/09 00:11:46 andyh
- * Virtual Destructor Patch, submitted by Kirk Wylie
- *
- * Revision 1.7 2000/04/19 02:26:16 aruna1
- * Full support for DOM_EntityReference, IDOM_Entity and DOM_DocumentType introduced
- *
- * Revision 1.6 2000/03/11 02:58:38 chchou
- * Fix bug # 18, remove set method of readonly attributes
- *
- * Revision 1.5 2000/03/02 19:53:55 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.4 2000/02/24 20:11:28 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.3 2000/02/06 07:47:30 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/01/05 01:16:07 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:58 twl
- * Initial checkin
+ * Revision 1.2 2001/05/11 13:25:52 tng
+ * Copyright update.
*
- * Revision 1.2 1999/11/08 20:44:17 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:30 andyh
+ * IDOM
*
*/
@@ -99,16 +73,16 @@
/**
- * This interface represents an entity, either parsed or unparsed, in an XML
- * document.
+ * This interface represents an entity, either parsed or unparsed, in an XML
+ * document.
*
- * Note that this models the entity itself not the entity
- * declaration. <code>Entity</code> declaration modeling has been left for a
+ * Note that this models the entity itself not the entity
+ * declaration. <code>Entity</code> declaration modeling has been left for a
* later Level of the DOM specification.
- * <p>The <code>nodeName</code> attribute that is inherited from
+ * <p>The <code>nodeName</code> attribute that is inherited from
* <code>Node</code> contains the name of the entity.
- * <p>An XML processor may choose to completely expand entities before the
- * structure model is passed to the DOM; in this case there will be no
+ * <p>An XML processor may choose to completely expand entities before the
+ * structure model is passed to the DOM; in this case there will be no
* <code>EntityReference</code> nodes in the document tree.
*
* <p>Note: the first release of this parser does not create entity
@@ -127,23 +101,23 @@ public:
/** @name Get functions. */
//@{
/**
- * The public identifier associated with the entity, if specified.
+ * The public identifier associated with the entity, if specified.
*
* If the public identifier was not specified, this is <code>null</code>.
*/
virtual const XMLCh * getPublicId() const = 0;
/**
- * The system identifier associated with the entity, if specified.
+ * The system identifier associated with the entity, if specified.
*
* If the system identifier was not specified, this is <code>null</code>.
*/
virtual const XMLCh * getSystemId() const = 0;
/**
- * For unparsed entities, the name of the notation for the entity.
+ * For unparsed entities, the name of the notation for the entity.
*
- * For parsed entities, this is <code>null</code>.
+ * For parsed entities, this is <code>null</code>.
*/
virtual const XMLCh * getNotationName() const = 0;
diff --git a/src/idom/IDOM_EntityReference.hpp b/src/idom/IDOM_EntityReference.hpp
index 7ac214cc537fd194b950a9bf9017cc4821e2e456..e447748efe6e1f9f0f14b040a29bcdc652505a4d 100644
--- a/src/idom/IDOM_EntityReference.hpp
+++ b/src/idom/IDOM_EntityReference.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -48,10 +48,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -59,28 +59,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:30 andyh
- * Initial revision
- *
- * Revision 1.5 2000/03/02 19:53:56 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.4 2000/02/24 20:11:28 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.3 2000/02/06 07:47:30 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/01/05 01:16:07 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:58 twl
- * Initial checkin
+ * Revision 1.2 2001/05/11 13:25:52 tng
+ * Copyright update.
*
- * Revision 1.2 1999/11/08 20:44:18 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:30 andyh
+ * IDOM
*
*/
@@ -90,9 +73,9 @@
/**
- * <code>EntityReference</code> nodes will appear in the structure
- * model when an entity reference is in the source document, or when the user
- * wishes to insert an entity reference.
+ * <code>EntityReference</code> nodes will appear in the structure
+ * model when an entity reference is in the source document, or when the user
+ * wishes to insert an entity reference.
*
* The expansion of the entity will appear as child nodes of the entity
* reference node. The expansion may be just simple text, or it may
diff --git a/src/idom/IDOM_NamedNodeMap.hpp b/src/idom/IDOM_NamedNodeMap.hpp
index 2a57c0bb500b4b9ba81edf07e82521cf14f1b746..6de0203c8cc694f225554579a6b90004150066e2 100644
--- a/src/idom/IDOM_NamedNodeMap.hpp
+++ b/src/idom/IDOM_NamedNodeMap.hpp
@@ -4,38 +4,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -49,10 +49,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -60,57 +60,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:30 andyh
- * Initial revision
- *
- * Revision 1.13 2000/06/07 22:49:40 andyh
- * Memory usage reduction: DOM NamedNodeMaps for attributes are allocated
- * only for elements that actually have attributes. By Joe Polastre.
- *
- * Revision 1.12 2000/03/11 03:19:13 chchou
- * Fix bug # 19, add const keyword to API
- *
- * Revision 1.11 2000/03/02 19:53:56 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.10 2000/02/24 20:11:28 abagchi
- * Swat for removing Log from API docs
+ * Revision 1.2 2001/05/11 13:25:53 tng
+ * Copyright update.
*
- * Revision 1.9 2000/02/17 17:47:24 andyh
- * Update Doc++ API comments
- * NameSpace update to track W3C
- * Changes were made by Chih Hsiang Chou
- *
- * Revision 1.8 2000/02/15 23:17:36 andyh
- * Update Doc++ API comments
- * NameSpace bugfix and update to track W3C
- * Chih Hsiang Chou
- *
- * Revision 1.7 2000/02/10 20:20:42 abagchi
- * Added docs for assignment operators
- *
- * Revision 1.6 2000/02/10 20:19:24 abagchi
- * Added docs for equality operators
- *
- * Revision 1.5 2000/02/06 07:47:30 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.4 2000/02/04 01:49:28 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.3 2000/01/22 01:38:29 andyh
- * Remove compiler warnings in DOM impl classes
- *
- * Revision 1.2 2000/01/05 01:16:07 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:59 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:44:18 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:30 andyh
+ * IDOM
*
*/
@@ -119,57 +73,57 @@
class IDOM_Node;
/**
-* <code>NamedNodeMap</code>s are used to
+* <code>NamedNodeMap</code>s are used to
* represent collections of nodes that can be accessed by name.
*
-* Note that <code>NamedNodeMap</code> does not inherit from <code>NodeList</code>;
-* <code>NamedNodeMap</code>s are not maintained in any particular order.
-* Nodes contained in a <code>NamedNodeMap</code> may
-* also be accessed by an ordinal index, but this is simply to allow
-* convenient enumeration of the contents, and
-* does not imply that the DOM specifies an order to these Nodes.
+* Note that <code>NamedNodeMap</code> does not inherit from <code>NodeList</code>;
+* <code>NamedNodeMap</code>s are not maintained in any particular order.
+* Nodes contained in a <code>NamedNodeMap</code> may
+* also be accessed by an ordinal index, but this is simply to allow
+* convenient enumeration of the contents, and
+* does not imply that the DOM specifies an order to these Nodes.
*/
class CDOM_EXPORT IDOM_NamedNodeMap {
protected:
IDOM_NamedNodeMap() {};
IDOM_NamedNodeMap(const IDOM_NamedNodeMap &other) {};
IDOM_NamedNodeMap & operator = (const IDOM_NamedNodeMap &other) {return *this;};
-
+
public:
/** @name Destructor. */
//@{
virtual ~IDOM_NamedNodeMap() {};
-
+
//@}
/** @name Set functions. */
//@{
/**
- * Adds a node using its <code>nodeName</code> attribute.
+ * Adds a node using its <code>nodeName</code> attribute.
*
- * <br>As the <code>nodeName</code> attribute is used to derive the name
- * which the node must be stored under, multiple nodes of certain types
- * (those that have a "special" string value) cannot be stored as the names
+ * <br>As the <code>nodeName</code> attribute is used to derive the name
+ * which the node must be stored under, multiple nodes of certain types
+ * (those that have a "special" string value) cannot be stored as the names
* would clash. This is seen as preferable to allowing nodes to be aliased.
- * @param arg A node to store in a named node map. The node will later be
- * accessible using the value of the <code>nodeName</code> attribute of
- * the node. If a node with that name is already present in the map, it
+ * @param arg A node to store in a named node map. The node will later be
+ * accessible using the value of the <code>nodeName</code> attribute of
+ * the node. If a node with that name is already present in the map, it
* is replaced by the new one.
* @return If the new <code>Node</code> replaces an existing node the
- * replaced <code>Node</code> is returned,
+ * replaced <code>Node</code> is returned,
* otherwise <code>null</code> is returned.
* @exception DOMException
- * WRONG_DOCUMENT_ERR: Raised if <code>arg</code> was created from a
- * different document than the one that created the
+ * WRONG_DOCUMENT_ERR: Raised if <code>arg</code> was created from a
+ * different document than the one that created the
* <code>NamedNodeMap</code>.
- * <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this
+ * <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this
* <code>NamedNodeMap</code> is readonly.
- * <br>INUSE_ATTRIBUTE_ERR: Raised if <code>arg</code> is an
- * <code>Attr</code> that is already an attribute of another
- * <code>Element</code> object. The DOM user must explicitly clone
+ * <br>INUSE_ATTRIBUTE_ERR: Raised if <code>arg</code> is an
+ * <code>Attr</code> that is already an attribute of another
+ * <code>Element</code> object. The DOM user must explicitly clone
* <code>Attr</code> nodes to re-use them in other elements.
*/
virtual IDOM_Node *setNamedItem(IDOM_Node *arg) = 0;
@@ -179,14 +133,14 @@ public:
//@{
/**
- * Returns the <code>index</code>th item in the map.
+ * Returns the <code>index</code>th item in the map.
*
- * If <code>index</code>
- * is greater than or equal to the number of nodes in the map, this returns
+ * If <code>index</code>
+ * is greater than or equal to the number of nodes in the map, this returns
* <code>null</code>.
* @param index Index into the map.
- * @return The node at the <code>index</code>th position in the
- * <code>NamedNodeMap</code>, or <code>null</code> if that is not a valid
+ * @return The node at the <code>index</code>th position in the
+ * <code>NamedNodeMap</code>, or <code>null</code> if that is not a valid
* index.
*/
virtual IDOM_Node *item(unsigned int index) const = 0;
@@ -195,17 +149,17 @@ public:
* Retrieves a node specified by name.
*
* @param name The <code>nodeName</code> of a node to retrieve.
- * @return A <code>IDOM_Node</code> (of any type) with the specified <code>nodeName</code>, or
- * <code>null</code> if it does not identify any node in
- * the map.
+ * @return A <code>IDOM_Node</code> (of any type) with the specified <code>nodeName</code>, or
+ * <code>null</code> if it does not identify any node in
+ * the map.
*/
virtual IDOM_Node *getNamedItem(const XMLCh *name) const = 0;
/**
- * The number of nodes in the map.
+ * The number of nodes in the map.
*
- * The range of valid child node indices is
- * 0 to <code>length-1</code> inclusive.
+ * The range of valid child node indices is
+ * 0 to <code>length-1</code> inclusive.
*/
virtual unsigned int getLength() const = 0;
@@ -216,13 +170,13 @@ public:
/**
* Removes a node specified by name.
*
- * If the removed node is an
+ * If the removed node is an
* <code>Attr</code> with a default value it is immediately replaced.
* @param name The <code>nodeName</code> of a node to remove.
- * @return The node removed from the map or <code>null</code> if no node
+ * @return The node removed from the map or <code>null</code> if no node
* with such a name exists.
* @exception DOMException
- * NOT_FOUND_ERR: Raised if there is no node named <code>name</code> in
+ * NOT_FOUND_ERR: Raised if there is no node named <code>name</code> in
* the map.
* <br>
* NO_MODIFICATION_ALLOWED_ERR: Raised if this <code>NamedNodeMap</code>
@@ -254,23 +208,23 @@ public:
*
* <p><b>"Experimental - subject to change"</b></p>
*
- * @param arg A node to store in a named node map. The node will later be
- * accessible using the value of the <CODE>namespaceURI</CODE> and
- * <CODE>localName</CODE> attribute of the node. If a node with those
- * namespace URI and local name is already present in the map, it is
+ * @param arg A node to store in a named node map. The node will later be
+ * accessible using the value of the <CODE>namespaceURI</CODE> and
+ * <CODE>localName</CODE> attribute of the node. If a node with those
+ * namespace URI and local name is already present in the map, it is
* replaced by the new one.
* @return If the new <code>IDOM_Node</code> replaces an existing node the
- * replaced <code>IDOM_Node</code> is returned,
+ * replaced <code>IDOM_Node</code> is returned,
* otherwise <code>null</code> is returned.
* @exception DOMException
- * WRONG_DOCUMENT_ERR: Raised if <code>arg</code> was created from a
- * different document than the one that created the
+ * WRONG_DOCUMENT_ERR: Raised if <code>arg</code> was created from a
+ * different document than the one that created the
* <code>IDOM_NamedNodeMap</code>.
- * <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this
+ * <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this
* <code>vNamedNodeMap</code> is readonly.
- * <br>INUSE_ATTRIBUTE_ERR: Raised if <code>arg</code> is an
- * <code>DOM_Attr</code> that is already an attribute of another
- * <code>DOM_Element</code> object. The DOM user must explicitly clone
+ * <br>INUSE_ATTRIBUTE_ERR: Raised if <code>arg</code> is an
+ * <code>DOM_Attr</code> that is already an attribute of another
+ * <code>DOM_Element</code> object. The DOM user must explicitly clone
* <code>DOM_Attr</code> nodes to re-use them in other elements.
*/
virtual IDOM_Node *setNamedItemNS(IDOM_Node *arg) = 0;
@@ -292,7 +246,7 @@ public:
* @return The node removed from the map if a node with such a local name
* and namespace URI exists.
* @exception DOMException
- * NOT_FOUND_ERR: Raised if there is no node named <code>name</code> in
+ * NOT_FOUND_ERR: Raised if there is no node named <code>name</code> in
* the map.
* <br>
* NO_MODIFICATION_ALLOWED_ERR: Raised if this <code>IDOM_NamedNodeMap</code>
diff --git a/src/idom/IDOM_Node.hpp b/src/idom/IDOM_Node.hpp
index 2656271bdbac7185bb766a631caa3b2cc7bbb960..51ed7361691c3329e5241ea85cdc4e42859c82c6 100644
--- a/src/idom/IDOM_Node.hpp
+++ b/src/idom/IDOM_Node.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,12 +48,15 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
+/*
+ * $Id$
+ */
#ifndef IDOM_Node_HEADER_GUARD_
#define IDOM_Node_HEADER_GUARD_
@@ -116,7 +119,7 @@ class CDOM_EXPORT IDOM_Node {
/** @name Destructor. */
//@{
/**
- * Destructor for IDOM_Node.
+ * Destructor for IDOM_Node.
*
*/
virtual ~IDOM_Node() {};
@@ -395,19 +398,19 @@ class CDOM_EXPORT IDOM_Node {
//@{
/**
- * Puts all <CODE>IDOM_Text</CODE>
- * nodes in the full depth of the sub-tree underneath this <CODE>IDOM_Node</CODE>,
- * including attribute nodes, into a "normal" form where only markup (e.g.,
- * tags, comments, processing instructions, CDATA sections, and entity
+ * Puts all <CODE>IDOM_Text</CODE>
+ * nodes in the full depth of the sub-tree underneath this <CODE>IDOM_Node</CODE>,
+ * including attribute nodes, into a "normal" form where only markup (e.g.,
+ * tags, comments, processing instructions, CDATA sections, and entity
* references) separates <CODE>IDOM_Text</CODE>
* nodes, i.e., there are neither adjacent <CODE>IDOM_Text</CODE>
* nodes nor empty <CODE>IDOM_Text</CODE>
- * nodes. This can be used to ensure that the DOM view of a document is the
- * same as if it were saved and re-loaded, and is useful when operations
- * (such as XPointer lookups) that depend on a particular document tree
+ * nodes. This can be used to ensure that the DOM view of a document is the
+ * same as if it were saved and re-loaded, and is useful when operations
+ * (such as XPointer lookups) that depend on a particular document tree
* structure are to be used.
- * <P><B>Note:</B> In cases where the document contains <CODE>IDOM_CDATASections</CODE>,
- * the normalize operation alone may not be sufficient, since XPointers do
+ * <P><B>Note:</B> In cases where the document contains <CODE>IDOM_CDATASections</CODE>,
+ * the normalize operation alone may not be sufficient, since XPointers do
* not differentiate between <CODE>IDOM_Text</CODE>
* nodes and <CODE>IDOM_CDATASection</CODE>
* nodes.</P>
@@ -443,8 +446,8 @@ class CDOM_EXPORT IDOM_Node {
* based on an examination of the namespace declarations in scope. It is
* merely the namespace URI given at creation time.
* <p>
- * For nodes of any type other than <CODE>ELEMENT_NODE</CODE> and
- * <CODE>ATTRIBUTE_NODE</CODE> and nodes created with a DOM Level 1 method,
+ * For nodes of any type other than <CODE>ELEMENT_NODE</CODE> and
+ * <CODE>ATTRIBUTE_NODE</CODE> and nodes created with a DOM Level 1 method,
* such as <CODE>createElement</CODE> from the <CODE>IDOM_Document</CODE>
* interface, this is always <CODE>null</CODE>.
*
@@ -476,15 +479,15 @@ class CDOM_EXPORT IDOM_Node {
/**
* Set the <em>namespace prefix</em> of this node.
* <p>
- * Note that setting this attribute, when permitted, changes
- * the <CODE>nodeName</CODE> attribute, which holds the <EM>qualified
- * name</EM>, as well as the <CODE>tagName</CODE> and <CODE>name</CODE>
+ * Note that setting this attribute, when permitted, changes
+ * the <CODE>nodeName</CODE> attribute, which holds the <EM>qualified
+ * name</EM>, as well as the <CODE>tagName</CODE> and <CODE>name</CODE>
* attributes of the <CODE>IDOM_Element</CODE> and <CODE>IDOM_Attr</CODE>
* interfaces, when applicable.
* <p>
- * Note also that changing the prefix of an
- * attribute, that is known to have a default value, does not make a new
- * attribute with the default value and the original prefix appear, since the
+ * Note also that changing the prefix of an
+ * attribute, that is known to have a default value, does not make a new
+ * attribute with the default value and the original prefix appear, since the
* <CODE>namespaceURI</CODE> and <CODE>localName</CODE> do not change.
*
*
@@ -495,14 +498,14 @@ class CDOM_EXPORT IDOM_Node {
* <br>
* NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
* <br>
- * NAMESPACE_ERR: Raised if the specified <CODE>prefix</CODE> is
- * malformed, if the <CODE>namespaceURI</CODE> of this node is
- * <CODE>null</CODE>, if the specified prefix is "xml" and the
- * <CODE>namespaceURI</CODE> of this node is different from
- * "http://www.w3.org/XML/1998/namespace", if this node is an attribute
- * and the specified prefix is "xmlns" and the
- * <CODE>namespaceURI</CODE> of this node is different from
- * "http://www.w3.org/2000/xmlns/", or if this node is an attribute and
+ * NAMESPACE_ERR: Raised if the specified <CODE>prefix</CODE> is
+ * malformed, if the <CODE>namespaceURI</CODE> of this node is
+ * <CODE>null</CODE>, if the specified prefix is "xml" and the
+ * <CODE>namespaceURI</CODE> of this node is different from
+ * "http://www.w3.org/XML/1998/namespace", if this node is an attribute
+ * and the specified prefix is "xmlns" and the
+ * <CODE>namespaceURI</CODE> of this node is different from
+ * "http://www.w3.org/2000/xmlns/", or if this node is an attribute and
* the <CODE>qualifiedName</CODE> of this node is "xmlns".
*/
virtual void setPrefix(const XMLCh * prefix) = 0;
diff --git a/src/idom/IDOM_NodeFilter.hpp b/src/idom/IDOM_NodeFilter.hpp
index 0186133bb59f8dd30c95d0efc44c066ae5873568..69cc5986c57381a996b26b4eda53e0933edb499e 100644
--- a/src/idom/IDOM_NodeFilter.hpp
+++ b/src/idom/IDOM_NodeFilter.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,45 +56,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:31 andyh
- * Initial revision
+ * Revision 1.2 2001/05/11 13:25:53 tng
+ * Copyright update.
*
- * Revision 1.10 2000/10/20 22:03:04 andyh
- * DOM NodeFileter - define values for FilterAction enum to match those in the DOM spec.
- *
- * Revision 1.9 2000/05/11 00:07:38 abagchi
- * Removed tables. It was confusing doxygen
- *
- * Revision 1.8 2000/03/11 03:19:13 chchou
- * Fix bug # 19, add const keyword to API
- *
- * Revision 1.7 2000/02/24 20:11:28 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.6 2000/02/17 17:47:25 andyh
- * Update Doc++ API comments
- * NameSpace update to track W3C
- * Changes were made by Chih Hsiang Chou
- *
- * Revision 1.5 2000/02/15 23:17:37 andyh
- * Update Doc++ API comments
- * NameSpace bugfix and update to track W3C
- * Chih Hsiang Chou
- *
- * Revision 1.4 2000/02/10 21:47:12 abagchi
- * Added API docs
- *
- * Revision 1.3 2000/02/06 07:47:30 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/02/04 01:49:28 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.1.1.1 1999/11/09 01:09:00 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:19 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:31 andyh
+ * IDOM
*
*/
diff --git a/src/idom/IDOM_NodeIterator.hpp b/src/idom/IDOM_NodeIterator.hpp
index 6ed1e87ded2a141c07d74683f66d3977ffa14d1d..8a49f248b2aaeb3ed64bbc48b715802b2c167b38 100644
--- a/src/idom/IDOM_NodeIterator.hpp
+++ b/src/idom/IDOM_NodeIterator.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,42 +56,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:31 andyh
- * Initial revision
+ * Revision 1.2 2001/05/11 13:25:53 tng
+ * Copyright update.
*
- * Revision 1.9 2000/02/17 17:47:25 andyh
- * Update Doc++ API comments
- * NameSpace update to track W3C
- * Changes were made by Chih Hsiang Chou
- *
- * Revision 1.8 2000/02/16 19:39:38 aruna1
- * API Doc++ changes in
- *
- * Revision 1.7 2000/02/15 23:17:37 andyh
- * Update Doc++ API comments
- * NameSpace bugfix and update to track W3C
- * Chih Hsiang Chou
- *
- * Revision 1.6 2000/02/11 18:14:11 abagchi
- * Fixed doc++ bugs
- *
- * Revision 1.5 2000/02/11 03:01:04 abagchi
- * Made protected method public to compile, must be fixed later
- *
- * Revision 1.4 2000/02/10 23:38:05 abagchi
- * Added API docs
- *
- * Revision 1.3 2000/02/06 07:47:30 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/02/04 01:49:28 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.3 1999/11/08 20:44:20 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
- * Revision 1.1.1.1 1999/11/09 01:09:01 twl
- * Initial checkin
+ * Revision 1.1.1.1 2001/04/03 00:14:31 andyh
+ * IDOM
*
*/
diff --git a/src/idom/IDOM_NodeList.hpp b/src/idom/IDOM_NodeList.hpp
index 19714fceee1efc3a5531b840b4f0cbe2fea5d9a1..da373ff9b46b8d106950d79b627da1a863354d06 100644
--- a/src/idom/IDOM_NodeList.hpp
+++ b/src/idom/IDOM_NodeList.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -48,10 +48,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -59,40 +59,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:31 andyh
- * Initial revision
- *
- * Revision 1.9 2000/04/19 02:26:16 aruna1
- * Full support for DOM_EntityReference, DOM_Entity and DOM_DocumentType introduced
- *
- * Revision 1.8 2000/03/02 19:53:56 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.7 2000/02/24 20:11:28 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.6 2000/02/10 20:38:46 abagchi
- * Added docs for equality operators
- *
- * Revision 1.5 2000/02/06 07:47:30 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.4 2000/02/04 01:49:27 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.3 2000/01/22 01:38:29 andyh
- * Remove compiler warnings in DOM impl classes
- *
- * Revision 1.2 2000/01/05 01:16:08 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.1.1.1 1999/11/09 01:09:02 twl
- * Initial checkin
+ * Revision 1.2 2001/05/11 13:25:54 tng
+ * Copyright update.
*
- * Revision 1.2 1999/11/08 20:44:20 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:31 andyh
+ * IDOM
*
*/
@@ -102,12 +73,12 @@ class IDOM_Node;
/**
- * The <code>NodeList</code> interface provides the abstraction of an ordered
- * collection of nodes. NodeLists are created by DOM_Document::getElementsByTagName(),
- * DOM_Node::getChildNodes(),
+ * The <code>NodeList</code> interface provides the abstraction of an ordered
+ * collection of nodes. NodeLists are created by DOM_Document::getElementsByTagName(),
+ * DOM_Node::getChildNodes(),
*
- * <p>The items in the <code>NodeList</code> are accessible via an integral
- * index, starting from 0.
+ * <p>The items in the <code>NodeList</code> are accessible via an integral
+ * index, starting from 0.
*
* NodeLists are "live", in that any changes to the document tree are immediately
* reflected in any NodeLists that may have been created for that tree.
@@ -130,22 +101,22 @@ public:
/** @name Get functions. */
//@{
/**
- * Returns the <code>index</code>th item in the collection.
+ * Returns the <code>index</code>th item in the collection.
*
- * If <code>index</code> is greater than or equal to the number of nodes in
+ * If <code>index</code> is greater than or equal to the number of nodes in
* the list, this returns <code>null</code>.
*
* @param index Index into the collection.
- * @return The node at the <code>index</code>th position in the
- * <code>NodeList</code>, or <code>null</code> if that is not a valid
+ * @return The node at the <code>index</code>th position in the
+ * <code>NodeList</code>, or <code>null</code> if that is not a valid
* index.
*/
virtual IDOM_Node *item(unsigned int index) const = 0;
/**
- * Returns the number of nodes in the list.
+ * Returns the number of nodes in the list.
*
- * The range of valid child node indices is 0 to <code>length-1</code> inclusive.
+ * The range of valid child node indices is 0 to <code>length-1</code> inclusive.
*/
virtual unsigned int getLength() const = 0;
//@}
diff --git a/src/idom/IDOM_Notation.hpp b/src/idom/IDOM_Notation.hpp
index b2b4297fd8144e23d9ebd56422b2ace418512ee8..82589c1998c625a8369d43716ae0b4cdabd62fda 100644
--- a/src/idom/IDOM_Notation.hpp
+++ b/src/idom/IDOM_Notation.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -48,10 +48,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -59,31 +59,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:32 andyh
- * Initial revision
- *
- * Revision 1.6 2000/03/11 02:58:39 chchou
- * Fix bug # 18, remove set method of readonly attributes
- *
- * Revision 1.5 2000/03/02 19:53:57 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.4 2000/02/24 20:11:28 abagchi
- * Swat for removing Log from API docs
+ * Revision 1.2 2001/05/11 13:25:54 tng
+ * Copyright update.
*
- * Revision 1.3 2000/02/06 07:47:31 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/01/05 01:16:08 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.1.1.1 1999/11/09 01:09:03 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:21 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:32 andyh
+ * IDOM
*
*/
@@ -92,13 +72,13 @@
/**
- * This interface represents a notation declared in the DTD. A notation either
- * declares, by name, the format of an unparsed entity (see section 4.7 of
- * the XML 1.0 specification), or is used for formal declaration of
- * Processing Instruction targets (see section 2.6 of the XML 1.0
- * specification). The <code>nodeName</code> attribute inherited from
+ * This interface represents a notation declared in the DTD. A notation either
+ * declares, by name, the format of an unparsed entity (see section 4.7 of
+ * the XML 1.0 specification), or is used for formal declaration of
+ * Processing Instruction targets (see section 2.6 of the XML 1.0
+ * specification). The <code>nodeName</code> attribute inherited from
* <code>Node</code> is set to the declared name of the notation.
- * <p>The DOM Level 1 does not support editing <code>Notation</code> nodes;
+ * <p>The DOM Level 1 does not support editing <code>Notation</code> nodes;
* they are therefore readonly.
* <p>A <code>Notation</code> node does not have any parent.
*/
@@ -115,17 +95,17 @@ public:
//@{
/**
- * Get the public identifier of this notation.
- *
- * If the public identifier was not
+ * Get the public identifier of this notation.
+ *
+ * If the public identifier was not
* specified, this is <code>null</code>.
* @return Returns the public identifier of the notation
*/
virtual const XMLCh *getPublicId() const = 0;
/**
- * Get the system identifier of this notation.
+ * Get the system identifier of this notation.
*
- * If the system identifier was not
+ * If the system identifier was not
* specified, this is <code>null</code>.
* @return Returns the system identifier of the notation
*/
diff --git a/src/idom/IDOM_ProcessingInstruction.hpp b/src/idom/IDOM_ProcessingInstruction.hpp
index 55554ff0b77db5c657076c0adc264e262f06be68..ead5a9a6bfad7ec5976ce3ca332b862aeac4bdf2 100644
--- a/src/idom/IDOM_ProcessingInstruction.hpp
+++ b/src/idom/IDOM_ProcessingInstruction.hpp
@@ -4,38 +4,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -49,10 +49,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -60,28 +60,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:32 andyh
- * Initial revision
- *
- * Revision 1.5 2000/03/02 19:53:57 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.4 2000/02/24 20:11:28 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.3 2000/02/06 07:47:31 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/01/05 01:16:08 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.1.1.1 1999/11/09 01:09:03 twl
- * Initial checkin
+ * Revision 1.2 2001/05/11 13:25:54 tng
+ * Copyright update.
*
- * Revision 1.2 1999/11/08 20:44:21 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:32 andyh
+ * IDOM
*
*/
@@ -90,8 +73,8 @@
/**
- * The <code>ProcessingInstruction</code> interface represents a "processing
- * instruction", used in XML as a way to keep processor-specific information
+ * The <code>ProcessingInstruction</code> interface represents a "processing
+ * instruction", used in XML as a way to keep processor-specific information
* in the text of the document.
*/
class CDOM_EXPORT IDOM_ProcessingInstruction: public IDOM_Node {
@@ -108,18 +91,18 @@ public:
/** @name Get functions. */
//@{
/**
- * The target of this processing instruction.
+ * The target of this processing instruction.
*
- * XML defines this as being the
+ * XML defines this as being the
* first token following the markup that begins the processing instruction.
*/
virtual const XMLCh * getTarget() const = 0;
/**
- * The content of this processing instruction.
+ * The content of this processing instruction.
*
- * This is from the first non
- * white space character after the target to the character immediately
+ * This is from the first non
+ * white space character after the target to the character immediately
* preceding the <code>?></code>.
* @exception DOMException
* NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly.
@@ -130,10 +113,10 @@ public:
/** @name Set functions. */
//@{
/**
- * Sets the content of this processing instruction.
+ * Sets the content of this processing instruction.
*
- * This is from the first non
- * white space character after the target to the character immediately
+ * This is from the first non
+ * white space character after the target to the character immediately
* preceding the <code>?></code>.
* @param data The string containing the processing instruction
*/
diff --git a/src/idom/IDOM_Range.hpp b/src/idom/IDOM_Range.hpp
index 94524d03b423a2c8176af0bba9b6286fd88f580e..e0c67366d8ae5e7197a52035b9a4bb475bd3bd18 100644
--- a/src/idom/IDOM_Range.hpp
+++ b/src/idom/IDOM_Range.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -84,7 +84,7 @@ public:
DOM_Range();
~DOM_Range();
-
+
DOM_Range & operator = (const DOM_Range &other);
DOM_Range & operator = (const DOM_NullPtr *other);
bool operator != (const DOM_Range & other) const;
@@ -108,7 +108,7 @@ public:
void setStartAfter(const DOM_Node &refNode);
void setEndBefore(const DOM_Node &refNode);
void setEndAfter(const DOM_Node &refNode);
-
+
//misc functions
void collapse(bool toStart);
void selectNode(const DOM_Node &node);
@@ -126,8 +126,8 @@ public:
DOMString toString() const;
void detach();
-
-
+
+
protected:
diff --git a/src/idom/IDOM_RangeException.hpp b/src/idom/IDOM_RangeException.hpp
index ec17b7c86e6892566eb5ef490f33216cf01f6729..5d1500af343834a3fbdbcef7b34ceb8b542db632 100644
--- a/src/idom/IDOM_RangeException.hpp
+++ b/src/idom/IDOM_RangeException.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,11 +56,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:32 andyh
- * Initial revision
+ * Revision 1.2 2001/05/11 13:25:55 tng
+ * Copyright update.
*
- * Revision 1.1 2000/07/28 01:33:31 aruna1
- * DOM Level 2 Range feature introduced
+ * Revision 1.1.1.1 2001/04/03 00:14:32 andyh
+ * IDOM
*
*/
@@ -70,12 +70,12 @@
#include <dom/DOM_DOMException.hpp>
/**
- * Encapsulate range related DOM error or warning. DOM level 2 implementation.
+ * Encapsulate range related DOM error or warning. DOM level 2 implementation.
*
* <p> The DOM will create and throw an instance of DOM_RangeException
* when an error condition in range is detected. Exceptions can occur
* when an application directly manipulates the range elements in DOM document
- * tree that is produced by the parser.
+ * tree that is produced by the parser.
*
* <p>Unlike the other classes in the C++ DOM API, DOM_RangeException
* is NOT a reference to an underlying implementation class, and
diff --git a/src/idom/IDOM_Text.hpp b/src/idom/IDOM_Text.hpp
index cf449c6fc796ec68e2ec3d8b5035988d0253d226..8675b6f208b6bd677f5e38be059b94f0e194c802 100644
--- a/src/idom/IDOM_Text.hpp
+++ b/src/idom/IDOM_Text.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,37 +56,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:32 andyh
- * Initial revision
- *
- * Revision 1.8 2000/07/28 01:33:31 aruna1
- * DOM Level 2 Range feature introduced
- *
- * Revision 1.7 2000/03/24 01:30:50 chchou
- * Fix bug #8 to support ignorable whitespace text nodes
- *
- * Revision 1.6 2000/03/02 19:53:57 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.5 2000/02/24 20:11:28 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.4 2000/02/06 07:47:31 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.3 2000/02/04 01:49:27 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.2 2000/01/05 01:16:08 andyh
- * DOM Level 2 core, namespace support added.
- *
- * Revision 1.1.1.1 1999/11/09 01:09:04 twl
- * Initial checkin
+ * Revision 1.2 2001/05/11 13:25:55 tng
+ * Copyright update.
*
- * Revision 1.2 1999/11/08 20:44:22 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:32 andyh
+ * IDOM
*
*/
@@ -99,24 +73,24 @@
/**
- * The <code>Text</code> interface represents the textual content (termed
- * character data in XML) of an <code>Element</code> or <code>Attr</code>.
- * If there is no markup inside an element's content, the text is contained
- * in a single object implementing the <code>Text</code> interface that is
- * the only child of the element. If there is markup, it is parsed into a
- * list of elements and <code>Text</code> nodes that form the list of
+ * The <code>Text</code> interface represents the textual content (termed
+ * character data in XML) of an <code>Element</code> or <code>Attr</code>.
+ * If there is no markup inside an element's content, the text is contained
+ * in a single object implementing the <code>Text</code> interface that is
+ * the only child of the element. If there is markup, it is parsed into a
+ * list of elements and <code>Text</code> nodes that form the list of
* children of the element.
- * <p>When a document is first made available via the DOM, there is only one
- * <code>Text</code> node for each block of text. Users may create adjacent
- * <code>Text</code> nodes that represent the contents of a given element
- * without any intervening markup, but should be aware that there is no way
- * to represent the separations between these nodes in XML, so they
- * will not (in general) persist between DOM editing sessions. The
- * <code>normalize()</code> method on <code>Element</code> merges any such
- * adjacent <code>Text</code> objects into a single node for each block of
- * text; this is recommended before employing operations that depend on a
- * particular document structure, such as navigation with
- * <code>XPointers.</code>
+ * <p>When a document is first made available via the DOM, there is only one
+ * <code>Text</code> node for each block of text. Users may create adjacent
+ * <code>Text</code> nodes that represent the contents of a given element
+ * without any intervening markup, but should be aware that there is no way
+ * to represent the separations between these nodes in XML, so they
+ * will not (in general) persist between DOM editing sessions. The
+ * <code>normalize()</code> method on <code>Element</code> merges any such
+ * adjacent <code>Text</code> objects into a single node for each block of
+ * text; this is recommended before employing operations that depend on a
+ * particular document structure, such as navigation with
+ * <code>XPointers.</code>
*/
class CDOM_EXPORT IDOM_Text: public IDOM_CharacterData {
@@ -146,19 +120,19 @@ class CDOM_EXPORT IDOM_Text: public IDOM_CharacterData {
//@{
/**
- * Breaks this node into two nodes at the specified
- * offset, keeping both in the tree as siblings.
+ * Breaks this node into two nodes at the specified
+ * offset, keeping both in the tree as siblings.
*
- * This node then only
- * contains all the content up to the <code>offset</code> point. And a new
- * node of the same nodeType, which is inserted as the next sibling of this
- * node, contains all the content at and after the <code>offset</code>
+ * This node then only
+ * contains all the content up to the <code>offset</code> point. And a new
+ * node of the same nodeType, which is inserted as the next sibling of this
+ * node, contains all the content at and after the <code>offset</code>
* point. When the <code>offset</code> is equal to the lenght of this node,
* the new node has no data.
* @param offset The offset at which to split, starting from 0.
* @return The new <code>Text</code> node.
* @exception DOMException
- * INDEX_SIZE_ERR: Raised if the specified offset is negative or greater
+ * INDEX_SIZE_ERR: Raised if the specified offset is negative or greater
* than the number of characters in <code>data</code>.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
*/
diff --git a/src/idom/IDOM_TreeWalker.hpp b/src/idom/IDOM_TreeWalker.hpp
index 79d7c2a0e6c2e35dd9b26809d4935fc93bf55204..9a3be20d75a3569bc937cde8682ee8209d6b1972 100644
--- a/src/idom/IDOM_TreeWalker.hpp
+++ b/src/idom/IDOM_TreeWalker.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,42 +56,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:33 andyh
- * Initial revision
+ * Revision 1.2 2001/05/11 13:25:56 tng
+ * Copyright update.
*
- * Revision 1.9 2000/08/08 01:00:36 aruna1
- * detach functionality removed from TreeWalker
- *
- * Revision 1.8 2000/02/24 20:11:29 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.7 2000/02/17 17:47:25 andyh
- * Update Doc++ API comments
- * NameSpace update to track W3C
- * Changes were made by Chih Hsiang Chou
- *
- * Revision 1.6 2000/02/15 23:17:37 andyh
- * Update Doc++ API comments
- * NameSpace bugfix and update to track W3C
- * Chih Hsiang Chou
- *
- * Revision 1.5 2000/02/11 03:01:04 abagchi
- * Made protected method public to compile, must be fixed later
- *
- * Revision 1.4 2000/02/11 01:05:11 abagchi
- * Added API docs
- *
- * Revision 1.3 2000/02/06 07:47:31 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/02/04 01:49:27 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.1.1.1 1999/11/09 01:09:05 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:44:22 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:33 andyh
+ * IDOM
*
*/
@@ -283,9 +252,9 @@ class CDOM_EXPORT DOM_TreeWalker {
/**
* Moves the <code>DOM_TreeWalker</code> to the previous visible node in document
* order relative to the current node, and returns the new node. If the current
- * node has no previous node,
+ * node has no previous node,
* or if the search for previousNode attempts to step upward from the DOM_TreeWalker's
- * root node, returns <code>null</code>, and retains the current node.
+ * root node, returns <code>null</code>, and retains the current node.
*
* <p><b>"Experimental - subject to change"</b></p>
*
@@ -295,7 +264,7 @@ class CDOM_EXPORT DOM_TreeWalker {
/**
* Moves the <code>DOM_TreeWalker</code> to the next visible node in document order
* relative to the current node, and returns the new node. If the current node has
- * no next node,
+ * no next node,
* or if the search for nextNode attempts to step upward from the DOM_TreeWalker's
* root node, returns <code>null</code>, and retains the current node.
*
@@ -316,7 +285,7 @@ class CDOM_EXPORT DOM_TreeWalker {
void setCurrentNode(DOM_Node currentNode);
//@}
-
+
protected:
DOM_TreeWalker(TreeWalkerImpl* impl);
diff --git a/src/idom/IDOM_XMLDecl.hpp b/src/idom/IDOM_XMLDecl.hpp
index 3010fdbe6903049a861989a10b7375d522193d8a..c5c141c0174f5343861bfbae9ae94c0b0c572f64 100644
--- a/src/idom/IDOM_XMLDecl.hpp
+++ b/src/idom/IDOM_XMLDecl.hpp
@@ -4,7 +4,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -51,7 +51,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -84,24 +84,24 @@ public:
//@}
//@{
-
+
/**
* To get the version string of the xmlDeclaration statement
*/
virtual const XMLCh * getVersion() const = 0;
-
+
/**
* To get the encoding string of the xmlDeclaration statement
*/
virtual const XMLCh * getEncoding() const = 0;
-
+
/**
* To get the standalone string of the xmlDeclaration statement
*/
virtual const XMLCh * getStandalone() const = 0;
//@}
-
+
};
diff --git a/src/idom/IDParentNode.cpp b/src/idom/IDParentNode.cpp
index 9034f39a6571703260e4a01cbb4f86148b7a6af8..64c7a69f2f3de280403a6fb78b939fb7f569bd26 100644
--- a/src/idom/IDParentNode.cpp
+++ b/src/idom/IDParentNode.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -72,7 +72,7 @@ IDParentNode::IDParentNode(IDOM_Document *ownerDoc)
: fOwnerDocument(ownerDoc), fChildNodeList(castToNode(this))
{
fFirstChild = 0;
-};
+};
// This only makes a shallow copy, cloneChildren must also be called for a
// deep clone
@@ -86,16 +86,16 @@ IDParentNode::IDParentNode(const IDParentNode &other) :
};
-IDOM_Node * IDParentNode::appendChild(IDOM_Node *newChild)
+IDOM_Node * IDParentNode::appendChild(IDOM_Node *newChild)
{
return insertBefore(newChild, 0);
};
-void IDParentNode::cloneChildren(const IDOM_Node *other) {
- // for (IDOM_Node *mykid = other.getFirstChild();
- for (IDOM_Node *mykid = other->getFirstChild();
- mykid != 0;
+void IDParentNode::cloneChildren(const IDOM_Node *other) {
+ // for (IDOM_Node *mykid = other.getFirstChild();
+ for (IDOM_Node *mykid = other->getFirstChild();
+ mykid != 0;
mykid = mykid->getNextSibling()) {
castToNodeImpl(this)->appendChild(mykid->cloneNode(true));
}
@@ -119,13 +119,13 @@ IDOM_NodeList *IDParentNode::getChildNodes() const {
IDOM_Node * IDParentNode::getFirstChild() const {
return fFirstChild;
-};
+};
IDOM_Node * IDParentNode::getLastChild() const
{
return lastChild();
-};
+};
IDOM_Node * IDParentNode::lastChild() const
{
@@ -137,7 +137,7 @@ IDOM_Node * IDParentNode::lastChild() const
IDChildNode *firstChild = castToChildImpl(fFirstChild);
IDOM_Node *ret = firstChild->previousSibling;
return ret;
-};
+};
//
@@ -153,9 +153,9 @@ void IDParentNode::lastChild(IDOM_Node *node) {
bool IDParentNode::hasChildNodes() const
-{
+{
return fFirstChild!=0;
-};
+};
@@ -163,11 +163,11 @@ IDOM_Node *IDParentNode::insertBefore(IDOM_Node *newChild, IDOM_Node *refChild)
IDNodeImpl *thisNodeImpl = castToNodeImpl(this);
if (thisNodeImpl->isReadOnly())
throw IDOM_DOMException(IDOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, 0);
-
+
if (newChild->getOwnerDocument() != fOwnerDocument)
throw IDOM_DOMException(IDOM_DOMException::WRONG_DOCUMENT_ERR, 0);
-
-
+
+
// Prevent cycles in the tree
bool treeSafe=true;
for(IDOM_Node *a=castToNode(this)->getParentNode();
@@ -176,11 +176,11 @@ IDOM_Node *IDParentNode::insertBefore(IDOM_Node *newChild, IDOM_Node *refChild)
treeSafe=(newChild!=a);
if(!treeSafe)
throw IDOM_DOMException(IDOM_DOMException::HIERARCHY_REQUEST_ERR,0);
-
+
// refChild must in fact be a child of this node (or 0)
if (refChild!=0 && refChild->getParentNode() != castToNode(this))
throw IDOM_DOMException(IDOM_DOMException::NOT_FOUND_ERR,0);
-
+
if (newChild->getNodeType() == IDOM_Node::DOCUMENT_FRAGMENT_NODE)
{
// SLOW BUT SAFE: We could insert the whole subtree without
@@ -189,7 +189,7 @@ IDOM_Node *IDParentNode::insertBefore(IDOM_Node *newChild, IDOM_Node *refChild)
// ends of the list.) But we know some subclasses have special-
// case behavior they add to insertBefore(), so we don't risk it.
// This approch also takes fewer bytecodes.
-
+
// NOTE: If one of the children is not a legal child of this
// node, throw HIERARCHY_REQUEST_ERR before _any_ of the children
// have been transferred. (Alternative behaviors would be to
@@ -197,7 +197,7 @@ IDOM_Node *IDParentNode::insertBefore(IDOM_Node *newChild, IDOM_Node *refChild)
// which are acceptable to the target node, neither of which is
// as robust. PR-DOM-0818 isn't entirely clear on which it
// recommends?????
-
+
// No need to check kids for right-document; if they weren't,
// they wouldn't be kids of that DocFrag.
for(IDOM_Node *kid=newChild->getFirstChild(); // Prescan
@@ -206,14 +206,14 @@ IDOM_Node *IDParentNode::insertBefore(IDOM_Node *newChild, IDOM_Node *refChild)
{
if (!IDDocumentImpl::isKidOK(castToNode(this), kid))
throw IDOM_DOMException(IDOM_DOMException::HIERARCHY_REQUEST_ERR,0);
- }
+ }
while(newChild->hasChildNodes()) // Move
insertBefore(newChild->getFirstChild(),refChild);
}
-
+
else if (!IDDocumentImpl::isKidOK(castToNode(this), newChild))
throw IDOM_DOMException(IDOM_DOMException::HIERARCHY_REQUEST_ERR,0);
-
+
else
{
IDOM_Node *oldparent=newChild->getParentNode();
@@ -224,7 +224,7 @@ IDOM_Node *IDParentNode::insertBefore(IDOM_Node *newChild, IDOM_Node *refChild)
// Attach up
castToNodeImpl(newChild)->fOwnerNode = castToNode(this);
castToNodeImpl(newChild)->isOwned(true);
-
+
// Attach before and after
// Note: fFirstChild.previousSibling == lastChild!!
if (fFirstChild == 0) {
@@ -264,7 +264,7 @@ IDOM_Node *IDParentNode::insertBefore(IDOM_Node *newChild, IDOM_Node *refChild)
}
changed();
-
+
#ifdef idom_revisit
if (this->getOwnerDocument() != 0) {
typedef RefVectorOf<RangeImpl> RangeImpls;
@@ -282,18 +282,18 @@ IDOM_Node *IDParentNode::insertBefore(IDOM_Node *newChild, IDOM_Node *refChild)
return newChild;
};
-
-
-
-IDOM_Node *IDParentNode::removeChild(IDOM_Node *oldChild)
+
+
+
+IDOM_Node *IDParentNode::removeChild(IDOM_Node *oldChild)
{
if (castToNodeImpl(this)->isReadOnly())
throw IDOM_DOMException(
IDOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, 0);
-
+
if (oldChild != 0 && oldChild->getParentNode() != castToNode(this))
throw IDOM_DOMException(IDOM_DOMException::NOT_FOUND_ERR, 0);
-
+
//fix other ranges for change before deleting the node
#ifdef idom_revisit
if (this->getOwnerDocument() != 0 ) {
@@ -303,15 +303,15 @@ IDOM_Node *IDParentNode::removeChild(IDOM_Node *oldChild)
unsigned int sz = ranges->size();
if (sz != 0) {
for (unsigned int i =0; i<sz; i++) {
- if (ranges->elementAt(i) != 0)
+ if (ranges->elementAt(i) != 0)
ranges->elementAt(i)->updateRangeForDeletedNode(oldChild);
}
}
}
}
#endif
-
-
+
+
// Patch linked list around oldChild
// Note: lastChild == fFirstChild->previousSibling
if (oldChild == fFirstChild) {
@@ -353,35 +353,35 @@ IDOM_Node *IDParentNode::replaceChild(IDOM_Node *newChild, IDOM_Node *oldChild)
// changed() already done.
return removeChild(oldChild);
};
-
-
+
+
//Introduced in DOM Level 2
-
+
void IDParentNode::normalize()
{
IDOM_Node *kid, *next;
for (kid = fFirstChild; kid != 0; kid = next)
{
next = castToChildImpl(kid)->nextSibling;
-
+
// If kid and next are both Text nodes (but _not_ CDATASection,
// which is a subclass of Text), they can be merged.
- if (next != 0 &&
- kid->getNodeType() == IDOM_Node::TEXT_NODE &&
+ if (next != 0 &&
+ kid->getNodeType() == IDOM_Node::TEXT_NODE &&
next->getNodeType() == IDOM_Node::TEXT_NODE )
{
((IDTextImpl *) kid)->appendData(((IDTextImpl *) next)->getData());
removeChild(next);
next = kid; // Don't advance; there might be another.
}
-
- // Otherwise it might be an Element, which is handled recursively
+
+ // Otherwise it might be an Element, which is handled recursively
else
if (kid->getNodeType() == IDOM_Node::ELEMENT_NODE)
kid->normalize();
};
-
+
// changed() will have occurred when the removeChild() was done,
// so does not have to be reissued.
};
diff --git a/src/idom/IDParentNode.hpp b/src/idom/IDParentNode.hpp
index 72697b10bed29d170e9cbe8f70305f81303a3597..46366e8a7e47e85aac183dba3296d156f5bf44f9 100644
--- a/src/idom/IDParentNode.hpp
+++ b/src/idom/IDParentNode.hpp
@@ -4,38 +4,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -49,10 +49,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -99,7 +99,7 @@ public:
public:
IDParentNode(IDOM_Document *ownerDocument);
IDParentNode(const IDParentNode &other);
-
+
IDOM_Document * getOwnerDocument() const;
// Track changes to the node tree structure under this node. An optimization
diff --git a/src/idom/IDProcessingInstructionImpl.cpp b/src/idom/IDProcessingInstructionImpl.cpp
index dbfca25d324a1852dfaef6998a845a29d5270534..4e3f8dc4fa0aa79edc156acdd03871098b4d9c5c 100644
--- a/src/idom/IDProcessingInstructionImpl.cpp
+++ b/src/idom/IDProcessingInstructionImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -133,9 +133,9 @@ should be directed to. It is defined differently in HTML and XML.
In XML, a PI's "target" is the first (whitespace-delimited) token
following the "<?" token that begins the PI.
-
+
In HTML, target is always 0.
-
+
Note that getNodeName is aliased to getTarget.
*/
const XMLCh * IDProcessingInstructionImpl::getTarget() const
@@ -144,9 +144,9 @@ const XMLCh * IDProcessingInstructionImpl::getTarget() const
};
-/**
-* Change the data content of this PI.
-* Note that setNodeValue is aliased to setData
+/**
+* Change the data content of this PI.
+* Note that setNodeValue is aliased to setData
* @see getData().
* @throws DOMException(NO_MODIFICATION_ALLOWED_ERR) if node is read-only.
*/
diff --git a/src/idom/IDProcessingInstructionImpl.hpp b/src/idom/IDProcessingInstructionImpl.hpp
index 1aa5fa3ca9afbd9dcd4c2860e74dafb6c0c8276d..d5042868e716fe9ff80a3736a4e38c39c8ed1538 100644
--- a/src/idom/IDProcessingInstructionImpl.hpp
+++ b/src/idom/IDProcessingInstructionImpl.hpp
@@ -2,38 +2,38 @@
#define IDProcessingInstructionImpl_HEADER_GUARD_
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -47,10 +47,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -96,7 +96,7 @@ public:
// Declare all of the functions from IDOM_Node.
IDOM_NODE_FUNCTIONS;
-
+
virtual const XMLCh *getData() const;
virtual const XMLCh *getTarget() const;
virtual void setData(const XMLCh *arg);
diff --git a/src/idom/IDRangeImpl.cpp b/src/idom/IDRangeImpl.cpp
index 8baa69b6ba6504741e67251d238110f2322fd0d0..efa4701ba34060208101d70fd24b723cfc433cc3 100644
--- a/src/idom/IDRangeImpl.cpp
+++ b/src/idom/IDRangeImpl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -73,11 +73,11 @@
//---------------------
-// C'tor and D'tor
+// C'tor and D'tor
//---------------------
RangeImpl::RangeImpl(DOM_Document doc)
-
+
: fDocument(doc),
fStartContainer(doc),
fStartOffset(0),
@@ -87,7 +87,7 @@ RangeImpl::RangeImpl(DOM_Document doc)
fCollapsed(true),
fRemoveChild(0)
{
-}
+}
RangeImpl::RangeImpl(const RangeImpl& other)
{
@@ -149,13 +149,13 @@ unsigned int RangeImpl::getEndOffset() const
bool RangeImpl::getCollapsed() const
{
- if (fDetached)
+ if (fDetached)
{
throw DOM_DOMException(
DOM_DOMException::INVALID_STATE_ERR, null);
}
- return ((fStartContainer == fEndContainer)
+ return ((fStartContainer == fEndContainer)
&& (fStartOffset == fEndOffset));
}
@@ -163,7 +163,7 @@ bool RangeImpl::getCollapsed() const
// Public getter functions
//-------------------------------
-void RangeImpl::setStartContainer(const DOM_Node& node)
+void RangeImpl::setStartContainer(const DOM_Node& node)
{
if (fDetached)
{
@@ -174,7 +174,7 @@ void RangeImpl::setStartContainer(const DOM_Node& node)
fStartContainer = node;
}
-void RangeImpl::setStartOffset(unsigned int offset)
+void RangeImpl::setStartOffset(unsigned int offset)
{
if (fDetached)
{
@@ -185,7 +185,7 @@ void RangeImpl::setStartOffset(unsigned int offset)
fStartOffset = offset;
}
-void RangeImpl::setEndContainer(const DOM_Node& node)
+void RangeImpl::setEndContainer(const DOM_Node& node)
{
if (fDetached)
{
@@ -194,10 +194,10 @@ void RangeImpl::setEndContainer(const DOM_Node& node)
}
fEndContainer = node;
-
+
}
-void RangeImpl::setEndOffset(unsigned int offset)
+void RangeImpl::setEndOffset(unsigned int offset)
{
if (fDetached)
{
@@ -212,17 +212,17 @@ void RangeImpl::setStart(const DOM_Node& refNode, unsigned int offset)
{
validateNode(refNode);
checkIndex(refNode, offset);
-
+
fStartContainer = refNode;
fStartOffset = offset;
-
- if ((fDocument != refNode.getOwnerDocument() )
+
+ if ((fDocument != refNode.getOwnerDocument() )
&& (refNode.getOwnerDocument().fImpl != 0) )
{
fDocument = refNode.getOwnerDocument();
- collapse(true);
+ collapse(true);
}
-
+
//compare the start and end boundary point
//collapse if start point is after the end point
if(compareBoundaryPoints(DOM_Range::END_TO_START, this) == 1)
@@ -235,17 +235,17 @@ void RangeImpl::setEnd(const DOM_Node& refNode, unsigned int offset)
{
validateNode(refNode);
checkIndex(refNode, offset);
-
+
fEndContainer = refNode;
fEndOffset = offset;
-
- if ((fDocument != refNode.getOwnerDocument() )
+
+ if ((fDocument != refNode.getOwnerDocument() )
&& (refNode.getOwnerDocument().fImpl != 0) )
{
fDocument = refNode.getOwnerDocument();
collapse(false);
}
-
+
//compare the start and end boundary point
//collapse if start point is after the end point
if(compareBoundaryPoints(DOM_Range::END_TO_START, this) == 1)
@@ -264,7 +264,7 @@ void RangeImpl::setStartBefore(const DOM_Node& refNode)
throw DOM_RangeException(
DOM_RangeException::INVALID_NODE_TYPE_ERR, null);
}
-
+
fStartContainer = refNode.getParentNode();
unsigned int i = 0;
for (DOM_Node n = refNode; n!=null; n = n.getPreviousSibling()) {
@@ -275,13 +275,13 @@ void RangeImpl::setStartBefore(const DOM_Node& refNode)
else
fStartOffset = i-1;
- if ((fDocument != refNode.getOwnerDocument())
+ if ((fDocument != refNode.getOwnerDocument())
&& (refNode.getOwnerDocument().fImpl != 0) )
{
fDocument = refNode.getOwnerDocument();
- collapse(true);
+ collapse(true);
}
-
+
//compare the start and end boundary point
//collapse if start point is after the end point
if(compareBoundaryPoints(DOM_Range::END_TO_START, this) == 1)
@@ -308,14 +308,14 @@ void RangeImpl::setStartAfter(const DOM_Node& refNode)
}
fStartOffset = i;
-
- if ((fDocument != refNode.getOwnerDocument() )
+
+ if ((fDocument != refNode.getOwnerDocument() )
&& (refNode.getOwnerDocument().fImpl != 0) )
{
fDocument = refNode.getOwnerDocument();
- collapse(true);
+ collapse(true);
}
-
+
//compare the start and end boundary point
//collapse if start point is after the end point
if(compareBoundaryPoints(DOM_Range::END_TO_START, this) == 1)
@@ -334,7 +334,7 @@ void RangeImpl::setEndBefore(const DOM_Node& refNode)
throw DOM_RangeException(
DOM_RangeException::INVALID_NODE_TYPE_ERR, null);
}
-
+
fEndContainer = refNode.getParentNode();
unsigned int i = 0;
for (DOM_Node n = refNode; n!=null; n = n.getPreviousSibling(), i++) ;
@@ -344,13 +344,13 @@ void RangeImpl::setEndBefore(const DOM_Node& refNode)
else
fEndOffset = i-1;
- if ((fDocument != refNode.getOwnerDocument() )
+ if ((fDocument != refNode.getOwnerDocument() )
&& (refNode.getOwnerDocument().fImpl != 0) )
{
fDocument = refNode.getOwnerDocument();
- collapse(true);
+ collapse(true);
}
-
+
//compare the start and end boundary point
//collapse if start point is after the end point
if(compareBoundaryPoints(DOM_Range::END_TO_START, this) == 1)
@@ -369,7 +369,7 @@ void RangeImpl::setEndAfter(const DOM_Node& refNode)
throw DOM_RangeException(
DOM_RangeException::INVALID_NODE_TYPE_ERR, null);
}
-
+
fEndContainer = refNode.getParentNode();
unsigned int i = 0;
for (DOM_Node n = refNode; n!=null; n = n.getPreviousSibling(), i++) ;
@@ -379,13 +379,13 @@ void RangeImpl::setEndAfter(const DOM_Node& refNode)
else
fEndOffset = i;
- if ((fDocument != refNode.getOwnerDocument() )
+ if ((fDocument != refNode.getOwnerDocument() )
&& (refNode.getOwnerDocument().fImpl != 0) )
{
fDocument = refNode.getOwnerDocument();
- collapse(true);
+ collapse(true);
}
-
+
//compare the start and end boundary point
//collapse if start point is after the end point
if(compareBoundaryPoints(DOM_Range::END_TO_START, this) == 1)
@@ -404,14 +404,14 @@ void RangeImpl::detach()
}
fDetached = true;
-
+
//nullify nodes
fStartContainer = 0;
fStartOffset = 0;
fEndContainer = 0;
fEndOffset = 0;
fCollapsed = true;
-
+
fRemoveChild = 0;
}
@@ -445,7 +445,7 @@ void RangeImpl::selectNode(const DOM_Node& refNode)
//The node itself is the container.
fStartContainer = refNode;
fEndContainer = refNode;
-
+
//Select all the contents of the node
fStartOffset = 0;
fEndOffset = ((DOM_Text &)refNode).getLength();
@@ -457,12 +457,12 @@ void RangeImpl::selectNode(const DOM_Node& refNode)
{
fStartContainer = parent;
fEndContainer = parent;
-
+
unsigned int i = 0;
for (DOM_Node n = parent.getFirstChild(); n!=null, n!=refNode; n = n.getNextSibling()) {
i++;
}
-
+
fStartOffset = i;
fEndOffset = fStartOffset+1;
}
@@ -471,10 +471,10 @@ void RangeImpl::selectNode(const DOM_Node& refNode)
void RangeImpl::selectNodeContents(const DOM_Node& node)
{
validateNode(node);
-
+
fStartContainer = node;
fEndContainer = node;
-
+
fStartOffset = 0;
if (node.getNodeType() == DOM_Node::TEXT_NODE ) {
fEndOffset = ((DOM_Text &)node).getLength();
@@ -496,7 +496,7 @@ void RangeImpl::selectNodeContents(const DOM_Node& node)
void RangeImpl::surroundContents(DOM_Node& newParent)
{
if (newParent==null) return;
-
+
//check for elimination criteria
if( fDetached) {
throw DOM_DOMException(
@@ -507,7 +507,7 @@ void RangeImpl::surroundContents(DOM_Node& newParent)
throw DOM_DOMException(
DOM_DOMException::WRONG_DOCUMENT_ERR, null);
}
-
+
int type = newParent.getNodeType();
if ( !isLegalContainedNode(newParent)
|| type == DOM_Node::DOCUMENT_TYPE_NODE)
@@ -515,9 +515,9 @@ void RangeImpl::surroundContents(DOM_Node& newParent)
throw DOM_RangeException(
DOM_RangeException::INVALID_NODE_TYPE_ERR, null);
}
-
+
DOM_Node root = getCommonAncestorContainer();
-
+
DOM_Node realStart = fStartContainer;
DOM_Node realEnd = fEndContainer;
@@ -527,12 +527,12 @@ void RangeImpl::surroundContents(DOM_Node& newParent)
if (fEndContainer.getNodeType() == DOM_Node::TEXT_NODE) {
realEnd = fEndContainer.getParentNode();
}
-
+
if (realStart != realEnd) {
throw DOM_RangeException(
DOM_RangeException::BAD_BOUNDARYPOINTS_ERR, null);
}
-
+
DOM_DocumentFragment frag = extractContents();
insertNode(newParent);
newParent.appendChild(frag);
@@ -553,7 +553,7 @@ short RangeImpl::compareBoundaryPoints(DOM_Range::CompareHow how, RangeImpl* src
DOM_Node pointA, pointB;
int offsetA, offsetB;
-
+
switch (how)
{
case (DOM_Range::START_TO_START) :
@@ -581,7 +581,7 @@ short RangeImpl::compareBoundaryPoints(DOM_Range::CompareHow how, RangeImpl* src
offsetA = fEndOffset;
break;
}
-
+
// case 1: same container
if (pointA == pointB) {
if (offsetA < offsetB) return -1; //A before B
@@ -600,22 +600,22 @@ short RangeImpl::compareBoundaryPoints(DOM_Range::CompareHow how, RangeImpl* src
for (DOM_Node nd = pointB.getFirstChild(); nd != null; nd=nd.getNextSibling()) {
if (isAncestorOf(nd, pointA)) {
int index = indexOf(nd, pointB);
- if (index < offsetB ) return -1;
+ if (index < offsetB ) return -1;
return 1; //B strictly before A
}
}
-
+
// case 4: preorder traversal of context tree.
DOM_Node ancestor = commonAncestorOf(pointA, pointB);
DOM_Node current = ancestor;
-
+
do {
if (current == pointA) return -1;
if (current == pointB) return 1;
- current = nextNode(current, true);
+ current = nextNode(current, true);
}
while (current!=null && current!=ancestor);
-
+
return -2; // this should never happen
}
@@ -648,24 +648,24 @@ void RangeImpl::insertNode(DOM_Node& newNode)
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
}
}
-
+
if (fDocument != newNode.getOwnerDocument()) {
throw DOM_DOMException(
DOM_DOMException::WRONG_DOCUMENT_ERR, null);
}
-
+
// Prevent cycles in the tree.
//isKidOK() is not checked here as its taken care by insertBefore() function
if (isAncestorOf( newNode, fStartContainer)) {
throw DOM_DOMException(
DOM_DOMException::HIERARCHY_REQUEST_ERR, null);
}
-
+
if( fDetached) {
throw DOM_DOMException(
DOM_DOMException::INVALID_STATE_ERR, null);
}
-
+
int type = newNode.getNodeType();
if (type == DOM_Node::ATTRIBUTE_NODE
|| type == DOM_Node::ENTITY_NODE
@@ -675,7 +675,7 @@ void RangeImpl::insertNode(DOM_Node& newNode)
throw DOM_RangeException(
DOM_RangeException::INVALID_NODE_TYPE_ERR, null);
}
-
+
DOM_Node parent;
DOM_Node next;
@@ -686,19 +686,19 @@ void RangeImpl::insertNode(DOM_Node& newNode)
parent = fStartContainer.getParentNode();
//split the text nodes
- if (fStartOffset > 0)
+ if (fStartOffset > 0)
((DOM_Text &)fStartContainer).splitText(fStartOffset);
-
+
//update the new start information later. After inserting the first newNode
- if (fStartOffset == 0)
+ if (fStartOffset == 0)
next = fStartContainer;
else
next = fStartContainer.getNextSibling();
-
+
} // end of text handling
else {
parent = fStartContainer;
-
+
next = fStartContainer.getFirstChild();
for(unsigned int i = 0; (i < fStartOffset) && (next != null); i++) {
next=next.getNextSibling();
@@ -706,9 +706,9 @@ void RangeImpl::insertNode(DOM_Node& newNode)
}
if (parent != null) {
- if (next != null)
+ if (next != null)
parent.insertBefore(newNode, next);
- else
+ else
parent.appendChild(newNode);
}
}
@@ -719,11 +719,11 @@ RangeImpl* RangeImpl::cloneRange() const
throw DOM_DOMException(
DOM_DOMException::INVALID_STATE_ERR, null);
}
-
+
RangeImpl* range = ((DocumentImpl*)fDocument.fImpl)->createRange();
range->setStart(fStartContainer, fStartOffset);
range->setEnd(fEndContainer, fEndOffset);
-
+
return range;
}
@@ -733,10 +733,10 @@ DOMString RangeImpl::toString() const
throw DOM_DOMException(
DOM_DOMException::INVALID_STATE_ERR, null);
}
-
+
DOM_Node node = fStartContainer;
DOM_Node stopNode = fEndContainer;
-
+
DOMString tempString;
if ( (fStartContainer.getNodeType() == DOM_Node::TEXT_NODE)
|| (fStartContainer.getNodeType() == DOM_Node::CDATA_SECTION_NODE) ) {
@@ -761,7 +761,7 @@ DOMString RangeImpl::toString() const
node = nextNode(fStartContainer,false);
}
}
-
+
if ( fEndContainer.getNodeType()!= DOM_Node::TEXT_NODE &&
fEndContainer.getNodeType()!= DOM_Node::CDATA_SECTION_NODE ){
int i=fEndOffset;
@@ -773,7 +773,7 @@ DOMString RangeImpl::toString() const
if ( stopNode == null )
stopNode = nextNode( fEndContainer, false );
}
-
+
while (node != stopNode) { //look into all kids of the Range
if (node == null) break;
if (node.getNodeType() == DOM_Node::TEXT_NODE
@@ -782,7 +782,7 @@ DOMString RangeImpl::toString() const
}
node = nextNode(node, true);
}
-
+
if (fEndContainer.getNodeType() == DOM_Node::TEXT_NODE
|| fEndContainer.getNodeType() == DOM_Node::CDATA_SECTION_NODE) {
tempString.appendData(fEndContainer.getNodeValue().substringData(0,fEndOffset));
@@ -795,10 +795,10 @@ DOM_Document RangeImpl::getDocument()
return fDocument;
}
-const DOM_Node RangeImpl::getCommonAncestorContainer() const
+const DOM_Node RangeImpl::getCommonAncestorContainer() const
{
- return commonAncestorOf(fStartContainer, fEndContainer);
-
+ return commonAncestorOf(fStartContainer, fEndContainer);
+
}
//---------------------
@@ -831,7 +831,7 @@ bool RangeImpl::hasLegalRootContainer(const DOM_Node& node) const {
DOM_Node rootContainer = node;
for (; rootContainer.getParentNode()!=null; rootContainer = rootContainer.getParentNode())
;
-
+
switch( rootContainer.getNodeType() ) {
case DOM_Node::ATTRIBUTE_NODE:
case DOM_Node::DOCUMENT_NODE:
@@ -872,7 +872,7 @@ void RangeImpl::validateNode(const DOM_Node& node) const
throw DOM_DOMException(
DOM_DOMException::INVALID_STATE_ERR, null);
}
-
+
if ( !isValidAncestorType(node)) {
throw DOM_RangeException(
DOM_RangeException::INVALID_NODE_TYPE_ERR, null);
@@ -882,7 +882,7 @@ void RangeImpl::validateNode(const DOM_Node& node) const
const DOM_Node RangeImpl::commonAncestorOf(const DOM_Node& pointA, const DOM_Node& pointB) const
{
- if (fDetached)
+ if (fDetached)
throw DOM_DOMException(DOM_DOMException::INVALID_STATE_ERR, null);
if (pointA.getOwnerDocument() != pointB.getOwnerDocument())
@@ -890,27 +890,27 @@ const DOM_Node RangeImpl::commonAncestorOf(const DOM_Node& pointA, const DOM_Nod
//if the containers are same then it itself is its common ancestor.
if (pointA == pointB)
- return pointA;
+ return pointA;
typedef RefVectorOf<NodeImpl> VectorNodes;
VectorNodes* startV= new VectorNodes(1, false);
DOM_Node node;
- for (node=fStartContainer; node != null; node=node.getParentNode())
+ for (node=fStartContainer; node != null; node=node.getParentNode())
{
startV->addElement(node.fImpl);
}
VectorNodes* endV = new VectorNodes(1, false);
- for (node=fEndContainer; node != null; node=node.getParentNode())
+ for (node=fEndContainer; node != null; node=node.getParentNode())
{
endV->addElement(node.fImpl);
}
int s = startV->size()-1;
int e = endV->size()-1;
-
+
NodeImpl* commonAncestor;
-
+
while (s>=0 && e>=0) {
if (startV->elementAt(s) == endV->elementAt(e)) {
commonAncestor = startV->elementAt(s);
@@ -919,10 +919,10 @@ const DOM_Node RangeImpl::commonAncestorOf(const DOM_Node& pointA, const DOM_Nod
--s;
--e;
}
-
+
delete startV;
delete endV;
-
+
return DOM_Node(commonAncestor);
}
@@ -931,9 +931,9 @@ void RangeImpl::checkIndex(const DOM_Node& node, unsigned int offset) const
if (offset < 0) {
throw DOM_DOMException( DOM_DOMException::INDEX_SIZE_ERR, null );
}
-
+
short type = node.getNodeType();
-
+
if((type == DOM_Node::TEXT_NODE
|| type == DOM_Node::CDATA_SECTION_NODE
|| type == DOM_Node::COMMENT_NODE
@@ -942,7 +942,7 @@ void RangeImpl::checkIndex(const DOM_Node& node, unsigned int offset) const
throw DOM_DOMException( DOM_DOMException::INDEX_SIZE_ERR, null );
else return;
}
-
+
DOM_Node child = node.getFirstChild();
unsigned int i = 0;
for (; child != null; i++) {
@@ -951,14 +951,14 @@ void RangeImpl::checkIndex(const DOM_Node& node, unsigned int offset) const
if (i < offset) {
throw DOM_DOMException( DOM_DOMException::INDEX_SIZE_ERR, null );
}
-
+
}
DOM_Node RangeImpl::nextNode(const DOM_Node& node, bool visitChildren) const
{
-
+
if (node == null) return null;
-
+
DOM_Node result;
if (visitChildren) {
result = node.getFirstChild();
@@ -966,17 +966,17 @@ DOM_Node RangeImpl::nextNode(const DOM_Node& node, bool visitChildren) const
return result;
}
}
-
+
// if hasSibling, return sibling
result = node.getNextSibling();
if (result != null) {
return result;
}
-
-
+
+
// return parent's 1st sibling.
DOM_Node parent = node.getParentNode();
-
+
while ( (parent != null) && (parent != fDocument) )
{
@@ -988,10 +988,10 @@ DOM_Node RangeImpl::nextNode(const DOM_Node& node, bool visitChildren) const
if (parent == fEndContainer) return parent;
}
-
+
}
// end of list, return null
- return null;
+ return null;
}
@@ -1001,43 +1001,43 @@ DOM_Node RangeImpl::nextNode(const DOM_Node& node, bool visitChildren) const
*/
DOM_DocumentFragment RangeImpl::traverseContents(TraversalType how)
{
- if (fDetached)
+ if (fDetached)
throw DOM_DOMException(DOM_DOMException::INVALID_STATE_ERR, null);
-
+
if (fStartContainer == null || fEndContainer == null) {
return DOM_DocumentFragment(); // REVIST: Throw exception?
}
-
+
/* Traversal is accomplished by first determining the
relationship between the endpoints of the range.
For each of four significant relationships, we will
delegate the traversal call to a method that
can make appropriate assumptions.
*/
-
+
// case 1: same container
if ( fStartContainer == fEndContainer )
return traverseSameContainer( how );
-
+
// case 2: Child C of start container is ancestor of end container
for (DOM_Node node = fStartContainer.getFirstChild(); node != null; node=node.getNextSibling()) {
if (isAncestorOf(node, fEndContainer))
return traverseCommonStartContainer( node, how );
}
-
+
// case 3: Child C of end container is ancestor of start container
for (DOM_Node nd = fEndContainer.getFirstChild(); nd != null; nd=nd.getNextSibling()) {
if (isAncestorOf(nd, fStartContainer))
return traverseCommonEndContainer( nd, how );
}
-
+
// case 4: preorder traversal of context tree.
// There is a common ancestor container. Find the
// ancestor siblings that are children of that container.
DOM_Node ancestor = commonAncestorOf(fStartContainer, fEndContainer);
return traverseCommonAncestors( ancestor, ancestor, how );
}
-
+
/**
* Visits the nodes selected by this range when we know
* a-priori that the start and end containers are the same.
@@ -1048,21 +1048,21 @@ DOM_DocumentFragment RangeImpl::traverseSameContainer( int how )
DOM_DocumentFragment frag = null;
if ( how!=DELETE_CONTENTS)
frag = fDocument.createDocumentFragment();
-
+
// If selection is empty, just return the fragment
if ( fStartOffset==fEndOffset )
return frag;
-
+
DOM_Node current = fStartContainer;
DOM_Node cloneCurrent = null;
-
+
// Text node needs special case handling
if ( fStartContainer.getNodeType()== DOM_Node::TEXT_NODE )
{
cloneCurrent = fStartContainer.cloneNode(false);
cloneCurrent.setNodeValue(
cloneCurrent.getNodeValue().substringData(fStartOffset, fEndOffset));
-
+
// set the original text node to its new value
if ( how != CLONE_CONTENTS )
((DOM_Text &)fStartContainer).deleteData(fStartOffset, fEndOffset-fStartOffset);
@@ -1083,7 +1083,7 @@ DOM_DocumentFragment RangeImpl::traverseSameContainer( int how )
n = sibling;
}
}
-
+
// Nothing is partially selected, so collapse to start point
if ( how != CLONE_CONTENTS )
collapse(true);
@@ -1540,7 +1540,7 @@ void RangeImpl::recurseTreeAndCheck(DOM_Node& start, DOM_Node& end)
throw DOM_DOMException(
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
}
-
+
if (node.hasChildNodes()) {
node = node.getFirstChild();
recurseTreeAndCheck(node, end);
@@ -1549,7 +1549,7 @@ void RangeImpl::recurseTreeAndCheck(DOM_Node& start, DOM_Node& end)
}
-DOM_Node RangeImpl::removeChild(DOM_Node& parent, DOM_Node& child)
+DOM_Node RangeImpl::removeChild(DOM_Node& parent, DOM_Node& child)
{
fRemoveChild = child; //only a precaution measure not to update this range data before removal
DOM_Node n = parent.removeChild(child);
@@ -1567,7 +1567,7 @@ DOM_Node RangeImpl::removeChild(DOM_Node& parent, DOM_Node& child)
* The text has already beeen replaced.
* Fix-up any offsets.
*/
-void RangeImpl::receiveReplacedText(NodeImpl* node)
+void RangeImpl::receiveReplacedText(NodeImpl* node)
{
if (node == null) return;
DOM_Node anode(node);
@@ -1581,15 +1581,15 @@ void RangeImpl::receiveReplacedText(NodeImpl* node)
}
}
-
+
/** This function is called from DOM.
* The text has already beeen inserted.
* Fix-up any offsets.
*/
-void RangeImpl::updateRangeForDeletedText(DOM_Node& node, unsigned int offset, int count)
+void RangeImpl::updateRangeForDeletedText(DOM_Node& node, unsigned int offset, int count)
{
if (node == null) return;
-
+
if (node == fStartContainer
&& fStartContainer.getNodeType() == DOM_Node::TEXT_NODE) {
if (fStartOffset > offset+count) {
@@ -1602,7 +1602,7 @@ void RangeImpl::updateRangeForDeletedText(DOM_Node& node, unsigned int offset, i
&& fEndContainer.getNodeType() == DOM_Node::TEXT_NODE) {
if (fEndOffset > offset+count) {
fEndOffset = fEndOffset-count;
- } else if (fEndOffset > offset) {
+ } else if (fEndOffset > offset) {
fEndOffset = offset;
}
}
@@ -1614,28 +1614,28 @@ void RangeImpl::updateRangeForDeletedText(DOM_Node& node, unsigned int offset, i
* a node is deleted, because at that time it is
* connected in the DOM tree, which we depend on.
*/
-void RangeImpl::updateRangeForDeletedNode(NodeImpl* node)
+void RangeImpl::updateRangeForDeletedNode(NodeImpl* node)
{
-
+
if (node == null) return;
- if (fRemoveChild == node) return;
-
+ if (fRemoveChild == node) return;
+
DOM_Node tNode(node);
-
+
if (node->getParentNode() == fStartContainer.fImpl) {
unsigned short index = indexOf(tNode, fStartContainer);
if ( fStartOffset > index) {
fStartOffset--;
}
}
-
+
if (node->getParentNode() == fEndContainer.fImpl) {
unsigned short index = indexOf(tNode, fEndContainer);
if ( fEndOffset > index) {
fEndOffset--;
}
}
-
+
if (node->getParentNode() != fStartContainer.fImpl
|| node->getParentNode() != fEndContainer.fImpl) {
if (isAncestorOf(node, fStartContainer)) {
@@ -1649,19 +1649,19 @@ void RangeImpl::updateRangeForDeletedNode(NodeImpl* node)
fEndOffset = indexOf( tNode, tpNode);
}
}
-
+
}
void RangeImpl::updateRangeForInsertedNode(NodeImpl* node) {
if (node == null) return;
-
+
if (node->getParentNode() == fStartContainer.fImpl) {
unsigned int index = indexOf(DOM_Node(node), fStartContainer);
if (index < fStartOffset) {
fStartOffset++;
}
}
-
+
if (node->getParentNode() == fEndContainer.fImpl) {
unsigned int index = indexOf(DOM_Node(node), fEndContainer);
if (index < fEndOffset) {
@@ -1674,7 +1674,7 @@ void RangeImpl::updateRangeForInsertedNode(NodeImpl* node) {
void RangeImpl::updateSplitInfo(TextImpl* oldNode, TextImpl* startNode, unsigned int offset)
{
if (startNode == null) return;
-
+
DOM_Text oldText(oldNode);
DOM_Text newText(startNode);
@@ -1682,7 +1682,7 @@ void RangeImpl::updateSplitInfo(TextImpl* oldNode, TextImpl* startNode, unsigned
fStartOffset = fStartOffset - offset;
fStartContainer = newText;
}
-
+
if (fEndContainer == oldText && fEndOffset > offset) {
fEndContainer = newText;
fEndOffset = fEndOffset - offset;
diff --git a/src/idom/IDRangeImpl.hpp b/src/idom/IDRangeImpl.hpp
index 80251ee4b442bdb9c7e2532fd6496645a3569808..b29231ec2aa400be3dbc3775b646668b2c834f4d 100644
--- a/src/idom/IDRangeImpl.hpp
+++ b/src/idom/IDRangeImpl.hpp
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -50,7 +50,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -71,9 +71,9 @@
typedef RefVectorOf<RangeImpl> Ranges;
-
+
class CDOM_EXPORT RangeImpl : public RefCountedImpl {
-public:
+public:
//c'tor
RangeImpl(DOM_Document doc);
RangeImpl(const RangeImpl& other);
@@ -83,16 +83,16 @@ public:
//referencing related functions
virtual void unreferenced();
-
+
//getter functions
DOM_Node getStartContainer() const;
unsigned int getStartOffset() const;
DOM_Node getEndContainer() const;
unsigned int getEndOffset() const;
-
-
-
+
+
+
void collapse(bool toStart);
bool getCollapsed() const;
@@ -106,15 +106,15 @@ public:
void selectNode(const DOM_Node& node);
void selectNodeContents(const DOM_Node& node);
-
+
short compareBoundaryPoints(DOM_Range::CompareHow how, RangeImpl* range) const;
-
+
void detach();
-
+
void deleteContents();
-
+
RangeImpl* cloneRange() const;
- DOMString toString() const;
+ DOMString toString() const;
DOM_Document getDocument();
void surroundContents(DOM_Node& node);
@@ -138,31 +138,31 @@ private:
};
enum TraversePoint {
- BEFORE = -1,
+ BEFORE = -1,
START = 0,
AFTER = 1
};
//setter functions
- void setStartContainer(const DOM_Node& node);
+ void setStartContainer(const DOM_Node& node);
void setStartOffset(unsigned int offset) ;
void setEndContainer(const DOM_Node& node);
void setEndOffset(unsigned int offset) ;
//misc functions
void validateNode(const DOM_Node& node) const;
- bool isValidAncestorType(const DOM_Node& node) const;
+ bool isValidAncestorType(const DOM_Node& node) const;
bool hasLegalRootContainer(const DOM_Node& node) const;
bool isLegalContainedNode(const DOM_Node& node ) const;
void checkIndex(const DOM_Node& node, unsigned int offset) const;
static bool isAncestorOf(const DOM_Node& a, const DOM_Node& b);
-
+
unsigned short indexOf(const DOM_Node& child, const DOM_Node& parent) const;
const DOM_Node commonAncestorOf(const DOM_Node& pointA, const DOM_Node& pointB) const;
DOM_Node nextNode(const DOM_Node& node, bool visitChildren) const;
DOM_DocumentFragment traverseContents(TraversalType type);
- void checkReadOnly(DOM_Node& start, DOM_Node& end,
+ void checkReadOnly(DOM_Node& start, DOM_Node& end,
unsigned int starOffset, unsigned int endOffset);
void recurseTreeAndCheck(DOM_Node& start, DOM_Node& end);
DOM_Node removeChild(DOM_Node& parent, DOM_Node& child);
@@ -179,8 +179,8 @@ private:
DOM_Node traverseTextNode( DOM_Node n, bool isLeft, int how );
DOM_Node getSelectedNode( DOM_Node container, int offset );
-
- //private data
+
+ //private data
DOM_Node fStartContainer;
unsigned int fStartOffset;
DOM_Node fEndContainer;
@@ -188,9 +188,9 @@ private:
bool fCollapsed;
DOM_Document fDocument;
bool fDetached;
-
+
DOM_Node fRemoveChild;
-
+
};
#endif
diff --git a/src/idom/IDStringPool.cpp b/src/idom/IDStringPool.cpp
index 59fb5808da2c5470c4607fc9ba4562ba1ec12627..ec61ec4bcfdf85195887fe373e79d11043419ea3 100644
--- a/src/idom/IDStringPool.cpp
+++ b/src/idom/IDStringPool.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,32 +56,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:34 andyh
- * Initial revision
- *
- * Revision 1.5 2000/06/02 00:45:42 andyh
- * DOM Fixes: DOMString::rawBuffer() now returns a const XMLCh * pointer.
- * Two plain deletes changed to array deletes.
- *
- * Revision 1.4 2000/05/09 00:22:31 andyh
- * Memory Cleanup. XMLPlatformUtils::Terminate() deletes all lazily
- * allocated memory; memory leak checking tools will no longer report
- * that leaks exist. (DOM GetElementsByTagID temporarily removed
- * as part of this.)
- *
- * Revision 1.3 2000/03/02 19:53:58 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
+ * Revision 1.2 2001/05/11 13:25:58 tng
+ * Copyright update.
*
- * Revision 1.2 2000/02/06 07:47:31 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.1.1.1 1999/11/09 01:09:05 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:23 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:34 andyh
+ * IDOM
*
*/
@@ -129,7 +108,7 @@ static IDStringPoolEntry *createSPE(const XMLCh *str, IDDocumentImpl *doc)
XMLString::copyString(nonConstStr, str);
return newSPE;
}
-
+
IDStringPool::IDStringPool(int hashTableSize, IDDocumentImpl *doc)
diff --git a/src/idom/IDStringPool.hpp b/src/idom/IDStringPool.hpp
index c1f569d195442cc0cb2abc229ddc7e2c02f5b512..64744143c1f6bc0479cb42f0a74ef879f448fd0f 100644
--- a/src/idom/IDStringPool.hpp
+++ b/src/idom/IDStringPool.hpp
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -48,19 +48,18 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-
-//
-// file IDStringPool.hpp
-//
+/*
+ * $Id$
+ */
//
// This file is part of the internal implementation of the C++ XML DOM.
@@ -87,7 +86,7 @@ class IDDocumentImpl;
class IDStringPool
{
public:
- IDStringPool(int hashTableSize, IDDocumentImpl *doc);
+ IDStringPool(int hashTableSize, IDDocumentImpl *doc);
~IDStringPool();
const XMLCh *getPooledString(const XMLCh *in);
diff --git a/src/idom/IDTextImpl.cpp b/src/idom/IDTextImpl.cpp
index 26f30a6d5a978b56aaf61a8bf75211a2859c23d4..1883595f1290e261d59308a77fd9ad4a4f8e9acc 100644
--- a/src/idom/IDTextImpl.cpp
+++ b/src/idom/IDTextImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -117,8 +117,8 @@ IDOM_Text *IDTextImpl::splitText(unsigned int offset)
unsigned int len = XMLString::stringLen(fCharacterData.fData);
if (offset > len)
throw IDOM_DOMException(IDOM_DOMException::INDEX_SIZE_ERR, 0);
-
- IDOM_Text *newText =
+
+ IDOM_Text *newText =
getOwnerDocument()->createTextNode(
this->substringData(offset, len - offset));
@@ -129,7 +129,7 @@ IDOM_Text *IDTextImpl::splitText(unsigned int offset)
XMLCh *wData = (XMLCh *)(fCharacterData.fData); // Cast off const.
wData[offset] = 0; // idom_revisit - could change a string that
// application code has. Do we want to do this?
-
+
#ifdef idom_revisit
if (this->getOwnerDocument() != null) {
@@ -198,11 +198,11 @@ void IDTextImpl::setIgnorableWhitespace(bool ignorable)
const XMLCh * IDTextImpl::getData() const {return fCharacterData.getData();};
- unsigned int IDTextImpl::getLength() const {return fCharacterData.getLength();};
+ unsigned int IDTextImpl::getLength() const {return fCharacterData.getLength();};
const XMLCh * IDTextImpl::substringData(unsigned int offset, unsigned int count) const
- {return fCharacterData.substringData(offset, count);};
- void IDTextImpl::appendData(const XMLCh *arg) {fCharacterData.appendData(this, arg);};
- void IDTextImpl::insertData(unsigned int offset, const XMLCh *arg)
+ {return fCharacterData.substringData(offset, count);};
+ void IDTextImpl::appendData(const XMLCh *arg) {fCharacterData.appendData(this, arg);};
+ void IDTextImpl::insertData(unsigned int offset, const XMLCh *arg)
{fCharacterData.insertData(offset, arg);};
void IDTextImpl::deleteData(unsigned int offset, unsigned int count)
{fCharacterData.deleteData(this, offset, count);};
diff --git a/src/idom/IDTextImpl.hpp b/src/idom/IDTextImpl.hpp
index 2f287d52b9cd39670e066e1c169cd553ff2cdf88..3f561bd2a823c9701b931c418791275ac49e7e7f 100644
--- a/src/idom/IDTextImpl.hpp
+++ b/src/idom/IDTextImpl.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -98,15 +98,15 @@ public:
// All of the functions coming from IDOM_CharacterData
virtual const XMLCh * getData() const;
- virtual unsigned int getLength() const;
- virtual const XMLCh * substringData(unsigned int offset,
- unsigned int count) const;
- virtual void appendData(const XMLCh *arg);
+ virtual unsigned int getLength() const;
+ virtual const XMLCh * substringData(unsigned int offset,
+ unsigned int count) const;
+ virtual void appendData(const XMLCh *arg);
virtual void insertData(unsigned int offset, const XMLCh *arg);
- virtual void deleteData(unsigned int offset,
+ virtual void deleteData(unsigned int offset,
unsigned int count);
- virtual void replaceData(unsigned int offset,
- unsigned int count,
+ virtual void replaceData(unsigned int offset,
+ unsigned int count,
const XMLCh *arg);
virtual void setData(const XMLCh *data);
diff --git a/src/idom/IDTreeWalkerImpl.cpp b/src/idom/IDTreeWalkerImpl.cpp
index bfea40d26a9893fbdfcd59302971905380ca1b6e..d1ff3c6ceabe5015d637262093247e8f5acb9e72 100644
--- a/src/idom/IDTreeWalkerImpl.cpp
+++ b/src/idom/IDTreeWalkerImpl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,39 +56,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:35 andyh
- * Initial revision
+ * Revision 1.2 2001/05/11 13:26:00 tng
+ * Copyright update.
*
- * Revision 1.8 2000/08/08 01:00:36 aruna1
- * detach functionality removed from TreeWalker
- *
- * Revision 1.7 2000/03/28 23:22:17 aruna1
- * Modified return statements in functions to avoid warnings on HP.
- *
- * Revision 1.6 2000/03/02 19:54:05 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.5 2000/02/06 07:47:34 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.4 2000/02/04 01:49:25 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.3 1999/11/30 21:16:26 roddey
- * Changes to add the transcode() method to DOMString, which returns a transcoded
- * version (to local code page) of the DOM string contents. And I changed all of the
- * exception 'throw by pointer' to 'throw by value' style.
- *
- * Revision 1.2 1999/11/23 01:48:17 rahulj
- * Changed 0L to 0. CC under HPUX is happy now.
- *
- * Revision 1.1.1.1 1999/11/09 01:09:20 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:44:33 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:35 andyh
+ * IDOM
*
*/
@@ -100,11 +72,11 @@
/** constructor */
TreeWalkerImpl::TreeWalkerImpl (
- DOM_Node root,
- unsigned long whatToShow,
- DOM_NodeFilter* nodeFilter,
- bool expandEntityRef)
-: fCurrentNode(root),
+ DOM_Node root,
+ unsigned long whatToShow,
+ DOM_NodeFilter* nodeFilter,
+ bool expandEntityRef)
+: fCurrentNode(root),
fRoot(root),
fWhatToShow(whatToShow),
fNodeFilter(nodeFilter),
@@ -114,7 +86,7 @@ TreeWalkerImpl::TreeWalkerImpl (
}
-TreeWalkerImpl::TreeWalkerImpl (const TreeWalkerImpl& twi)
+TreeWalkerImpl::TreeWalkerImpl (const TreeWalkerImpl& twi)
: fCurrentNode(twi.fCurrentNode),
fRoot(twi.fRoot),
fWhatToShow(twi.fWhatToShow),
diff --git a/src/idom/IDTreeWalkerImpl.hpp b/src/idom/IDTreeWalkerImpl.hpp
index d272438d94a9e3c3b3013baa6ee5166830f4eade..c135ec7c4c7daedc1b8a714335139d30253bad40 100644
--- a/src/idom/IDTreeWalkerImpl.hpp
+++ b/src/idom/IDTreeWalkerImpl.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,31 +56,11 @@
/*
* $Log$
- * Revision 1.1 2001/04/03 00:14:35 andyh
- * Initial revision
+ * Revision 1.2 2001/05/11 13:26:00 tng
+ * Copyright update.
*
- * Revision 1.6 2000/08/08 01:00:37 aruna1
- * detach functionality removed from TreeWalker
- *
- * Revision 1.5 2000/02/24 20:11:31 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.4 2000/02/15 23:17:37 andyh
- * Update Doc++ API comments
- * NameSpace bugfix and update to track W3C
- * Chih Hsiang Chou
- *
- * Revision 1.3 2000/02/06 07:47:34 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.2 2000/02/04 01:49:24 aruna1
- * TreeWalker and NodeIterator changes
- *
- * Revision 1.1.1.1 1999/11/09 01:09:20 twl
- * Initial checkin
- *
- * Revision 1.3 1999/11/08 20:44:34 rahul
- * Swat for adding in Product name and CVS comment log variable.
+ * Revision 1.1.1.1 2001/04/03 00:14:35 andyh
+ * IDOM
*
*/
@@ -102,8 +82,8 @@ class CDOM_EXPORT TreeWalkerImpl : public RefCountedImpl {
/** Public constructor */
TreeWalkerImpl (
- DOM_Node root,
- unsigned long whatToShow,
+ DOM_Node root,
+ unsigned long whatToShow,
DOM_NodeFilter* nodeFilter,
bool expandEntityRef);
TreeWalkerImpl (const TreeWalkerImpl& twi);
@@ -158,7 +138,7 @@ class CDOM_EXPORT TreeWalkerImpl : public RefCountedImpl {
DOM_Node nextNode ();
void unreferenced ();
-
+
// Get the expandEntity reference flag.
bool getExpandEntityReferences();
diff --git a/src/idom/IDXMLDeclImpl.cpp b/src/idom/IDXMLDeclImpl.cpp
index 3000be7b7fb1e6e119d1f00b180b534b758833f2..8308f015050bd6d3d3b12feef2dcecbb380fe540 100644
--- a/src/idom/IDXMLDeclImpl.cpp
+++ b/src/idom/IDXMLDeclImpl.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -66,7 +66,7 @@
-IDXMLDeclImpl::IDXMLDeclImpl(IDOM_Document *ownerDoc)
+IDXMLDeclImpl::IDXMLDeclImpl(IDOM_Document *ownerDoc)
: fNode(ownerDoc),
fVersion (XMLUni::fgSupportedVersion),
fEncoding (XMLUni::fgUTF8EncodingString),
@@ -79,7 +79,7 @@ IDXMLDeclImpl::IDXMLDeclImpl(IDOM_Document *ownerDoc)
//Introduced in DOM Level 2
IDXMLDeclImpl::IDXMLDeclImpl(IDOM_Document *ownerDoc, const XMLCh *ver,
const XMLCh *enc, const XMLCh *std)
- : fNode(ownerDoc)
+ : fNode(ownerDoc)
{
fNode.setIsLeafNode(true);
IDDocumentImpl *doc = (IDDocumentImpl *)ownerDoc;
@@ -111,7 +111,7 @@ IDOM_Node * IDXMLDeclImpl::cloneNode(bool deep) const
const XMLCh * IDXMLDeclImpl::getNodeName() const
{
static const XMLCh nam[] = // "#xmldecl"
- {chPound, chLatin_x, chLatin_m, chLatin_l, chLatin_d, chLatin_e,chLatin_c, chLatin_l, 0};
+ {chPound, chLatin_x, chLatin_m, chLatin_l, chLatin_d, chLatin_e,chLatin_c, chLatin_l, 0};
return nam;
}
diff --git a/src/idom/IDXMLDeclImpl.hpp b/src/idom/IDXMLDeclImpl.hpp
index 997a990f00e4175d7bf15c247c9d49bb08c31c5b..f37d0a8a3db1ba6f683777b68537ecd1bb103b28 100644
--- a/src/idom/IDXMLDeclImpl.hpp
+++ b/src/idom/IDXMLDeclImpl.hpp
@@ -4,7 +4,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -51,7 +51,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -88,14 +88,14 @@ private:
public:
IDXMLDeclImpl(IDOM_Document *ownerDoc);
- IDXMLDeclImpl(IDOM_Document *ownerDoc, const XMLCh * version,
+ IDXMLDeclImpl(IDOM_Document *ownerDoc, const XMLCh * version,
const XMLCh * encoding, const XMLCh * standalone);
IDXMLDeclImpl(const IDXMLDeclImpl &other, bool deep=false);
virtual ~IDXMLDeclImpl();
// Declare all of the functions from IDOM_Node.
IDOM_NODE_FUNCTIONS;
-
+
virtual const XMLCh * getVersion() const;
virtual const XMLCh * getEncoding() const;
diff --git a/src/idom/Makefile.in b/src/idom/Makefile.in
index a2fc23efa394d38d4d7fd840be853fd673320ab6..65d608eb8888fb5649972915618e6d6181199892 100644
--- a/src/idom/Makefile.in
+++ b/src/idom/Makefile.in
@@ -1,7 +1,7 @@
#
# The Apache Software License, Version 1.1
#
-# Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+# Copyright (c) 2001 The Apache Software Foundation. All rights
# reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
#
# 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
+# originally based on software copyright (c) 2001, International
# Business Machines, Inc., http://www.ibm.com . For more information
# on the Apache Software Foundation, please see
# <http://www.apache.org/>.
diff --git a/src/internal/ElemStack.cpp b/src/internal/ElemStack.cpp
index 42dc3aa463ddca8472f273a9308bef40fc692f5e..fed757eaf280faec55c917763d2114ea043a1467 100644
--- a/src/internal/ElemStack.cpp
+++ b/src/internal/ElemStack.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.11 2001/05/11 13:26:16 tng
+ * Copyright update.
+ *
* Revision 1.10 2001/05/03 20:34:28 tng
* Schema: SchemaValidator update
*
diff --git a/src/internal/ElemStack.hpp b/src/internal/ElemStack.hpp
index 62fa70c232bcb86e2afe8c6d0abf7f8ab42769f3..63ba6e9ffb4802b5b425fe8413f901d5750d8cc6 100644
--- a/src/internal/ElemStack.hpp
+++ b/src/internal/ElemStack.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2001/05/11 13:26:16 tng
+ * Copyright update.
+ *
* Revision 1.7 2001/05/03 20:34:28 tng
* Schema: SchemaValidator update
*
diff --git a/src/internal/VecAttributesImpl.cpp b/src/internal/VecAttributesImpl.cpp
index 04732ab1355c0330265831fb3451443881562bac..0d826ff6dbcc3d93bb899bd0c9d02e0708a72fd8 100644
--- a/src/internal/VecAttributesImpl.cpp
+++ b/src/internal/VecAttributesImpl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2001/05/11 13:26:16 tng
+ * Copyright update.
+ *
* Revision 1.5 2001/03/21 21:56:04 tng
* Schema: Add Schema Grammar, Schema Validator, and split the DTDValidator into DTDValidator, DTDScanner, and DTDGrammar.
*
diff --git a/src/internal/VecAttributesImpl.hpp b/src/internal/VecAttributesImpl.hpp
index 56a63f734d8799e05f50db1f230eef297ed6a088..ddb940759adbe0781155546e258a5c2c2681aa44 100644
--- a/src/internal/VecAttributesImpl.hpp
+++ b/src/internal/VecAttributesImpl.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2001/05/11 13:26:16 tng
+ * Copyright update.
+ *
* Revision 1.4 2001/03/21 21:56:04 tng
* Schema: Add Schema Grammar, Schema Validator, and split the DTDValidator into DTDValidator, DTDScanner, and DTDGrammar.
*
diff --git a/src/internal/XMLReader.cpp b/src/internal/XMLReader.cpp
index 9970e5ad844fa1585a18cda574856b601366a3c4..1ea28b2b6404661df7be5ab6dc8e21ab866f94f3 100644
--- a/src/internal/XMLReader.cpp
+++ b/src/internal/XMLReader.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -629,7 +629,7 @@ bool XMLReader::getNextChar(XMLCh& chGotten)
{
if (refreshCharBuffer())
{
- if (fCharBuf[fCharIndex] == chLF
+ if (fCharBuf[fCharIndex] == chLF
|| (fNEL && (fCharBuf[fCharIndex] == chNEL)))
fCharIndex++;
}
@@ -876,7 +876,7 @@ bool XMLReader::peekNextChar(XMLCh& chGotten)
// normal char get method in regards to newline normalization, though
// its not as complicated as the actual character getting method's.
//
- if ((fSource == Source_External)
+ if ((fSource == Source_External)
&& (chGotten == chCR || (fNEL && (chGotten == chNEL))))
chGotten = chLF;
@@ -1591,7 +1591,7 @@ void XMLReader::refreshRawBuffer()
{
//
// If there are any bytes left, move them down to the start. There
- // should only ever be (max bytes per char - 1) at the most.
+ // should only ever be (max bytes per char - 1) at the most.
//
const unsigned int bytesLeft = fRawBytesAvail - fRawBufIndex;
diff --git a/src/internal/XMLReader.hpp b/src/internal/XMLReader.hpp
index 347de019fbc71c22689db4c03b14f5740fbea708..eb93d74fb03f313e3385c0214e810ea89e39b02e 100644
--- a/src/internal/XMLReader.hpp
+++ b/src/internal/XMLReader.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.16 2001/05/11 13:26:17 tng
+ * Copyright update.
+ *
* Revision 1.15 2001/05/03 18:42:51 knoaman
* Added new option to the parsers so that the NEL (0x85) char can be treated as a newline character.
*
diff --git a/src/internal/XMLScanner.cpp b/src/internal/XMLScanner.cpp
index d926d52eb520e71f8d674ca15d4f87000ab0c2c4..487f2ec60ee55b66fcc05447721ee23953cadf89 100644
--- a/src/internal/XMLScanner.cpp
+++ b/src/internal/XMLScanner.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/internal/XMLScanner.hpp b/src/internal/XMLScanner.hpp
index 79921e2c3d58041b186c2ccbb0d2b5f08e0b507c..5d81a89b8b59928504d6067f6c477f5edad70160 100644
--- a/src/internal/XMLScanner.hpp
+++ b/src/internal/XMLScanner.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.17 2001/05/11 13:26:17 tng
+ * Copyright update.
+ *
* Revision 1.16 2001/05/03 20:34:29 tng
* Schema: SchemaValidator update
*
diff --git a/src/internal/XMLScanner2.cpp b/src/internal/XMLScanner2.cpp
index 62d920d5b7352e0048d3177e4ec2aae79ec5ae62..09c545a989d2419cb81d15e784b9a318c2b30b30 100644
--- a/src/internal/XMLScanner2.cpp
+++ b/src/internal/XMLScanner2.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/parsers/DOMParser.cpp b/src/parsers/DOMParser.cpp
index 1dd9d20b1c6ed2e0e89b9a4368993334e6e03eb9..04555acde8e605cb34505a39dd6f6acf33618ea4 100644
--- a/src/parsers/DOMParser.cpp
+++ b/src/parsers/DOMParser.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/parsers/DOMParser.hpp b/src/parsers/DOMParser.hpp
index 04a5318a4318a39808c42e0cf756eefc4b88bf58..52c99f425e22ac4004a0d5ad9d25bdd7c51de076 100644
--- a/src/parsers/DOMParser.hpp
+++ b/src/parsers/DOMParser.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -265,7 +265,7 @@ public :
* validation-constraint-fatal flag.
*
* @return true, if the parser is currently configured to
- * set validation constraint errors as fatal, false
+ * set validation constraint errors as fatal, false
* otherwise.
*
* @see #setValidationContraintFatal
@@ -411,7 +411,7 @@ public :
/**
* This method allows users to set the parser's behaviour when it
* encounters a validtion constraint error. If set to true, and the
- * the parser is set to exit when it encounter the first fatal error,
+ * the parser is set to exit when it encounter the first fatal error,
* the parser will exit at the first encounter. If false, then it will
* report the error and continue processing.
*
diff --git a/src/parsers/Makefile.in b/src/parsers/Makefile.in
index e6535ac73462e6476bb56b0770cf9f908142b009..d18e8fb8212e0afbff3fe9b0c78d6a2e7584b6ad 100644
--- a/src/parsers/Makefile.in
+++ b/src/parsers/Makefile.in
@@ -1,7 +1,7 @@
#
# The Apache Software License, Version 1.1
#
-# Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+# Copyright (c) 1999-2001 The Apache Software Foundation. All rights
# reserved.
#
# Redistribution and use in source and binary forms, with or without
diff --git a/src/parsers/SAX2XMLReaderImpl.cpp b/src/parsers/SAX2XMLReaderImpl.cpp
index 912e10778acbb0f9bd27ac3d5654b32f05e09f56..eca609b051b90634f1c21c24f0c47d361a6da023 100644
--- a/src/parsers/SAX2XMLReaderImpl.cpp
+++ b/src/parsers/SAX2XMLReaderImpl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.12 2001/05/11 13:26:21 tng
+ * Copyright update.
+ *
* Revision 1.11 2001/05/03 20:34:33 tng
* Schema: SchemaValidator update
*
diff --git a/src/parsers/SAX2XMLReaderImpl.hpp b/src/parsers/SAX2XMLReaderImpl.hpp
index 29b2c15278edc74fa51b2d461cb1b61b19b3a237..920e939716532ceeac42dd6d993d8a8be2e74de8 100644
--- a/src/parsers/SAX2XMLReaderImpl.hpp
+++ b/src/parsers/SAX2XMLReaderImpl.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2001/05/11 13:26:21 tng
+ * Copyright update.
+ *
* Revision 1.7 2001/03/30 16:46:57 tng
* Schema: Use setDoSchema instead of setSchemaValidation which makes more sense.
*
diff --git a/src/parsers/SAXParser.cpp b/src/parsers/SAXParser.cpp
index be189c43f04299fd5a5fed09e5461657ff052d0d..9f10cd02aa854a099e2d9cb9b820fd5752a024d0 100644
--- a/src/parsers/SAXParser.cpp
+++ b/src/parsers/SAXParser.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.19 2001/05/11 13:26:22 tng
+ * Copyright update.
+ *
* Revision 1.18 2001/05/03 19:09:23 knoaman
* Support Warning/Error/FatalError messaging.
* Validity constraints errors are treated as errors, with the ability by user to set
diff --git a/src/parsers/SAXParser.hpp b/src/parsers/SAXParser.hpp
index 09f05f5e5f3176bc99fe6496458e6ef6a4b539f9..8e2201fed32dc8f8357611fe2706bb757ee57243 100644
--- a/src/parsers/SAXParser.hpp
+++ b/src/parsers/SAXParser.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.15 2001/05/11 13:26:22 tng
+ * Copyright update.
+ *
* Revision 1.14 2001/05/03 19:09:25 knoaman
* Support Warning/Error/FatalError messaging.
* Validity constraints errors are treated as errors, with the ability by user to set
@@ -295,7 +298,7 @@ public :
* validation-constraint-fatal flag.
*
* @return true, if the parser is currently configured to
- * set validation constraint errors as fatal, false
+ * set validation constraint errors as fatal, false
* otherwise.
*
* @see #setValidationContraintFatal
@@ -383,7 +386,7 @@ public :
/**
* This method allows users to set the parser's behaviour when it
* encounters a validtion constraint error. If set to true, and the
- * the parser is set to exit when it encounter the first fatal error,
+ * the parser is set to exit when it encounter the first fatal error,
* the parser will exit at the first encounter. If false, then it will
* report the error and continue processing.
*
diff --git a/src/sax/Parser.hpp b/src/sax/Parser.hpp
index 41a844679babc17759fc763d140aa54cf9ea30fc..6c50f9c97cdabf0ddda4621f290524b5405cb057 100644
--- a/src/sax/Parser.hpp
+++ b/src/sax/Parser.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2001/05/11 13:26:24 tng
+ * Copyright update.
+ *
* Revision 1.7 2001/03/21 21:56:10 tng
* Schema: Add Schema Grammar, Schema Validator, and split the DTDValidator into DTDValidator, DTDScanner, and DTDGrammar.
*
diff --git a/src/sax2/Attributes.hpp b/src/sax2/Attributes.hpp
index 26676205519b604b03501256b6748105225e22b1..9e51f095082b024f466204dc48a551c41793ee5f 100644
--- a/src/sax2/Attributes.hpp
+++ b/src/sax2/Attributes.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2001/05/11 13:26:25 tng
+ * Copyright update.
+ *
* Revision 1.4 2001/02/26 19:44:19 tng
* Schema: add utility class QName, by Pei Yong Zhang.
*
@@ -134,10 +137,10 @@
* }
* </pre>
*
- * The AttributesImpl helper class provides a convenience
+ * The AttributesImpl helper class provides a convenience
* implementation for use by parser or application writers.
*
- * @see Sax2DocumentHandler#startElement
+ * @see Sax2DocumentHandler#startElement
* @see AttributesImpl#AttributesImpl
*/
@@ -170,7 +173,7 @@ public:
* declared or specified. The number of attributes may be
* zero.
*
- * @return The number of attributes in the list.
+ * @return The number of attributes in the list.
*/
virtual unsigned int getLength() const = 0;
@@ -185,7 +188,7 @@ public:
* @param index The index of the attribute in the list (starting at 0).
* @return The URI of the indexed attribute, or null
* if the index is out of range.
- * @see #getLength
+ * @see #getLength
*/
virtual const XMLCh* getURI(const unsigned int index) const = 0;
@@ -200,7 +203,7 @@ public:
* @param index The index of the attribute in the list (starting at 0).
* @return The local name of the indexed attribute, or null
* if the index is out of range.
- * @see #getLength
+ * @see #getLength
*/
virtual const XMLCh* getLocalName(const unsigned int index) const = 0;
@@ -215,7 +218,7 @@ public:
* @param index The index of the attribute in the list (starting at 0).
* @return The qName of the indexed attribute, or null
* if the index is out of range.
- * @see #getLength
+ * @see #getLength
*/
virtual const XMLCh* getQName(const unsigned int index) const = 0;
@@ -237,7 +240,7 @@ public:
* @param index The index of the attribute in the list (starting at 0).
* @return The attribute type as a string, or
* null if the index is out of range.
- * @see #getLength
+ * @see #getLength
* @see #getType(String)
*/
virtual const XMLCh* getType(const unsigned int index) const = 0;
@@ -299,7 +302,7 @@ public:
* Look up an attribute's type by XML 1.0 qualified name.
*
* <p>See #getType for a description of the possible types.</p>
- *
+ *
* @param qName The XML 1.0 qualified name.
* @return The attribute type as a string, or null if the
* attribute is not in the list or if qualified names
@@ -324,7 +327,7 @@ public:
* Look up an attribute's value by XML 1.0 qualified name.
*
* <p>See #getValue for a description of the possible values.</p>
- *
+ *
* @param qName The XML 1.0 qualified name.
* @return The attribute value as a string, or null if the
* attribute is not in the list or if qualified names
@@ -340,7 +343,7 @@ private :
Attributes(const Attributes&);
/* Assignment operator */
void operator=(const Attributes&);
-
+
};
#endif
diff --git a/src/sax2/SAX2XMLReader.hpp b/src/sax2/SAX2XMLReader.hpp
index 31b0c43f46897f7cb5b8cd8ca3cde7c5d5fb47d9..470e92825498de697f7ae8acf95cac50195b80aa 100644
--- a/src/sax2/SAX2XMLReader.hpp
+++ b/src/sax2/SAX2XMLReader.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2001/05/11 13:26:25 tng
+ * Copyright update.
+ *
* Revision 1.6 2001/02/15 15:56:31 tng
* Schema: Add setSchemaValidation and getSchemaValidation for DOMParser and SAXParser.
* Add feature "http://apache.org/xml/features/validation/schema" for SAX2XMLReader.
diff --git a/src/util/AutoSense.hpp b/src/util/AutoSense.hpp
index d8f51eb8e16e28bd560e05e811ec66b56a139823..e27d14ab885d8334b6125aeafc7401427449db3d 100644
--- a/src/util/AutoSense.hpp
+++ b/src/util/AutoSense.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.20 2001/05/11 13:26:26 tng
+ * Copyright update.
+ *
* Revision 1.19 2001/03/23 19:01:25 tng
* [Bug 1018] AutoSense looks for "IRIX" when it should look for "sgi" or "__sgi". By Jeff Harrell.
*
diff --git a/src/util/KVStringPair.cpp b/src/util/KVStringPair.cpp
index 2453a7ab0e796a43a8788bb503414e7df6d49538..3997c59b1bb9b12a9ff2edec971929257a0ebf61 100644
--- a/src/util/KVStringPair.cpp
+++ b/src/util/KVStringPair.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2001/05/11 13:26:27 tng
+ * Copyright update.
+ *
* Revision 1.4 2001/01/15 21:26:33 tng
* Performance Patches by David Bertoni.
*
diff --git a/src/util/KVStringPair.hpp b/src/util/KVStringPair.hpp
index 902bd50295c5557e98958aa4409284700de86934..0ab87a2fd83161080b940e4d0d17a54fe5c6c64a 100644
--- a/src/util/KVStringPair.hpp
+++ b/src/util/KVStringPair.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2001/05/11 13:26:27 tng
+ * Copyright update.
+ *
* Revision 1.5 2001/01/15 21:26:34 tng
* Performance Patches by David Bertoni.
*
@@ -130,7 +133,7 @@ public:
// -----------------------------------------------------------------------
// Getters
//
- // We support the
+ // We support the
// -----------------------------------------------------------------------
const XMLCh* getKey() const;
XMLCh* getKey();
diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 79da733c322af90b8de669a14435268a63200648..e6e4f691344d6df95a1bf67238ce617c200fb320 100644
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -1,7 +1,7 @@
#
# The Apache Software License, Version 1.1
#
-# Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+# Copyright (c) 1999-2001 The Apache Software Foundation. All rights
# reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -55,6 +55,9 @@
#
#
# $Log$
+# Revision 1.34 2001/05/11 13:26:27 tng
+# Copyright update.
+#
# Revision 1.33 2001/05/10 20:51:18 tng
# Schema: Add DecimalDatatypeValidator and XMLBigDecimal, XMLBigInteger. By Pei Yong Zhang.
#
diff --git a/src/util/NumberFormatException.hpp b/src/util/NumberFormatException.hpp
index 1a24a798f66aa9995e04fe63e677d8340c692d73..59f7a534f3047679a2141e09d37e0d9fc23ef601 100644
--- a/src/util/NumberFormatException.hpp
+++ b/src/util/NumberFormatException.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/util/ParseException.hpp b/src/util/ParseException.hpp
index 2f9ca67ef8d04b560e1dfb51ccb3eea8665aa5dc..267beb38e4fc8432893f3945ca079e75ae8669bf 100644
--- a/src/util/ParseException.hpp
+++ b/src/util/ParseException.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/util/PlatformUtils.cpp b/src/util/PlatformUtils.cpp
index 96ab8386086b4f2955022303c2a3aff7098b4af3..b68438d772f3912715c1ed904e1307cbae2bf116 100644
--- a/src/util/PlatformUtils.cpp
+++ b/src/util/PlatformUtils.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.13 2001/05/11 13:26:27 tng
+ * Copyright update.
+ *
* Revision 1.12 2001/05/03 18:43:01 knoaman
* Added new option to the parsers so that the NEL (0x85) char can be treated as a newline character.
*
diff --git a/src/util/PlatformUtils.hpp b/src/util/PlatformUtils.hpp
index 9c941688aa8078102ab582d0a832e5809caf633b..b03744adba5a8ad7e4f3656ced48d13fb4adf842 100644
--- a/src/util/PlatformUtils.hpp
+++ b/src/util/PlatformUtils.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -343,7 +343,7 @@ public :
* @param basePath The string containing the base path
* @param relativePath The string containing the relative path
*
- * @return Returns a string containing the 'woven' path. It should
+ * @return Returns a string containing the 'woven' path. It should
* be dynamically allocated and becomes the responsibility of the
* caller to delete.
*/
diff --git a/src/util/QName.cpp b/src/util/QName.cpp
index c20a3ea642ba8af9f75cc913bd6b4517644e1a22..bc91cff90a10f90b1983fa3b18e040c4272ca6de 100644
--- a/src/util/QName.cpp
+++ b/src/util/QName.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2001/05/11 13:26:28 tng
+ * Copyright update.
+ *
* Revision 1.5 2001/04/19 18:17:08 tng
* Schema: SchemaValidator update, and use QName in Content Model
*
diff --git a/src/util/QName.hpp b/src/util/QName.hpp
index b36861fd5b3b44fed6284e0f94e9b00f0926f01b..714684232b50fba81fa589dcf293c5ceefc1fa0c 100644
--- a/src/util/QName.hpp
+++ b/src/util/QName.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2001/05/11 13:26:28 tng
+ * Copyright update.
+ *
* Revision 1.5 2001/04/19 18:17:10 tng
* Schema: SchemaValidator update, and use QName in Content Model
*
diff --git a/src/util/RefHash2KeysTableOf.c b/src/util/RefHash2KeysTableOf.c
index 8f39b79ccdaebbeb4287dfdc12c8199a8e4012bf..8e268744efbc0f1720353b06197038172c9f29ff 100644
--- a/src/util/RefHash2KeysTableOf.c
+++ b/src/util/RefHash2KeysTableOf.c
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/**
* $Log$
+ * Revision 1.3 2001/05/11 13:26:28 tng
+ * Copyright update.
+ *
* Revision 1.2 2001/03/14 13:18:21 tng
* typo: should use fKey1
*
diff --git a/src/util/RefHash2KeysTableOf.hpp b/src/util/RefHash2KeysTableOf.hpp
index 8345e31b48d6f78b0e64502a52e7945db2b9f23f..e3f2f3168d36679ffb4b57db4018851090798a9b 100644
--- a/src/util/RefHash2KeysTableOf.hpp
+++ b/src/util/RefHash2KeysTableOf.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2001/05/11 13:26:28 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/02/27 18:24:01 tng
* Schema: Add utility RefHash2KeysTableOf.
*
diff --git a/src/util/RefHash3KeysIdPool.c b/src/util/RefHash3KeysIdPool.c
index 9c9d63a66ec36caaeee872ba781b169454806d9e..e3c5170ff6eab60e9e100914e8c4dab7933d6c60 100644
--- a/src/util/RefHash3KeysIdPool.c
+++ b/src/util/RefHash3KeysIdPool.c
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/**
* $Log$
+ * Revision 1.2 2001/05/11 13:26:29 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/03/21 21:56:12 tng
* Schema: Add Schema Grammar, Schema Validator, and split the DTDValidator into DTDValidator, DTDScanner, and DTDGrammar.
*
diff --git a/src/util/RefHash3KeysIdPool.hpp b/src/util/RefHash3KeysIdPool.hpp
index e139e0a9106c5ad3dbdd5704775f55e4963df387..ea4f13cb93f3bb80a4e83c7d66deec7a2b63cb01 100644
--- a/src/util/RefHash3KeysIdPool.hpp
+++ b/src/util/RefHash3KeysIdPool.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2001/05/11 13:26:29 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/03/21 21:56:12 tng
* Schema: Add Schema Grammar, Schema Validator, and split the DTDValidator into DTDValidator, DTDScanner, and DTDGrammar.
*
diff --git a/src/util/StringTokenizer.cpp b/src/util/StringTokenizer.cpp
index affa367a99a1b3deed4b38c9565133d932006183..285ff89bcd8944082b58c208f855f3c36f4e1cdd 100644
--- a/src/util/StringTokenizer.cpp
+++ b/src/util/StringTokenizer.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2001/05/11 13:26:29 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/04/19 17:47:58 knoaman
* A string tokenizer utility.
*
diff --git a/src/util/StringTokenizer.hpp b/src/util/StringTokenizer.hpp
index d8bad0574143b8f30d1d61a5330b03556208eb02..cb82cfd8fd8b9a22c9af91301cbd3c799272bd50 100644
--- a/src/util/StringTokenizer.hpp
+++ b/src/util/StringTokenizer.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -70,7 +70,7 @@
* The StringTokenizer methods do not distinguish among identifiers, numbers,
* and quoted strings, nor do they recognize and skip comments
*
- * A StringTokenizer object internally maintains a current position within
+ * A StringTokenizer object internally maintains a current position within
* the string to be tokenized. Some operations advance this current position
* past the characters processed.
*/
@@ -125,7 +125,7 @@ public:
/** @name Management Function */
//@{
- /**
+ /**
* Tests if there are more tokens available from this tokenizer's string.
*
* Returns true if and only if there is at least one token in the string
@@ -137,7 +137,7 @@ public:
* Calculates the number of times that this tokenizer's nextToken method
* can be called to return a valid token. The current position is not
* advanced.
- *
+ *
* Returns the number of tokens remaining in the string using the current
* delimiter set.
*/
@@ -177,7 +177,7 @@ private:
// The string to be parsed
//
// fDelimeters
- // A set of delimeter characters
+ // A set of delimeter characters
//
// fTokens
// A vector of the token strings
@@ -223,7 +223,7 @@ inline int StringTokenizer::countTokens() {
for (int i= fOffset; i< fStringLen; i++) {
if (isDelimeter(fString[i])) {
-
+
if (inToken) {
inToken = false;
}
diff --git a/src/util/TransService.cpp b/src/util/TransService.cpp
index b01e0d8e5e6b284e0a91bb8969248636f5b9c702..ef873b5e3e51e7d487ddbd80ff7d2fc11574aa31 100644
--- a/src/util/TransService.cpp
+++ b/src/util/TransService.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -203,7 +203,7 @@ XMLTransService::makeNewTranscoderFor( const XMLCh* const encoding
return ourMapping->makeNew(blockSize);
//
- // For now, we have a little list of encodings that we disallow
+ // For now, we have a little list of encodings that we disallow
// explicitly. So lets check for them up front. They all start with
// IBM, so we can do a quick check to see if we should even do
// anything at all.
diff --git a/src/util/TransService.hpp b/src/util/TransService.hpp
index 63cf2a3dc6e321e0f9070eac126d252aabd9f2fd..ebac44be306404a3b3fcc950a66fab61d5481c2d 100644
--- a/src/util/TransService.hpp
+++ b/src/util/TransService.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.13 2001/05/11 13:26:30 tng
+ * Copyright update.
+ *
* Revision 1.12 2001/01/25 19:19:32 tng
* Let user add their encoding to the intrinsic mapping table. Added by Khaled Noaman.
*
diff --git a/src/util/XMLBigDecimal.cpp b/src/util/XMLBigDecimal.cpp
index 621a8fcc5fef85cda35021b1711bd78ad4a8fa80..8a60de93df04b83a4400c9abe7c5350f652d861e 100644
--- a/src/util/XMLBigDecimal.cpp
+++ b/src/util/XMLBigDecimal.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2001/05/11 13:26:30 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/05/10 20:51:20 tng
* Schema: Add DecimalDatatypeValidator and XMLBigDecimal, XMLBigInteger. By Pei Yong Zhang.
*
@@ -101,21 +104,21 @@ XMLBigDecimal::XMLBigDecimal(const XMLCh* const strValue)
parseBigDecimal(strValue, ret_value, fScale);
fIntVal = new XMLBigInteger(ret_value);
-
+
}
XMLBigDecimal::XMLBigDecimal(const XMLBigDecimal& toCopy)
:fIntVal(0)
,fScale(toCopy.getScale())
{
-
+
//invoke XMLBigInteger' copy ctor
- fIntVal = new XMLBigInteger(*(toCopy.getValue()));
+ fIntVal = new XMLBigInteger(*(toCopy.getValue()));
}
/***
- *
+ *
* Leading and trailing whitespaces are allowed, and trimmed
*
* Only one and either of (+,-) after the leading whitespace, before
@@ -168,7 +171,7 @@ void XMLBigDecimal::parseBigDecimal(const XMLCh* const toConvert
endPtr--;
//
- // Work through what remains and convert each char to a digit.
+ // Work through what remains and convert each char to a digit.
//
XMLCh* retPtr = retBuffer;
//
@@ -186,7 +189,7 @@ void XMLBigDecimal::parseBigDecimal(const XMLCh* const toConvert
// skip the '+'
startPtr++;
}
-
+
// Leading zero will be taken care by BigInteger
bool dotSignFound = false;
@@ -221,7 +224,7 @@ void XMLBigDecimal::parseBigDecimal(const XMLCh* const toConvert
startPtr++;
}
- *retPtr = 0; //terminated
+ *retPtr = 0; //terminated
return;
}
@@ -233,20 +236,20 @@ void XMLBigDecimal::parseBigDecimal(const XMLCh* const toConvert
int XMLBigDecimal::compareValues(const XMLBigDecimal* const lValue
, const XMLBigDecimal* const rValue)
-{
+{
//
if ((!lValue) ||
(!rValue) )
ThrowXML(NumberFormatException, XMLExcepts::CM_UnaryOpHadBinType);
- //ThrowXML(NumberFormatException, XMLExcepts::XMLBIGDECIMAL_Null_value);
-
+ //ThrowXML(NumberFormatException, XMLExcepts::XMLBIGDECIMAL_Null_value);
+
/* Optimization: would run fine without the next three lines */
int sigDiff = lValue->getSign() - rValue->getSign();
if (sigDiff != 0)
return (sigDiff > 0 ? 1 : -1);
//
- // If signs match, scale and compare intVals
+ // If signs match, scale and compare intVals
// since matchScale will destructively change the scale
// we make a copy for both
//
diff --git a/src/util/XMLBigDecimal.hpp b/src/util/XMLBigDecimal.hpp
index 61e81dba8591a693426d14fbde6380020cfba785..8baf0dc8436fe143aa4276c05ab85d9e2050c26a 100644
--- a/src/util/XMLBigDecimal.hpp
+++ b/src/util/XMLBigDecimal.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -69,8 +69,8 @@ class XMLUTIL_EXPORT XMLBigDecimal
public:
/**
- * Constructs a newly allocated <code>XMLBigDecimal</code> object that
- * represents the value represented by the string.
+ * Constructs a newly allocated <code>XMLBigDecimal</code> object that
+ * represents the value represented by the string.
*
* @param the <code>String</code> to be converted to an
* <code>XMLBigDecimal</code>.
@@ -101,7 +101,7 @@ public:
* 0 zero
* 1 positive
*
- */
+ */
int getSign() const;
XMLBigInteger* getValue() const;
@@ -114,9 +114,9 @@ public:
/**
* Compares this object to the specified object.
- * The result is <code>true</code> if and only if the argument is not
- * <code>null</code> and is an <code>XMLBigDecimal</code> object that contains
- * the same <code>int</code> value as this object.
+ * The result is <code>true</code> if and only if the argument is not
+ * <code>null</code> and is an <code>XMLBigDecimal</code> object that contains
+ * the same <code>int</code> value as this object.
*
* @param obj the object to compare with.
* @return <code>true</code> if the objects are the same;
@@ -133,7 +133,7 @@ private:
//
// fIntVal
// the XMLBigInteger holding the value of this BigDecimal.
- //
+ //
// fScale
// the number of digits to the right of the decimal point
//
@@ -144,7 +144,7 @@ private:
};
-inline XMLBigDecimal::~XMLBigDecimal()
+inline XMLBigDecimal::~XMLBigDecimal()
{
delete fIntVal;
}
diff --git a/src/util/XMLBigInteger.cpp b/src/util/XMLBigInteger.cpp
index 46947050f5ecbd6c71c09efafbcad69df540a912..cd68490545da61e46d18f75e449f2dc889a1d6f6 100644
--- a/src/util/XMLBigInteger.cpp
+++ b/src/util/XMLBigInteger.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2001/05/11 13:26:31 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/05/10 20:51:23 tng
* Schema: Add DecimalDatatypeValidator and XMLBigDecimal, XMLBigInteger. By Pei Yong Zhang.
*
@@ -77,7 +80,7 @@
#include <util/Janitor.hpp>
/***
- *
+ *
* Leading and trailing whitespaces are allowed, and trimmed
*
* Only one and either of (+,-) after the leading whitespace, before
@@ -93,7 +96,7 @@
* w/o '+' and '-'
* w/o leading zero
*
- * see XMLInteger::parseInteger();
+ * see XMLString::parseInt();
* XMLString::textToBin();
*
* " +000203456" "203456"
@@ -102,7 +105,7 @@
***/
void XMLBigInteger::parseBigInteger(const XMLCh* const toConvert
- , XMLCh* retBuffer
+ , XMLCh* const retBuffer
, int& signValue)
{
// If no string, then its a failure
@@ -132,7 +135,7 @@ void XMLBigInteger::parseBigInteger(const XMLCh* const toConvert
endPtr--;
//
- // Work through what remains and convert each char to a digit.
+ // Work through what remains and convert each char to a digit.
// anything other than '
//
XMLCh* retPtr = retBuffer;
@@ -163,7 +166,7 @@ void XMLBigInteger::parseBigInteger(const XMLCh* const toConvert
// it is a zero, indeed
return;
}
-
+
while (startPtr < endPtr)
{
// If not valid decimal digit, then an error
@@ -177,14 +180,14 @@ void XMLBigInteger::parseBigInteger(const XMLCh* const toConvert
startPtr++;
}
- *retPtr = 0; //terminated
+ *retPtr = 0; //terminated
return;
}
/**
* Translates a string containing an optional minus sign followed by a
* sequence of one or more digits into a BigInteger.
- * Any extraneous characters (including whitespace),
+ * Any extraneous characters (including whitespace),
* inclusive, will result in a NumberFormatException.
*/
XMLBigInteger::XMLBigInteger(const XMLCh* const strValue)
@@ -192,7 +195,7 @@ XMLBigInteger::XMLBigInteger(const XMLCh* const strValue)
XMLCh* ret_value = new XMLCh[XMLString::stringLen(strValue)+1];
ArrayJanitor<XMLCh> janName(ret_value);
- try
+ try
{
parseBigInteger(strValue, ret_value, fSign);
}
@@ -212,7 +215,7 @@ XMLBigInteger::XMLBigInteger(const XMLCh* const strValue)
XMLString::moveChars(fMagnitude, ret_value, strLen);
fMagnitude[strLen]=0;
}
-
+
}
XMLBigInteger::~XMLBigInteger()
@@ -232,7 +235,7 @@ XMLBigInteger::XMLBigInteger(const XMLBigInteger& toCopy)
/**
* Returns -1, 0 or 1 as lValue is less than, equal to, or greater
- * than rValue.
+ * than rValue.
*/
int XMLBigInteger::compareValues(const XMLBigInteger* const lValue
, const XMLBigInteger* const rValue)
@@ -327,7 +330,7 @@ void XMLBigInteger::divide(const unsigned int byteToShift)
void XMLBigInteger::dumpData() const
{
- char *p;
+ char *p;
p = XMLString::transcode(fMagnitude);
cout<<"sign="<<"<"<<fSign<<">"<<endl;
cout<<"fMagnitude="<<"<"<<p<<">"<<endl;
diff --git a/src/util/XMLBigInteger.hpp b/src/util/XMLBigInteger.hpp
index dc01f99a4b1f007b42975c271dd8258c00bae5f4..974d24ad753504eceb45bd9f14ff5a121d602022 100644
--- a/src/util/XMLBigInteger.hpp
+++ b/src/util/XMLBigInteger.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001 International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -69,9 +69,9 @@ class XMLUTIL_EXPORT XMLBigInteger
public:
/**
- * Constructs a newly allocated <code>XMLBigInteger</code> object that
- * represents the value represented by the string. The string is
- * converted to an int value as if by the <code>valueOf</code> method.
+ * Constructs a newly allocated <code>XMLBigInteger</code> object that
+ * represents the value represented by the string. The string is
+ * converted to an int value as if by the <code>valueOf</code> method.
*
* @param s the <code>String</code> to be converted to an
* <code>XMLBigInteger</code>.
@@ -90,9 +90,9 @@ public:
, int& signValue);
static int compareValues(const XMLBigInteger* const lValue
- ,const XMLBigInteger* const rValue);
+ ,const XMLBigInteger* const rValue);
+
-
void multiply(const unsigned int byteToShift);
void divide(const unsigned int byteToShift);
@@ -103,9 +103,9 @@ public:
/**
* Compares this object to the specified object.
- * The result is <code>true</code> if and only if the argument is not
- * <code>null</code> and is an <code>XMLBigInteger</code> object that contains
- * the same <code>int</code> value as this object.
+ * The result is <code>true</code> if and only if the argument is not
+ * <code>null</code> and is an <code>XMLBigInteger</code> object that contains
+ * the same <code>int</code> value as this object.
*
* @param obj the object to compare with.
* @return <code>true</code> if the objects are the same;
@@ -120,7 +120,7 @@ public:
int getSign() const;
private:
-
+
void setSign(int);
/*
@@ -134,9 +134,9 @@ private:
//
// fSign
// to represent the sign of the number.
- //
+ //
// fMagnitude
- // the buffer holding the number.
+ // the buffer holding the number.
//
// -----------------------------------------------------------------------
diff --git a/src/util/XMLString.cpp b/src/util/XMLString.cpp
index 54c42846d6c7a6f389717ac2f6f600d087eb6617..84e8aa11320e5798980f686fb8c205f03f477ba9 100644
--- a/src/util/XMLString.cpp
+++ b/src/util/XMLString.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -1192,7 +1192,7 @@ int XMLString::parseInt(const XMLCh* const toConvert)
endPtr--;
//
- // Work through what remains and convert each char to a digit.
+ // Work through what remains and convert each char to a digit.
//
int signValue = 1;
@@ -1207,14 +1207,14 @@ int XMLString::parseInt(const XMLCh* const toConvert)
else if (*startPtr == chPlus)
startPtr++; // skip the '+'
- unsigned long tmpVal = 0;
+ unsigned long tmpVal = 0;
while (startPtr < endPtr)
{
// If not valid decimal digit, then an error
if ((*startPtr < chDigit_0) || (*startPtr > chDigit_9))
ThrowXML(NumberFormatException, XMLExcepts::CM_UnaryOpHadBinType);
//ThrowXML(NumberFormatException, XMLExcepts::XMLINT_Invalid);
-
+
const unsigned int nextVal = (unsigned int)(*startPtr - chDigit_0);
tmpVal = (tmpVal * 10) + nextVal;
diff --git a/src/util/XMLString.hpp b/src/util/XMLString.hpp
index fdfed61f7c0b89db4ec82b3f46bc4ed1a457a5a2..2f97568825155cdf92d06dae99f74b3293780c1a 100644
--- a/src/util/XMLString.hpp
+++ b/src/util/XMLString.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.21 2001/05/11 13:26:31 tng
+ * Copyright update.
+ *
* Revision 1.20 2001/05/09 18:43:30 tng
* Add StringDatatypeValidator and BooleanDatatypeValidator. By Pei Yong Zhang.
*
@@ -361,8 +364,8 @@ public:
static int parseInt
(
const XMLCh* const toConvert
- );
-
+ );
+
//@}
/** @name String concatenation functions */
diff --git a/src/util/XMLUCSTranscoder.cpp b/src/util/XMLUCSTranscoder.cpp
index 244cb338f90085417e83cc55abc5744ff2493147..e916bd34709c735a299160eebfcbc55ca913f499 100644
--- a/src/util/XMLUCSTranscoder.cpp
+++ b/src/util/XMLUCSTranscoder.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
diff --git a/src/util/XMLURL.cpp b/src/util/XMLURL.cpp
index 5aad622f108444345a1faa96f4bbd0a2a67fdd86..c1df9045c8d81092de8a3ad11ac8f614e0d5a877 100644
--- a/src/util/XMLURL.cpp
+++ b/src/util/XMLURL.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
@@ -122,7 +122,7 @@ static const XMLCh gHTTPString[] =
chLatin_h, chLatin_t, chLatin_t, chLatin_p, chNull
};
-static ProtoEntry gProtoList[XMLURL::Protocols_Count] =
+static ProtoEntry gProtoList[XMLURL::Protocols_Count] =
{
{ XMLURL::File , gFileString , 0 }
, { XMLURL::HTTP , gHTTPString , 80 }
@@ -533,7 +533,7 @@ BinInputStream* XMLURL::makeNewStream() const
}
// Similarly for UNC paths
- if ( *(fPath + 1) == *(fPath + 2) &&
+ if ( *(fPath + 1) == *(fPath + 2) &&
(*(fPath + 1) == chForwardSlash ||
*(fPath + 1) == chBackSlash) )
{
@@ -708,7 +708,7 @@ void XMLURL::cleanup()
//This function has been modified to take a bool parameter and the
-//functionality inside looks irrational but is only to make
+//functionality inside looks irrational but is only to make
//solaris 2.7 CC 5.0 optimized build happy.
bool XMLURL::conglomerateWithBase(const XMLURL& baseURL, bool useExceptions)
@@ -892,7 +892,7 @@ void XMLURL::parse(const XMLCh* const urlText)
, srcPtr
);
}
-
+
// And move our source pointer up past what we've processed
srcPtr = (ptr1 + 1);
}
@@ -981,7 +981,7 @@ void XMLURL::parse(const XMLCh* const urlText)
//
// Ok, so now we are at the actual host name, if any. If we are
// not at the end of the host data, then lets see if we have a
- // port trailing the
+ // port trailing the
//
ptr1 = XMLString::findAny(fHost, listThree);
if (ptr1)
@@ -1004,7 +1004,7 @@ void XMLURL::parse(const XMLCh* const urlText)
}
// If we are at the end, then we are done now
- if (!*srcPtr)
+ if (!*srcPtr)
{
return;
}
diff --git a/src/util/XMLUni.cpp b/src/util/XMLUni.cpp
index 69ac7332504b79cd0c95a8319230d84eeb9a5ad1..f256b75aa2d104836e4276968361cc024c3f0329 100644
--- a/src/util/XMLUni.cpp
+++ b/src/util/XMLUni.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/util/XMLUni.hpp b/src/util/XMLUni.hpp
index d23ff4e5b274280151bfbbb7133b897691e23480..0bf7295c85be94af47ef92d37c5af978f5526067 100644
--- a/src/util/XMLUni.hpp
+++ b/src/util/XMLUni.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/util/XMLUniDefs.hpp b/src/util/XMLUniDefs.hpp
index 643e99625dc5f4d1e055305f4337d2a0ba485de2..3cb0c37751daa9f059ed4a8545de4889fe8ddd2b 100644
--- a/src/util/XMLUniDefs.hpp
+++ b/src/util/XMLUniDefs.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,7 +45,7 @@
* 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
diff --git a/src/util/XercesDefs.hpp b/src/util/XercesDefs.hpp
index 10d62ff37e1d478fd25fb82591e7d0d6f91a2a5a..0861ba845cd90f00996e87e626342818afd9dd99 100644
--- a/src/util/XercesDefs.hpp
+++ b/src/util/XercesDefs.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.13 2001/05/11 13:26:32 tng
+ * Copyright update.
+ *
* Revision 1.12 2001/02/08 14:15:33 tng
* enable COMPAQ Tru64 UNIX machines to build xerces-c with gcc (tested using COMPAQ gcc version2.95.2 19991024 (release) and Tru64 V5.0 1094). Added by Martin Kalen.
*
diff --git a/src/util/regx/ASCIIRangeFactory.cpp b/src/util/regx/ASCIIRangeFactory.cpp
index cbd7b0db00fe1a03c643a58bcc80433e66a5b6f1..6d70f33154117916599f93303e80cc4be68e4149 100644
--- a/src/util/regx/ASCIIRangeFactory.cpp
+++ b/src/util/regx/ASCIIRangeFactory.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2001/05/11 13:26:39 tng
+ * Copyright update.
+ *
* Revision 1.2 2001/05/03 18:17:18 knoaman
* Some design changes:
* o Changed the TokenFactory from a single static instance, to a
diff --git a/src/util/regx/ASCIIRangeFactory.hpp b/src/util/regx/ASCIIRangeFactory.hpp
index c86844ea67c8a8677e8d1d89f3d8c4d40fb2b211..d8818075cdec93d3c1a1cb23a698b3ee13c5392d 100644
--- a/src/util/regx/ASCIIRangeFactory.hpp
+++ b/src/util/regx/ASCIIRangeFactory.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/util/regx/BMPattern.cpp b/src/util/regx/BMPattern.cpp
index c4589fc9e282bbb8d047eaecee52305b45ff36c1..c8c082a68812a70281afaa07eaebeaf22c7e6b12 100644
--- a/src/util/regx/BMPattern.cpp
+++ b/src/util/regx/BMPattern.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2001/05/11 13:26:40 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/03/02 19:22:31 knoaman
* Schema: Regular expression handling part I
*
@@ -71,7 +74,7 @@
// ---------------------------------------------------------------------------
// BMPattern: Constructors
// ---------------------------------------------------------------------------
-BMPattern::BMPattern(const XMLCh* const pattern, bool ignoreCase)
+BMPattern::BMPattern(const XMLCh* const pattern, bool ignoreCase)
:fPattern(XMLString::replicate(pattern)),
fUppercasePattern(0),
fIgnoreCase(ignoreCase),
@@ -88,7 +91,7 @@ BMPattern::BMPattern(const XMLCh* const pattern, bool ignoreCase)
}
}
-BMPattern::BMPattern(const XMLCh* const pattern, int tableSize, bool ignoreCase)
+BMPattern::BMPattern(const XMLCh* const pattern, int tableSize, bool ignoreCase)
:fPattern(XMLString::replicate(pattern)),
fUppercasePattern(0),
fIgnoreCase(ignoreCase),
@@ -147,7 +150,7 @@ int BMPattern::matches(const XMLCh* const content, int start, int limit) {
// No match, so we will break. But first we have
// to check the ignore case flag. If it is set, then
// we try to match with the case ignored
- if (!fIgnoreCase ||
+ if (!fIgnoreCase ||
(fUppercasePattern[patternIndex] != ucContent[index]))
break;
}
diff --git a/src/util/regx/BMPattern.hpp b/src/util/regx/BMPattern.hpp
index c0ab53c418bf5697bde8ef20aefb8db9edf3d34f..1679684400d24ae5793df7a9a5700774b918cf29 100644
--- a/src/util/regx/BMPattern.hpp
+++ b/src/util/regx/BMPattern.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/util/regx/BlockRangeFactory.cpp b/src/util/regx/BlockRangeFactory.cpp
index 04f31a99c9cc48d7386823bf759b3caabac75bae..eb6fb94b6cb10d409d35fd4271dfd6f55e01dcae 100644
--- a/src/util/regx/BlockRangeFactory.cpp
+++ b/src/util/regx/BlockRangeFactory.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2001/05/11 13:26:40 tng
+ * Copyright update.
+ *
* Revision 1.2 2001/05/03 18:17:21 knoaman
* Some design changes:
* o Changed the TokenFactory from a single static instance, to a
@@ -99,176 +102,176 @@ bool BlockRangeFactory::fKeywordsInitialized = false;
const int SIZE = 68;
const XMLCh fgBlockNames[][SIZE] =
{
- { chLatin_B, chLatin_a, chLatin_s, chLatin_i, chLatin_c, chSpace, chLatin_L, chLatin_a,
+ { chLatin_B, chLatin_a, chLatin_s, chLatin_i, chLatin_c, chSpace, chLatin_L, chLatin_a,
chLatin_t, chLatin_i, chLatin_n, chNull },
- { chLatin_L, chLatin_a, chLatin_t, chLatin_i, chLatin_n, chDash, chDigit_1, chSpace,
- chLatin_S, chLatin_u, chLatin_p, chLatin_p, chLatin_l, chLatin_e, chLatin_m, chLatin_e,
+ { chLatin_L, chLatin_a, chLatin_t, chLatin_i, chLatin_n, chDash, chDigit_1, chSpace,
+ chLatin_S, chLatin_u, chLatin_p, chLatin_p, chLatin_l, chLatin_e, chLatin_m, chLatin_e,
chLatin_n, chLatin_t, chNull },
- { chLatin_L, chLatin_a, chLatin_t, chLatin_i, chLatin_n, chSpace, chLatin_E, chLatin_x,
- chLatin_t, chLatin_e, chLatin_n, chLatin_d, chLatin_e, chLatin_d, chDash, chLatin_A,
+ { chLatin_L, chLatin_a, chLatin_t, chLatin_i, chLatin_n, chSpace, chLatin_E, chLatin_x,
+ chLatin_t, chLatin_e, chLatin_n, chLatin_d, chLatin_e, chLatin_d, chDash, chLatin_A,
chNull },
- { chLatin_L, chLatin_a, chLatin_t, chLatin_i, chLatin_n, chSpace, chLatin_E, chLatin_x,
- chLatin_t, chLatin_e, chLatin_n, chLatin_d, chLatin_e, chLatin_d, chDash, chLatin_B,
+ { chLatin_L, chLatin_a, chLatin_t, chLatin_i, chLatin_n, chSpace, chLatin_E, chLatin_x,
+ chLatin_t, chLatin_e, chLatin_n, chLatin_d, chLatin_e, chLatin_d, chDash, chLatin_B,
chNull },
- { chLatin_I, chLatin_P, chLatin_A, chSpace, chLatin_E, chLatin_x, chLatin_t, chLatin_e,
+ { chLatin_I, chLatin_P, chLatin_A, chSpace, chLatin_E, chLatin_x, chLatin_t, chLatin_e,
chLatin_n, chLatin_s, chLatin_i, chLatin_o, chLatin_n, chLatin_s, chNull },
- { chLatin_S, chLatin_p, chLatin_a, chLatin_c, chLatin_i, chLatin_n, chLatin_g, chSpace,
- chLatin_M, chLatin_o, chLatin_d, chLatin_i, chLatin_f, chLatin_i, chLatin_e, chLatin_r,
- chSpace, chLatin_L, chLatin_e, chLatin_t, chLatin_t, chLatin_e, chLatin_r, chLatin_s,
+ { chLatin_S, chLatin_p, chLatin_a, chLatin_c, chLatin_i, chLatin_n, chLatin_g, chSpace,
+ chLatin_M, chLatin_o, chLatin_d, chLatin_i, chLatin_f, chLatin_i, chLatin_e, chLatin_r,
+ chSpace, chLatin_L, chLatin_e, chLatin_t, chLatin_t, chLatin_e, chLatin_r, chLatin_s,
chNull },
- { chLatin_C, chLatin_o, chLatin_m, chLatin_b, chLatin_i, chLatin_n, chLatin_i, chLatin_n,
- chLatin_g, chSpace, chLatin_D, chLatin_i, chLatin_a, chLatin_c, chLatin_r, chLatin_i,
- chLatin_t, chLatin_i, chLatin_c, chLatin_a, chLatin_l, chSpace, chLatin_M, chLatin_a,
+ { chLatin_C, chLatin_o, chLatin_m, chLatin_b, chLatin_i, chLatin_n, chLatin_i, chLatin_n,
+ chLatin_g, chSpace, chLatin_D, chLatin_i, chLatin_a, chLatin_c, chLatin_r, chLatin_i,
+ chLatin_t, chLatin_i, chLatin_c, chLatin_a, chLatin_l, chSpace, chLatin_M, chLatin_a,
chLatin_r, chLatin_k, chLatin_s, chNull },
{ chLatin_G, chLatin_r, chLatin_e, chLatin_e, chLatin_k, chNull },
- { chLatin_C, chLatin_y, chLatin_r, chLatin_i, chLatin_l, chLatin_l, chLatin_i, chLatin_c,
+ { chLatin_C, chLatin_y, chLatin_r, chLatin_i, chLatin_l, chLatin_l, chLatin_i, chLatin_c,
chNull },
- { chLatin_A, chLatin_r, chLatin_m, chLatin_e, chLatin_n, chLatin_i, chLatin_a, chLatin_n,
+ { chLatin_A, chLatin_r, chLatin_m, chLatin_e, chLatin_n, chLatin_i, chLatin_a, chLatin_n,
chNull },
{ chLatin_H, chLatin_e, chLatin_b, chLatin_r, chLatin_e, chLatin_w, chNull },
{ chLatin_A, chLatin_r, chLatin_a, chLatin_b, chLatin_i, chLatin_c, chNull },
- { chLatin_D, chLatin_e, chLatin_v, chLatin_a, chLatin_n, chLatin_a, chLatin_g, chLatin_a,
+ { chLatin_D, chLatin_e, chLatin_v, chLatin_a, chLatin_n, chLatin_a, chLatin_g, chLatin_a,
chLatin_r, chLatin_i, chNull },
{ chLatin_B, chLatin_e, chLatin_n, chLatin_g, chLatin_a, chLatin_l, chLatin_i, chNull },
- { chLatin_G, chLatin_u, chLatin_r, chLatin_m, chLatin_u, chLatin_k, chLatin_h, chLatin_i,
+ { chLatin_G, chLatin_u, chLatin_r, chLatin_m, chLatin_u, chLatin_k, chLatin_h, chLatin_i,
chNull },
- { chLatin_G, chLatin_u, chLatin_j, chLatin_a, chLatin_r, chLatin_a, chLatin_t, chLatin_i,
+ { chLatin_G, chLatin_u, chLatin_j, chLatin_a, chLatin_r, chLatin_a, chLatin_t, chLatin_i,
chNull },
{ chLatin_O, chLatin_r, chLatin_i, chLatin_y, chLatin_a, chNull },
{ chLatin_T, chLatin_a, chLatin_m, chLatin_i, chLatin_l, chNull },
{ chLatin_T, chLatin_e, chLatin_l, chLatin_u, chLatin_g, chLatin_u, chNull },
{ chLatin_K, chLatin_a, chLatin_n, chLatin_n, chLatin_a, chLatin_d, chLatin_a, chNull },
- { chLatin_M, chLatin_a, chLatin_l, chLatin_a, chLatin_y, chLatin_a, chLatin_l, chLatin_a,
+ { chLatin_M, chLatin_a, chLatin_l, chLatin_a, chLatin_y, chLatin_a, chLatin_l, chLatin_a,
chLatin_m, chNull },
{ chLatin_T, chLatin_h, chLatin_a, chLatin_i, chNull },
{ chLatin_L, chLatin_a, chLatin_o, chNull },
{ chLatin_T, chLatin_i, chLatin_b, chLatin_e, chLatin_t, chLatin_a, chLatin_n, chNull },
- { chLatin_G, chLatin_e, chLatin_o, chLatin_r, chLatin_g, chLatin_i, chLatin_a, chLatin_n,
+ { chLatin_G, chLatin_e, chLatin_o, chLatin_r, chLatin_g, chLatin_i, chLatin_a, chLatin_n,
chNull },
- { chLatin_H, chLatin_a, chLatin_n, chLatin_g, chLatin_u, chLatin_l, chSpace, chLatin_J,
+ { chLatin_H, chLatin_a, chLatin_n, chLatin_g, chLatin_u, chLatin_l, chSpace, chLatin_J,
chLatin_a, chLatin_m, chLatin_o, chNull },
- { chLatin_L, chLatin_a, chLatin_t, chLatin_i, chLatin_n, chSpace, chLatin_E, chLatin_x,
- chLatin_t, chLatin_e, chLatin_n, chLatin_d, chLatin_e, chLatin_d, chSpace, chLatin_A,
- chLatin_d, chLatin_d, chLatin_i, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chLatin_a,
+ { chLatin_L, chLatin_a, chLatin_t, chLatin_i, chLatin_n, chSpace, chLatin_E, chLatin_x,
+ chLatin_t, chLatin_e, chLatin_n, chLatin_d, chLatin_e, chLatin_d, chSpace, chLatin_A,
+ chLatin_d, chLatin_d, chLatin_i, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chLatin_a,
chLatin_l, chNull },
- { chLatin_G, chLatin_r, chLatin_e, chLatin_e, chLatin_k, chSpace, chLatin_E, chLatin_x,
+ { chLatin_G, chLatin_r, chLatin_e, chLatin_e, chLatin_k, chSpace, chLatin_E, chLatin_x,
chLatin_t, chLatin_e, chLatin_n, chLatin_d, chLatin_e, chLatin_d, chNull },
- { chLatin_G, chLatin_e, chLatin_n, chLatin_e, chLatin_r, chLatin_a, chLatin_l, chSpace,
- chLatin_P, chLatin_u, chLatin_n, chLatin_c, chLatin_t, chLatin_u, chLatin_a, chLatin_t,
+ { chLatin_G, chLatin_e, chLatin_n, chLatin_e, chLatin_r, chLatin_a, chLatin_l, chSpace,
+ chLatin_P, chLatin_u, chLatin_n, chLatin_c, chLatin_t, chLatin_u, chLatin_a, chLatin_t,
chLatin_i, chLatin_o, chLatin_n, chNull },
- { chLatin_S, chLatin_u, chLatin_p, chLatin_e, chLatin_r, chLatin_s, chLatin_c, chLatin_r,
- chLatin_i, chLatin_p, chLatin_t, chLatin_s, chSpace, chLatin_a, chLatin_n, chLatin_d,
- chSpace, chLatin_S, chLatin_u, chLatin_b, chLatin_s, chLatin_c, chLatin_r, chLatin_i,
+ { chLatin_S, chLatin_u, chLatin_p, chLatin_e, chLatin_r, chLatin_s, chLatin_c, chLatin_r,
+ chLatin_i, chLatin_p, chLatin_t, chLatin_s, chSpace, chLatin_a, chLatin_n, chLatin_d,
+ chSpace, chLatin_S, chLatin_u, chLatin_b, chLatin_s, chLatin_c, chLatin_r, chLatin_i,
chLatin_p, chLatin_t, chLatin_s, chNull },
- { chLatin_C, chLatin_u, chLatin_r, chLatin_r, chLatin_e, chLatin_n, chLatin_c, chLatin_y,
- chSpace, chLatin_S, chLatin_y, chLatin_m, chLatin_b, chLatin_o, chLatin_l, chLatin_s,
+ { chLatin_C, chLatin_u, chLatin_r, chLatin_r, chLatin_e, chLatin_n, chLatin_c, chLatin_y,
+ chSpace, chLatin_S, chLatin_y, chLatin_m, chLatin_b, chLatin_o, chLatin_l, chLatin_s,
chNull },
- { chLatin_C, chLatin_o, chLatin_m, chLatin_b, chLatin_i, chLatin_n, chLatin_i, chLatin_n,
- chLatin_g, chSpace, chLatin_M, chLatin_a, chLatin_r, chLatin_k, chLatin_s, chSpace,
- chLatin_f, chLatin_o, chLatin_r, chSpace, chLatin_S, chLatin_y, chLatin_m, chLatin_b,
+ { chLatin_C, chLatin_o, chLatin_m, chLatin_b, chLatin_i, chLatin_n, chLatin_i, chLatin_n,
+ chLatin_g, chSpace, chLatin_M, chLatin_a, chLatin_r, chLatin_k, chLatin_s, chSpace,
+ chLatin_f, chLatin_o, chLatin_r, chSpace, chLatin_S, chLatin_y, chLatin_m, chLatin_b,
chLatin_o, chLatin_l, chLatin_s, chNull },
- { chLatin_L, chLatin_e, chLatin_t, chLatin_t, chLatin_e, chLatin_r, chLatin_l, chLatin_i,
- chLatin_k, chLatin_e, chSpace, chLatin_S, chLatin_y, chLatin_m, chLatin_b, chLatin_o,
+ { chLatin_L, chLatin_e, chLatin_t, chLatin_t, chLatin_e, chLatin_r, chLatin_l, chLatin_i,
+ chLatin_k, chLatin_e, chSpace, chLatin_S, chLatin_y, chLatin_m, chLatin_b, chLatin_o,
chLatin_l, chLatin_s, chNull },
- { chLatin_N, chLatin_u, chLatin_m, chLatin_b, chLatin_e, chLatin_r, chSpace, chLatin_F,
+ { chLatin_N, chLatin_u, chLatin_m, chLatin_b, chLatin_e, chLatin_r, chSpace, chLatin_F,
chLatin_o, chLatin_r, chLatin_m, chLatin_s, chNull },
{ chLatin_A, chLatin_r, chLatin_r, chLatin_o, chLatin_w, chLatin_s, chNull },
- { chLatin_M, chLatin_a, chLatin_t, chLatin_h, chLatin_e, chLatin_m, chLatin_a, chLatin_t,
- chLatin_i, chLatin_c, chLatin_a, chLatin_l, chSpace, chLatin_O, chLatin_p, chLatin_e,
+ { chLatin_M, chLatin_a, chLatin_t, chLatin_h, chLatin_e, chLatin_m, chLatin_a, chLatin_t,
+ chLatin_i, chLatin_c, chLatin_a, chLatin_l, chSpace, chLatin_O, chLatin_p, chLatin_e,
chLatin_r, chLatin_a, chLatin_t, chLatin_o, chLatin_r, chLatin_s, chNull },
- { chLatin_M, chLatin_i, chLatin_s, chLatin_c, chLatin_e, chLatin_l, chLatin_l, chLatin_a,
- chLatin_n, chLatin_e, chLatin_o, chLatin_u, chLatin_s, chSpace, chLatin_T, chLatin_e,
+ { chLatin_M, chLatin_i, chLatin_s, chLatin_c, chLatin_e, chLatin_l, chLatin_l, chLatin_a,
+ chLatin_n, chLatin_e, chLatin_o, chLatin_u, chLatin_s, chSpace, chLatin_T, chLatin_e,
chLatin_c, chLatin_h, chLatin_n, chLatin_i, chLatin_c, chLatin_a, chLatin_l, chNull },
- { chLatin_C, chLatin_o, chLatin_n, chLatin_t, chLatin_r, chLatin_o, chLatin_l, chSpace,
- chLatin_P, chLatin_i, chLatin_c, chLatin_t, chLatin_u, chLatin_r, chLatin_e, chLatin_s,
+ { chLatin_C, chLatin_o, chLatin_n, chLatin_t, chLatin_r, chLatin_o, chLatin_l, chSpace,
+ chLatin_P, chLatin_i, chLatin_c, chLatin_t, chLatin_u, chLatin_r, chLatin_e, chLatin_s,
chNull },
- { chLatin_O, chLatin_p, chLatin_t, chLatin_i, chLatin_c, chLatin_a, chLatin_l, chSpace,
- chLatin_C, chLatin_h, chLatin_a, chLatin_r, chLatin_a, chLatin_c, chLatin_t, chLatin_e,
- chLatin_r, chSpace, chLatin_R, chLatin_e, chLatin_c, chLatin_o, chLatin_g, chLatin_n,
+ { chLatin_O, chLatin_p, chLatin_t, chLatin_i, chLatin_c, chLatin_a, chLatin_l, chSpace,
+ chLatin_C, chLatin_h, chLatin_a, chLatin_r, chLatin_a, chLatin_c, chLatin_t, chLatin_e,
+ chLatin_r, chSpace, chLatin_R, chLatin_e, chLatin_c, chLatin_o, chLatin_g, chLatin_n,
chLatin_i, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chNull },
- { chLatin_E, chLatin_n, chLatin_c, chLatin_l, chLatin_o, chLatin_s, chLatin_e, chLatin_d,
- chSpace, chLatin_A, chLatin_l, chLatin_p, chLatin_h, chLatin_a, chLatin_n, chLatin_u,
+ { chLatin_E, chLatin_n, chLatin_c, chLatin_l, chLatin_o, chLatin_s, chLatin_e, chLatin_d,
+ chSpace, chLatin_A, chLatin_l, chLatin_p, chLatin_h, chLatin_a, chLatin_n, chLatin_u,
chLatin_m, chLatin_e, chLatin_r, chLatin_i, chLatin_c, chLatin_s, chNull },
- { chLatin_B, chLatin_o, chLatin_x, chSpace, chLatin_D, chLatin_r, chLatin_a, chLatin_w,
+ { chLatin_B, chLatin_o, chLatin_x, chSpace, chLatin_D, chLatin_r, chLatin_a, chLatin_w,
chLatin_i, chLatin_n, chLatin_g, chNull },
- { chLatin_B, chLatin_l, chLatin_o, chLatin_c, chLatin_k, chSpace, chLatin_E, chLatin_l,
+ { chLatin_B, chLatin_l, chLatin_o, chLatin_c, chLatin_k, chSpace, chLatin_E, chLatin_l,
chLatin_e, chLatin_m, chLatin_e, chLatin_n, chLatin_t, chLatin_s, chNull },
- { chLatin_G, chLatin_e, chLatin_o, chLatin_m, chLatin_e, chLatin_t, chLatin_r, chLatin_i,
- chLatin_c, chSpace, chLatin_S, chLatin_h, chLatin_a, chLatin_p, chLatin_e, chLatin_s,
+ { chLatin_G, chLatin_e, chLatin_o, chLatin_m, chLatin_e, chLatin_t, chLatin_r, chLatin_i,
+ chLatin_c, chSpace, chLatin_S, chLatin_h, chLatin_a, chLatin_p, chLatin_e, chLatin_s,
chNull },
- { chLatin_M, chLatin_i, chLatin_s, chLatin_c, chLatin_e, chLatin_l, chLatin_l, chLatin_a,
- chLatin_n, chLatin_e, chLatin_o, chLatin_u, chLatin_s, chSpace, chLatin_S, chLatin_y,
+ { chLatin_M, chLatin_i, chLatin_s, chLatin_c, chLatin_e, chLatin_l, chLatin_l, chLatin_a,
+ chLatin_n, chLatin_e, chLatin_o, chLatin_u, chLatin_s, chSpace, chLatin_S, chLatin_y,
chLatin_m, chLatin_b, chLatin_o, chLatin_l, chLatin_s, chNull },
- { chLatin_D, chLatin_i, chLatin_n, chLatin_g, chLatin_b, chLatin_a, chLatin_t, chLatin_s,
+ { chLatin_D, chLatin_i, chLatin_n, chLatin_g, chLatin_b, chLatin_a, chLatin_t, chLatin_s,
chNull },
- { chLatin_C, chLatin_J, chLatin_K, chSpace, chLatin_S, chLatin_y, chLatin_m, chLatin_b,
- chLatin_o, chLatin_l, chLatin_s, chSpace, chLatin_a, chLatin_n, chLatin_d, chSpace,
- chLatin_P, chLatin_u, chLatin_n, chLatin_c, chLatin_t, chLatin_u, chLatin_a, chLatin_t,
+ { chLatin_C, chLatin_J, chLatin_K, chSpace, chLatin_S, chLatin_y, chLatin_m, chLatin_b,
+ chLatin_o, chLatin_l, chLatin_s, chSpace, chLatin_a, chLatin_n, chLatin_d, chSpace,
+ chLatin_P, chLatin_u, chLatin_n, chLatin_c, chLatin_t, chLatin_u, chLatin_a, chLatin_t,
chLatin_i, chLatin_o, chLatin_n, chNull },
- { chLatin_H, chLatin_i, chLatin_r, chLatin_a, chLatin_g, chLatin_a, chLatin_n, chLatin_a,
+ { chLatin_H, chLatin_i, chLatin_r, chLatin_a, chLatin_g, chLatin_a, chLatin_n, chLatin_a,
chNull },
- { chLatin_K, chLatin_a, chLatin_t, chLatin_a, chLatin_k, chLatin_a, chLatin_n, chLatin_a,
+ { chLatin_K, chLatin_a, chLatin_t, chLatin_a, chLatin_k, chLatin_a, chLatin_n, chLatin_a,
chNull },
- { chLatin_B, chLatin_o, chLatin_p, chLatin_o, chLatin_m, chLatin_o, chLatin_f, chLatin_o,
+ { chLatin_B, chLatin_o, chLatin_p, chLatin_o, chLatin_m, chLatin_o, chLatin_f, chLatin_o,
chNull },
- { chLatin_H, chLatin_a, chLatin_n, chLatin_g, chLatin_u, chLatin_l, chSpace, chLatin_C,
- chLatin_o, chLatin_m, chLatin_p, chLatin_a, chLatin_t, chLatin_i, chLatin_b, chLatin_i,
- chLatin_l, chLatin_i, chLatin_t, chLatin_y, chSpace, chLatin_J, chLatin_a, chLatin_m,
+ { chLatin_H, chLatin_a, chLatin_n, chLatin_g, chLatin_u, chLatin_l, chSpace, chLatin_C,
+ chLatin_o, chLatin_m, chLatin_p, chLatin_a, chLatin_t, chLatin_i, chLatin_b, chLatin_i,
+ chLatin_l, chLatin_i, chLatin_t, chLatin_y, chSpace, chLatin_J, chLatin_a, chLatin_m,
chLatin_o, chNull },
{ chLatin_K, chLatin_a, chLatin_n, chLatin_b, chLatin_u, chLatin_n, chNull },
- { chLatin_E, chLatin_n, chLatin_c, chLatin_l, chLatin_o, chLatin_s, chLatin_e, chLatin_d,
- chSpace, chLatin_C, chLatin_J, chLatin_K, chSpace, chLatin_L, chLatin_e, chLatin_t,
- chLatin_t, chLatin_e, chLatin_r, chLatin_s, chSpace, chLatin_a, chLatin_n, chLatin_d,
+ { chLatin_E, chLatin_n, chLatin_c, chLatin_l, chLatin_o, chLatin_s, chLatin_e, chLatin_d,
+ chSpace, chLatin_C, chLatin_J, chLatin_K, chSpace, chLatin_L, chLatin_e, chLatin_t,
+ chLatin_t, chLatin_e, chLatin_r, chLatin_s, chSpace, chLatin_a, chLatin_n, chLatin_d,
chSpace, chLatin_M, chLatin_o, chLatin_n, chLatin_t, chLatin_h, chLatin_s, chNull },
- { chLatin_C, chLatin_J, chLatin_K, chSpace, chLatin_C, chLatin_o, chLatin_m, chLatin_p,
- chLatin_a, chLatin_t, chLatin_i, chLatin_b, chLatin_i, chLatin_l, chLatin_i, chLatin_t,
+ { chLatin_C, chLatin_J, chLatin_K, chSpace, chLatin_C, chLatin_o, chLatin_m, chLatin_p,
+ chLatin_a, chLatin_t, chLatin_i, chLatin_b, chLatin_i, chLatin_l, chLatin_i, chLatin_t,
chLatin_y, chNull },
- { chLatin_C, chLatin_J, chLatin_K, chSpace, chLatin_U, chLatin_n, chLatin_i, chLatin_f,
- chLatin_i, chLatin_e, chLatin_d, chSpace, chLatin_I, chLatin_d, chLatin_e, chLatin_o,
+ { chLatin_C, chLatin_J, chLatin_K, chSpace, chLatin_U, chLatin_n, chLatin_i, chLatin_f,
+ chLatin_i, chLatin_e, chLatin_d, chSpace, chLatin_I, chLatin_d, chLatin_e, chLatin_o,
chLatin_g, chLatin_r, chLatin_a, chLatin_p, chLatin_h, chLatin_s, chNull },
- { chLatin_H, chLatin_a, chLatin_n, chLatin_g, chLatin_u, chLatin_l, chSpace, chLatin_S,
- chLatin_y, chLatin_l, chLatin_l, chLatin_a, chLatin_b, chLatin_l, chLatin_e, chLatin_s,
+ { chLatin_H, chLatin_a, chLatin_n, chLatin_g, chLatin_u, chLatin_l, chSpace, chLatin_S,
+ chLatin_y, chLatin_l, chLatin_l, chLatin_a, chLatin_b, chLatin_l, chLatin_e, chLatin_s,
chNull },
- { chLatin_H, chLatin_i, chLatin_g, chLatin_h, chSpace, chLatin_S, chLatin_u, chLatin_r,
+ { chLatin_H, chLatin_i, chLatin_g, chLatin_h, chSpace, chLatin_S, chLatin_u, chLatin_r,
chLatin_r, chLatin_o, chLatin_g, chLatin_a, chLatin_t, chLatin_e, chLatin_s, chNull },
- { chLatin_H, chLatin_i, chLatin_g, chLatin_h, chSpace, chLatin_P, chLatin_r, chLatin_i,
- chLatin_v, chLatin_a, chLatin_t, chLatin_e, chSpace, chLatin_U, chLatin_s, chLatin_e,
- chSpace, chLatin_S, chLatin_u, chLatin_r, chLatin_r, chLatin_o, chLatin_g, chLatin_a,
+ { chLatin_H, chLatin_i, chLatin_g, chLatin_h, chSpace, chLatin_P, chLatin_r, chLatin_i,
+ chLatin_v, chLatin_a, chLatin_t, chLatin_e, chSpace, chLatin_U, chLatin_s, chLatin_e,
+ chSpace, chLatin_S, chLatin_u, chLatin_r, chLatin_r, chLatin_o, chLatin_g, chLatin_a,
chLatin_t, chLatin_e, chLatin_s, chNull },
- { chLatin_L, chLatin_o, chLatin_w, chSpace, chLatin_S, chLatin_u, chLatin_r, chLatin_r,
+ { chLatin_L, chLatin_o, chLatin_w, chSpace, chLatin_S, chLatin_u, chLatin_r, chLatin_r,
chLatin_o, chLatin_g, chLatin_a, chLatin_t, chLatin_e, chLatin_s, chNull },
- { chLatin_P, chLatin_r, chLatin_i, chLatin_v, chLatin_a, chLatin_t, chLatin_e, chSpace,
+ { chLatin_P, chLatin_r, chLatin_i, chLatin_v, chLatin_a, chLatin_t, chLatin_e, chSpace,
chLatin_U, chLatin_s, chLatin_e, chNull },
- { chLatin_C, chLatin_J, chLatin_K, chSpace, chLatin_C, chLatin_o, chLatin_m, chLatin_p,
- chLatin_a, chLatin_t, chLatin_i, chLatin_b, chLatin_i, chLatin_l, chLatin_i, chLatin_t,
- chLatin_y, chSpace, chLatin_I, chLatin_d, chLatin_e, chLatin_o, chLatin_g, chLatin_r,
+ { chLatin_C, chLatin_J, chLatin_K, chSpace, chLatin_C, chLatin_o, chLatin_m, chLatin_p,
+ chLatin_a, chLatin_t, chLatin_i, chLatin_b, chLatin_i, chLatin_l, chLatin_i, chLatin_t,
+ chLatin_y, chSpace, chLatin_I, chLatin_d, chLatin_e, chLatin_o, chLatin_g, chLatin_r,
chLatin_a, chLatin_p, chLatin_h, chLatin_s, chNull },
- { chLatin_A, chLatin_l, chLatin_p, chLatin_h, chLatin_a, chLatin_b, chLatin_e, chLatin_t,
- chLatin_i, chLatin_c, chSpace, chLatin_P, chLatin_r, chLatin_e, chLatin_s, chLatin_e,
- chLatin_n, chLatin_t, chLatin_a, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chSpace,
+ { chLatin_A, chLatin_l, chLatin_p, chLatin_h, chLatin_a, chLatin_b, chLatin_e, chLatin_t,
+ chLatin_i, chLatin_c, chSpace, chLatin_P, chLatin_r, chLatin_e, chLatin_s, chLatin_e,
+ chLatin_n, chLatin_t, chLatin_a, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chSpace,
chLatin_F, chLatin_o, chLatin_r, chLatin_m, chLatin_s, chNull },
- { chLatin_A, chLatin_r, chLatin_a, chLatin_b, chLatin_i, chLatin_c, chSpace, chLatin_P,
- chLatin_r, chLatin_e, chLatin_s, chLatin_e, chLatin_n, chLatin_t, chLatin_a, chLatin_t,
- chLatin_i, chLatin_o, chLatin_n, chSpace, chLatin_F, chLatin_o, chLatin_r, chLatin_m,
+ { chLatin_A, chLatin_r, chLatin_a, chLatin_b, chLatin_i, chLatin_c, chSpace, chLatin_P,
+ chLatin_r, chLatin_e, chLatin_s, chLatin_e, chLatin_n, chLatin_t, chLatin_a, chLatin_t,
+ chLatin_i, chLatin_o, chLatin_n, chSpace, chLatin_F, chLatin_o, chLatin_r, chLatin_m,
chLatin_s, chDash, chLatin_A, chNull },
- { chLatin_C, chLatin_o, chLatin_m, chLatin_b, chLatin_i, chLatin_n, chLatin_i, chLatin_n,
- chLatin_g, chSpace, chLatin_H, chLatin_a, chLatin_l, chLatin_f, chSpace, chLatin_M,
+ { chLatin_C, chLatin_o, chLatin_m, chLatin_b, chLatin_i, chLatin_n, chLatin_i, chLatin_n,
+ chLatin_g, chSpace, chLatin_H, chLatin_a, chLatin_l, chLatin_f, chSpace, chLatin_M,
chLatin_a, chLatin_r, chLatin_k, chLatin_s, chNull },
- { chLatin_C, chLatin_J, chLatin_K, chSpace, chLatin_C, chLatin_o, chLatin_m, chLatin_p,
- chLatin_a, chLatin_t, chLatin_i, chLatin_b, chLatin_i, chLatin_l, chLatin_i, chLatin_t,
+ { chLatin_C, chLatin_J, chLatin_K, chSpace, chLatin_C, chLatin_o, chLatin_m, chLatin_p,
+ chLatin_a, chLatin_t, chLatin_i, chLatin_b, chLatin_i, chLatin_l, chLatin_i, chLatin_t,
chLatin_y, chSpace, chLatin_F, chLatin_o, chLatin_r, chLatin_m, chLatin_s, chNull },
- { chLatin_S, chLatin_m, chLatin_a, chLatin_l, chLatin_l, chSpace, chLatin_F, chLatin_o,
- chLatin_r, chLatin_m, chSpace, chLatin_V, chLatin_a, chLatin_r, chLatin_i, chLatin_a,
+ { chLatin_S, chLatin_m, chLatin_a, chLatin_l, chLatin_l, chSpace, chLatin_F, chLatin_o,
+ chLatin_r, chLatin_m, chSpace, chLatin_V, chLatin_a, chLatin_r, chLatin_i, chLatin_a,
chLatin_n, chLatin_t, chLatin_s, chNull },
- { chLatin_A, chLatin_r, chLatin_a, chLatin_b, chLatin_i, chLatin_c, chSpace, chLatin_P,
- chLatin_r, chLatin_e, chLatin_s, chLatin_e, chLatin_n, chLatin_t, chLatin_a, chLatin_t,
- chLatin_i, chLatin_o, chLatin_n, chSpace, chLatin_F, chLatin_o, chLatin_r, chLatin_m,
+ { chLatin_A, chLatin_r, chLatin_a, chLatin_b, chLatin_i, chLatin_c, chSpace, chLatin_P,
+ chLatin_r, chLatin_e, chLatin_s, chLatin_e, chLatin_n, chLatin_t, chLatin_a, chLatin_t,
+ chLatin_i, chLatin_o, chLatin_n, chSpace, chLatin_F, chLatin_o, chLatin_r, chLatin_m,
chLatin_s, chDash, chLatin_B, chNull },
- { chLatin_S, chLatin_p, chLatin_e, chLatin_c, chLatin_i, chLatin_a, chLatin_l, chLatin_s,
+ { chLatin_S, chLatin_p, chLatin_e, chLatin_c, chLatin_i, chLatin_a, chLatin_l, chLatin_s,
chNull },
- { chLatin_H, chLatin_a, chLatin_l, chLatin_f, chLatin_w, chLatin_i, chLatin_d, chLatin_t,
- chLatin_h, chSpace, chLatin_a, chLatin_n, chLatin_d, chSpace, chLatin_F, chLatin_u,
- chLatin_l, chLatin_l, chLatin_w, chLatin_i, chLatin_d, chLatin_t, chLatin_h, chSpace,
+ { chLatin_H, chLatin_a, chLatin_l, chLatin_f, chLatin_w, chLatin_i, chLatin_d, chLatin_t,
+ chLatin_h, chSpace, chLatin_a, chLatin_n, chLatin_d, chSpace, chLatin_F, chLatin_u,
+ chLatin_l, chLatin_l, chLatin_w, chLatin_i, chLatin_d, chLatin_t, chLatin_h, chSpace,
chLatin_F, chLatin_o, chLatin_r, chLatin_m, chLatin_s, chNull }
};
diff --git a/src/util/regx/BlockRangeFactory.hpp b/src/util/regx/BlockRangeFactory.hpp
index 12b8df6b5c8a06f56a80b5578e9a99f57937e9ff..bc11a46e05e00763cee599a0515b8625f121897b 100644
--- a/src/util/regx/BlockRangeFactory.hpp
+++ b/src/util/regx/BlockRangeFactory.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/util/regx/CharToken.cpp b/src/util/regx/CharToken.cpp
index b3f6f16882f54dadf7cb41ed3bc69e00d45b6dde..56ab409fc0c470eba7d719f43259bf538656e4fe 100644
--- a/src/util/regx/CharToken.cpp
+++ b/src/util/regx/CharToken.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2001/05/11 13:26:40 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/03/02 19:22:34 knoaman
* Schema: Regular expression handling part I
*
diff --git a/src/util/regx/CharToken.hpp b/src/util/regx/CharToken.hpp
index b32d46572e085e56afcf517ffda0f8579abca0b6..1d6e0f0f2f5cc24bfb33a95dacf9d7c20307f623 100644
--- a/src/util/regx/CharToken.hpp
+++ b/src/util/regx/CharToken.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/util/regx/ClosureToken.cpp b/src/util/regx/ClosureToken.cpp
index 12510e931c80f975da3bad201a336b0344f6819b..cb1d3423b4702c4d7e152ee337d6da66662945f0 100644
--- a/src/util/regx/ClosureToken.cpp
+++ b/src/util/regx/ClosureToken.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2001/05/11 13:26:41 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/03/02 19:22:36 knoaman
* Schema: Regular expression handling part I
*
diff --git a/src/util/regx/ClosureToken.hpp b/src/util/regx/ClosureToken.hpp
index 01e40eb4e7731d8244407b71b21a0edc81c08410..ecac13e64a4a91ae69b0ebba68106151dc3bfab5 100644
--- a/src/util/regx/ClosureToken.hpp
+++ b/src/util/regx/ClosureToken.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/util/regx/ConcatToken.cpp b/src/util/regx/ConcatToken.cpp
index 80f41f1caa6eabe752413f806d287f94c1f7eac8..8a582963467d5d72b431095c8e245683a99ff4c6 100644
--- a/src/util/regx/ConcatToken.cpp
+++ b/src/util/regx/ConcatToken.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2001/05/11 13:26:41 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/03/02 19:22:37 knoaman
* Schema: Regular expression handling part I
*
diff --git a/src/util/regx/ConcatToken.hpp b/src/util/regx/ConcatToken.hpp
index 9485a2224481a27056928020a4150f2e4c3f0139..666db2e8a067581d536596fc8268c2c399c976b8 100644
--- a/src/util/regx/ConcatToken.hpp
+++ b/src/util/regx/ConcatToken.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/util/regx/ConditionToken.cpp b/src/util/regx/ConditionToken.cpp
index 3d548e25505735e45ee9b35854d0a16b183562aa..bb529a2b29e80e529df6bd2f0a8009a8b826c876 100644
--- a/src/util/regx/ConditionToken.cpp
+++ b/src/util/regx/ConditionToken.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2001/05/11 13:26:41 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/03/02 19:22:39 knoaman
* Schema: Regular expression handling part I
*
diff --git a/src/util/regx/ConditionToken.hpp b/src/util/regx/ConditionToken.hpp
index b4ca25d5c6e33d4bf891a3a839f2f0e64ea1a6c0..f1abb3e93784e2891a80bab5a3c47c1cd11a9555 100644
--- a/src/util/regx/ConditionToken.hpp
+++ b/src/util/regx/ConditionToken.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/util/regx/Makefile.in b/src/util/regx/Makefile.in
index b2b4c9fb1c028d9b4e5e6ee2ef2998f72c295aad..e350eb5608169f092b809e69b905b1b14a18c7d1 100644
--- a/src/util/regx/Makefile.in
+++ b/src/util/regx/Makefile.in
@@ -2,7 +2,7 @@
#
# The Apache Software License, Version 1.1
#
-# Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+# Copyright (c) 2001 The Apache Software Foundation. All rights
# reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -49,13 +49,16 @@
#
# 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
+# originally based on software copyright (c) 2001, International
# Business Machines, Inc., http://www.ibm.com . For more information
# on the Apache Software Foundation, please see
# <http://www.apache.org/>.
#
#
# $Log$
+# Revision 1.3 2001/05/11 13:26:42 tng
+# Copyright update.
+#
# Revision 1.2 2001/05/03 18:17:24 knoaman
# Some design changes:
# o Changed the TokenFactory from a single static instance, to a
@@ -81,13 +84,13 @@
PLATFORM = @platform@
CC = @cc@
CXX = @cxx@
-CXXFLAGS = @cxxflags@
+CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
-LDFLAGS = @ldflags@
+LDFLAGS = @ldflags@
LIBS = @libs@
-OSVER = @osver@
-USELIBWWW = @uselibwww@
+OSVER = @osver@
+USELIBWWW = @uselibwww@
MESSAGELOADER = @messageloader@
TRANSCODER = @transcoder@
NETACCESSOR = @netaccessor@
diff --git a/src/util/regx/Match.cpp b/src/util/regx/Match.cpp
index cec6be278fc52f0b1998b2801dc0122c9101fba5..565f3aa1632cec37ef58fa9464481d75a4a171e3 100644
--- a/src/util/regx/Match.cpp
+++ b/src/util/regx/Match.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2001/05/11 13:26:42 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/03/02 19:22:40 knoaman
* Schema: Regular expression handling part I
*
diff --git a/src/util/regx/Match.hpp b/src/util/regx/Match.hpp
index 20dc1fd49890f3a84c6b98ad9f835e68f1cb0777..24576d9a1b21f6dd9a15edaf90a9c81778e97f37 100644
--- a/src/util/regx/Match.hpp
+++ b/src/util/regx/Match.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/util/regx/ModifierToken.cpp b/src/util/regx/ModifierToken.cpp
index 860552f88e07c9afe6fa014ded9db2cda109bc4f..dc68bb84421092199bd66cfcf5143456815bb6ae 100644
--- a/src/util/regx/ModifierToken.cpp
+++ b/src/util/regx/ModifierToken.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2001/05/11 13:26:43 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/03/02 19:22:41 knoaman
* Schema: Regular expression handling part I
*
diff --git a/src/util/regx/ModifierToken.hpp b/src/util/regx/ModifierToken.hpp
index bb53cdea506eca9751d24f003943938840d9521d..fa7220dc42f7503391accbe6fb79ebeabdb5c83a 100644
--- a/src/util/regx/ModifierToken.hpp
+++ b/src/util/regx/ModifierToken.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/util/regx/Op.cpp b/src/util/regx/Op.cpp
index 906be64a7567866af575ad62f1ed5446140605b2..f7be0811974b76ffff1748d2359d6d87533cf385 100644
--- a/src/util/regx/Op.cpp
+++ b/src/util/regx/Op.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2001/05/11 13:26:43 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/03/02 19:22:47 knoaman
* Schema: Regular expression handling part I
*
@@ -78,7 +81,7 @@ Op::Op(const short type) : fNextOp(0),
// ---------------------------------------------------------------------------
// CharOp: Constructors and Destuctors
// ---------------------------------------------------------------------------
-CharOp::CharOp(const short type, const XMLInt32 charData)
+CharOp::CharOp(const short type, const XMLInt32 charData)
: Op(type)
, fCharData(charData) {
}
@@ -95,7 +98,7 @@ UnionOp::UnionOp(const short type, const int size)
// ---------------------------------------------------------------------------
// ChildOp: Constructors and Destuctors
// ---------------------------------------------------------------------------
-ChildOp::ChildOp(const short type)
+ChildOp::ChildOp(const short type)
: Op(type)
, fChild(0) {
diff --git a/src/util/regx/Op.hpp b/src/util/regx/Op.hpp
index e1abafab0a4ac2435936ad1b21e7966c8e87f358..ca47f7aed4a00503cc8cb7373d597fe4a649f07b 100644
--- a/src/util/regx/Op.hpp
+++ b/src/util/regx/Op.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/util/regx/OpFactory.cpp b/src/util/regx/OpFactory.cpp
index b1d1bc56fd4838cd1573263bccff06a36d860c8d..1f8ab0ae0b2d05e6707a8674042a962b52bcb8ba 100644
--- a/src/util/regx/OpFactory.cpp
+++ b/src/util/regx/OpFactory.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2001/05/11 13:26:43 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/03/02 19:22:48 knoaman
* Schema: Regular expression handling part I
*
@@ -143,7 +146,7 @@ ChildOp* OpFactory::createNonGreedyClosureOp() {
ChildOp* OpFactory::createQuestionOp(bool nonGreedy) {
- ChildOp* tmpOp = new ChildOp(nonGreedy ? Op::NONGREEDYQUESTION :
+ ChildOp* tmpOp = new ChildOp(nonGreedy ? Op::NONGREEDYQUESTION :
Op::QUESTION);
fOpVector->addElement(tmpOp);
diff --git a/src/util/regx/OpFactory.hpp b/src/util/regx/OpFactory.hpp
index decf3cc19b7a04a7f83d747e835e8e89860ae060..769e4f89abad6b9e635f5caaa99ffe161304a1f7 100644
--- a/src/util/regx/OpFactory.hpp
+++ b/src/util/regx/OpFactory.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -117,7 +117,7 @@ public:
const Op* const branch);
ModifierOp* createModifierOp(const Op* const next, const Op* const branch,
const int add, const int mask);
- ConditionOp* createConditionOp(const Op* const next, const int ref,
+ ConditionOp* createConditionOp(const Op* const next, const int ref,
const Op* const conditionFlow,
const Op* const yesFlow,
const Op* const noFlow);
diff --git a/src/util/regx/ParenToken.cpp b/src/util/regx/ParenToken.cpp
index 09c66118d585856c374b705e9014affb188f5bb2..45c00258b739f64b87eadb8ba5c1615f009e473f 100644
--- a/src/util/regx/ParenToken.cpp
+++ b/src/util/regx/ParenToken.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2001/05/11 13:26:44 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/03/02 19:22:49 knoaman
* Schema: Regular expression handling part I
*
diff --git a/src/util/regx/ParenToken.hpp b/src/util/regx/ParenToken.hpp
index ff0e278aa8ba3d52464b85cda8edeacf35a52c57..b06361976adf1efd20c3f014b01c2ed6c123b27a 100644
--- a/src/util/regx/ParenToken.hpp
+++ b/src/util/regx/ParenToken.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/util/regx/ParserForXMLSchema.cpp b/src/util/regx/ParserForXMLSchema.cpp
index 3ee1375e0de619a5bf1157e372b7d46de66ed278..ae7c4f1782909293c9be92e2c994a767914a9eff 100644
--- a/src/util/regx/ParserForXMLSchema.cpp
+++ b/src/util/regx/ParserForXMLSchema.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2001/05/11 13:26:44 tng
+ * Copyright update.
+ *
* Revision 1.2 2001/05/03 18:17:30 knoaman
* Some design changes:
* o Changed the TokenFactory from a single static instance, to a
@@ -117,7 +120,7 @@ Token* ParserForXMLSchema::processDollar() {
Token* ParserForXMLSchema::processPlus(Token* const tok) {
processNext();
- return getTokenFactory()->createConcat(tok,
+ return getTokenFactory()->createConcat(tok,
getTokenFactory()->createClosure(tok));
}
@@ -201,7 +204,7 @@ RangeToken* ParserForXMLSchema::parseCharacterClass(const bool useNRange) {
case chLatin_s:
case chLatin_S:
{
- tok->mergeRanges(getTokenForShorthand(ch));
+ tok->mergeRanges(getTokenForShorthand(ch));
end = true;
}
break;
diff --git a/src/util/regx/ParserForXMLSchema.hpp b/src/util/regx/ParserForXMLSchema.hpp
index ba8a95d5b53c609211b001a02c4aac4625ff4403..7bca80d8040351cc6f7c031facaeee2cb6b02baf 100644
--- a/src/util/regx/ParserForXMLSchema.hpp
+++ b/src/util/regx/ParserForXMLSchema.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/util/regx/RangeFactory.cpp b/src/util/regx/RangeFactory.cpp
index 396b52c9e28938b90b0b07b29edfa59921b8d7c6..1ffcc4a231850c4b27cd53f2eab9607c4ecc6cdc 100644
--- a/src/util/regx/RangeFactory.cpp
+++ b/src/util/regx/RangeFactory.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2001/05/11 13:26:45 tng
+ * Copyright update.
+ *
* Revision 1.3 2001/05/03 18:17:33 knoaman
* Some design changes:
* o Changed the TokenFactory from a single static instance, to a
diff --git a/src/util/regx/RangeFactory.hpp b/src/util/regx/RangeFactory.hpp
index 3fdfa03902baf4db4968063bd6c2be675b6444cb..d47fd05ebcd58f73fba26e8895e385d4075db70e 100644
--- a/src/util/regx/RangeFactory.hpp
+++ b/src/util/regx/RangeFactory.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/util/regx/RangeToken.cpp b/src/util/regx/RangeToken.cpp
index ea0115c947c0b1c15ce27df5033f51800288a48c..6784a92aa2a72e52a03d82103c8596d9ba5c2dbc 100644
--- a/src/util/regx/RangeToken.cpp
+++ b/src/util/regx/RangeToken.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2001/05/11 13:26:45 tng
+ * Copyright update.
+ *
* Revision 1.2 2001/05/03 18:17:37 knoaman
* Some design changes:
* o Changed the TokenFactory from a single static instance, to a
@@ -481,7 +484,7 @@ void RangeToken::intersectRanges(RangeToken* const tok) {
else
srcCount += 2;
}
- }
+ }
else if (tokEnd < srcBegin) {
tokCount += 2;
@@ -609,7 +612,7 @@ void RangeToken::createMap() {
for (unsigned int j= 0; j < fElemCount; j += 2) {
XMLInt32 begin = fRanges[j];
- XMLInt32 end = fRanges[j+1];
+ XMLInt32 end = fRanges[j+1];
if (begin < MAPSIZE) {
diff --git a/src/util/regx/RangeToken.hpp b/src/util/regx/RangeToken.hpp
index 839edffde4686b5e09724f7ae2d07b7d99210a77..3efdba648a74fd3316aa897e6d4c06219e1f24c2 100644
--- a/src/util/regx/RangeToken.hpp
+++ b/src/util/regx/RangeToken.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/util/regx/RangeTokenMap.cpp b/src/util/regx/RangeTokenMap.cpp
index 5919fd1baa1181b595a7df10906a43afa5c30d1f..5277786e06042bebb91b04b1ebe0b161309d56fa 100644
--- a/src/util/regx/RangeTokenMap.cpp
+++ b/src/util/regx/RangeTokenMap.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2001/05/11 13:26:45 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/05/03 18:17:40 knoaman
* Some design changes:
* o Changed the TokenFactory from a single static instance, to a
@@ -174,8 +177,8 @@ RangeToken* RangeTokenMap::getRange(const XMLCh* const keyword,
if (complement && ((rangeTok = elemMap->getRangeToken()) != 0)) {
elemMap->setRangeToken((RangeToken*)
RangeToken::complementRanges(rangeTok, fTokenFactory),
- complement);
- }
+ complement);
+ }
}
return (elemMap == 0) ? 0 : elemMap->getRangeToken(complement);
diff --git a/src/util/regx/RangeTokenMap.hpp b/src/util/regx/RangeTokenMap.hpp
index 0966b8cc9798c4037ed1db55b9384b9c77630024..509b374a2d81b24a0338e4648f0f49bf139f6797 100644
--- a/src/util/regx/RangeTokenMap.hpp
+++ b/src/util/regx/RangeTokenMap.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/util/regx/RegularExpression.cpp b/src/util/regx/RegularExpression.cpp
index a850e4e7db3b4e6fa1ae59cfb2139ae0df89c1cb..15c31b5f75468098bd63263626ade8226a48283c 100644
--- a/src/util/regx/RegularExpression.cpp
+++ b/src/util/regx/RegularExpression.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2001/05/11 13:26:46 tng
+ * Copyright update.
+ *
* Revision 1.2 2001/05/03 18:17:42 knoaman
* Some design changes:
* o Changed the TokenFactory from a single static instance, to a
@@ -194,7 +197,7 @@ bool RegularExpression::Context::nextCh(XMLInt32& ch, int& offset,
// ---------------------------------------------------------------------------
// RegularExpression: Constructors and Destructors
// ---------------------------------------------------------------------------
-RegularExpression::RegularExpression(const char* const pattern)
+RegularExpression::RegularExpression(const char* const pattern)
:fHasBackReferences(false),
fFixedStringOnly(false),
fNoGroups(0),
@@ -224,7 +227,7 @@ RegularExpression::RegularExpression(const char* const pattern)
}
RegularExpression::RegularExpression(const char* const pattern,
- const char* const options)
+ const char* const options)
:fHasBackReferences(false),
fFixedStringOnly(false),
fNoGroups(0),
@@ -255,7 +258,7 @@ RegularExpression::RegularExpression(const char* const pattern,
}
-RegularExpression::RegularExpression(const XMLCh* const pattern)
+RegularExpression::RegularExpression(const XMLCh* const pattern)
:fHasBackReferences(false),
fFixedStringOnly(false),
fNoGroups(0),
@@ -268,7 +271,7 @@ RegularExpression::RegularExpression(const XMLCh* const pattern)
fFixedString(0),
fOperations(0),
fTokenTree(0),
- fFirstChar(0)
+ fFirstChar(0)
{
try {
@@ -282,7 +285,7 @@ RegularExpression::RegularExpression(const XMLCh* const pattern)
}
RegularExpression::RegularExpression(const XMLCh* const pattern,
- const XMLCh* const options)
+ const XMLCh* const options)
:fHasBackReferences(false),
fFixedStringOnly(false),
fNoGroups(0),
@@ -323,7 +326,7 @@ void RegularExpression::setPattern(const XMLCh* const pattern,
fOptions = parseOptions(options);
fPattern = XMLString::replicate(pattern);
- RegxParser* regxParser = isSet(fOptions, XMLSCHEMA_MODE)
+ RegxParser* regxParser = isSet(fOptions, XMLSCHEMA_MODE)
? new ParserForXMLSchema() : new RegxParser();
if (regxParser) {
@@ -637,7 +640,7 @@ int RegularExpression::getOptionValue(const XMLCh ch) {
}
int RegularExpression::match(Context* const context, const Op* const operations
- , int offset, const short direction)
+ , int offset, const short direction)
{
const Op* tmpOp = operations;
bool ignoreCase = isSet(fOptions, IGNORE_CASE);
@@ -775,7 +778,7 @@ int RegularExpression::match(Context* const context, const Op* const operations
return -1;
if (matchCondition(context, tmpOp, offset, direction))
tmpOp = tmpOp->getYesFlow();
- else
+ else
if (tmpOp->getNoFlow() != 0)
tmpOp = tmpOp->getNoFlow();
else
@@ -787,7 +790,7 @@ int RegularExpression::match(Context* const context, const Op* const operations
return offset;
}
-bool RegularExpression::matchChar(Context* const context,
+bool RegularExpression::matchChar(Context* const context,
const XMLInt32 ch, int& offset,
const short direction, const bool ignoreCase)
{
@@ -906,8 +909,8 @@ bool RegularExpression::matchAnchor(Context* const context, const XMLInt32 ch,
{
int after = getWordType(context->fString, context->fStart,
context->fLimit, offset);
- if (after == WT_IGNORE
- || after == getPreviousWordType(context->fString,
+ if (after == WT_IGNORE
+ || after == getPreviousWordType(context->fString,
context->fStart
, context->fLimit, offset))
return false;
@@ -923,7 +926,7 @@ bool RegularExpression::matchAnchor(Context* const context, const XMLInt32 ch,
else {
if (!(offset == context->fLimit
- || (offset+1 == context->fLimit
+ || (offset+1 == context->fLimit
&& RegxUtil::isEOLChar(context->fString[offset]))
|| (offset+2 == context->fLimit
&& context->fString[offset] == chCR
@@ -976,7 +979,7 @@ bool RegularExpression::matchAnchor(Context* const context, const XMLInt32 ch,
bool RegularExpression::matchBackReference(Context* const context,
const XMLInt32 refNo, int& offset,
- const short direction,
+ const short direction,
const bool ignoreCase)
{
if (refNo <=0 || refNo >= fNoGroups)
@@ -993,7 +996,7 @@ bool RegularExpression::matchBackReference(Context* const context,
if (context->fLimit - tmpOffset < length)
return false;
- bool match = ignoreCase
+ bool match = ignoreCase
? XMLString::regionIMatches(context->fString,tmpOffset,
context->fString,start,length)
: XMLString::regionMatches(context->fString, tmpOffset,
@@ -1015,7 +1018,7 @@ bool RegularExpression::matchString(Context* const context,
if (context->fLimit - offset < length)
return false;
- bool match = ignoreCase
+ bool match = ignoreCase
? XMLString::regionIMatches(context->fString, offset,
literal, 0, length)
: XMLString::regionMatches(context->fString, offset,
diff --git a/src/util/regx/RegularExpression.hpp b/src/util/regx/RegularExpression.hpp
index 38197749220c43686c4c50d87b09951dd773391a..dfac5b62a2a424c673cc35f91e74f6395cf881ce 100644
--- a/src/util/regx/RegularExpression.hpp
+++ b/src/util/regx/RegularExpression.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -264,7 +264,7 @@ private:
RangeToken* fFirstChar;
static RangeToken* fWordRange;
OpFactory fOpFactory;
- XMLMutex fMutex;
+ XMLMutex fMutex;
TokenFactory* fTokenFactory;
};
@@ -404,7 +404,7 @@ inline Op* RegularExpression::compileParenthesis(const Token* const token,
Op* captureOp = 0;
if (reverse) {
-
+
captureOp = fOpFactory.createCaptureOp(token->getNoParen(), next);
captureOp = compile(token->getChild(0), captureOp, reverse);
@@ -467,7 +467,7 @@ inline Op* RegularExpression::compileClosure(const Token* const token,
ret = next;
for (int i=0; i<max; i++) {
-
+
ChildOp* childOp = fOpFactory.createQuestionOp(
tokType == Token::NONGREEDYCLOSURE);
@@ -506,7 +506,7 @@ inline Op* RegularExpression::compileClosure(const Token* const token,
return ret;
}
-inline int RegularExpression::matchUnion(Context* const context,
+inline int RegularExpression::matchUnion(Context* const context,
const Op* const op, int offset,
const short direction)
{
@@ -517,7 +517,7 @@ inline int RegularExpression::matchUnion(Context* const context,
if (ret >= 0)
return ret;
}
-
+
return -1;
}
@@ -562,7 +562,7 @@ unsigned short RegularExpression::getPreviousWordType(const XMLCh* const target
return ret;
}
-inline bool RegularExpression::matchIgnoreCase(const XMLInt32 ch1,
+inline bool RegularExpression::matchIgnoreCase(const XMLInt32 ch1,
const XMLInt32 ch2)
{
diff --git a/src/util/regx/RegxDefs.hpp b/src/util/regx/RegxDefs.hpp
index 2d66d8d92f9f0bbc7b00956b3e0294e95f4cfa58..02bb4c48ccb2acb007e60ab6b584931f8c001c08 100644
--- a/src/util/regx/RegxDefs.hpp
+++ b/src/util/regx/RegxDefs.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -201,7 +201,7 @@ const XMLCh fgUniIsPunct[] =
chLatin_t, chNull
};
-const XMLCh fgUniIsSpace[] =
+const XMLCh fgUniIsSpace[] =
{
chLatin_I, chLatin_s, chLatin_S, chLatin_p, chLatin_a, chLatin_c,
chLatin_e, chNull
diff --git a/src/util/regx/RegxParser.cpp b/src/util/regx/RegxParser.cpp
index 037a42407366b54b43f9e2a1cbf658e3b2b67483..402386a533baa96ca3ff539c0d27675b1d58dd8f 100644
--- a/src/util/regx/RegxParser.cpp
+++ b/src/util/regx/RegxParser.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2001/05/11 13:26:48 tng
+ * Copyright update.
+ *
* Revision 1.2 2001/05/03 18:17:45 knoaman
* Some design changes:
* o Changed the TokenFactory from a single static instance, to a
@@ -110,7 +113,7 @@ RegxParser::ReferencePosition::ReferencePosition(const int refNo,
// ---------------------------------------------------------------------------
// RegxParser: Constructors and Destructors
// ---------------------------------------------------------------------------
-RegxParser::RegxParser()
+RegxParser::RegxParser()
:fHasBackReferences(false),
fOptions(0),
fOffset(0),
@@ -211,7 +214,7 @@ void RegxParser::processNext() {
fCharData = fString[fOffset++];
break;
case chDash:
- if (isSet(RegularExpression::XMLSCHEMA_MODE)
+ if (isSet(RegularExpression::XMLSCHEMA_MODE)
&& fOffset < fStringLen && fString[fOffset] == chOpenSquare) {
fOffset++;
@@ -222,7 +225,7 @@ void RegxParser::processNext() {
}
break;
case chOpenSquare:
- if (!isSet(RegularExpression::XMLSCHEMA_MODE)
+ if (!isSet(RegularExpression::XMLSCHEMA_MODE)
&& fOffset < fStringLen && fString[fOffset] == chColon) {
fOffset++;
@@ -534,7 +537,7 @@ Token* RegxParser::processPlus(Token* const tok) {
fTokenFactory->createClosure(tok,true));
}
- return fTokenFactory->createConcat(tok,
+ return fTokenFactory->createConcat(tok,
fTokenFactory->createClosure(tok));
}
@@ -746,7 +749,7 @@ Token* RegxParser::processBacksolidus_c() {
XMLCh ch; //Must be in 0x0040-0x005F
- if (fOffset >= fStringLen
+ if (fOffset >= fStringLen
|| ((ch = fString[fOffset++]) & 0xFFE0) != 0x0040)
ThrowXML(ParseException,XMLExcepts::Parser_Atom1);
@@ -772,7 +775,7 @@ Token* RegxParser::processBacksolidus_i() {
Token* RegxParser::processBacksolidus_I() {
//Ditto
- return 0;
+ return 0;
}
@@ -872,7 +875,7 @@ Token* RegxParser::parseFactor() {
min = ch - chDigit_0;
while (offset < fStringLen
- && (ch = fString[offset++]) >= chDigit_0
+ && (ch = fString[offset++]) >= chDigit_0
&& ch <= chDigit_9) {
min = min*10 + ch - chDigit_0;
@@ -1199,7 +1202,7 @@ RangeToken* RegxParser::parseCharacterClass(const bool useNRange) {
positive = false;
}
- XMLCh* name = new XMLCh[(nameEnd - fOffset) + 1];
+ XMLCh* name = new XMLCh[(nameEnd - fOffset) + 1];
ArrayJanitor<XMLCh> janName(name);
XMLString::subString(name, fString, fOffset, nameEnd);
@@ -1282,7 +1285,7 @@ RangeToken* RegxParser::parseSetOperations() {
while (fState != T_RPAREN) {
- if (fState == T_CHAR
+ if (fState == T_CHAR
&& (fCharData == chDash || fCharData == chAmpersand)
|| fState == T_PLUS) {
diff --git a/src/util/regx/RegxParser.hpp b/src/util/regx/RegxParser.hpp
index 08e0ac7a7fc310751eebfc211d28bb5d1b701f7e..cbc20f41862826709e3e88b9b1aecc0022648202 100644
--- a/src/util/regx/RegxParser.hpp
+++ b/src/util/regx/RegxParser.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -190,7 +190,7 @@ protected:
// -----------------------------------------------------------------------
// Protected PreCreated RangeToken access methods
// -----------------------------------------------------------------------
- virtual Token* getTokenForShorthand(const XMLInt32 ch);
+ virtual Token* getTokenForShorthand(const XMLInt32 ch);
private:
// -----------------------------------------------------------------------
diff --git a/src/util/regx/RegxUtil.cpp b/src/util/regx/RegxUtil.cpp
index 7e16fcb4633842dd6e431d4e357d6f85b9e3728b..86c5de24ac84a1058592c356b2ae09c8a549c16b 100644
--- a/src/util/regx/RegxUtil.cpp
+++ b/src/util/regx/RegxUtil.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2001/05/11 13:26:49 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/03/02 19:22:56 knoaman
* Schema: Regular expression handling part I
*
@@ -126,7 +129,7 @@ XMLCh* RegxUtil::stripExtendedComment(const XMLCh* const expression) {
buffer.append(next);
offset++;
}
- }
+ }
else { // As is.
buffer.append(ch);
}
diff --git a/src/util/regx/RegxUtil.hpp b/src/util/regx/RegxUtil.hpp
index fed0b0ed11b79bd0327b44cb842685f41a7b0e1a..cb07c73c9cd3a5235c5b659778181fa5183d6fd5 100644
--- a/src/util/regx/RegxUtil.hpp
+++ b/src/util/regx/RegxUtil.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/util/regx/StringToken.cpp b/src/util/regx/StringToken.cpp
index 869777f5f88d94955cbc8b7b0ebffae0b715e0b7..e88ababbd213da94a787c6146e7440fd084790db 100644
--- a/src/util/regx/StringToken.cpp
+++ b/src/util/regx/StringToken.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2001/05/11 13:26:49 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/03/02 19:22:57 knoaman
* Schema: Regular expression handling part I
*
diff --git a/src/util/regx/StringToken.hpp b/src/util/regx/StringToken.hpp
index 8f53b8d779eb1003d45803677e661c9166a8cb78..2fbf65088ae95f3d5f77bbb2b9fd5b851e0d9645 100644
--- a/src/util/regx/StringToken.hpp
+++ b/src/util/regx/StringToken.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/util/regx/Token.cpp b/src/util/regx/Token.cpp
index 82b6a44989aab5b0a5bcea9d631977c10443ee05..c4f245a65a960fde12a2c99cf3959a8169203bc6 100644
--- a/src/util/regx/Token.cpp
+++ b/src/util/regx/Token.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2001/05/11 13:26:50 tng
+ * Copyright update.
+ *
* Revision 1.2 2001/05/03 18:17:49 knoaman
* Some design changes:
* o Changed the TokenFactory from a single static instance, to a
@@ -200,7 +203,7 @@ int Token::getMaxLength() const {
{
unsigned int childSize = size();
- if (childSize == 0)
+ if (childSize == 0)
return 0;
int ret = getChild(0)->getMaxLength();
@@ -258,7 +261,7 @@ int Token::getMaxLength() const {
// ---------------------------------------------------------------------------
// Token: Helper mthods
// ---------------------------------------------------------------------------
-int Token::analyzeFirstCharacter(RangeToken* const rangeTok,
+int Token::analyzeFirstCharacter(RangeToken* const rangeTok,
const int options,
TokenFactory* const tokFactory)
{
@@ -340,7 +343,7 @@ int Token::analyzeFirstCharacter(RangeToken* const rangeTok,
case RANGE:
{
if (isSet(options, RegularExpression::IGNORE_CASE)) {
- rangeTok->mergeRanges(((RangeToken*)
+ rangeTok->mergeRanges(((RangeToken*)
this)->getCaseInsensitiveToken(tokFactory));
}
else {
@@ -352,7 +355,7 @@ int Token::analyzeFirstCharacter(RangeToken* const rangeTok,
{
if (isSet(options, RegularExpression::IGNORE_CASE)) {
- RangeToken* caseITok = (((RangeToken*)
+ RangeToken* caseITok = (((RangeToken*)
this)->getCaseInsensitiveToken(tokFactory));
rangeTok->mergeRanges(RangeToken::complementRanges(caseITok, tokFactory));
}
diff --git a/src/util/regx/Token.hpp b/src/util/regx/Token.hpp
index 77b1010c87b6a783cb279a8c02666b8ccf2837c6..c6a3b17aa24227a2cdc3531320d752ca70c6fec2 100644
--- a/src/util/regx/Token.hpp
+++ b/src/util/regx/Token.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -86,9 +86,9 @@ public:
// Public Constants
// -----------------------------------------------------------------------
// Token types
- enum {
+ enum {
CHAR = 0,
- CONCAT = 1,
+ CONCAT = 1,
UNION = 2,
CLOSURE = 3,
RANGE = 4,
@@ -152,7 +152,7 @@ public:
virtual void addChild(Token* const child, TokenFactory* const tokFactory);
// -----------------------------------------------------------------------
- // Helper methods
+ // Helper methods
// -----------------------------------------------------------------------
int analyzeFirstCharacter(RangeToken* const rangeTok, const int options,
TokenFactory* const tokFactory);
diff --git a/src/util/regx/TokenFactory.cpp b/src/util/regx/TokenFactory.cpp
index 8a2531a676c21e656517dd83c4372d4a8596804d..67ec3f4edd4378ccb32b74109a5383016d5e0a63 100644
--- a/src/util/regx/TokenFactory.cpp
+++ b/src/util/regx/TokenFactory.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2001/05/11 13:26:51 tng
+ * Copyright update.
+ *
* Revision 1.3 2001/05/03 18:17:52 knoaman
* Some design changes:
* o Changed the TokenFactory from a single static instance, to a
@@ -160,7 +163,7 @@ ParenToken* TokenFactory::createParenthesis(Token* const token,
return tmpTok;
}
-ClosureToken* TokenFactory::createClosure(Token* const token,
+ClosureToken* TokenFactory::createClosure(Token* const token,
bool isNonGreedy) {
ClosureToken* tmpTok = isNonGreedy ? new ClosureToken(Token::NONGREEDYCLOSURE, token)
@@ -355,7 +358,7 @@ Token* TokenFactory::getCombiningCharacterSequence() {
foo = createConcat(getRange(fgUniMark, true), foo); // \PM + \pM*
fCombiningChar = foo;
}
-
+
return fCombiningChar;
}
@@ -367,7 +370,7 @@ Token* TokenFactory::getCombiningCharacterSequence() {
Token* TokenFactory::getGraphemePattern() {
if (fGrapheme == 0) {
-
+
Token* base_char = createRange(); // [{ASSIGNED}]-[{M},{C}]
base_char->mergeRanges(getRange(fgUniAssigned));
base_char->subtractRanges(getRange(fgUniMark));
diff --git a/src/util/regx/TokenFactory.hpp b/src/util/regx/TokenFactory.hpp
index c0b608eec47adb614f4c98575887f8ac7be1587d..5806c4156717dc61bf40fd45de3258046dd4abc0 100644
--- a/src/util/regx/TokenFactory.hpp
+++ b/src/util/regx/TokenFactory.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/util/regx/TokenInc.hpp b/src/util/regx/TokenInc.hpp
index ebf8c7ec955d269f21fc48bf0f17be1568e96777..43cf2bee7b834d4df7130e5540181b257e9253cc 100644
--- a/src/util/regx/TokenInc.hpp
+++ b/src/util/regx/TokenInc.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/util/regx/UniCharTable.hpp b/src/util/regx/UniCharTable.hpp
index a33ce2bd10d007d1d12fa94ea27d0408cb0a469f..27c52a87ac319c8e12d8cf620620354b06709f59 100644
--- a/src/util/regx/UniCharTable.hpp
+++ b/src/util/regx/UniCharTable.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -57,7 +57,7 @@
// ---------------------------------------------------------------------------
// These are Unicode character type lookup table. The table is used by the
-// XMLUniCharacter class to return the type of a given XMLCh char
+// XMLUniCharacter class to return the type of a given XMLCh char
// (i.e LowercaseLetter, TitlecaseLetter, DigitOther, etc...) in case
// ICU is not used.
// ---------------------------------------------------------------------------
diff --git a/src/util/regx/UnicodeRangeFactory.cpp b/src/util/regx/UnicodeRangeFactory.cpp
index 3e4f5116a25d545f3b581d35adaf4dfc0cdc96ad..4812def1a36119f9b097e540170426fae321c446 100644
--- a/src/util/regx/UnicodeRangeFactory.cpp
+++ b/src/util/regx/UnicodeRangeFactory.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2001/05/11 13:26:51 tng
+ * Copyright update.
+ *
* Revision 1.2 2001/05/03 18:17:56 knoaman
* Some design changes:
* o Changed the TokenFactory from a single static instance, to a
diff --git a/src/util/regx/UnicodeRangeFactory.hpp b/src/util/regx/UnicodeRangeFactory.hpp
index 519991ce3c020b1090cd1d38ebe896b32a06a85d..7002ef49c614c3cd7c86f23713de0793dfcc7a1a 100644
--- a/src/util/regx/UnicodeRangeFactory.hpp
+++ b/src/util/regx/UnicodeRangeFactory.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/util/regx/UnionToken.cpp b/src/util/regx/UnionToken.cpp
index bbdb72ea3372b697194588ebf6f2f69986672504..c3f7beeb35eef263416366353a14c7ed66e87103 100644
--- a/src/util/regx/UnionToken.cpp
+++ b/src/util/regx/UnionToken.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2001/05/11 13:26:52 tng
+ * Copyright update.
+ *
* Revision 1.2 2001/05/03 18:17:59 knoaman
* Some design changes:
* o Changed the TokenFactory from a single static instance, to a
diff --git a/src/util/regx/UnionToken.hpp b/src/util/regx/UnionToken.hpp
index cdf36d188876d79487acd4259a5bcb75ae5075d9..6051c2cab29f718c04816e0c005d323b616c2109 100644
--- a/src/util/regx/UnionToken.hpp
+++ b/src/util/regx/UnionToken.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/util/regx/XMLRangeFactory.cpp b/src/util/regx/XMLRangeFactory.cpp
index 8abc2e321597c18881dcc7bf99be5324b2e111e3..9510c7f9f4b585c4d23147a028efc3e8b78ca9e0 100644
--- a/src/util/regx/XMLRangeFactory.cpp
+++ b/src/util/regx/XMLRangeFactory.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2001/05/11 13:26:52 tng
+ * Copyright update.
+ *
* Revision 1.2 2001/05/03 18:18:02 knoaman
* Some design changes:
* o Changed the TokenFactory from a single static instance, to a
diff --git a/src/util/regx/XMLRangeFactory.hpp b/src/util/regx/XMLRangeFactory.hpp
index c53e56916309c5478c7f0df75b353326fa08059d..72a9d3526ff9f600960848b499fb903cd864461e 100644
--- a/src/util/regx/XMLRangeFactory.hpp
+++ b/src/util/regx/XMLRangeFactory.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/util/regx/XMLUniCharacter.cpp b/src/util/regx/XMLUniCharacter.cpp
index 04bb33adf1fb7dfa3b1373a89edacbad16576ce9..ca1a25279391360e7f85003ab9dc479d0b8a2edc 100644
--- a/src/util/regx/XMLUniCharacter.cpp
+++ b/src/util/regx/XMLUniCharacter.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2001/05/11 13:26:52 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/03/02 19:26:51 knoaman
* Schema: Regular expression handling part II
*
diff --git a/src/util/regx/XMLUniCharacter.hpp b/src/util/regx/XMLUniCharacter.hpp
index f980c53c05bcd18c10f0423800b041b360ba9b79..803e4a6628b1410a9f6c21111bac0607c89bcf2f 100644
--- a/src/util/regx/XMLUniCharacter.hpp
+++ b/src/util/regx/XMLUniCharacter.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -65,7 +65,7 @@
/**
- * Class for representing unicode characters
+ * Class for representing unicode characters
*/
class XMLUTIL_EXPORT XMLUniCharacter
{
@@ -74,7 +74,7 @@ public:
// Public Constants
// -----------------------------------------------------------------------
// Unicode chara types
- enum {
+ enum {
UNASSIGNED = 0,
UPPERCASE_LETTER = 1,
LOWERCASE_LETTER = 2,
@@ -122,7 +122,7 @@ public:
//@}
private :
-
+
/** @name Constructors and Destructor */
//@{
/** Unimplemented default constructor */
diff --git a/src/validators/DTD/DTDElementDecl.cpp b/src/validators/DTD/DTDElementDecl.cpp
index 00dd45d5892407d6b5e38fc670c6659af072801e..64da479c3c813323d290cda1f2ca9b6b94e65102 100644
--- a/src/validators/DTD/DTDElementDecl.cpp
+++ b/src/validators/DTD/DTDElementDecl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/validators/DTD/DTDElementDecl.hpp b/src/validators/DTD/DTDElementDecl.hpp
index 3d62c123dd9aa3873742bb549024e791b3a8919e..c8fbefef1f49b8c14f27bb64a9a708a160eb7bac 100644
--- a/src/validators/DTD/DTDElementDecl.hpp
+++ b/src/validators/DTD/DTDElementDecl.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.10 2001/05/11 13:27:08 tng
+ * Copyright update.
+ *
* Revision 1.9 2001/04/19 18:17:20 tng
* Schema: SchemaValidator update, and use QName in Content Model
*
diff --git a/src/validators/DTD/DTDGrammar.cpp b/src/validators/DTD/DTDGrammar.cpp
index 43bc83a92e9ac0883f395b1aa182893b875dc9f2..6b161718ec56278ea108f26fcbda89f8155de6a5 100644
--- a/src/validators/DTD/DTDGrammar.cpp
+++ b/src/validators/DTD/DTDGrammar.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2001/05/11 13:27:08 tng
+ * Copyright update.
+ *
* Revision 1.2 2001/04/19 18:17:20 tng
* Schema: SchemaValidator update, and use QName in Content Model
*
diff --git a/src/validators/DTD/DTDGrammar.hpp b/src/validators/DTD/DTDGrammar.hpp
index 4acd5daa5fee8e9474eb0a751751da50121ab3bf..7223855feb5a0a2fb7cb8b50b7d86d39c9622d6e 100644
--- a/src/validators/DTD/DTDGrammar.hpp
+++ b/src/validators/DTD/DTDGrammar.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2001/05/11 13:27:09 tng
+ * Copyright update.
+ *
* Revision 1.2 2001/04/19 18:17:21 tng
* Schema: SchemaValidator update, and use QName in Content Model
*
diff --git a/src/validators/DTD/DTDScanner.cpp b/src/validators/DTD/DTDScanner.cpp
index 0572456586ef56c74f2620e5f5b59974ad34bfe8..2f0bfbecbc398ad9480da37f92994b2041ca5e33 100644
--- a/src/validators/DTD/DTDScanner.cpp
+++ b/src/validators/DTD/DTDScanner.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2001/05/11 13:27:09 tng
+ * Copyright update.
+ *
* Revision 1.5 2001/05/03 20:34:36 tng
* Schema: SchemaValidator update
*
diff --git a/src/validators/DTD/DTDScanner.hpp b/src/validators/DTD/DTDScanner.hpp
index 8e6639ae4ef7445e7dfcf87b534aada2666ac318..0562fe2a556b25cadac3d942aad18a6275952a2e 100644
--- a/src/validators/DTD/DTDScanner.hpp
+++ b/src/validators/DTD/DTDScanner.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2001/05/11 13:27:10 tng
+ * Copyright update.
+ *
* Revision 1.2 2001/04/19 18:17:22 tng
* Schema: SchemaValidator update, and use QName in Content Model
*
diff --git a/src/validators/DTD/DTDValidator.cpp b/src/validators/DTD/DTDValidator.cpp
index 8781da799292993538c18585bf32871a0e3675ad..fe28db6b569172253da99757fbb5355b12cfe669 100644
--- a/src/validators/DTD/DTDValidator.cpp
+++ b/src/validators/DTD/DTDValidator.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/validators/DTD/DTDValidator.hpp b/src/validators/DTD/DTDValidator.hpp
index 0c62b934ed17b9749e8d510fc071179b05de35e0..9f8bc9024f8560e6ec6f75cf2d8f297f06935855 100644
--- a/src/validators/DTD/DTDValidator.hpp
+++ b/src/validators/DTD/DTDValidator.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.11 2001/05/11 13:27:11 tng
+ * Copyright update.
+ *
* Revision 1.10 2001/05/03 20:34:37 tng
* Schema: SchemaValidator update
*
diff --git a/src/validators/DTD/Makefile.in b/src/validators/DTD/Makefile.in
index bc73957a7da000f6a84ed22aed8e18001f308699..df64783ae67d250881da6ae0beab3a3d8716378d 100644
--- a/src/validators/DTD/Makefile.in
+++ b/src/validators/DTD/Makefile.in
@@ -1,7 +1,7 @@
#
# The Apache Software License, Version 1.1
#
-# Copyright (c) 1999 The Apache Software Foundation. All rights
+# Copyright (c) 1999-2001 The Apache Software Foundation. All rights
# reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -55,6 +55,9 @@
#
#
# $Log$
+# Revision 1.9 2001/05/11 13:27:11 tng
+# Copyright update.
+#
# Revision 1.8 2001/03/21 21:56:22 tng
# Schema: Add Schema Grammar, Schema Validator, and split the DTDValidator into DTDValidator, DTDScanner, and DTDGrammar.
#
diff --git a/src/validators/Makefile.in b/src/validators/Makefile.in
index e01078b85e4983308d247b624e56accae427e584..b8aedc546f28f82763eb6fc65eb83cd53807266a 100644
--- a/src/validators/Makefile.in
+++ b/src/validators/Makefile.in
@@ -1,7 +1,7 @@
#
# The Apache Software License, Version 1.1
#
-# Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+# Copyright (c) 1999-2001 The Apache Software Foundation. All rights
# reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -55,6 +55,9 @@
#
#
# $Log$
+# Revision 1.2 2001/05/11 13:27:06 tng
+# Copyright update.
+#
# Revision 1.1 2001/02/27 18:48:22 tng
# Schema: Add SchemaAttDef, SchemaElementDecl, SchemaAttDefList.
#
diff --git a/src/validators/common/CMAny.cpp b/src/validators/common/CMAny.cpp
index 06e02c2d1bd397918c38fc7811bb94261d9f9bb2..fc5c779b30d80bbcfb179f921ced44a90394740e 100644
--- a/src/validators/common/CMAny.cpp
+++ b/src/validators/common/CMAny.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2001/05/11 13:27:14 tng
+ * Copyright update.
+ *
* Revision 1.2 2001/05/03 21:02:27 tng
* Schema: Add SubstitutionGroupComparator and update exception messages. By Pei Yong Zhang.
*
diff --git a/src/validators/common/CMAny.hpp b/src/validators/common/CMAny.hpp
index 3768b9016f0b7b5831fe350f1be4d2b4153b837e..079418ed4dbabbc3aa2209e9e75715c1cb772ef8 100644
--- a/src/validators/common/CMAny.hpp
+++ b/src/validators/common/CMAny.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2001/05/11 13:27:14 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/02/27 14:48:46 tng
* Schema: Add CMAny and ContentLeafNameTypeVector, by Pei Yong Zhang
*
diff --git a/src/validators/common/CMBinaryOp.cpp b/src/validators/common/CMBinaryOp.cpp
index 35252c4775e3448614143ffb749cfa691aea3166..2f07ebfac635f7cb9a9932e327565e080e83f71a 100644
--- a/src/validators/common/CMBinaryOp.cpp
+++ b/src/validators/common/CMBinaryOp.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2001/05/11 13:27:15 tng
+ * Copyright update.
+ *
* Revision 1.2 2001/02/16 14:58:57 tng
* Schema: Update Makefile, configure files, project files, and include path in
* certain cpp files because of the move of the common Content Model files. By Pei Yong Zhang.
diff --git a/src/validators/common/CMBinaryOp.hpp b/src/validators/common/CMBinaryOp.hpp
index aafc016655ad436237a84b8e373192b28b5b960d..c527f9c76c8262e220ae9c8182bf9fae97e83975 100644
--- a/src/validators/common/CMBinaryOp.hpp
+++ b/src/validators/common/CMBinaryOp.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2001/05/11 13:27:16 tng
+ * Copyright update.
+ *
* Revision 1.2 2001/02/16 14:58:57 tng
* Schema: Update Makefile, configure files, project files, and include path in
* certain cpp files because of the move of the common Content Model files. By Pei Yong Zhang.
diff --git a/src/validators/common/CMLeaf.hpp b/src/validators/common/CMLeaf.hpp
index a51bba04ce12156c7290909204cc991207affb9c..605e071e3a1065fa2bd16de14dd75bf52916b156 100644
--- a/src/validators/common/CMLeaf.hpp
+++ b/src/validators/common/CMLeaf.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2001/05/11 13:27:16 tng
+ * Copyright update.
+ *
* Revision 1.3 2001/04/19 18:17:27 tng
* Schema: SchemaValidator update, and use QName in Content Model
*
diff --git a/src/validators/common/CMNode.hpp b/src/validators/common/CMNode.hpp
index 2bb561cf2eeb8f5fd0e21e71922474d2756528a8..d3ad0ad74699e09d8e5f71c1f7edf6c5bc503634 100644
--- a/src/validators/common/CMNode.hpp
+++ b/src/validators/common/CMNode.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2001/05/11 13:27:17 tng
+ * Copyright update.
+ *
* Revision 1.2 2001/02/16 14:58:57 tng
* Schema: Update Makefile, configure files, project files, and include path in
* certain cpp files because of the move of the common Content Model files. By Pei Yong Zhang.
diff --git a/src/validators/common/CMStateSet.hpp b/src/validators/common/CMStateSet.hpp
index d2fc992718f6f6a145e84b5b9c458c096742074d..8063e804cce48f14b4d0b516619a1eedc244fbc2 100644
--- a/src/validators/common/CMStateSet.hpp
+++ b/src/validators/common/CMStateSet.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2001/05/11 13:27:17 tng
+ * Copyright update.
+ *
* Revision 1.3 2001/05/03 21:02:28 tng
* Schema: Add SubstitutionGroupComparator and update exception messages. By Pei Yong Zhang.
*
@@ -232,7 +235,7 @@ public :
// They have to be the same size
if (fBitCount != srcSet.fBitCount)
- ThrowXML(RuntimeException, XMLExcepts::Bitset_NotEqualSize);
+ ThrowXML(RuntimeException, XMLExcepts::Bitset_NotEqualSize);
if (fBitCount < 65)
{
diff --git a/src/validators/common/CMUnaryOp.cpp b/src/validators/common/CMUnaryOp.cpp
index 1a220b00dba9aad8630dae206f5a1c1743421a0e..6236328338d511e0e4df91751515ebd49d822471 100644
--- a/src/validators/common/CMUnaryOp.cpp
+++ b/src/validators/common/CMUnaryOp.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2001/05/11 13:27:17 tng
+ * Copyright update.
+ *
* Revision 1.3 2001/02/27 14:48:47 tng
* Schema: Add CMAny and ContentLeafNameTypeVector, by Pei Yong Zhang
*
diff --git a/src/validators/common/CMUnaryOp.hpp b/src/validators/common/CMUnaryOp.hpp
index 09d56f4953c0f789e96efda439075a89ef2d3bd3..af11ead5dfeec57a44852411d401d9f94741a4d5 100644
--- a/src/validators/common/CMUnaryOp.hpp
+++ b/src/validators/common/CMUnaryOp.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2001/05/11 13:27:17 tng
+ * Copyright update.
+ *
* Revision 1.2 2001/02/16 14:58:57 tng
* Schema: Update Makefile, configure files, project files, and include path in
* certain cpp files because of the move of the common Content Model files. By Pei Yong Zhang.
diff --git a/src/validators/common/ContentLeafNameTypeVector.cpp b/src/validators/common/ContentLeafNameTypeVector.cpp
index 75bda44d3eb5bfc4555607a3b5f499e5555b5e91..5ad86f4258812fc6f634285ad424ce73d859683f 100644
--- a/src/validators/common/ContentLeafNameTypeVector.cpp
+++ b/src/validators/common/ContentLeafNameTypeVector.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2001/05/11 13:27:17 tng
+ * Copyright update.
+ *
* Revision 1.2 2001/04/19 18:17:28 tng
* Schema: SchemaValidator update, and use QName in Content Model
*
diff --git a/src/validators/common/ContentLeafNameTypeVector.hpp b/src/validators/common/ContentLeafNameTypeVector.hpp
index 58812873ee30687a92958da1a071fafa9eac0bd3..7803d4ebeb3ec546bcdaf7c1fb369f883ee13a61 100644
--- a/src/validators/common/ContentLeafNameTypeVector.hpp
+++ b/src/validators/common/ContentLeafNameTypeVector.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2001/05/11 13:27:17 tng
+ * Copyright update.
+ *
* Revision 1.2 2001/04/19 18:17:28 tng
* Schema: SchemaValidator update, and use QName in Content Model
*
diff --git a/src/validators/common/ContentSpecNode.cpp b/src/validators/common/ContentSpecNode.cpp
index fc2553ca582e8147e85165ce888fe4cb4f59e635..d3b3089d67487ee57356c0742d3bfe2ee35debc5 100644
--- a/src/validators/common/ContentSpecNode.cpp
+++ b/src/validators/common/ContentSpecNode.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -101,7 +101,7 @@ static void formatNode( const ContentSpecNode* const curNode
// Now handle our type
switch(curType)
{
- case ContentSpecNode::Leaf :
+ case ContentSpecNode::Leaf :
if (curNode->getElement()->getURI() == XMLElementDecl::fgPCDataElemId)
bufToFill.append(XMLElementDecl::fgPCDataElemName);
else
diff --git a/src/validators/common/ContentSpecNode.hpp b/src/validators/common/ContentSpecNode.hpp
index 6251a7f712e041d96bbb6b9cbfc255abfd336b3d..df55b26b9408bf4bb2eb044cb91464a34ac02d02 100644
--- a/src/validators/common/ContentSpecNode.hpp
+++ b/src/validators/common/ContentSpecNode.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2001/05/11 13:27:18 tng
+ * Copyright update.
+ *
* Revision 1.6 2001/05/10 16:33:08 knoaman
* Traverse Schema Part III + error messages.
*
@@ -373,7 +376,7 @@ inline ContentSpecNode::~ContentSpecNode()
delete fFirst;
}
- if (fAdoptSecond) {
+ if (fAdoptSecond) {
delete fSecond;
}
diff --git a/src/validators/common/DFAContentModel.cpp b/src/validators/common/DFAContentModel.cpp
index 0094038e04d73738a45f69452a2f2dbcd366c939..ba333ca75765089695d4a5715738355fc423e97d 100644
--- a/src/validators/common/DFAContentModel.cpp
+++ b/src/validators/common/DFAContentModel.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2001/05/11 13:27:18 tng
+ * Copyright update.
+ *
* Revision 1.8 2001/05/03 21:02:29 tng
* Schema: Add SubstitutionGroupComparator and update exception messages. By Pei Yong Zhang.
*
diff --git a/src/validators/common/DFAContentModel.hpp b/src/validators/common/DFAContentModel.hpp
index def9166b41ed22ae77a240aefdb42d7bd4032e13..50ec1daf14f9cde040db41dd5c3dc95f834729ca 100644
--- a/src/validators/common/DFAContentModel.hpp
+++ b/src/validators/common/DFAContentModel.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2001/05/11 13:27:18 tng
+ * Copyright update.
+ *
* Revision 1.7 2001/05/03 21:02:30 tng
* Schema: Add SubstitutionGroupComparator and update exception messages. By Pei Yong Zhang.
*
diff --git a/src/validators/common/Grammar.hpp b/src/validators/common/Grammar.hpp
index 3bb68ef160baed1f3f31432e052172d9d8d34f16..b9e1b0ff080fa63eb85feea5a25315f22b4b3ce5 100644
--- a/src/validators/common/Grammar.hpp
+++ b/src/validators/common/Grammar.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2001/05/11 13:27:18 tng
+ * Copyright update.
+ *
* Revision 1.3 2001/05/03 20:34:40 tng
* Schema: SchemaValidator update
*
diff --git a/src/validators/common/GrammarResolver.cpp b/src/validators/common/GrammarResolver.cpp
index 404bc3641d350fb46e1b08ef5ccd90dd1864f5f1..192388df7322b0975e67608f3dedd90dab97377f 100644
--- a/src/validators/common/GrammarResolver.cpp
+++ b/src/validators/common/GrammarResolver.cpp
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -49,7 +49,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.apache.org. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -57,6 +57,9 @@
/*
* $Log$
+ * Revision 1.2 2001/05/11 13:27:19 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/03/21 21:56:28 tng
* Schema: Add Schema Grammar, Schema Validator, and split the DTDValidator into DTDValidator, DTDScanner, and DTDGrammar.
*
diff --git a/src/validators/common/GrammarResolver.hpp b/src/validators/common/GrammarResolver.hpp
index 63f97dd96d6acc83f616b1bf4cdaea8e61b7b8df..23a67713f33c7eda05e58b5d8371848962514314 100644
--- a/src/validators/common/GrammarResolver.hpp
+++ b/src/validators/common/GrammarResolver.hpp
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -49,7 +49,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.apache.org. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/validators/common/Makefile.in b/src/validators/common/Makefile.in
index c1479d7f85ab371a54110af81c8fc40389f74538..056ddf50247ba59ac5917e63411dc84debd7dd2a 100644
--- a/src/validators/common/Makefile.in
+++ b/src/validators/common/Makefile.in
@@ -1,7 +1,7 @@
#
# The Apache Software License, Version 1.1
#
-# Copyright (c) 1999 The Apache Software Foundation. All rights
+# Copyright (c) 1999-2001 The Apache Software Foundation. All rights
# reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -54,6 +54,9 @@
# <http://www.apache.org/>.
#
# $Log$
+# Revision 1.4 2001/05/11 13:27:19 tng
+# Copyright update.
+#
# Revision 1.3 2001/03/21 21:56:28 tng
# Schema: Add Schema Grammar, Schema Validator, and split the DTDValidator into DTDValidator, DTDScanner, and DTDGrammar.
#
diff --git a/src/validators/common/MixedContentModel.cpp b/src/validators/common/MixedContentModel.cpp
index 2ea8bbd2fc18e0cfa77ac5cf71ae0c0f4f1db951..ac7d7ecfc1ced9cf148022e2f96936b3cdcf0434 100644
--- a/src/validators/common/MixedContentModel.cpp
+++ b/src/validators/common/MixedContentModel.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2001/05/11 13:27:19 tng
+ * Copyright update.
+ *
* Revision 1.8 2001/05/03 21:02:30 tng
* Schema: Add SubstitutionGroupComparator and update exception messages. By Pei Yong Zhang.
*
diff --git a/src/validators/common/MixedContentModel.hpp b/src/validators/common/MixedContentModel.hpp
index baecbc76c7f720481fe297247b576130d24da2ae..2847c04508aaabcc2c81b03ae28beb093ef368e1 100644
--- a/src/validators/common/MixedContentModel.hpp
+++ b/src/validators/common/MixedContentModel.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2001/05/11 13:27:19 tng
+ * Copyright update.
+ *
* Revision 1.7 2001/05/03 21:02:31 tng
* Schema: Add SubstitutionGroupComparator and update exception messages. By Pei Yong Zhang.
*
diff --git a/src/validators/common/SimpleContentModel.cpp b/src/validators/common/SimpleContentModel.cpp
index 6b2d808ba5048e64485234dcfdd5ecee2be7f661..013e460b44e12103cd25c4d88352fe3bb2d1b1b4 100644
--- a/src/validators/common/SimpleContentModel.cpp
+++ b/src/validators/common/SimpleContentModel.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2001/05/11 13:27:19 tng
+ * Copyright update.
+ *
* Revision 1.7 2001/05/03 21:02:32 tng
* Schema: Add SubstitutionGroupComparator and update exception messages. By Pei Yong Zhang.
*
diff --git a/src/validators/common/SimpleContentModel.hpp b/src/validators/common/SimpleContentModel.hpp
index d8110380f71247dbd0177b1295093a845c570198..8664b1699c84810ebb31c9cbceb92c12bb84aa7d 100644
--- a/src/validators/common/SimpleContentModel.hpp
+++ b/src/validators/common/SimpleContentModel.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2001/05/11 13:27:20 tng
+ * Copyright update.
+ *
* Revision 1.7 2001/05/03 21:02:33 tng
* Schema: Add SubstitutionGroupComparator and update exception messages. By Pei Yong Zhang.
*
diff --git a/src/validators/datatype/BooleanDatatypeValidator.cpp b/src/validators/datatype/BooleanDatatypeValidator.cpp
index 578c5128acac4c89837a49720153b2a2c29c503c..f8f2fca3f4bc02bcb3e2d09a647f83786ac7378e 100644
--- a/src/validators/datatype/BooleanDatatypeValidator.cpp
+++ b/src/validators/datatype/BooleanDatatypeValidator.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2001/05/11 13:27:26 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/05/09 18:43:35 tng
* Add StringDatatypeValidator and BooleanDatatypeValidator. By Pei Yong Zhang.
*
@@ -83,16 +86,16 @@ const XMLCh fgValueSpace[][32] =
// ---------------------------------------------------------------------------
BooleanDatatypeValidator::BooleanDatatypeValidator(
DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ , RefHashTableOf<KVStringPair>* const facets
, const int finalSet)
:DatatypeValidator(baseValidator, facets, finalSet, DatatypeValidator::Boolean)
{
// Set Facets if any defined
- if ( facets )
- {
+ if ( facets )
+ {
XMLCh* key;
XMLCh* value;
- RefHashTableOfEnumerator<KVStringPair> e(facets);
+ RefHashTableOfEnumerator<KVStringPair> e(facets);
while (e.hasMoreElements())
{
@@ -100,17 +103,17 @@ BooleanDatatypeValidator::BooleanDatatypeValidator(
key = pair.getKey();
value = pair.getValue();
- if (XMLString::compareString(key, SchemaSymbols::fgELT_PATTERN)==0)
+ if (XMLString::compareString(key, SchemaSymbols::fgELT_PATTERN)==0)
{
setPattern(value);
setFacetsDefined(DatatypeValidator::FACET_PATTERN);
- }
- else
+ }
+ else
{
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Invalid_Tag);
}
- }
+ }
}// End of facet setting
}
@@ -120,11 +123,11 @@ void BooleanDatatypeValidator::checkContent( const XMLCh* const content, bool as
//validate against base validator if any
BooleanDatatypeValidator *pBaseValidator = (BooleanDatatypeValidator*) this->getBaseValidator();
- if (pBaseValidator !=0)
+ if (pBaseValidator !=0)
pBaseValidator->checkContent(content, true);
// we check pattern first
- if ( (getFacetsDefined() & DatatypeValidator::FACET_PATTERN ) != 0 )
+ if ( (getFacetsDefined() & DatatypeValidator::FACET_PATTERN ) != 0 )
{
// lazy construction
if (getRegex() ==0)
@@ -145,12 +148,12 @@ void BooleanDatatypeValidator::checkContent( const XMLCh* const content, bool as
return;
int i = 0;
- for ( ; i < SIZE; i++ )
+ for ( ; i < SIZE; i++ )
{
if ( XMLString::compareString(content, fgValueSpace[i]) ==0 )
break;
}
-
+
if (i == SIZE)
ThrowXML(InvalidDatatypeValueException, XMLExcepts::CM_UnaryOpHadBinType);
//Not valid boolean type
@@ -168,15 +171,15 @@ int BooleanDatatypeValidator::compare(const XMLCh* const lValue
( XMLString::compareString(lValue, fgValueSpace[2]) ==0 ) )
{
if (( XMLString::compareString(rValue, fgValueSpace[0]) ==0 ) ||
- ( XMLString::compareString(rValue, fgValueSpace[2]) ==0 ) )
+ ( XMLString::compareString(rValue, fgValueSpace[2]) ==0 ) )
return 0;
}
- else
+ else
if (( XMLString::compareString(lValue, fgValueSpace[1]) ==0 ) ||
( XMLString::compareString(lValue, fgValueSpace[3]) ==0 ) )
{
if (( XMLString::compareString(rValue, fgValueSpace[1]) ==0 ) ||
- ( XMLString::compareString(rValue, fgValueSpace[3]) ==0 ) )
+ ( XMLString::compareString(rValue, fgValueSpace[3]) ==0 ) )
return 0;
}
diff --git a/src/validators/datatype/BooleanDatatypeValidator.hpp b/src/validators/datatype/BooleanDatatypeValidator.hpp
index d89b7e9ee5596f6b26c58e94dc7201b6a7c36716..6d6139c0d2c7e1ee18f81541311017df5c5ea6cc 100644
--- a/src/validators/datatype/BooleanDatatypeValidator.hpp
+++ b/src/validators/datatype/BooleanDatatypeValidator.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -76,7 +76,7 @@ public:
BooleanDatatypeValidator();
BooleanDatatypeValidator(DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ , RefHashTableOf<KVStringPair>* const facets
, const int finalSet);
virtual ~BooleanDatatypeValidator();
@@ -118,10 +118,10 @@ public:
/**
* Compare two boolean data types
- *
+ *
* @param content1
* @param content2
- * @return
+ * @return
*/
int compare(const XMLCh* const, const XMLCh* const);
@@ -142,7 +142,7 @@ private:
// -----------------------------------------------------------------------
// Private data members
//
- // -----------------------------------------------------------------------
+ // -----------------------------------------------------------------------
};
diff --git a/src/validators/datatype/DatatypeValidator.cpp b/src/validators/datatype/DatatypeValidator.cpp
index f9cd68337e5ac646c6e7e0c8d8f11790a3093692..09db897ccf9f7aaf901b0fec0915fdf148a8d0ad 100644
--- a/src/validators/datatype/DatatypeValidator.cpp
+++ b/src/validators/datatype/DatatypeValidator.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2001/05/11 13:27:27 tng
+ * Copyright update.
+ *
* Revision 1.4 2001/05/09 18:43:38 tng
* Add StringDatatypeValidator and BooleanDatatypeValidator. By Pei Yong Zhang.
*
diff --git a/src/validators/datatype/DatatypeValidator.hpp b/src/validators/datatype/DatatypeValidator.hpp
index 49a77ae70d2631501b1f78fb02c5c490ab977f52..4cc7186854b3f94f708e4f1dc438a7145cbb586c 100644
--- a/src/validators/datatype/DatatypeValidator.hpp
+++ b/src/validators/datatype/DatatypeValidator.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/validators/datatype/DatatypeValidatorFactory.cpp b/src/validators/datatype/DatatypeValidatorFactory.cpp
index d734bc8ff4626e3f8cf0e50bf0356569f6b7d4a8..ef580586a352298d42a900c981516c1d80eb6e01 100644
--- a/src/validators/datatype/DatatypeValidatorFactory.cpp
+++ b/src/validators/datatype/DatatypeValidatorFactory.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2001/05/11 13:27:28 tng
+ * Copyright update.
+ *
* Revision 1.3 2001/05/09 18:43:40 tng
* Add StringDatatypeValidator and BooleanDatatypeValidator. By Pei Yong Zhang.
*
diff --git a/src/validators/datatype/DatatypeValidatorFactory.hpp b/src/validators/datatype/DatatypeValidatorFactory.hpp
index c2c5469e54b4b24525b97d349c7a05fb905dfd34..d7e1a788fcb9adb0ea1c5f50a054af6feb5eb204 100644
--- a/src/validators/datatype/DatatypeValidatorFactory.hpp
+++ b/src/validators/datatype/DatatypeValidatorFactory.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -77,7 +77,7 @@
* facets and registering the Datatype into registry table.
* This implementation uses a Hahtable as a registry. The datatype validators created
* by the factory will be deleted by the registry.
- *
+ *
* As the Parser parses an instance document it knows if validation needs
* to be checked. If no validation is necesary we should not instantiate a
* DatatypeValidatorFactory.
@@ -134,29 +134,29 @@ public:
/**
* Initializes registry with primitive and derived Simple types.
- *
- * This method does not clear the registry to clear the registry you
+ *
+ * This method does not clear the registry to clear the registry you
* have to call resetRegistry.
- *
- * The net effect of this method is to start with a the smallest set of
+ *
+ * The net effect of this method is to start with a the smallest set of
* datatypes needed by the validator.
*
- * If we start with DTD's, then we initialize the table to only
+ * If we start with DTD's, then we initialize the table to only
* the 9 validators needed by DTD Validation.
*/
void initializeDTDRegistry();
/**
* Initializes registry with primitive and derived Simple types.
- *
- * This method does not clear the registry to clear the registry you
+ *
+ * This method does not clear the registry to clear the registry you
* have to call resetRegistry.
- *
- * The net effect of this method is to start with a the smallest set of
+ *
+ * The net effect of this method is to start with a the smallest set of
* datatypes needed by the validator.
*
- * If we start with Schema's then we initialize to to full set of
- * validators.
+ * If we start with Schema's then we initialize to to full set of
+ * validators.
*/
void expandRegistryToFullSchemaSet();
@@ -168,7 +168,7 @@ public:
/** @name Validator Factory Functions */
//@{
- /**
+ /**
* Creates a new datatype validator of type baseValidator's class and
* adds it to the registry
*
@@ -183,13 +183,13 @@ public:
*
* @param finalSet 'final' values of the simpleType
*/
- DatatypeValidator* createDatatypeValidator(const XMLCh* const,
+ DatatypeValidator* createDatatypeValidator(const XMLCh* const,
DatatypeValidator* const,
RefHashTableOf<KVStringPair>* const,
const bool,
const int = 0);
- /**
+ /**
* Creates a new datatype validator of type UnionDatatypeValidator and
* adds it to the registry
*
@@ -232,7 +232,7 @@ private:
// ---------------------------------------------------------------------------
// DatatypeValidatorFactory: Getters
// ---------------------------------------------------------------------------
-inline DatatypeValidator*
+inline DatatypeValidator*
DatatypeValidatorFactory::getDatatypeValidator(const XMLCh* const dvType) const
{
if (dvType && fRegistry && fRegistry->containsKey(dvType)) {
diff --git a/src/validators/datatype/DecimalDatatypeValidator.cpp b/src/validators/datatype/DecimalDatatypeValidator.cpp
index 2c3b838d696bbca2956fa541bf4c5667ad6bb5dc..91aa42bf73121faa1a046daa2ff421de647eba19 100644
--- a/src/validators/datatype/DecimalDatatypeValidator.cpp
+++ b/src/validators/datatype/DecimalDatatypeValidator.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2001/05/11 13:27:28 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/05/10 20:51:29 tng
* Schema: Add DecimalDatatypeValidator and XMLBigDecimal, XMLBigInteger. By Pei Yong Zhang.
*
@@ -75,7 +78,7 @@
// ---------------------------------------------------------------------------
DecimalDatatypeValidator::DecimalDatatypeValidator(
DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ , RefHashTableOf<KVStringPair>* const facets
, const int finalSet)
:DatatypeValidator(baseValidator, facets, finalSet, DatatypeValidator::Decimal)
, fTotalDigits(0)
@@ -86,7 +89,7 @@ DecimalDatatypeValidator::DecimalDatatypeValidator(
, fMinExclusive(0)
, fEnumeration(0)
{
- try
+ try
{
init(baseValidator, facets);
}
@@ -96,21 +99,21 @@ DecimalDatatypeValidator::DecimalDatatypeValidator(
cleanUp();
throw;
}
-
+
}
void DecimalDatatypeValidator::init(DatatypeValidator* const baseValidator
, RefHashTableOf<KVStringPair>* const facets)
{
// Set Facets if any defined
- if (facets)
- {
+ if (facets)
+ {
XMLCh* key;
XMLCh* value;
RefVectorOf<XMLCh>* fStrEnumeration = 0; // save the literal value
Janitor<RefVectorOf<XMLCh> > janStrEnum(fStrEnumeration);
- RefHashTableOfEnumerator<KVStringPair> e(facets);
+ RefHashTableOfEnumerator<KVStringPair> e(facets);
while (e.hasMoreElements())
{
@@ -118,13 +121,13 @@ void DecimalDatatypeValidator::init(DatatypeValidator* const baseVali
key = pair.getKey();
value = pair.getValue();
- if (XMLString::compareString(key, SchemaSymbols::fgELT_PATTERN)==0)
- {
+ if (XMLString::compareString(key, SchemaSymbols::fgELT_PATTERN)==0)
+ {
setPattern(value);
if (getPattern())
setFacetsDefined(DatatypeValidator::FACET_PATTERN);
// do not construct regex until needed
- }
+ }
else if (XMLString::compareString(key, SchemaSymbols::fgELT_ENUMERATION)==0)
{
if (fStrEnumeration)
@@ -132,7 +135,7 @@ void DecimalDatatypeValidator::init(DatatypeValidator* const baseVali
fStrEnumeration = XMLString::tokenizeString(value);
setFacetsDefined(DatatypeValidator::FACET_ENUMERATION);
- }
+ }
else if (XMLString::compareString(key, SchemaSymbols::fgELT_MAXINCLUSIVE)==0)
{
try
@@ -145,10 +148,10 @@ void DecimalDatatypeValidator::init(DatatypeValidator* const baseVali
// ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Inv_MaxInc);
}
setFacetsDefined(DatatypeValidator::FACET_MAXINCLUSIVE);
- }
+ }
else if (XMLString::compareString(key, SchemaSymbols::fgELT_MAXEXCLUSIVE)==0)
{
- try
+ try
{
setMaxExclusive(new XMLBigDecimal(value));
}
@@ -158,10 +161,10 @@ void DecimalDatatypeValidator::init(DatatypeValidator* const baseVali
// ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Inv_MaxExc);
}
setFacetsDefined(DatatypeValidator::FACET_MAXEXCLUSIVE);
- }
+ }
else if (XMLString::compareString(key, SchemaSymbols::fgELT_MININCLUSIVE)==0)
{
- try
+ try
{
setMinInclusive(new XMLBigDecimal(value));
}
@@ -171,7 +174,7 @@ void DecimalDatatypeValidator::init(DatatypeValidator* const baseVali
// ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Inv_MinInc);
}
setFacetsDefined(DatatypeValidator::FACET_MININCLUSIVE);
- }
+ }
else if (XMLString::compareString(key, SchemaSymbols::fgELT_MINEXCLUSIVE)==0)
{
try
@@ -184,9 +187,9 @@ void DecimalDatatypeValidator::init(DatatypeValidator* const baseVali
// ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Inv_MinExc);
}
setFacetsDefined(DatatypeValidator::FACET_MINEXCLUSIVE);
- }
+ }
else if (XMLString::compareString(key, SchemaSymbols::fgELT_PRECISION)==0)
- {
+ {
try
{
setTotalDigits(XMLString::parseInt(value));
@@ -206,7 +209,7 @@ void DecimalDatatypeValidator::init(DatatypeValidator* const baseVali
setFacetsDefined(DatatypeValidator::FACET_PRECISSION);
}
else if (XMLString::compareString(key, SchemaSymbols::fgELT_FRACTIONDIGITS)==0)
- {
+ {
try
{
setFractionDigits(XMLString::parseInt(value));
@@ -223,9 +226,9 @@ void DecimalDatatypeValidator::init(DatatypeValidator* const baseVali
// ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Neg_Fraction);
//InvalidDatatypeFacetException("fractionDigits value '"+fFractionDigits+"' must be a positiveInteger.");
- setFacetsDefined(DatatypeValidator::FACET_SCALE);
+ setFacetsDefined(DatatypeValidator::FACET_SCALE);
}
- else
+ else
{
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Invalid_Tag);
}
@@ -235,27 +238,27 @@ void DecimalDatatypeValidator::init(DatatypeValidator* const baseVali
Schema constraint: Part I -- self checking
***/
- if ( getFacetsDefined() != 0 )
+ if ( getFacetsDefined() != 0 )
{
// non co-existence checking
// check 4.3.8.c1 error: maxInclusive + maxExclusive
- if ( ((getFacetsDefined() & DatatypeValidator::FACET_MAXEXCLUSIVE) != 0) &&
- ((getFacetsDefined() & DatatypeValidator::FACET_MAXINCLUSIVE) != 0) )
+ if ( ((getFacetsDefined() & DatatypeValidator::FACET_MAXEXCLUSIVE) != 0) &&
+ ((getFacetsDefined() & DatatypeValidator::FACET_MAXINCLUSIVE) != 0) )
{
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Len_maxLen);
// ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_max_inc_exc);
- // "It is an error for both maxInclusive and maxExclusive to be specified
+ // "It is an error for both maxInclusive and maxExclusive to be specified
// for the same datatype." );
}
// non co-existence checking
// check 4.3.9.c1 error: minInclusive + minExclusive
- if ( ((getFacetsDefined() & DatatypeValidator::FACET_MINEXCLUSIVE) != 0) &&
- ((getFacetsDefined() & DatatypeValidator::FACET_MININCLUSIVE) != 0) )
+ if ( ((getFacetsDefined() & DatatypeValidator::FACET_MINEXCLUSIVE) != 0) &&
+ ((getFacetsDefined() & DatatypeValidator::FACET_MININCLUSIVE) != 0) )
{
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Len_maxLen);
// ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_min_inc_exc);
- // "It is an error for both minInclusive and minExclusive to be specified
+ // "It is an error for both minInclusive and minExclusive to be specified
// for the same datatype." );
}
@@ -263,79 +266,79 @@ void DecimalDatatypeValidator::init(DatatypeValidator* const baseVali
// minExclusive < minInclusive <= maxInclusive < maxExclusive
//
// check 4.3.7.c1 must: minInclusive <= maxInclusive
- if ( ((getFacetsDefined() & DatatypeValidator::FACET_MAXINCLUSIVE) != 0) &&
- ((getFacetsDefined() & DatatypeValidator::FACET_MININCLUSIVE) != 0) )
+ if ( ((getFacetsDefined() & DatatypeValidator::FACET_MAXINCLUSIVE) != 0) &&
+ ((getFacetsDefined() & DatatypeValidator::FACET_MININCLUSIVE) != 0) )
{
if ( XMLBigDecimal::compareValues(getMinInclusive(), getMaxInclusive()) == 1 )
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Len_maxLen);
// ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_inc_min_max);
- // "minInclusive value ='" + getMinInclusive(false) + "'must be <=
+ // "minInclusive value ='" + getMinInclusive(false) + "'must be <=
// maxInclusive value ='" + getMaxInclusive(false) + "'. " );
}
-
+
// check 4.3.8.c2 must: minExclusive <= maxExclusive ??? minExclusive < maxExclusive
- if ( ((getFacetsDefined() & DatatypeValidator::FACET_MAXEXCLUSIVE) != 0) &&
- ((getFacetsDefined() & DatatypeValidator::FACET_MINEXCLUSIVE) != 0) )
+ if ( ((getFacetsDefined() & DatatypeValidator::FACET_MAXEXCLUSIVE) != 0) &&
+ ((getFacetsDefined() & DatatypeValidator::FACET_MINEXCLUSIVE) != 0) )
{
if ( XMLBigDecimal::compareValues(getMinExclusive(), getMaxExclusive()) == 1 )
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Len_maxLen);
// ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_exc_min_max);
- // "minExclusive value ='" + getMinExclusive(false) + "'must be <=
+ // "minExclusive value ='" + getMinExclusive(false) + "'must be <=
// maxExclusive value ='" + getMaxExclusive(false) + "'. " );
}
-
+
// check 4.3.9.c2 must: minExclusive < maxInclusive
- if ( ((getFacetsDefined() & DatatypeValidator::FACET_MAXINCLUSIVE) != 0) &&
- ((getFacetsDefined() & DatatypeValidator::FACET_MINEXCLUSIVE) != 0) )
+ if ( ((getFacetsDefined() & DatatypeValidator::FACET_MAXINCLUSIVE) != 0) &&
+ ((getFacetsDefined() & DatatypeValidator::FACET_MINEXCLUSIVE) != 0) )
{
if ( XMLBigDecimal::compareValues(getMinExclusive(), getMaxInclusive()) != -1 )
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Len_maxLen);
// ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_maxinc_minexc);
- // "minExclusive value ='" + getMinExclusive(false) + "'must be >
+ // "minExclusive value ='" + getMinExclusive(false) + "'must be >
// maxInclusive value ='" + getMaxInclusive(false) + "'. " );
}
-
+
// check 4.3.10.c1 must: minInclusive < maxExclusive
- if ( ((getFacetsDefined() & DatatypeValidator::FACET_MAXEXCLUSIVE) != 0) &&
- ((getFacetsDefined() & DatatypeValidator::FACET_MININCLUSIVE) != 0) )
+ if ( ((getFacetsDefined() & DatatypeValidator::FACET_MAXEXCLUSIVE) != 0) &&
+ ((getFacetsDefined() & DatatypeValidator::FACET_MININCLUSIVE) != 0) )
{
if ( XMLBigDecimal::compareValues(getMinInclusive(), getMaxExclusive()) != -1 )
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Len_maxLen);
// ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_mininc_maxexc);
- // "minInclusive value ='" + getMinInclusive(false) + "'must be <
+ // "minInclusive value ='" + getMinInclusive(false) + "'must be <
// maxExclusive value ='" + getMaxExclusive(false) + "'. " );
}
-
+
// check 4.3.12.c1 must: fractionDigits <= totalDigits
- if ( ((getFacetsDefined() & DatatypeValidator::FACET_SCALE) != 0) &&
- ((getFacetsDefined() & DatatypeValidator::FACET_PRECISSION) != 0) )
+ if ( ((getFacetsDefined() & DatatypeValidator::FACET_SCALE) != 0) &&
+ ((getFacetsDefined() & DatatypeValidator::FACET_PRECISSION) != 0) )
{
if ( fFractionDigits > fTotalDigits )
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Len_maxLen);
//ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_scale_precision);
- // "fractionDigits value ='" + this.fFractionDigits + "'must be <=
+ // "fractionDigits value ='" + this.fFractionDigits + "'must be <=
// totalDigits value ='" + this.fTotalDigits + "'. " );
}
} // if getFacetsDefined
/***
- Schema constraint: Part II -- self vs base
+ Schema constraint: Part II -- self vs base
***/
- if ( baseValidator != 0 )
+ if ( baseValidator != 0 )
{
DecimalDatatypeValidator* numBase = (DecimalDatatypeValidator*)baseValidator;
// this
// minExclusive maxExclusive
- // minInclusive maxInclusive
+ // minInclusive maxInclusive
//
// base
// minExclusive maxExclusive
- // minInclusive maxExclusive
+ // minInclusive maxExclusive
//
- if ( getFacetsDefined() != 0 )
+ if ( getFacetsDefined() != 0 )
{
// check 4.3.7.c2 error:
// maxInclusive > base.maxInclusive
@@ -343,34 +346,34 @@ void DecimalDatatypeValidator::init(DatatypeValidator* const baseVali
// maxInclusive < base.minInclusive
// maxInclusive <= base.minExclusive
- if ( ((getFacetsDefined() & DatatypeValidator::FACET_MAXINCLUSIVE) != 0) )
+ if ( ((getFacetsDefined() & DatatypeValidator::FACET_MAXINCLUSIVE) != 0) )
{
if ( ((numBase->getFacetsDefined() & DatatypeValidator::FACET_MAXINCLUSIVE) != 0) &&
( XMLBigDecimal::compareValues(getMaxInclusive(), numBase->getMaxInclusive()) == 1 ))
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Len_maxLen);
//ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_maxinc_base_maxinc);
- // "maxInclusive value ='" + getMaxInclusive(false) + "' must be <=
+ // "maxInclusive value ='" + getMaxInclusive(false) + "' must be <=
// base.maxInclusive value ='" + getMaxInclusive(true) + "'." );
-
+
if ( ((numBase->getFacetsDefined() & DatatypeValidator::FACET_MAXEXCLUSIVE) != 0) &&
( XMLBigDecimal::compareValues(getMaxInclusive(), numBase->getMaxExclusive()) != -1 ))
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Len_maxLen);
//ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_maxinc_base_maxexc);
- // "maxInclusive value ='" + getMaxInclusive(false) + "' must be <
+ // "maxInclusive value ='" + getMaxInclusive(false) + "' must be <
// base.maxExclusive value ='" + getMaxExclusive(true) + "'." );
if ( (( numBase->getFacetsDefined() & DatatypeValidator::FACET_MININCLUSIVE) != 0) &&
( XMLBigDecimal::compareValues(getMaxInclusive(), numBase->getMinInclusive()) == -1 ))
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Len_maxLen);
//ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_maxinc_base_mininc);
- // "maxInclusive value ='" + getMaxInclusive(false) + "' must be >=
+ // "maxInclusive value ='" + getMaxInclusive(false) + "' must be >=
// base.minInclusive value ='" + getMinInclusive(true) + "'." );
-
+
if ( (( numBase->getFacetsDefined() & DatatypeValidator::FACET_MINEXCLUSIVE) != 0) &&
( XMLBigDecimal::compareValues(getMaxInclusive(), numBase->getMinExclusive() ) != 1 ))
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Len_maxLen);
//ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_maxinc_base_minexc);
- // "maxInclusive value ='" + getMaxInclusive(false) + "' must be >
+ // "maxInclusive value ='" + getMaxInclusive(false) + "' must be >
// base.minExclusive value ='" + getMinExclusive(true) + "'." );
}
@@ -379,34 +382,34 @@ void DecimalDatatypeValidator::init(DatatypeValidator* const baseVali
// maxExclusive > base.maxInclusive
// maxExclusive <= base.minInclusive
// maxExclusive <= base.minExclusive
- if ( ((getFacetsDefined() & DatatypeValidator::FACET_MAXEXCLUSIVE) != 0) )
+ if ( ((getFacetsDefined() & DatatypeValidator::FACET_MAXEXCLUSIVE) != 0) )
{
if ( (( numBase->getFacetsDefined() & DatatypeValidator::FACET_MAXEXCLUSIVE) != 0) &&
( XMLBigDecimal::compareValues(getMaxExclusive(), numBase->getMaxExclusive()) == 1 ))
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Len_maxLen);
//ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_maxexc_base_maxexc);
- // "maxExclusive value ='" + getMaxExclusive(false) + "' must be
+ // "maxExclusive value ='" + getMaxExclusive(false) + "' must be
// <= base.maxExclusive value ='" + getMaxExclusive(true) + "'." );
if ( (( numBase->getFacetsDefined() & DatatypeValidator::FACET_MAXINCLUSIVE) != 0) &&
( XMLBigDecimal::compareValues(getMaxExclusive(), numBase->getMaxInclusive()) == 1 ))
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Len_maxLen);
//ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_maxexc_base_maxinc);
- // "maxExclusive value ='" + getMaxExclusive(false) + "' must be
+ // "maxExclusive value ='" + getMaxExclusive(false) + "' must be
// <= base.maxInclusive value ='" + getMaxInclusive(true) + "'." );
if ( (( numBase->getFacetsDefined() & DatatypeValidator::FACET_MINEXCLUSIVE) != 0) &&
( XMLBigDecimal::compareValues(getMaxExclusive(), numBase->getMinExclusive() ) != 1 ))
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Len_maxLen);
//ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_maxexc_base_mininc);
- // "maxExclusive value ='" + getMaxExclusive(false) + "' must be
+ // "maxExclusive value ='" + getMaxExclusive(false) + "' must be
// > base.minExclusive value ='" + getMinExclusive(true) + "'." );
if ( (( numBase->getFacetsDefined() & DatatypeValidator::FACET_MININCLUSIVE) != 0) &&
( XMLBigDecimal::compareValues(getMaxExclusive(), numBase->getMinInclusive()) != 1 ))
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Len_maxLen);
//ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_maxexc_base_minexc);
- // "maxExclusive value ='" + getMaxExclusive(false) + "' must be
+ // "maxExclusive value ='" + getMaxExclusive(false) + "' must be
// > base.minInclusive value ='" + getMinInclusive(true) + "'." );
}
@@ -415,36 +418,36 @@ void DecimalDatatypeValidator::init(DatatypeValidator* const baseVali
// minExclusive > base.maxInclusive ??? minExclusive >= base.maxInclusive
// minExclusive < base.minInclusive
// minExclusive >= base.maxExclusive
- if ( ((getFacetsDefined() & DatatypeValidator::FACET_MINEXCLUSIVE) != 0) )
+ if ( ((getFacetsDefined() & DatatypeValidator::FACET_MINEXCLUSIVE) != 0) )
{
if ( (( numBase->getFacetsDefined() & DatatypeValidator::FACET_MINEXCLUSIVE) != 0) &&
( XMLBigDecimal::compareValues(getMinExclusive(), numBase->getMinExclusive() ) == -1 ))
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Len_maxLen);
//ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_mininc_base_minexc);
- // "minExclusive value ='" + getMinExclusive(false) + "' must be
+ // "minExclusive value ='" + getMinExclusive(false) + "' must be
// >= base.minExclusive value ='" + getMinExclusive(true) + "'." );
if ( (( numBase->getFacetsDefined() & DatatypeValidator::FACET_MAXINCLUSIVE) != 0) &&
( XMLBigDecimal::compareValues(getMinExclusive(), numBase->getMaxInclusive()) == 1 ))
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Len_maxLen);
//ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_mininc_base_maxinc);
- // "minExclusive value ='" + getMinExclusive(false) + "' must be
- // <= base.maxInclusive value ='" + getMaxInclusive(true) + "'." );
+ // "minExclusive value ='" + getMinExclusive(false) + "' must be
+ // <= base.maxInclusive value ='" + getMaxInclusive(true) + "'." );
if ( (( numBase->getFacetsDefined() & DatatypeValidator::FACET_MININCLUSIVE) != 0) &&
( XMLBigDecimal::compareValues(getMinExclusive(), numBase->getMinInclusive()) == -1 ))
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Len_maxLen);
//ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_mininc_base_mininc);
- // "minExclusive value ='" + getMinExclusive(false) + "' must be
+ // "minExclusive value ='" + getMinExclusive(false) + "' must be
// >= base.minInclusive value ='" + getMinInclusive(true) + "'." );
-
+
if ( (( numBase->getFacetsDefined() & DatatypeValidator::FACET_MAXEXCLUSIVE) != 0) &&
( XMLBigDecimal::compareValues(getMinExclusive(), numBase->getMaxExclusive()) != -1 ))
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Len_maxLen);
//ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_mininc_base_maxexc);
- // "minExclusive value ='" + getMinExclusive(false) + "' must be
+ // "minExclusive value ='" + getMinExclusive(false) + "' must be
// < base.maxExclusive value ='" + getMaxExclusive(true) + "'." );
-
+
}
// check 4.3.10.c2 error:
@@ -452,38 +455,38 @@ void DecimalDatatypeValidator::init(DatatypeValidator* const baseVali
// minInclusive > base.maxInclusive
// minInclusive <= base.minExclusive
// minInclusive >= base.maxExclusive
- if ( ((getFacetsDefined() & DatatypeValidator::FACET_MININCLUSIVE) != 0) )
+ if ( ((getFacetsDefined() & DatatypeValidator::FACET_MININCLUSIVE) != 0) )
{
if ( ((numBase->getFacetsDefined() & DatatypeValidator::FACET_MININCLUSIVE) != 0) &&
( XMLBigDecimal::compareValues(getMinInclusive(), numBase->getMinInclusive()) == -1 ))
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Len_maxLen);
//ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_mininc_base_mininc);
- // "minInclusive value ='" + getMinInclusive(false) + "' must be
+ // "minInclusive value ='" + getMinInclusive(false) + "' must be
// >= base.minInclusive value ='" + getMinInclusive(true) + "'." );
-
+
if ( (( numBase->getFacetsDefined() & DatatypeValidator::FACET_MAXINCLUSIVE) != 0) &&
( XMLBigDecimal::compareValues(getMinInclusive(), numBase->getMaxInclusive()) == 1 ))
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Len_maxLen);
//ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_mininc_base_maxinc);
- // "minInclusive value ='" + getMinInclusive(false) + "' must be
+ // "minInclusive value ='" + getMinInclusive(false) + "' must be
// <= base.maxInclusive value ='" + getMaxInclusive(true) + "'." );
-
+
if ( (( numBase->getFacetsDefined() & DatatypeValidator::FACET_MINEXCLUSIVE) != 0) &&
( XMLBigDecimal::compareValues(getMinInclusive(), numBase->getMinExclusive() ) != 1 ))
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Len_maxLen);
//ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_mininc_base_minexc);
- // "minInclusive value ='" + getMinInclusive(false) + "' must be
+ // "minInclusive value ='" + getMinInclusive(false) + "' must be
// > base.minExclusive value ='" + getMinExclusive(true) + "'." );
-
+
if ( (( numBase->getFacetsDefined() & DatatypeValidator::FACET_MAXEXCLUSIVE) != 0) &&
( XMLBigDecimal::compareValues(getMinInclusive(), numBase->getMaxExclusive()) != -1 ))
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Len_maxLen);
//ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_mininc_base_maxexc);
- // "minInclusive value ='" + getMinInclusive(false) + "' must be
+ // "minInclusive value ='" + getMinInclusive(false) + "' must be
// < base.maxExclusive value ='" + getMaxExclusive(true) + "'." );
-
+
}
-
+
// check 4.3.11.c1 error: totalDigits > base.totalDigits
if (( getFacetsDefined() & DatatypeValidator::FACET_PRECISSION) != 0)
{
@@ -491,11 +494,11 @@ void DecimalDatatypeValidator::init(DatatypeValidator* const baseVali
( fTotalDigits > numBase->fTotalDigits ))
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Len_maxLen);
//ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_totdigit_base_totdigit);
- // "totalDigits value ='" + fTotalDigits + "' must be
+ // "totalDigits value ='" + fTotalDigits + "' must be
// <= base.totalDigits value ='" + numBase.fTotalDigits + "'." );
-
+
}
-
+
// check question error: fractionDigits > base.fractionDigits ???
// check question error: fractionDigits > base.totalDigits ???
// check question error: totalDigits conflicts with bounds ???
@@ -511,12 +514,12 @@ void DecimalDatatypeValidator::init(DatatypeValidator* const baseVali
{
int i = 0;
int enumLength = fStrEnumeration->size();
- try
+ try
{
- for ( ; i < enumLength; i++)
+ for ( ; i < enumLength; i++)
// ask parent do a complete check
numBase->checkContent(fStrEnumeration->elementAt(i), false);
- }
+ }
catch ( XMLException& )
{
@@ -527,12 +530,12 @@ void DecimalDatatypeValidator::init(DatatypeValidator* const baseVali
//
// we need to convert from fStrEnumeration to fEnumeration
- try
+ try
{
fEnumeration = new RefVectorOf<XMLBigDecimal>(enumLength, true);
- for ( ; i < enumLength; i++)
+ for ( ; i < enumLength; i++)
fEnumeration->insertElementAt(new XMLBigDecimal(fStrEnumeration->elementAt(i)), i);
- }
+ }
catch ( NumberFormatException& )
{
@@ -546,27 +549,27 @@ void DecimalDatatypeValidator::init(DatatypeValidator* const baseVali
}
/***
- Schema constraint: Part III -- inherit from base
+ Schema constraint: Part III -- inherit from base
***/
-
+
// inherit enumeration
if ( ((getFacetsDefined() & DatatypeValidator::FACET_ENUMERATION) == 0 ) &&
((numBase->getFacetsDefined() & DatatypeValidator::FACET_ENUMERATION) != 0 ))
{
setFacetsDefined(DatatypeValidator::FACET_ENUMERATION);
- // need to adopt the Vector
+ // need to adopt the Vector
RefVectorOf<XMLBigDecimal>* fBaseEnumeration = numBase->fEnumeration;
int enumLength = fBaseEnumeration->size();
fEnumeration = new RefVectorOf<XMLBigDecimal>(enumLength, true);
- for ( int i = 0; i < enumLength; i++)
+ for ( int i = 0; i < enumLength; i++)
fEnumeration->insertElementAt(fBaseEnumeration->elementAt(i), i);
}
// inherit maxExclusive
if ( (( numBase->getFacetsDefined() & DatatypeValidator::FACET_MAXEXCLUSIVE) != 0) &&
- (( getFacetsDefined() & DatatypeValidator::FACET_MAXEXCLUSIVE) == 0) &&
- (( getFacetsDefined() & DatatypeValidator::FACET_MAXINCLUSIVE) == 0) )
+ (( getFacetsDefined() & DatatypeValidator::FACET_MAXEXCLUSIVE) == 0) &&
+ (( getFacetsDefined() & DatatypeValidator::FACET_MAXINCLUSIVE) == 0) )
{
setMaxExclusive(new XMLBigDecimal(*(numBase->getMaxExclusive())));
setFacetsDefined(DatatypeValidator::FACET_MAXEXCLUSIVE);
@@ -574,8 +577,8 @@ void DecimalDatatypeValidator::init(DatatypeValidator* const baseVali
// inherit maxInclusive
if ( (( numBase->getFacetsDefined() & DatatypeValidator::FACET_MAXINCLUSIVE) != 0) &&
- (( getFacetsDefined() & DatatypeValidator::FACET_MAXEXCLUSIVE) == 0) &&
- (( getFacetsDefined() & DatatypeValidator::FACET_MAXINCLUSIVE) == 0) )
+ (( getFacetsDefined() & DatatypeValidator::FACET_MAXEXCLUSIVE) == 0) &&
+ (( getFacetsDefined() & DatatypeValidator::FACET_MAXINCLUSIVE) == 0) )
{
setMaxInclusive(new XMLBigDecimal(*(numBase->getMaxInclusive())));
setFacetsDefined(DatatypeValidator::FACET_MAXINCLUSIVE);
@@ -583,8 +586,8 @@ void DecimalDatatypeValidator::init(DatatypeValidator* const baseVali
// inherit minExclusive
if ( (( numBase->getFacetsDefined() & DatatypeValidator::FACET_MINEXCLUSIVE) != 0) &&
- (( getFacetsDefined() & DatatypeValidator::FACET_MINEXCLUSIVE) == 0) &&
- (( getFacetsDefined() & DatatypeValidator::FACET_MININCLUSIVE) == 0) )
+ (( getFacetsDefined() & DatatypeValidator::FACET_MINEXCLUSIVE) == 0) &&
+ (( getFacetsDefined() & DatatypeValidator::FACET_MININCLUSIVE) == 0) )
{
setMinExclusive(new XMLBigDecimal(*(numBase->getMinExclusive())));
setFacetsDefined(DatatypeValidator::FACET_MINEXCLUSIVE);
@@ -592,42 +595,42 @@ void DecimalDatatypeValidator::init(DatatypeValidator* const baseVali
// inherit minExclusive
if ( (( numBase->getFacetsDefined() & DatatypeValidator::FACET_MININCLUSIVE) != 0) &&
- (( getFacetsDefined() & DatatypeValidator::FACET_MINEXCLUSIVE) == 0) &&
- (( getFacetsDefined() & DatatypeValidator::FACET_MININCLUSIVE) == 0) )
+ (( getFacetsDefined() & DatatypeValidator::FACET_MINEXCLUSIVE) == 0) &&
+ (( getFacetsDefined() & DatatypeValidator::FACET_MININCLUSIVE) == 0) )
{
setMinInclusive(new XMLBigDecimal(*(numBase->getMinInclusive())));
setFacetsDefined(DatatypeValidator::FACET_MININCLUSIVE);
}
// inherit totalDigits
- if ( (( numBase->getFacetsDefined() & DatatypeValidator::FACET_PRECISSION) != 0) &&
- (( getFacetsDefined() & DatatypeValidator::FACET_PRECISSION) == 0) )
+ if ( (( numBase->getFacetsDefined() & DatatypeValidator::FACET_PRECISSION) != 0) &&
+ (( getFacetsDefined() & DatatypeValidator::FACET_PRECISSION) == 0) )
{
setTotalDigits(numBase->fTotalDigits);
setFacetsDefined(DatatypeValidator::FACET_PRECISSION);
}
// inherit fractionDigits
- if ( (( numBase->getFacetsDefined() & DatatypeValidator::FACET_SCALE) != 0) &&
- (( getFacetsDefined() & DatatypeValidator::FACET_SCALE) == 0) )
+ if ( (( numBase->getFacetsDefined() & DatatypeValidator::FACET_SCALE) != 0) &&
+ (( getFacetsDefined() & DatatypeValidator::FACET_SCALE) == 0) )
{
setFractionDigits(numBase->fFractionDigits);
setFacetsDefined(DatatypeValidator::FACET_SCALE);
- }
-
+ }
+
// inherit enumeration
if ((( numBase->getFacetsDefined() & DatatypeValidator::FACET_ENUMERATION) !=0) &&
(( getFacetsDefined() & DatatypeValidator::FACET_ENUMERATION) == 0))
{
setFacetsDefined(DatatypeValidator::FACET_ENUMERATION);
- // need to adopt the Vector
+ // need to adopt the Vector
RefVectorOf<XMLBigDecimal>* fBaseEnumeration = numBase->fEnumeration;
int enumLength = fBaseEnumeration->size();
fEnumeration = new RefVectorOf<XMLBigDecimal>(enumLength, true);
- for ( int i = 0; i < enumLength; i++)
- //invoke XMLBigDecimal's copy ctor
+ for ( int i = 0; i < enumLength; i++)
+ //invoke XMLBigDecimal's copy ctor
fEnumeration->insertElementAt(new XMLBigDecimal(*(fBaseEnumeration->elementAt(i))), i);
- }
+ }
} //if baseValidator
@@ -640,11 +643,11 @@ void DecimalDatatypeValidator::checkContent( const XMLCh* const content, bool as
//validate against base validator if any
DecimalDatatypeValidator *pBase = (DecimalDatatypeValidator*) this->getBaseValidator();
- if (pBase !=0)
+ if (pBase !=0)
pBase->checkContent(content, true);
// we check pattern first
- if ( (getFacetsDefined() & DatatypeValidator::FACET_PATTERN ) != 0 )
+ if ( (getFacetsDefined() & DatatypeValidator::FACET_PATTERN ) != 0 )
{
// lazy construction
if (getRegex() ==0)
@@ -671,7 +674,7 @@ void DecimalDatatypeValidator::checkContent( const XMLCh* const content, bool as
{
int i=0;
int enumLength = fEnumeration->size();
- for ( ; i < enumLength; i++)
+ for ( ; i < enumLength; i++)
{
if (XMLBigDecimal::compareValues(theData, fEnumeration->elementAt(i))==0)
break;
@@ -680,9 +683,9 @@ void DecimalDatatypeValidator::checkContent( const XMLCh* const content, bool as
if (i == enumLength)
ThrowXML1(InvalidDatatypeValueException, XMLExcepts::VALUE_NotIn_Enumeration, content);
}
-
-
- if ( (getFacetsDefined() & DatatypeValidator::FACET_SCALE) != 0 )
+
+
+ if ( (getFacetsDefined() & DatatypeValidator::FACET_SCALE) != 0 )
{
if ( theData->getScale() > fFractionDigits )
ThrowXML(InvalidDatatypeValueException, XMLExcepts::FACET_Len_maxLen);
@@ -690,8 +693,8 @@ void DecimalDatatypeValidator::checkContent( const XMLCh* const content, bool as
// "'" + content + "'" + " with totalDigits = '"+ totalDigits +"'"
// "'" + fTotalDigits + "'"} ));
}
-
- if ( (getFacetsDefined() & DatatypeValidator::FACET_PRECISSION) != 0 )
+
+ if ( (getFacetsDefined() & DatatypeValidator::FACET_PRECISSION) != 0 )
{
if ( theData->getTotalDigit() > fTotalDigits )
ThrowXML(InvalidDatatypeValueException, XMLExcepts::FACET_Len_maxLen);
@@ -699,8 +702,8 @@ void DecimalDatatypeValidator::checkContent( const XMLCh* const content, bool as
// "'" + content + "'" + " with totalDigits = '"+ totalDigits +"'"
// "'" + fTotalDigits + "'"} ));
}
-
- if ( (getFacetsDefined() & DatatypeValidator::FACET_MAXEXCLUSIVE) != 0 )
+
+ if ( (getFacetsDefined() & DatatypeValidator::FACET_MAXEXCLUSIVE) != 0 )
{
// must be < MaxExclusive
if (XMLBigDecimal::compareValues(theData, getMaxExclusive()) != -1)
@@ -708,15 +711,15 @@ void DecimalDatatypeValidator::checkContent( const XMLCh* const content, bool as
//ThrowXML(InvalidDatatypeValueException, XMLExcepts::VALUE_exceed_maxexc);
}
- if ( (getFacetsDefined() & DatatypeValidator::FACET_MAXINCLUSIVE) != 0 )
+ if ( (getFacetsDefined() & DatatypeValidator::FACET_MAXINCLUSIVE) != 0 )
{
// must be <= MaxInclusive
if (XMLBigDecimal::compareValues(theData, getMaxInclusive()) == 1)
ThrowXML(InvalidDatatypeValueException, XMLExcepts::FACET_Len_maxLen);
//ThrowXML(InvalidDatatypeValueException, XMLExcepts::VALUE_exceed_maxinc);
}
-
- if ( (getFacetsDefined() & DatatypeValidator::FACET_MININCLUSIVE) != 0 )
+
+ if ( (getFacetsDefined() & DatatypeValidator::FACET_MININCLUSIVE) != 0 )
{
// must be >= MinInclusive
if (XMLBigDecimal::compareValues(theData, getMinInclusive()) == -1)
@@ -724,7 +727,7 @@ void DecimalDatatypeValidator::checkContent( const XMLCh* const content, bool as
//ThrowXML(InvalidDatatypeValueException, XMLExcepts::VALUE_exceed_mininc);
}
- if ( (getFacetsDefined() & DatatypeValidator::FACET_MINEXCLUSIVE) != 0 )
+ if ( (getFacetsDefined() & DatatypeValidator::FACET_MINEXCLUSIVE) != 0 )
{
// must be > MinExclusive
if (XMLBigDecimal::compareValues(theData, getMinExclusive()) != 1)
diff --git a/src/validators/datatype/DecimalDatatypeValidator.hpp b/src/validators/datatype/DecimalDatatypeValidator.hpp
index 2a8a06dde079fabf2dfd1a9c961a362ac7ba14a5..fa6d729de0d14fb6db5ae4bddc5d63da372d5afb 100644
--- a/src/validators/datatype/DecimalDatatypeValidator.hpp
+++ b/src/validators/datatype/DecimalDatatypeValidator.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/validators/datatype/InvalidDatatypeFacetException.hpp b/src/validators/datatype/InvalidDatatypeFacetException.hpp
index 1a42c657a9fbd37e40237479dfa766d27e0f47d1..e665c96b59eb929298246ccd3f86690831f58336 100644
--- a/src/validators/datatype/InvalidDatatypeFacetException.hpp
+++ b/src/validators/datatype/InvalidDatatypeFacetException.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/validators/datatype/InvalidDatatypeValueException.hpp b/src/validators/datatype/InvalidDatatypeValueException.hpp
index bb2d2fe7624aea006316a2051f020871feb62edc..2206573e55c86388a557893884847d805f8b307c 100644
--- a/src/validators/datatype/InvalidDatatypeValueException.hpp
+++ b/src/validators/datatype/InvalidDatatypeValueException.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/validators/datatype/Makefile.in b/src/validators/datatype/Makefile.in
index d8b01330ba277b80eff9b3092af779b583cc1b34..1a3f3b5c5defd2e8b42ecbddf94453c92ba8be7a 100644
--- a/src/validators/datatype/Makefile.in
+++ b/src/validators/datatype/Makefile.in
@@ -1,7 +1,7 @@
#
# The Apache Software License, Version 1.1
#
-# Copyright (c) 1999 The Apache Software Foundation. All rights
+# Copyright (c) 2001 The Apache Software Foundation. All rights
# reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -48,13 +48,16 @@
#
# 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
+# originally based on software copyright (c) 2001, International
# Business Machines, Inc., http://www.ibm.com . For more information
# on the Apache Software Foundation, please see
# <http://www.apache.org/>.
#
#
# $Log$
+# Revision 1.5 2001/05/11 13:27:29 tng
+# Copyright update.
+#
# Revision 1.4 2001/05/10 20:51:31 tng
# Schema: Add DecimalDatatypeValidator and XMLBigDecimal, XMLBigInteger. By Pei Yong Zhang.
#
diff --git a/src/validators/datatype/StringDatatypeValidator.cpp b/src/validators/datatype/StringDatatypeValidator.cpp
index 67c2010d674d31ceaf37cea9cc5a32aefa172a3c..6bfee29407a7288bb834e1995109cea765b5fb0c 100644
--- a/src/validators/datatype/StringDatatypeValidator.cpp
+++ b/src/validators/datatype/StringDatatypeValidator.cpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2001/05/11 13:27:29 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/05/09 18:43:42 tng
* Add StringDatatypeValidator and BooleanDatatypeValidator. By Pei Yong Zhang.
*
@@ -78,7 +81,7 @@ static XMLCh value2[BUF_LEN+1];
// ---------------------------------------------------------------------------
StringDatatypeValidator::StringDatatypeValidator(
DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ , RefHashTableOf<KVStringPair>* const facets
, const int finalSet)
:DatatypeValidator(baseValidator, facets, finalSet, DatatypeValidator::String)
,fLength(0)
@@ -101,11 +104,11 @@ void StringDatatypeValidator::init(DatatypeValidator* const baseValid
, RefHashTableOf<KVStringPair>* const facets)
{
// Set Facets if any defined
- if (facets)
- {
+ if (facets)
+ {
XMLCh* key;
XMLCh* value;
- RefHashTableOfEnumerator<KVStringPair> e(facets);
+ RefHashTableOfEnumerator<KVStringPair> e(facets);
while (e.hasMoreElements())
{
@@ -113,8 +116,8 @@ void StringDatatypeValidator::init(DatatypeValidator* const baseValid
key = pair.getKey();
value = pair.getValue();
- if (XMLString::compareString(key, SchemaSymbols::fgELT_LENGTH)==0)
- {
+ if (XMLString::compareString(key, SchemaSymbols::fgELT_LENGTH)==0)
+ {
try
{
setLength(XMLString::parseInt(value));
@@ -128,7 +131,7 @@ void StringDatatypeValidator::init(DatatypeValidator* const baseValid
ThrowXML1(InvalidDatatypeFacetException, XMLExcepts::FACET_NonNeg_Len, value);
setFacetsDefined(DatatypeValidator::FACET_LENGTH);
- }
+ }
else if (XMLString::compareString(key, SchemaSymbols::fgELT_MINLENGTH)==0)
{
try
@@ -144,7 +147,7 @@ void StringDatatypeValidator::init(DatatypeValidator* const baseValid
ThrowXML1(InvalidDatatypeFacetException, XMLExcepts::FACET_NonNeg_minLen, value);
setFacetsDefined(DatatypeValidator::FACET_MINLENGTH);
- }
+ }
else if (XMLString::compareString(key, SchemaSymbols::fgELT_MAXLENGTH)==0)
{
try
@@ -159,36 +162,36 @@ void StringDatatypeValidator::init(DatatypeValidator* const baseValid
if (getMaxLength() < 0)
ThrowXML1(InvalidDatatypeFacetException, XMLExcepts::FACET_NonNeg_maxLen, value);
- setFacetsDefined(DatatypeValidator::FACET_MAXLENGTH);
- }
+ setFacetsDefined(DatatypeValidator::FACET_MAXLENGTH);
+ }
else if (XMLString::compareString(key, SchemaSymbols::fgELT_PATTERN)==0)
{
setPattern(value);
if (getPattern())
setFacetsDefined(DatatypeValidator::FACET_PATTERN);
// do not construct regex until needed
- }
+ }
else if (XMLString::compareString(key, SchemaSymbols::fgELT_ENUMERATION)==0)
{
setEnumeration(XMLString::tokenizeString(value));
setFacetsDefined(DatatypeValidator::FACET_ENUMERATION);
- }
+ }
else if (XMLString::compareString(key, SchemaSymbols::fgELT_WHITESPACE)==0)
{
// whiteSpace = preserve | replace | collapse
- if (XMLString::compareString(value, SchemaSymbols::fgWS_PRESERVE) == 0)
+ if (XMLString::compareString(value, SchemaSymbols::fgWS_PRESERVE) == 0)
setWhiteSpace(DatatypeValidator::PRESERVE);
- else if (XMLString::compareString(value, SchemaSymbols::fgWS_REPLACE) == 0)
+ else if (XMLString::compareString(value, SchemaSymbols::fgWS_REPLACE) == 0)
setWhiteSpace(DatatypeValidator::REPLACE);
- else if (XMLString::compareString(value, SchemaSymbols::fgWS_COLLAPSE) == 0)
+ else if (XMLString::compareString(value, SchemaSymbols::fgWS_COLLAPSE) == 0)
setWhiteSpace(DatatypeValidator::COLLAPSE);
- else
+ else
ThrowXML1(InvalidDatatypeFacetException, XMLExcepts::FACET_Invalid_WS, value);
//("whiteSpace value '" + ws + "' must be one of 'preserve', 'replace', 'collapse'.");
setFacetsDefined(DatatypeValidator::FACET_WHITESPACE);
- }
- else
+ }
+ else
{
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Invalid_Tag);
}
@@ -199,19 +202,19 @@ void StringDatatypeValidator::init(DatatypeValidator* const baseValid
***/
// check 4.3.1.c1 error: length & (maxLength | minLength)
- if ((getFacetsDefined() & DatatypeValidator::FACET_LENGTH) != 0)
+ if ((getFacetsDefined() & DatatypeValidator::FACET_LENGTH) != 0)
{
- if ((getFacetsDefined() & DatatypeValidator::FACET_MAXLENGTH) != 0)
+ if ((getFacetsDefined() & DatatypeValidator::FACET_MAXLENGTH) != 0)
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Len_maxLen);
- else if (((getFacetsDefined() & DatatypeValidator::FACET_MINLENGTH) != 0))
+ else if (((getFacetsDefined() & DatatypeValidator::FACET_MINLENGTH) != 0))
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Len_minLen);
}
// check 4.3.2.c1 must: minLength <= maxLength
- if ((getFacetsDefined() & (DatatypeValidator::FACET_MINLENGTH
- |DatatypeValidator::FACET_MAXLENGTH)) != 0)
+ if ((getFacetsDefined() & (DatatypeValidator::FACET_MINLENGTH
+ |DatatypeValidator::FACET_MAXLENGTH)) != 0)
{
- if ( getMinLength() > getMaxLength() )
+ if ( getMinLength() > getMaxLength() )
{
XMLString::binToText(getMaxLength(), value1, BUF_LEN, 10);
XMLString::binToText(getMinLength(), value2, BUF_LEN, 10);
@@ -226,7 +229,7 @@ void StringDatatypeValidator::init(DatatypeValidator* const baseValid
/***
Schema constraint: Part II base vs derived checking
***/
- if (baseValidator != 0)
+ if (baseValidator != 0)
{
/***
check facets against base.facets
@@ -234,27 +237,27 @@ void StringDatatypeValidator::init(DatatypeValidator* const baseValid
and apply that to every individual facet.
***/
StringDatatypeValidator *pBaseValidator = (StringDatatypeValidator*) baseValidator;
-
+
/***
Non coexistence of derived' length and base' (minLength | maxLength)
base' length and derived' (minLength | maxLength)
***/
// check 4.3.1.c1 error: length & (base.maxLength | base.minLength)
- if ((getFacetsDefined() & DatatypeValidator::FACET_LENGTH) !=0)
+ if ((getFacetsDefined() & DatatypeValidator::FACET_LENGTH) !=0)
{
- if ((pBaseValidator->getFacetsDefined() & DatatypeValidator::FACET_MAXLENGTH) !=0)
+ if ((pBaseValidator->getFacetsDefined() & DatatypeValidator::FACET_MAXLENGTH) !=0)
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Len_maxLen);
- else if ((pBaseValidator->getFacetsDefined() & DatatypeValidator::FACET_MINLENGTH) !=0)
+ else if ((pBaseValidator->getFacetsDefined() & DatatypeValidator::FACET_MINLENGTH) !=0)
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Len_minLen);
}
// check 4.3.1.c1 error: base.length & (maxLength | minLength)
- if ((pBaseValidator->getFacetsDefined() & DatatypeValidator::FACET_LENGTH) !=0)
+ if ((pBaseValidator->getFacetsDefined() & DatatypeValidator::FACET_LENGTH) !=0)
{
- if ((getFacetsDefined() & DatatypeValidator::FACET_MAXLENGTH) !=0)
+ if ((getFacetsDefined() & DatatypeValidator::FACET_MAXLENGTH) !=0)
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Len_maxLen);
- else if ((getFacetsDefined() & DatatypeValidator::FACET_MINLENGTH) !=0)
+ else if ((getFacetsDefined() & DatatypeValidator::FACET_MINLENGTH) !=0)
ThrowXML(InvalidDatatypeFacetException, XMLExcepts::FACET_Len_minLen);
}
@@ -288,9 +291,9 @@ void StringDatatypeValidator::init(DatatypeValidator* const baseValid
// check 4.3.2.c1 must: minLength <= base.maxLength
if (((getFacetsDefined() & DatatypeValidator::FACET_MINLENGTH ) != 0) &&
- ((pBaseValidator->getFacetsDefined() & DatatypeValidator::FACET_MAXLENGTH ) != 0))
+ ((pBaseValidator->getFacetsDefined() & DatatypeValidator::FACET_MAXLENGTH ) != 0))
{
- if ( getMinLength() > pBaseValidator->getMaxLength() )
+ if ( getMinLength() > pBaseValidator->getMaxLength() )
{
XMLString::binToText(getMinLength(), value1, BUF_LEN, 10);
XMLString::binToText(pBaseValidator->getMaxLength(), value2, BUF_LEN, 10);
@@ -326,9 +329,9 @@ void StringDatatypeValidator::init(DatatypeValidator* const baseValid
// check 4.3.2.c1 must: base.minLength <= maxLength
if (((pBaseValidator->getFacetsDefined() & DatatypeValidator::FACET_MINLENGTH) !=0) &&
- ((getFacetsDefined() & DatatypeValidator::FACET_MAXLENGTH) !=0))
+ ((getFacetsDefined() & DatatypeValidator::FACET_MAXLENGTH) !=0))
{
- if ( pBaseValidator->getMinLength() > getMaxLength() )
+ if ( pBaseValidator->getMinLength() > getMaxLength() )
{
XMLString::binToText(getMaxLength(), value1, BUF_LEN, 10);
XMLString::binToText(pBaseValidator->getMinLength(), value2, BUF_LEN, 10);
@@ -339,7 +342,7 @@ void StringDatatypeValidator::init(DatatypeValidator* const baseValid
, value2);
}
}
-
+
// check 4.3.3.c1 error: maxLength > base.maxLength
if (((getFacetsDefined() & DatatypeValidator::FACET_MAXLENGTH) !=0) &&
((pBaseValidator->getFacetsDefined() & DatatypeValidator::FACET_MAXLENGTH) !=0))
@@ -364,18 +367,18 @@ void StringDatatypeValidator::init(DatatypeValidator* const baseValid
// check 4.3.5.c0 must: enumeration values from the value space of base
if ( ((getFacetsDefined() & DatatypeValidator::FACET_ENUMERATION) != 0) &&
- (getEnumeration() !=0))
+ (getEnumeration() !=0))
{
int i = 0;
int enumLength = getEnumeration()->size();
- try
+ try
{
- for ( ; i < enumLength; i++)
+ for ( ; i < enumLength; i++)
// ask parent do a complete check
pBaseValidator->checkContent(getEnumeration()->elementAt(i), false);
// REVISIT: enum shall pass this->checkContent() as well.
//checkContent(getEnumeration()->elementAt(i), false);
- }
+ }
catch ( XMLException& )
{
@@ -387,7 +390,7 @@ void StringDatatypeValidator::init(DatatypeValidator* const baseValid
// check 4.3.6.c1 error: whitespace
if (((getFacetsDefined() & DatatypeValidator::FACET_WHITESPACE) != 0) &&
- ((pBaseValidator->getFacetsDefined() & DatatypeValidator::FACET_WHITESPACE) != 0 ))
+ ((pBaseValidator->getFacetsDefined() & DatatypeValidator::FACET_WHITESPACE) != 0 ))
{
if ((pBaseValidator->getWSFacet() == DatatypeValidator::COLLAPSE) &&
((getWSFacet() == DatatypeValidator::PRESERVE) ||
@@ -401,12 +404,12 @@ void StringDatatypeValidator::init(DatatypeValidator* const baseValid
/***
Inherit facets from base.facets
-
+
The reason of this inheriting (or copying values) is to ease
- schema constraint checking, so that we need NOT trace back to our
- very first base validator in the hierachy. Instead, we are pretty
+ schema constraint checking, so that we need NOT trace back to our
+ very first base validator in the hierachy. Instead, we are pretty
sure checking against immediate base validator is enough.
-
+
***/
// inherit length
@@ -416,7 +419,7 @@ void StringDatatypeValidator::init(DatatypeValidator* const baseValid
setLength(pBaseValidator->getLength());
setFacetsDefined(DatatypeValidator::FACET_LENGTH);
}
-
+
// inherit minLength
if (((pBaseValidator->getFacetsDefined() & DatatypeValidator::FACET_MINLENGTH) !=0) &&
((getFacetsDefined() & DatatypeValidator::FACET_MINLENGTH) == 0))
@@ -424,7 +427,7 @@ void StringDatatypeValidator::init(DatatypeValidator* const baseValid
setMinLength(pBaseValidator->getMinLength());
setFacetsDefined(DatatypeValidator::FACET_MINLENGTH);
}
-
+
// inherit maxLength
if (((pBaseValidator->getFacetsDefined() & DatatypeValidator::FACET_MAXLENGTH) !=0) &&
((getFacetsDefined() & DatatypeValidator::FACET_MAXLENGTH) == 0))
@@ -432,17 +435,17 @@ void StringDatatypeValidator::init(DatatypeValidator* const baseValid
setMaxLength(pBaseValidator->getMaxLength());
setFacetsDefined(DatatypeValidator::FACET_MAXLENGTH);
}
-
+
// inherit enumeration
if (((pBaseValidator->getFacetsDefined() & DatatypeValidator::FACET_ENUMERATION) !=0) &&
((getFacetsDefined() & DatatypeValidator::FACET_ENUMERATION) == 0))
{
- // need to adopt the Vector
+ // need to adopt the Vector
RefVectorOf<XMLCh>* fBaseEnumeration = pBaseValidator->getEnumeration();
int enumLength = fBaseEnumeration->size();
-
+
RefVectorOf<XMLCh>* tmpEnumeration = new RefVectorOf<XMLCh>(enumLength, true);
- for ( int i = 0; i < enumLength; i++)
+ for ( int i = 0; i < enumLength; i++)
{
int strLen = XMLString::stringLen(fBaseEnumeration->elementAt(i));
XMLCh* tmp = new XMLCh[strLen+1];
@@ -475,11 +478,11 @@ void StringDatatypeValidator::checkContent( const XMLCh* const content, bool asB
//validate against base validator if any
StringDatatypeValidator *pBaseValidator = (StringDatatypeValidator*) this->getBaseValidator();
- if (pBaseValidator !=0)
+ if (pBaseValidator !=0)
pBaseValidator->checkContent(content, true);
// we check pattern first
- if ( (getFacetsDefined() & DatatypeValidator::FACET_PATTERN ) != 0 )
+ if ( (getFacetsDefined() & DatatypeValidator::FACET_PATTERN ) != 0 )
{
// lazy construction
if (getRegex() ==0)
@@ -541,11 +544,11 @@ void StringDatatypeValidator::checkContent( const XMLCh* const content, bool asB
}
if ((getFacetsDefined() & DatatypeValidator::FACET_ENUMERATION) != 0 &&
- (getEnumeration() != 0))
+ (getEnumeration() != 0))
{
int i=0;
int enumLength = getEnumeration()->size();
- for ( ; i < enumLength; i++)
+ for ( ; i < enumLength; i++)
{
if (XMLString::compareString(content, getEnumeration()->elementAt(i))==0)
break;
diff --git a/src/validators/datatype/StringDatatypeValidator.hpp b/src/validators/datatype/StringDatatypeValidator.hpp
index c55363f4914952a22b8ae52646ed8332d5eb53c3..dab5ebf6d2dacd7f2d058831aeab6be549e44b88 100644
--- a/src/validators/datatype/StringDatatypeValidator.hpp
+++ b/src/validators/datatype/StringDatatypeValidator.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -77,7 +77,7 @@ public:
StringDatatypeValidator();
StringDatatypeValidator(DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ , RefHashTableOf<KVStringPair>* const facets
, const int finalSet);
@@ -121,10 +121,10 @@ public:
/**
* Compare two boolean data types
- *
+ *
* @param content1
* @param content2
- * @return
+ * @return
*/
int compare(const XMLCh* const, const XMLCh* const);
@@ -176,10 +176,10 @@ private:
// -----------------------------------------------------------------------
// Private data members
//
- // -----------------------------------------------------------------------
+ // -----------------------------------------------------------------------
unsigned int fLength;
- unsigned int fMaxLength;
- unsigned int fMinLength;
+ unsigned int fMaxLength;
+ unsigned int fMinLength;
RefVectorOf<XMLCh>* fEnumeration;
short fWhiteSpace; //DatatypeValidator::PRESERVE
diff --git a/src/validators/schema/ComplexTypeInfo.cpp b/src/validators/schema/ComplexTypeInfo.cpp
index bb2b833049c4e2cd327d785e35aaf67f98ed2e79..ea7501d3de7fc783de9b6c08767c549352971125 100644
--- a/src/validators/schema/ComplexTypeInfo.cpp
+++ b/src/validators/schema/ComplexTypeInfo.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2001/05/11 13:27:32 tng
+ * Copyright update.
+ *
* Revision 1.4 2001/05/10 17:49:40 tng
* Schema: SchemaValidator fixes
*
diff --git a/src/validators/schema/ComplexTypeInfo.hpp b/src/validators/schema/ComplexTypeInfo.hpp
index 462daf6bab5871ae883aa7532567d1eceb174040..029ff2f8c24af55bec6144a5905aed6b15524a25 100644
--- a/src/validators/schema/ComplexTypeInfo.hpp
+++ b/src/validators/schema/ComplexTypeInfo.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -310,7 +310,7 @@ inline void ComplexTypeInfo::setElementId(const unsigned int elemId) {
fElementId = elemId;
}
-inline void
+inline void
ComplexTypeInfo::setContentType(const int contentType) {
fContentType = contentType;
@@ -325,7 +325,7 @@ inline void ComplexTypeInfo::setTypeName(const XMLCh* const typeName) {
fTypeName = XMLString::replicate(typeName);
}
-inline void
+inline void
ComplexTypeInfo::setBaseDatatypeValidator(DatatypeValidator* const validator) {
fBaseDatatypeValidator = validator;
@@ -337,7 +337,7 @@ ComplexTypeInfo::setDatatypeValidator(DatatypeValidator* const validator) {
fDatatypeValidator = validator;
}
-inline void
+inline void
ComplexTypeInfo::setBaseComplexTypeInfo(ComplexTypeInfo* const typeInfo) {
fBaseComplexTypeInfo = typeInfo;
diff --git a/src/validators/schema/Makefile.in b/src/validators/schema/Makefile.in
index c587f649c9def2d1628fbb5a88fdadca236a2e60..a786db8877499c23db935e57ffa409173b371037 100644
--- a/src/validators/schema/Makefile.in
+++ b/src/validators/schema/Makefile.in
@@ -1,7 +1,7 @@
#
# The Apache Software License, Version 1.1
#
-# Copyright (c) 1999 The Apache Software Foundation. All rights
+# Copyright (c) 2001 The Apache Software Foundation. All rights
# reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -48,13 +48,16 @@
#
# 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
+# originally based on software copyright (c) 2001, International
# Business Machines, Inc., http://www.ibm.com . For more information
# on the Apache Software Foundation, please see
# <http://www.apache.org/>.
#
#
# $Log$
+# Revision 1.10 2001/05/11 13:27:32 tng
+# Copyright update.
+#
# Revision 1.9 2001/05/10 16:33:15 knoaman
# Traverse Schema Part III + error messages.
#
diff --git a/src/validators/schema/NamespaceScope.cpp b/src/validators/schema/NamespaceScope.cpp
index c680c34d5928a247ba33a12d612720af214d41be..6cc4a719a30f890a6c7576e7995c27b0978bc8e5 100644
--- a/src/validators/schema/NamespaceScope.cpp
+++ b/src/validators/schema/NamespaceScope.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2001/05/11 13:27:33 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/04/19 17:43:15 knoaman
* More schema implementation classes.
*
@@ -176,7 +179,7 @@ void NamespaceScope::addPrefix(const XMLCh* const prefixToAdd,
}
-unsigned int
+unsigned int
NamespaceScope::getNamespaceForPrefix(const XMLCh* const prefixToMap) const {
//
diff --git a/src/validators/schema/NamespaceScope.hpp b/src/validators/schema/NamespaceScope.hpp
index ab5b18889b31698204efbd9a414b7853bd37ca48..0d1f99633c960dccdc301921a775630b38d249ad 100644
--- a/src/validators/schema/NamespaceScope.hpp
+++ b/src/validators/schema/NamespaceScope.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/validators/schema/SchemaAttDef.cpp b/src/validators/schema/SchemaAttDef.cpp
index cbf3594dca0aa69d8a8626d99b1a218a698639f8..4d18756fc32381bc8494bca0638fd6583781ae14 100644
--- a/src/validators/schema/SchemaAttDef.cpp
+++ b/src/validators/schema/SchemaAttDef.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2001/05/11 13:27:33 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/02/27 18:48:22 tng
* Schema: Add SchemaAttDef, SchemaElementDecl, SchemaAttDefList.
*
diff --git a/src/validators/schema/SchemaAttDef.hpp b/src/validators/schema/SchemaAttDef.hpp
index f694015a90bc0cbbc1ea0513d753a5ee69558b7e..d709d9c15c32b6dbfa6204e677069b40bfa2f600 100644
--- a/src/validators/schema/SchemaAttDef.hpp
+++ b/src/validators/schema/SchemaAttDef.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2001/05/11 13:27:34 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/02/27 18:48:22 tng
* Schema: Add SchemaAttDef, SchemaElementDecl, SchemaAttDefList.
*
diff --git a/src/validators/schema/SchemaAttDefList.cpp b/src/validators/schema/SchemaAttDefList.cpp
index c8be3cbe1401556f0c19ec0b259b18439958e55a..00fc232d20ccef794705126ffa34470b428461f0 100644
--- a/src/validators/schema/SchemaAttDefList.cpp
+++ b/src/validators/schema/SchemaAttDefList.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2001/05/11 13:27:34 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/02/27 18:48:22 tng
* Schema: Add SchemaAttDef, SchemaElementDecl, SchemaAttDefList.
*
diff --git a/src/validators/schema/SchemaAttDefList.hpp b/src/validators/schema/SchemaAttDefList.hpp
index 4a6c69dcd1af7e578521370e1a44b158d66ea79a..1deae95e27044ffc302c37232ec7726c1766fdc5 100644
--- a/src/validators/schema/SchemaAttDefList.hpp
+++ b/src/validators/schema/SchemaAttDefList.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2001/05/11 13:27:34 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/02/27 18:48:22 tng
* Schema: Add SchemaAttDef, SchemaElementDecl, SchemaAttDefList.
*
diff --git a/src/validators/schema/SchemaElementDecl.cpp b/src/validators/schema/SchemaElementDecl.cpp
index 18df7d8d6ff107cd7cb6ee7b2d8b675fa413f6ac..dfa7eed4f2b19d39a431569057fb27dc19a96550 100644
--- a/src/validators/schema/SchemaElementDecl.cpp
+++ b/src/validators/schema/SchemaElementDecl.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2001/05/11 13:27:35 tng
+ * Copyright update.
+ *
* Revision 1.7 2001/05/03 20:34:42 tng
* Schema: SchemaValidator update
*
diff --git a/src/validators/schema/SchemaElementDecl.hpp b/src/validators/schema/SchemaElementDecl.hpp
index 4d3e50b2da0e5d5aacdc9570d7253f8f978ab8cd..fef426ffd132377187e8da6a632068d300b522ec 100644
--- a/src/validators/schema/SchemaElementDecl.hpp
+++ b/src/validators/schema/SchemaElementDecl.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2001/05/11 13:27:36 tng
+ * Copyright update.
+ *
* Revision 1.6 2001/05/03 20:34:43 tng
* Schema: SchemaValidator update
*
diff --git a/src/validators/schema/SchemaGrammar.cpp b/src/validators/schema/SchemaGrammar.cpp
index a59ede6af70af285f9374fb42fcd8a6899344cf5..f0cf0bafad2775cd71a240c18560658d9e4438fb 100644
--- a/src/validators/schema/SchemaGrammar.cpp
+++ b/src/validators/schema/SchemaGrammar.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2001/05/11 13:27:36 tng
+ * Copyright update.
+ *
* Revision 1.2 2001/04/19 17:43:18 knoaman
* More schema implementation classes.
*
diff --git a/src/validators/schema/SchemaGrammar.hpp b/src/validators/schema/SchemaGrammar.hpp
index fe82d57f8cb1c00f8b0c4eff4de13c1ea5e6dba1..98d61e97160316d3173f36f268914c20f6565332 100644
--- a/src/validators/schema/SchemaGrammar.hpp
+++ b/src/validators/schema/SchemaGrammar.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2001/05/11 13:27:36 tng
+ * Copyright update.
+ *
* Revision 1.3 2001/05/03 20:34:43 tng
* Schema: SchemaValidator update
*
diff --git a/src/validators/schema/SchemaInfo.cpp b/src/validators/schema/SchemaInfo.cpp
index 848eeb378d26a20037dc1e88b79ab1337686677e..7d9f40f29ae47c759c340731e8963175351e8a1a 100644
--- a/src/validators/schema/SchemaInfo.cpp
+++ b/src/validators/schema/SchemaInfo.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2001/05/11 13:27:36 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/05/10 16:33:16 knoaman
* Traverse Schema Part III + error messages.
*
diff --git a/src/validators/schema/SchemaInfo.hpp b/src/validators/schema/SchemaInfo.hpp
index 421fb55b40eff33e6e8d7873d96719d464c2c7bc..e9e59b8e8829d2d3979c813f173cbeed1a2c0880 100644
--- a/src/validators/schema/SchemaInfo.hpp
+++ b/src/validators/schema/SchemaInfo.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -62,15 +62,15 @@
#define SCHEMAINFO_HPP
-/** When in a <redefine>, type definitions being used (and indeed
- * refs to <group>'s and <attributeGroup>'s) may refer to info
+/** When in a <redefine>, type definitions being used (and indeed
+ * refs to <group>'s and <attributeGroup>'s) may refer to info
* items either in the schema being redefined, in the <redefine>,
- * or else in the schema doing the redefining. Because of this
- * latter we have to be prepared sometimes to look for our type
- * definitions outside the schema stored in fSchemaRootElement.
- * This simple class does this; it's just a linked list that
- * lets us look at the <schema>'s on the queue; note also that this
- * should provide us with a mechanism to handle nested <redefine>'s.
+ * or else in the schema doing the redefining. Because of this
+ * latter we have to be prepared sometimes to look for our type
+ * definitions outside the schema stored in fSchemaRootElement.
+ * This simple class does this; it's just a linked list that
+ * lets us look at the <schema>'s on the queue; note also that this
+ * should provide us with a mechanism to handle nested <redefine>'s.
* It's also a handy way of saving schema info when importing/including.
*/
diff --git a/src/validators/schema/SchemaSymbols.cpp b/src/validators/schema/SchemaSymbols.cpp
index 1546b25eb9194a0cfa97ec6d088a4053832c0fe7..4b70250bc1a2ecfa63a61cc55d79f76e4f40976d 100644
--- a/src/validators/schema/SchemaSymbols.cpp
+++ b/src/validators/schema/SchemaSymbols.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2001/05/11 13:27:37 tng
+ * Copyright update.
+ *
* Revision 1.3 2001/05/09 18:43:49 tng
* Add StringDatatypeValidator and BooleanDatatypeValidator. By Pei Yong Zhang.
*
diff --git a/src/validators/schema/SchemaSymbols.hpp b/src/validators/schema/SchemaSymbols.hpp
index b988f99a9000ac5333fe9b8e5d4452203d5c1002..ac09a548cccd0dc6d38f44c3197b705c174a617c 100644
--- a/src/validators/schema/SchemaSymbols.hpp
+++ b/src/validators/schema/SchemaSymbols.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/validators/schema/SchemaValidator.cpp b/src/validators/schema/SchemaValidator.cpp
index 0ec97234c10416c374f04b030082a83a659912cf..15d385215a9770a3a5b838b62b74daa2527e84be 100644
--- a/src/validators/schema/SchemaValidator.cpp
+++ b/src/validators/schema/SchemaValidator.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2001/05/11 13:27:37 tng
+ * Copyright update.
+ *
* Revision 1.5 2001/05/10 17:49:42 tng
* Schema: SchemaValidator fixes
*
diff --git a/src/validators/schema/SchemaValidator.hpp b/src/validators/schema/SchemaValidator.hpp
index d4cafa4622436c73d959a98943c42b3e9c2742b2..61ef53802980014a3701d12f2767138a9426f5a2 100644
--- a/src/validators/schema/SchemaValidator.hpp
+++ b/src/validators/schema/SchemaValidator.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2001/05/11 13:27:37 tng
+ * Copyright update.
+ *
* Revision 1.4 2001/05/03 20:34:45 tng
* Schema: SchemaValidator update
*
diff --git a/src/validators/schema/SubstitutionGroupComparator.cpp b/src/validators/schema/SubstitutionGroupComparator.cpp
index 64d4ec7f96957c48a702cdff2d84e44a924f67fc..97594f3dbdd9af307b894ad20cf96dd9b536f46f 100644
--- a/src/validators/schema/SubstitutionGroupComparator.cpp
+++ b/src/validators/schema/SubstitutionGroupComparator.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2001/05/11 13:27:37 tng
+ * Copyright update.
+ *
* Revision 1.2 2001/05/04 14:50:28 tng
* Fixed the cvs symbols.
*
diff --git a/src/validators/schema/SubstitutionGroupComparator.hpp b/src/validators/schema/SubstitutionGroupComparator.hpp
index f0278c5b881a5917484994a49747a76f9044aab6..0ec8bf795e3d4b9646f164d7e0764abff22bd58a 100644
--- a/src/validators/schema/SubstitutionGroupComparator.hpp
+++ b/src/validators/schema/SubstitutionGroupComparator.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
diff --git a/src/validators/schema/TraverseSchema.cpp b/src/validators/schema/TraverseSchema.cpp
index 3a02e693ee8d0d26462ca01a227e6c2825de9bf1..0e9407f838646998ece400d1a8455eec8cb99d85 100644
--- a/src/validators/schema/TraverseSchema.cpp
+++ b/src/validators/schema/TraverseSchema.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2001/05/11 13:27:38 tng
+ * Copyright update.
+ *
* Revision 1.3 2001/05/10 17:49:44 tng
* Schema: SchemaValidator fixes
*
diff --git a/src/validators/schema/TraverseSchema.hpp b/src/validators/schema/TraverseSchema.hpp
index 79ef31fedfc9fb9af2ef93fe3c669558151d1bc4..db69263954f3185bb4b9577508bf05a766339d3e 100644
--- a/src/validators/schema/TraverseSchema.hpp
+++ b/src/validators/schema/TraverseSchema.hpp
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 2001 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.
- *
+ * 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:
+ * 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 "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 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
@@ -45,10 +45,10 @@
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -185,7 +185,7 @@ private:
// -----------------------------------------------------------------------
void reportSchemaError(const XMLCh* const msgDomain, const int errorCode);
void reportSchemaError(const XMLCh* const msgDomain,
- const int errorCode,
+ const int errorCode,
const XMLCh* const text1,
const XMLCh* const text2 = 0,
const XMLCh* const text3 = 0,
@@ -200,7 +200,7 @@ private:
void retrieveNamespaceMapping();
/**
- * Extract all top-level attribute, attributeGroup, and group Decls and
+ * Extract all top-level attribute, attributeGroup, and group Decls and
* put them in the 3 hash tables in the SchemaGrammar.
*/
void extractTopLevel3Components(const DOM_Element& rootElem);
@@ -215,13 +215,13 @@ private:
* Parameters:
* rootElem - top element for a given type declaration
* contentElem - content must be annotation? or some other simple content
- * isEmpty: - true if (annotation?, smth_else), false if (annotation?)
+ * isEmpty: - true if (annotation?, smth_else), false if (annotation?)
*
* Check for Annotation if it is present, traverse it. If a sibling is
* found and it is not an annotation return it, otherwise return 0.
* Used by traverseSimpleTypeDecl.
*/
- DOM_Element checkContent(const DOM_Element& rootElem,
+ DOM_Element checkContent(const DOM_Element& rootElem,
const DOM_Element& contentElem,
const bool isEmpty);
@@ -395,7 +395,7 @@ private:
*/
bool isValidNCName(const XMLCh* const name);
- ContentSpecNode* expandContentModel(ContentSpecNode* const specNode,
+ ContentSpecNode* expandContentModel(ContentSpecNode* const specNode,
const DOM_Element& elem);
/**
@@ -563,7 +563,7 @@ TraverseSchema::isValidRefDeclaration(const DOM_Element& elem) {
|| elem.getAttribute(SchemaSymbols::fgATT_BLOCK).length() != 0
|| elem.getAttribute(SchemaSymbols::fgATT_FINAL).length() != 0
|| elem.getAttribute(SchemaSymbols::fgATT_TYPE).length() != 0
- || elem.getAttribute(SchemaSymbols::fgATT_DEFAULT).length() != 0
+ || elem.getAttribute(SchemaSymbols::fgATT_DEFAULT).length() != 0
|| elem.getAttribute(SchemaSymbols::fgATT_FIXED).length() != 0
|| elem.getAttribute(SchemaSymbols::fgATT_SUBSTITUTIONGROUP).length() != 0);
}
@@ -579,7 +579,7 @@ const XMLCh* TraverseSchema::getElementAttValue(const DOM_Element& elem,
fBuffer.set(attValue.rawBuffer(), attValue.length());
unsigned int elemId = fStringPool.addOrFind(fBuffer.getRawBuffer());
- return fStringPool.getValueForId(elemId);
+ return fStringPool.getValueForId(elemId);
}
return 0;
@@ -590,7 +590,7 @@ inline bool TraverseSchema::isBaseFromAnotherSchema(const XMLCh* const baseURI)
if (XMLString::compareString(baseURI,fTargetNSURIString) != 0
&& XMLString::compareString(baseURI, SchemaSymbols::fgURI_SCHEMAFORSCHEMA) != 0
&& XMLString::stringLen(baseURI) != 0) {
- //REVISIT, !!!! a hack: for schema that has no
+ //REVISIT, !!!! a hack: for schema that has no
//target namespace, e.g. personal-schema.xml
return true;
}
diff --git a/src/validators/schema/XUtil.cpp b/src/validators/schema/XUtil.cpp
index 6fbbca491e2c467b3651ac2a9cfc9357a5dbcb0d..ef75002e84fa0060a766f93ec98ccabc08dc239d 100644
--- a/src/validators/schema/XUtil.cpp
+++ b/src/validators/schema/XUtil.cpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2001/05/11 13:27:39 tng
+ * Copyright update.
+ *
* Revision 1.3 2001/05/03 21:02:40 tng
* Schema: Add SubstitutionGroupComparator and update exception messages. By Pei Yong Zhang.
*
@@ -95,54 +98,54 @@ void XUtil::copyInto(const DOM_Node &src, DOM_Node &dest)
// copy this node
DOM_Node node;
short type = place.getNodeType();
- switch (type)
+ switch (type)
{
- case DOM_Node::CDATA_SECTION_NODE:
+ case DOM_Node::CDATA_SECTION_NODE:
{
node = factory.createCDATASection(place.getNodeValue());
break;
}
- case DOM_Node::COMMENT_NODE:
- {
- node = factory.createComment(place.getNodeValue());
+ case DOM_Node::COMMENT_NODE:
+ {
+ node = factory.createComment(place.getNodeValue());
break;
}
- case DOM_Node::ELEMENT_NODE:
+ case DOM_Node::ELEMENT_NODE:
{
DOM_Element element = factory.createElement(place.getNodeName());
node = element;
ElementImpl *elemImpl = (ElementImpl*)element.fImpl;
DOM_NamedNodeMap attrs = place.getAttributes();
unsigned int attrCount = attrs.getLength();
- for (unsigned int i = 0; i < attrCount; i++)
+ for (unsigned int i = 0; i < attrCount; i++)
{
if (attrs.item(i).getNodeType() == DOM_Node::ATTRIBUTE_NODE)
{
DOM_Node tmpNode = attrs.item(i);
DOM_Attr attr = (DOM_Attr&)tmpNode;
AttrImpl *attrImpl = elemImpl->setAttribute(attr.getNodeName(), attr.getNodeValue());
- if ((factory.getNodeType() == DOM_Node::DOCUMENT_NODE) && !attr.getSpecified())
+ if ((factory.getNodeType() == DOM_Node::DOCUMENT_NODE) && !attr.getSpecified())
attrImpl->setSpecified(false);
}
}//for
break;
}
- case DOM_Node::ENTITY_REFERENCE_NODE:
+ case DOM_Node::ENTITY_REFERENCE_NODE:
{
node = factory.createEntityReference(place.getNodeName());
break;
}
- case DOM_Node::PROCESSING_INSTRUCTION_NODE:
+ case DOM_Node::PROCESSING_INSTRUCTION_NODE:
{
node = factory.createProcessingInstruction(place.getNodeName(), place.getNodeValue());
break;
}
- case DOM_Node::TEXT_NODE:
+ case DOM_Node::TEXT_NODE:
{
node = factory.createTextNode(place.getNodeValue());
break;
}
- default:
+ default:
{
ThrowXML1(IllegalArgumentException
, XMLExcepts::XUTIL_UnCopyableNodeType
@@ -153,17 +156,17 @@ void XUtil::copyInto(const DOM_Node &src, DOM_Node &dest)
dest.appendChild(node);
// iterate over children
- if (place.hasChildNodes())
+ if (place.hasChildNodes())
{
parent = place;
place = place.getFirstChild();
dest = node;
}
// advance
- else
+ else
{
place = place.getNextSibling();
- while (place == null && parent != start)
+ while (place == null && parent != start)
{
place = parent.getNextSibling();
parent = parent.getParentNode();
@@ -172,14 +175,14 @@ void XUtil::copyInto(const DOM_Node &src, DOM_Node &dest)
}
}//while
-}
+}
/*
* Returns the concatenated child text of the specified node.
* This method only looks at the immediate children of type
* <code>Node.TEXT_NODE</code> or the children of any child
- * node that is of type <code>Node.CDATA_SECTION_NODE</code>
+ * node that is of type <code>Node.CDATA_SECTION_NODE</code>
* for the concatenation.
*
* @param node The node to look at.
@@ -194,7 +197,7 @@ DOMString XUtil::getChildText(const DOM_Node &node)
// concatenate children text
DOMString bufToFill;
DOM_Node child = node.getFirstChild();
- while (child != 0)
+ while (child != 0)
{
short type = child.getNodeType();
if (type == DOM_Node::TEXT_NODE)
@@ -214,9 +217,9 @@ DOM_Element XUtil::getFirstChildElement(const DOM_Node &parent)
{
// search for node
DOM_Node child = parent.getFirstChild();
- while (child != 0)
+ while (child != 0)
{
- if (child.getNodeType() == DOM_Node::ELEMENT_NODE)
+ if (child.getNodeType() == DOM_Node::ELEMENT_NODE)
return (DOM_Element&)child;
child = child.getNextSibling();
@@ -232,7 +235,7 @@ DOM_Element XUtil::getFirstChildElement(const DOM_Node &parent
{
// search for node
DOM_Node child = parent.getFirstChild();
- while (child != 0)
+ while (child != 0)
{
if ((child.getNodeType() == DOM_Node::ELEMENT_NODE) &&
(XMLString::compareString(child.getNodeName().rawBuffer(), elemName) ==0))
@@ -252,7 +255,7 @@ DOM_Element XUtil::getFirstChildElement(const DOM_Node &parent
{
// search for node
DOM_Node child = parent.getFirstChild();
- while (child != 0)
+ while (child != 0)
{
if (child.getNodeType() == DOM_Node::ELEMENT_NODE)
{
@@ -278,9 +281,9 @@ DOM_Element XUtil::getFirstChildElement(const DOM_Node &parent
{
// search for node
DOM_Node child = parent.getFirstChild();
- while (child != 0)
+ while (child != 0)
{
- if (child.getNodeType() == DOM_Node::ELEMENT_NODE)
+ if (child.getNodeType() == DOM_Node::ELEMENT_NODE)
{
DOM_Element element = (DOM_Element&)child;
if ((XMLString::compareString(element.getNodeName().rawBuffer(), elemName) ==0) &&
@@ -299,7 +302,7 @@ DOM_Element XUtil::getLastChildElement(const DOM_Node &parent) {
// search for node
DOM_Node child = parent.getLastChild();
- while (child != 0)
+ while (child != 0)
{
if (child.getNodeType() == DOM_Node::ELEMENT_NODE)
return (DOM_Element&)child;
@@ -318,7 +321,7 @@ DOM_Element XUtil::getLastChildElement(const DOM_Node &parent
{
// search for node
DOM_Node child = parent.getLastChild();
- while (child != 0)
+ while (child != 0)
{
if ((child.getNodeType() == DOM_Node::ELEMENT_NODE) &&
(XMLString::compareString(child.getNodeName().rawBuffer(), elemName) ==0))
@@ -338,7 +341,7 @@ DOM_Element XUtil::getLastChildElement(const DOM_Node &parent
{
// search for node
DOM_Node child = parent.getLastChild();
- while (child != 0)
+ while (child != 0)
{
if (child.getNodeType() == DOM_Node::ELEMENT_NODE)
{
@@ -364,9 +367,9 @@ DOM_Element XUtil::getLastChildElement(const DOM_Node &parent
{
// search for node
DOM_Node child = parent.getLastChild();
- while (child != 0)
+ while (child != 0)
{
- if (child.getNodeType() == DOM_Node::ELEMENT_NODE)
+ if (child.getNodeType() == DOM_Node::ELEMENT_NODE)
{
DOM_Element element = (DOM_Element&)child;
if ((XMLString::compareString(element.getNodeName().rawBuffer(), elemName) ==0) &&
@@ -381,11 +384,11 @@ DOM_Element XUtil::getLastChildElement(const DOM_Node &parent
}
// Finds and returns the next sibling element node.
-DOM_Element XUtil::getNextSiblingElement(const DOM_Node &node)
+DOM_Element XUtil::getNextSiblingElement(const DOM_Node &node)
{
// search for node
DOM_Node sibling = node.getNextSibling();
- while (sibling != 0)
+ while (sibling != 0)
{
if (sibling.getNodeType() == DOM_Node::ELEMENT_NODE)
return (DOM_Element&)sibling;
@@ -399,11 +402,11 @@ DOM_Element XUtil::getNextSiblingElement(const DOM_Node &node)
// Finds and returns the next sibling element node with the give name.
DOM_Element XUtil::getNextSiblingElement(const DOM_Node &node
- , const XMLCh* const elemName)
+ , const XMLCh* const elemName)
{
// search for node
DOM_Node sibling = node.getNextSibling();
- while (sibling != 0)
+ while (sibling != 0)
{
if ((sibling.getNodeType() == DOM_Node::ELEMENT_NODE) &&
(XMLString::compareString(sibling.getNodeName().rawBuffer(), elemName) ==0))
@@ -419,11 +422,11 @@ DOM_Element XUtil::getNextSiblingElement(const DOM_Node &node
// Finds and returns the next sibling element node with the give name.
DOM_Element XUtil::getNextSiblingElement(const DOM_Node &node
, const XMLCh** const elemNames
- , unsigned int length)
+ , unsigned int length)
{
// search for node
DOM_Node sibling = node.getNextSibling();
- while (sibling != 0)
+ while (sibling != 0)
{
if (sibling.getNodeType() == DOM_Node::ELEMENT_NODE)
{
@@ -449,9 +452,9 @@ DOM_Element XUtil::getNextSiblingElement(const DOM_Node &node
{
// search for node
DOM_Node sibling = node.getNextSibling();
- while (sibling != 0)
+ while (sibling != 0)
{
- if (sibling.getNodeType() == DOM_Node::ELEMENT_NODE)
+ if (sibling.getNodeType() == DOM_Node::ELEMENT_NODE)
{
DOM_Element element = (DOM_Element&)sibling;
if ((XMLString::compareString(element.getNodeName().rawBuffer(), elemName) ==0) &&
diff --git a/src/validators/schema/XUtil.hpp b/src/validators/schema/XUtil.hpp
index a6f45b2e22c5da92bd957d9eef241d7619302962..816583dd0015bc5bf7ea2889328cc794af72e189 100644
--- a/src/validators/schema/XUtil.hpp
+++ b/src/validators/schema/XUtil.hpp
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
*
* 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
+ * originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.2 2001/05/11 13:27:39 tng
+ * Copyright update.
+ *
* Revision 1.1 2001/03/30 16:06:00 tng
* Schema: XUtil, added by Pei Yong Zhang
*
@@ -72,7 +75,7 @@
/**
* Some useful utility methods.
*/
-class VALIDATORS_EXPORT XUtil
+class VALIDATORS_EXPORT XUtil
{
public:
@@ -89,7 +92,7 @@ public:
* Returns the concatenated child text of the specified node.
* This method only looks at the immediate children of type
* <code>Node.TEXT_NODE</code> or the children of any child
- * node that is of type <code>Node.CDATA_SECTION_NODE</code>
+ * node that is of type <code>Node.CDATA_SECTION_NODE</code>
* for the concatenation.
*
* @param node The node to look at.