You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2005/08/31 12:52:41 UTC
svn commit: r265010 - in /xerces/c/trunk/src/xercesc: dom/DOMEntity.hpp
dom/impl/DOMEntityImpl.cpp dom/impl/DOMEntityImpl.hpp
parsers/AbstractDOMParser.cpp parsers/AbstractDOMParser.hpp
Author: amassari
Date: Wed Aug 31 03:51:55 2005
New Revision: 265010
URL: http://svn.apache.org/viewcvs?rev=265010&view=rev
Log:
DOM L3 Core: DOMEntity
Modified:
xerces/c/trunk/src/xercesc/dom/DOMEntity.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMEntityImpl.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMEntityImpl.hpp
xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.cpp
xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.hpp
Modified: xerces/c/trunk/src/xercesc/dom/DOMEntity.hpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/dom/DOMEntity.hpp?rev=265010&r1=265009&r2=265010&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMEntity.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMEntity.hpp Wed Aug 31 03:51:55 2005
@@ -136,68 +136,31 @@
//@{
/**
- * An attribute specifying the actual encoding of this entity, when it is
- * an external parsed entity. This is <code>null</code> otherwise.
- *
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * @since DOM Level 3
- */
- virtual const XMLCh* getActualEncoding() const = 0;
-
- /**
- * An attribute specifying the actual encoding of this entity, when it is
- * an external parsed entity. This is <code>null</code> otherwise.
- *
- * <p><b>"Experimental - subject to change"</b></p>
+ * An attribute specifying the encoding used for this entity at the time of parsing,
+ * when it is an external parsed entity. This is <code>null</code> if it an entity
+ * from the internal subset or if it is not known.
*
* @since DOM Level 3
*/
- virtual void setActualEncoding(const XMLCh* actualEncoding) = 0;
+ virtual const XMLCh* getInputEncoding() const = 0;
/**
* An attribute specifying, as part of the text declaration, the encoding
* of this entity, when it is an external parsed entity. This is
* <code>null</code> otherwise.
*
- * <p><b>"Experimental - subject to change"</b></p>
- *
* @since DOM Level 3
*/
- virtual const XMLCh* getEncoding() const = 0;
-
- /**
- * An attribute specifying, as part of the text declaration, the encoding
- * of this entity, when it is an external parsed entity. This is
- * <code>null</code> otherwise.
- *
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * @since DOM Level 3
- */
- virtual void setEncoding(const XMLCh* encoding) = 0;
+ virtual const XMLCh* getXmlEncoding() const = 0;
/**
* An attribute specifying, as part of the text declaration, the version
* number of this entity, when it is an external parsed entity. This is
* <code>null</code> otherwise.
*
- * <p><b>"Experimental - subject to change"</b></p>
- *
- * @since DOM Level 3
- */
- virtual const XMLCh* getVersion() const = 0;
-
- /**
- * An attribute specifying, as part of the text declaration, the version
- * number of this entity, when it is an external parsed entity. This is
- * <code>null</code> otherwise.
- *
- * <p><b>"Experimental - subject to change"</b></p>
- *
* @since DOM Level 3
*/
- virtual void setVersion(const XMLCh* version) = 0;
+ virtual const XMLCh* getXmlVersion() const = 0;
//@}
};
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMEntityImpl.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/dom/impl/DOMEntityImpl.cpp?rev=265010&r1=265009&r2=265010&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMEntityImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMEntityImpl.cpp Wed Aug 31 03:51:55 2005
@@ -33,9 +33,9 @@
fSystemId(0),
fNotationName(0),
fRefEntity(0),
- fActualEncoding(0),
- fEncoding(0),
- fVersion(0),
+ fInputEncoding(0),
+ fXmlEncoding(0),
+ fXmlVersion(0),
fBaseURI(0),
fEntityRefNodeCloned(false)
{
@@ -53,9 +53,9 @@
fSystemId(other.fSystemId),
fNotationName(other.fNotationName),
fRefEntity(other.fRefEntity),
- fActualEncoding(other.fActualEncoding),
- fEncoding(other.fEncoding),
- fVersion(other.fVersion),
+ fInputEncoding(other.fInputEncoding),
+ fXmlEncoding(other.fXmlEncoding),
+ fXmlVersion(other.fXmlVersion),
fBaseURI(other.fBaseURI),
fEntityRefNodeCloned(false)
{
@@ -264,31 +264,31 @@
//Introduced in DOM Level 3
-const XMLCh* DOMEntityImpl::getActualEncoding() const {
- return fActualEncoding;
+const XMLCh* DOMEntityImpl::getInputEncoding() const {
+ return fInputEncoding;
}
-void DOMEntityImpl::setActualEncoding(const XMLCh* actualEncoding){
+void DOMEntityImpl::setInputEncoding(const XMLCh* actualEncoding){
DOMDocumentImpl *doc = (DOMDocumentImpl *)this->getOwnerDocument();
- fActualEncoding = doc->cloneString(actualEncoding);
+ fInputEncoding = doc->cloneString(actualEncoding);
}
-const XMLCh* DOMEntityImpl::getEncoding() const {
- return fEncoding;
+const XMLCh* DOMEntityImpl::getXmlEncoding() const {
+ return fXmlEncoding;
}
-void DOMEntityImpl::setEncoding(const XMLCh* encoding){
+void DOMEntityImpl::setXmlEncoding(const XMLCh* encoding){
DOMDocumentImpl *doc = (DOMDocumentImpl *)this->getOwnerDocument();
- fEncoding = doc->cloneString(encoding);
+ fXmlEncoding = doc->cloneString(encoding);
}
-const XMLCh* DOMEntityImpl::getVersion() const {
- return fVersion;
+const XMLCh* DOMEntityImpl::getXmlVersion() const {
+ return fXmlVersion;
}
-void DOMEntityImpl::setVersion(const XMLCh* version){
+void DOMEntityImpl::setXmlVersion(const XMLCh* version){
DOMDocumentImpl *doc = (DOMDocumentImpl *)this->getOwnerDocument();
- fVersion = doc->cloneString(version);
+ fXmlVersion = doc->cloneString(version);
}
XERCES_CPP_NAMESPACE_END
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMEntityImpl.hpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/dom/impl/DOMEntityImpl.hpp?rev=265010&r1=265009&r2=265010&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMEntityImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMEntityImpl.hpp Wed Aug 31 03:51:55 2005
@@ -52,9 +52,9 @@
DOMEntityReference* fRefEntity;
// New data introduced in DOM Level 3
- const XMLCh* fActualEncoding;
- const XMLCh* fEncoding;
- const XMLCh* fVersion;
+ const XMLCh* fInputEncoding;
+ const XMLCh* fXmlEncoding;
+ const XMLCh* fXmlVersion;
const XMLCh* fBaseURI;
bool fEntityRefNodeCloned;
// private helper function
@@ -79,18 +79,18 @@
virtual void setSystemId(const XMLCh *arg);
//DOM Level 2 additions. Non standard functions
- virtual void setEntityRef(DOMEntityReference *);
+ virtual void setEntityRef(DOMEntityReference *);
virtual DOMEntityReference* getEntityRef() const;
//Introduced in DOM Level 3
- virtual const XMLCh* getActualEncoding() const;
- virtual void setActualEncoding(const XMLCh* actualEncoding);
- virtual const XMLCh* getEncoding() const;
- virtual void setEncoding(const XMLCh* encoding);
- virtual const XMLCh* getVersion() const;
- virtual void setVersion(const XMLCh* version);
- virtual void setBaseURI(const XMLCh *arg);
-
+ virtual const XMLCh* getInputEncoding() const;
+ virtual const XMLCh* getXmlEncoding() const;
+ virtual const XMLCh* getXmlVersion() const;
+ virtual void setBaseURI(const XMLCh *arg);
+
+ void setInputEncoding(const XMLCh* actualEncoding);
+ void setXmlEncoding(const XMLCh* encoding);
+ void setXmlVersion(const XMLCh* version);
private:
// -----------------------------------------------------------------------
// Unimplemented constructors and operators
Modified: xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.cpp?rev=265010&r1=265009&r2=265010&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.cpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.cpp Wed Aug 31 03:51:55 2005
@@ -1113,7 +1113,7 @@
DOMNamedNodeMap *entities = fDocumentType->getEntities();
DOMEntityImpl* entity = (DOMEntityImpl*)entities->getNamedItem(entName);
if (entity)
- entity->setActualEncoding(fScanner->getReaderMgr()->getCurrentEncodingStr());
+ entity->setInputEncoding(fScanner->getReaderMgr()->getCurrentEncodingStr());
fCurrentEntity = entity;
@@ -1652,8 +1652,8 @@
)
{
if (fCurrentEntity) {
- fCurrentEntity->setVersion(versionStr);
- fCurrentEntity->setEncoding(encodingStr);
+ fCurrentEntity->setXmlVersion(versionStr);
+ fCurrentEntity->setXmlEncoding(encodingStr);
}
}
Modified: xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.hpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.hpp?rev=265010&r1=265009&r2=265010&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.hpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.hpp Wed Aug 31 03:51:55 2005
@@ -40,6 +40,7 @@
class XMLValidator;
class DOMDocumentImpl;
class DOMDocumentTypeImpl;
+class DOMEntityImpl;
class DOMElement;
class GrammarResolver;
class XMLGrammarPool;
@@ -1740,7 +1741,7 @@
XMLCh* fImplementationFeatures;
DOMNode* fCurrentParent;
DOMNode* fCurrentNode;
- DOMEntity* fCurrentEntity;
+ DOMEntityImpl* fCurrentEntity;
DOMDocumentImpl* fDocument;
ValueStackOf<DOMNode*>* fNodeStack;
DOMDocumentTypeImpl* fDocumentType;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org