dbertoni 2003/07/14 18:04:54
Modified: c/src/xalanc/XSLT ElemTemplateElement.cpp
ElemTemplateElement.hpp
Log:
Don't derive from XalanElement any more.
Revision Changes Path
1.3 +3 -375 xml-xalan/c/src/xalanc/XSLT/ElemTemplateElement.cpp
Index: ElemTemplateElement.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemTemplateElement.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ElemTemplateElement.cpp 3 Jul 2003 00:42:10 -0000 1.2
+++ ElemTemplateElement.cpp 15 Jul 2003 01:04:54 -0000 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -115,8 +115,6 @@
const XalanDOMString ElemTemplateElement::s_emptyString;
-const XalanEmptyNamedNodeMap ElemTemplateElement::s_fakeAttributes;
-
const XalanQNameByReference
ElemTemplateElement::s_emptyQName(s_emptyString, s_emptyString);
@@ -127,7 +125,6 @@
int
lineNumber,
int
columnNumber,
int
xslToken) :
- XalanElement(),
PrefixResolver(),
m_stylesheet(stylesheetTree),
m_namespacesHandler(
@@ -155,7 +152,6 @@
int
lineNumber,
int
columnNumber,
int
xslToken) :
- XalanElement(),
PrefixResolver(),
m_stylesheet(stylesheetTree),
m_namespacesHandler(),
@@ -735,267 +731,6 @@
-const XalanDOMString&
-ElemTemplateElement::getNodeName() const
-{
- return getElementName();
-}
-
-
-
-const XalanDOMString&
-ElemTemplateElement::getNodeValue() const
-{
- return s_emptyString;
-}
-
-
-
-ElemTemplateElement::NodeType
-ElemTemplateElement::getNodeType() const
-{
- return XalanNode::ELEMENT_NODE;
-}
-
-
-
-XalanNode*
-ElemTemplateElement::getParentNode() const
-{
- return m_parentNode;
-}
-
-
-
-const XalanNodeList*
-ElemTemplateElement::getChildNodes() const
-{
- throw XalanDOMException(XalanDOMException::NOT_SUPPORTED_ERR);
-
- return 0;
-}
-
-
-
-XalanNode*
-ElemTemplateElement::getFirstChild() const
-{
- return m_firstChild;
-}
-
-
-
-XalanNode*
-ElemTemplateElement::getLastChild() const
-{
- return getLastChildElem();
-}
-
-
-
-XalanNode*
-ElemTemplateElement::getPreviousSibling() const
-{
- return m_previousSibling;
-}
-
-
-
-XalanNode*
-ElemTemplateElement::getNextSibling() const
-{
- return m_nextSibling;
-}
-
-
-
-const XalanNamedNodeMap*
-ElemTemplateElement::getAttributes() const
-{
- return &s_fakeAttributes;
-}
-
-
-
-XalanDocument*
-ElemTemplateElement::getOwnerDocument() const
-{
- return &m_stylesheet;
-}
-
-
-
-#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
-XalanNode*
-#else
-ElemTemplateElement*
-#endif
-ElemTemplateElement::cloneNode(bool /* deep */) const
-{
- throw XalanDOMException(XalanDOMException::NOT_SUPPORTED_ERR);
-
- return 0;
-}
-
-
-
-XalanNode*
-ElemTemplateElement::insertBefore(
- XalanNode* /* newChild */,
- XalanNode* /* refChild */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
- // Dummy return value...
- return 0;
-}
-
-
-
-XalanNode*
-ElemTemplateElement::replaceChild(
- XalanNode* /* newChild */,
- XalanNode* /* oldChild */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
- // Dummy return value...
- return 0;
-}
-
-
-
-XalanNode*
-ElemTemplateElement::removeChild(XalanNode* /* oldChild */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
- // Dummy return value...
- return 0;
-}
-
-
-/**
- * Throw a template element error.
- *
- * @param msg Description of the error that occured.
- */
-
-XalanNode*
-ElemTemplateElement::appendChild(XalanNode* /* oldChild */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
- // Dummy return value...
- return 0;
-}
-
-
-
-bool
-ElemTemplateElement::hasChildNodes() const
-{
- return 0 != m_firstChild ? true : false;
-}
-
-
-void
-ElemTemplateElement::setNodeValue(const XalanDOMString& /*
nodeValue */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-void
-ElemTemplateElement::normalize()
-{
-}
-
-
-
-bool
-ElemTemplateElement::isSupported(
- const XalanDOMString& /* feature */,
- const XalanDOMString& /* version */) const
-{
- return false;
-}
-
-
-
-const XalanDOMString&
-ElemTemplateElement::getNamespaceURI() const
-{
- return s_emptyString;
-}
-
-
-
-const XalanDOMString&
-ElemTemplateElement::getPrefix() const
-{
- return s_emptyString;
-}
-
-
-
-const XalanDOMString&
-ElemTemplateElement::getLocalName() const
-{
- return s_emptyString;
-}
-
-
-
-void
-ElemTemplateElement::setPrefix(const XalanDOMString& /* prefix */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-bool
-ElemTemplateElement::isIndexed() const
-{
- return false;
-}
-
-
-
-ElemTemplateElement::IndexType
-ElemTemplateElement::getIndex() const
-{
- return 0;
-}
-
-
-
-const XalanDOMString&
-ElemTemplateElement::getTagName() const
-{
- return getElementName();
-}
-
-
-
-const XalanDOMString&
-ElemTemplateElement::getAttribute(const XalanDOMString& /* name
*/) const
-{
- return s_emptyString;
-}
-
-
-
-XalanAttr*
-ElemTemplateElement::getAttributeNode(const XalanDOMString& /* name
*/) const
-{
- return 0;
-}
-
-
-
void
ElemTemplateElement::postConstruction(
StylesheetConstructionContext& constructionContext,
@@ -1035,12 +770,12 @@
// There are opportunities for optimization if there's only one
// xsl:text child node. See childrenToString()...
if (theToken ==
StylesheetConstructionContext::ELEMNAME_TEXT_LITERAL_RESULT &&
- m_firstChild->getNextSibling() == 0)
+ m_firstChild->getNextSiblingElem() == 0)
{
m_flags |= eHasSingleTextChild;
}
else if (theToken ==
StylesheetConstructionContext::ELEMNAME_CALL_TEMPLATE &&
- m_firstChild->getNextSibling() == 0)
+ m_firstChild->getNextSiblingElem() == 0)
{
// Just a single xsl:call-template child, so we don't
need to
// execute it if it has no params -- we can just
execute the
@@ -1080,113 +815,6 @@
true,
getElementName(),
&theParentHandler);
-}
-
-
-
-XalanNodeList*
-ElemTemplateElement::getElementsByTagName(const XalanDOMString&
/* name */) const
-{
- return 0;
-}
-
-
-
-void
-ElemTemplateElement::setAttribute(
- const XalanDOMString& /* name */,
- const XalanDOMString& /* value */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-XalanAttr*
-ElemTemplateElement::setAttributeNode(XalanAttr* /* newAttr */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
- return 0;
-}
-
-
-
-XalanAttr*
-ElemTemplateElement::removeAttributeNode(XalanAttr* /* oldAttr */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
- return 0;
-}
-
-
-
-void
-ElemTemplateElement::removeAttribute(const XalanDOMString& /* name */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-const XalanDOMString&
-ElemTemplateElement::getAttributeNS(
- const XalanDOMString& /* namespaceURI */,
- const XalanDOMString& /* localName */) const
-{
- return s_emptyString;
-}
-
-
-
-void
-ElemTemplateElement::setAttributeNS(
- const XalanDOMString& /* namespaceURI */,
- const XalanDOMString& /* qualifiedName */,
- const XalanDOMString& /* value */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-void
-ElemTemplateElement::removeAttributeNS(
- const XalanDOMString& /* namespaceURI */,
- const XalanDOMString& /* localName */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-XalanAttr*
-ElemTemplateElement::getAttributeNodeNS(
- const XalanDOMString& /* namespaceURI */,
- const XalanDOMString& /* localName */) const
-{
- return 0;
-}
-
-
-
-XalanAttr*
-ElemTemplateElement::setAttributeNodeNS(XalanAttr* /* newAttr */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
- return 0;
-}
-
-
-
-XalanNodeList*
-ElemTemplateElement::getElementsByTagNameNS(
- const XalanDOMString& /* namespaceURI */,
- const XalanDOMString& /* localName */) const
-{
- return 0;
}
1.2 +3 -160 xml-xalan/c/src/xalanc/XSLT/ElemTemplateElement.hpp
Index: ElemTemplateElement.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemTemplateElement.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ElemTemplateElement.hpp 29 Jun 2003 03:58:07 -0000 1.1
+++ ElemTemplateElement.hpp 15 Jul 2003 01:04:54 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -65,8 +65,7 @@
#include <xalanc/XalanDOM/XalanDOMString.hpp>
-#include <xalanc/XalanDOM/XalanElement.hpp>
-#include <xalanc/XalanDOM/XalanEmptyNamedNodeMap.hpp>
+#include <xalanc/XalanDOM/XalanNode.hpp>
@@ -107,12 +106,10 @@
-class XALAN_XSLT_EXPORT ElemTemplateElement : public XalanElement, public
PrefixResolver
+class XALAN_XSLT_EXPORT ElemTemplateElement : public PrefixResolver
{
public:
- typedef XalanElement::NodeType NodeType;
-
/**
* Construct a template element instance.
*
@@ -524,158 +521,6 @@
appendChildElem(ElemTemplateElement* newChild);
- // These interfaces are inherited from XalanElement ...
-
- virtual const XalanDOMString&
- getNodeName() const;
-
- virtual const XalanDOMString&
- getNodeValue() const;
-
- virtual NodeType
- getNodeType() const;
-
- virtual XalanNode*
- getParentNode() const;
-
- virtual const XalanNodeList*
- getChildNodes() const;
-
- virtual XalanNode*
- getFirstChild() const;
-
- virtual XalanNode*
- getLastChild() const;
-
- virtual XalanNode*
- getPreviousSibling() const;
-
- virtual XalanNode*
- getNextSibling() const;
-
- virtual const XalanNamedNodeMap*
- getAttributes() const;
-
- virtual XalanDocument*
- getOwnerDocument() const;
-
-#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
- virtual XalanNode*
-#else
- virtual ElemTemplateElement*
-#endif
- cloneNode(bool deep) const;
-
- virtual XalanNode*
- insertBefore(
- XalanNode* newChild,
- XalanNode* refChild);
-
- virtual XalanNode*
- replaceChild(
- XalanNode* newChild,
- XalanNode* oldChild);
-
- virtual XalanNode*
- removeChild(XalanNode* oldChild);
-
- /**
- * Add a child to the child list.
- *
- * @exception DOMException
- * @param newChild child node to add
- */
- virtual XalanNode*
- appendChild(XalanNode* newChild);
-
- virtual bool
- hasChildNodes() const;
-
- virtual void
- setNodeValue(const XalanDOMString& nodeValue);
-
- virtual void
- normalize();
-
- virtual bool
- isSupported(
- const XalanDOMString& feature,
- const XalanDOMString& version) const;
-
- virtual const XalanDOMString&
- getNamespaceURI() const;
-
- virtual const XalanDOMString&
- getPrefix() const;
-
- virtual const XalanDOMString&
- getLocalName() const;
-
- virtual void
- setPrefix(const XalanDOMString& prefix);
-
- virtual bool
- isIndexed() const;
-
- virtual IndexType
- getIndex() const;
-
- virtual const XalanDOMString&
- getTagName() const;
-
- virtual const XalanDOMString&
- getAttribute(const XalanDOMString& name) const;
-
- virtual XalanAttr*
- getAttributeNode(const XalanDOMString& name) const;
-
- virtual XalanNodeList*
- getElementsByTagName(const XalanDOMString& name) const;
-
- virtual void
- setAttribute(
- const XalanDOMString& name,
- const XalanDOMString& value);
-
- virtual XalanAttr*
- setAttributeNode(XalanAttr* newAttr);
-
- virtual XalanAttr*
- removeAttributeNode(XalanAttr* oldAttr);
-
- virtual void
- removeAttribute(const XalanDOMString& name);
-
- virtual const XalanDOMString&
- getAttributeNS(
- const XalanDOMString& namespaceURI,
- const XalanDOMString& localName) const;
-
- virtual void
- setAttributeNS(
- const XalanDOMString& namespaceURI,
- const XalanDOMString& qualifiedName,
- const XalanDOMString& value);
-
- virtual void
- removeAttributeNS(
- const XalanDOMString& namespaceURI,
- const XalanDOMString& localName);
-
- virtual XalanAttr*
- getAttributeNodeNS(
- const XalanDOMString& namespaceURI,
- const XalanDOMString& localName) const;
-
- virtual XalanAttr*
- setAttributeNodeNS(XalanAttr* newAttr);
-
- virtual XalanNodeList*
- getElementsByTagNameNS(
- const XalanDOMString& namespaceURI,
- const XalanDOMString& localName) const;
-
-
// These interfaces are inherited from PrefixResolver...
virtual const XalanDOMString*
@@ -979,8 +824,6 @@
LocatorProxy m_locatorProxy;
unsigned short m_flags;
-
- static const XalanEmptyNamedNodeMap s_fakeAttributes;
static const XalanQNameByReference s_emptyQName;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
