X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8805dbab72812a326c121cc7fdefe82620595b1a..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/common/xtixml.cpp?ds=inline diff --git a/src/common/xtixml.cpp b/src/common/xtixml.cpp index 08a895415a..049107cc4b 100644 --- a/src/common/xtixml.cpp +++ b/src/common/xtixml.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/common/xtistrm.cpp +// Name: src/common/xtixml.cpp // Purpose: streaming runtime metadata information // Author: Stefan Csomor // Modified by: @@ -9,31 +9,28 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "xtistrm.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_EXTENDED_RTTI + +#include "wx/xtixml.h" + #ifndef WX_PRECOMP -#include "wx/hash.h" -#include "wx/object.h" + #include "wx/object.h" + #include "wx/hash.h" + #include "wx/event.h" #endif #include "wx/xml/xml.h" #include "wx/tokenzr.h" #include "wx/txtstrm.h" -#include "wx/event.h" - -#if wxUSE_EXTENDED_RTTI #include "wx/xtistrm.h" -#include "wx/xtixml.h" #include "wx/beforestd.h" #include @@ -97,7 +94,7 @@ void wxXmlWriter::DoBeginWriteTopLevelEntry( const wxString &name ) { wxXmlNode *pnode; pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("entry")); - pnode->AddProperty(wxString(wxT("name")), name); + pnode->AddAttribute(wxString(wxT("name")), name); m_data->m_current->AddChild(pnode) ; m_data->Push( pnode ) ; } @@ -111,12 +108,12 @@ void wxXmlWriter::DoBeginWriteObject(const wxObject *WXUNUSED(object), const wxC { wxXmlNode *pnode; pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("object")); - pnode->AddProperty(wxT("class"), wxString(classInfo->GetClassName())); - pnode->AddProperty(wxT("id"), wxString::Format( wxT("%d") , objectID ) ); + pnode->AddAttribute(wxT("class"), wxString(classInfo->GetClassName())); + pnode->AddAttribute(wxT("id"), wxString::Format( wxT("%d") , objectID ) ); for ( size_t i = 0 ; i < metadata.GetCount() ; ++i ) { - pnode->AddProperty( metadata[i].GetName() , metadata[i].GetAsString() ) ; + pnode->AddAttribute( metadata[i].GetName() , metadata[i].GetAsString() ) ; } m_data->m_current->AddChild(pnode) ; m_data->Push( pnode ) ; @@ -151,7 +148,7 @@ void wxXmlWriter::DoBeginWriteProperty(const wxPropertyInfo *pi ) { wxXmlNode *pnode; pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("prop") ); - pnode->AddProperty(wxT("name"), pi->GetName() ); + pnode->AddAttribute(wxT("name"), pi->GetName() ); m_data->m_current->AddChild(pnode) ; m_data->Push( pnode ) ; } @@ -168,7 +165,7 @@ void wxXmlWriter::DoWriteRepeatedObject( int objectID ) { wxXmlNode *pnode; pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("object")); - pnode->AddProperty(wxString(wxT("href")), wxString::Format( wxT("%d") , objectID ) ); + pnode->AddAttribute(wxString(wxT("href")), wxString::Format( wxT("%d") , objectID ) ); m_data->m_current->AddChild(pnode) ; } @@ -223,41 +220,61 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks) if (!children) { // check for a null object or href - if (node->GetPropVal(wxT("href") , &ObjectIdString ) ) + if (node->GetAttribute(wxT("href") , &ObjectIdString ) ) { objectID = atoi( ObjectIdString.ToAscii() ) ; - wxASSERT_MSG( HasObjectClassInfo( objectID ) , wxT("Forward hrefs are not supported") ) ; - return objectID ; + if ( HasObjectClassInfo( objectID ) ) + { + return objectID ; + } + else + { + wxLogError( _("Forward hrefs are not supported") ) ; + return wxInvalidObjectID ; + } } - if ( !node->GetPropVal(wxT("id") , &ObjectIdString ) ) + if ( !node->GetAttribute(wxT("id") , &ObjectIdString ) ) { return wxNullObjectID; } } - if (!node->GetPropVal(wxT("class"), &className)) + if (!node->GetAttribute(wxT("class"), &className)) { // No class name. Eek. FIXME: error handling return wxInvalidObjectID; } classInfo = wxClassInfo::FindClass(className); - wxASSERT_MSG( classInfo , wxString::Format(wxT("unknown class %s"),className ) ) ; - wxASSERT_MSG( !children || children->GetType() != wxXML_TEXT_NODE , wxT("objects cannot have XML Text Nodes") ) ; - if (!node->GetPropVal(wxT("id"), &ObjectIdString)) + if ( classInfo == NULL ) + { + wxLogError( wxString::Format(_("unknown class %s"),className ) ) ; + return wxInvalidObjectID ; + } + + if ( children != NULL && children->GetType() == wxXML_TEXT_NODE ) { - wxASSERT_MSG(0,wxT("Objects must have an id attribute") ) ; + wxLogError(_("objects cannot have XML Text Nodes") ) ; + return wxInvalidObjectID; + } + if (!node->GetAttribute(wxT("id"), &ObjectIdString)) + { + wxLogError(_("Objects must have an id attribute") ) ; // No object id. Eek. FIXME: error handling return wxInvalidObjectID; } objectID = atoi( ObjectIdString.ToAscii() ) ; // is this object already has been streamed in, return it here - wxASSERT_MSG( !HasObjectClassInfo( objectID ) , wxString::Format(wxT("Doubly used id : %d"), objectID ) ) ; + if ( HasObjectClassInfo( objectID ) ) + { + wxLogError ( wxString::Format(_("Doubly used id : %d"), objectID ) ) ; + return wxInvalidObjectID ; + } // new object, start with allocation // first make the object know to our internal registry SetObjectClassInfo( objectID , classInfo ) ; wxxVariantArray metadata ; - wxXmlProperty *xp = node->GetProperties() ; + wxXmlAttribute *xp = node->GetAttributes() ; while ( xp ) { if ( xp->GetName() != wxString(wxT("class")) && xp->GetName() != wxString(wxT("id")) ) @@ -288,9 +305,9 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks) while( children ) { wxString name ; - children->GetPropVal( wxT("name") , &name ) ; - propertyNames.push_back( name.c_str() ) ; - propertyNodes[name.c_str()] = children->GetChildren() ; + children->GetAttribute( wxT("name") , &name ) ; + propertyNames.push_back( (const wxChar*)name.c_str() ) ; + propertyNodes[(const wxChar*)name.c_str()] = children->GetChildren() ; children = children->GetNext() ; } @@ -299,7 +316,10 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks) const wxChar* paramName = classInfo->GetCreateParamName(i) ; PropertyNodes::iterator propiter = propertyNodes.find( paramName ) ; const wxPropertyInfo* pi = classInfo->FindPropertyInfo( paramName ) ; - wxASSERT_MSG(pi,wxString::Format(wxT("Unkown Property %s"),paramName) ) ; + if ( pi == 0 ) + { + wxLogError( wxString::Format(_("Unknown Property %s"),paramName) ) ; + } // if we don't have the value of a create param set in the xml // we use the default value if ( propiter != propertyNodes.end() ) @@ -317,11 +337,16 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks) if( pi->GetFlags() & wxPROP_ENUM_STORE_LONG ) { const wxEnumTypeInfo *eti = dynamic_cast( pi->GetTypeInfo() ) ; - wxASSERT_MSG( eti , wxT("Type must have enum - long conversion") ) ; - - long realval ; - eti->ConvertToLong( createParams[i] , realval ) ; - createParams[i] = wxxVariant( realval ) ; + if ( eti ) + { + long realval ; + eti->ConvertToLong( createParams[i] , realval ) ; + createParams[i] = wxxVariant( realval ) ; + } + else + { + wxLogError( _("Type must have enum - long conversion") ) ; + } } createClassInfos[i] = NULL ; } @@ -376,7 +401,11 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks) const wxTypeInfo * elementType = collType->GetElementType() ; while( prop ) { - wxASSERT_MSG(prop->GetName() == wxT("element") , wxT("A non empty collection must consist of 'element' nodes")) ; + if ( prop->GetName() != wxT("element") ) + { + wxLogError( _("A non empty collection must consist of 'element' nodes" ) ) ; + break ; + } wxXmlNode* elementContent = prop->GetChildren() ; if ( elementContent ) { @@ -433,13 +462,19 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks) { wxString resstring = prop->GetContent() ; wxInt32 pos = resstring.Find('.') ; - assert( pos != wxNOT_FOUND ) ; - int sinkOid = atol(resstring.Left(pos).ToAscii()) ; - wxString handlerName = resstring.Mid(pos+1) ; - wxClassInfo* sinkClassInfo = GetObjectClassInfo( sinkOid ) ; + if ( pos != wxNOT_FOUND ) + { + int sinkOid = atol(resstring.Left(pos).ToAscii()) ; + wxString handlerName = resstring.Mid(pos+1) ; + wxClassInfo* sinkClassInfo = GetObjectClassInfo( sinkOid ) ; - callbacks->SetConnect( objectID , classInfo , pi , sinkClassInfo , - sinkClassInfo->FindHandlerInfo(handlerName) , sinkOid ) ; + callbacks->SetConnect( objectID , classInfo , pi , sinkClassInfo , + sinkClassInfo->FindHandlerInfo(handlerName) , sinkOid ) ; + } + else + { + wxLogError( _("incorrect event handler string, missing dot") ) ; + } } } @@ -449,11 +484,16 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks) if( pi->GetFlags() & wxPROP_ENUM_STORE_LONG ) { const wxEnumTypeInfo *eti = dynamic_cast( pi->GetTypeInfo() ) ; - wxASSERT_MSG( eti , wxT("Type must have enum - long conversion") ) ; - - long realval ; - eti->ConvertToLong( nodeval , realval ) ; - nodeval = wxxVariant( realval ) ; + if ( eti ) + { + long realval ; + eti->ConvertToLong( nodeval , realval ) ; + nodeval = wxxVariant( realval ) ; + } + else + { + wxLogError( _("Type must have enum - long conversion") ) ; + } } callbacks->SetProperty( objectID, classInfo ,pi , nodeval ) ; } @@ -485,7 +525,7 @@ int wxXmlReader::ReadObject( const wxString &name , wxDepersister *callbacks) while ( iter ) { wxString entryName ; - if ( iter->GetPropVal(wxT("name"), &entryName) ) + if ( iter->GetAttribute(wxT("name"), &entryName) ) { if ( entryName == name ) return ReadComponent( iter->GetChildren() , callbacks ) ; @@ -495,4 +535,4 @@ int wxXmlReader::ReadObject( const wxString &name , wxDepersister *callbacks) return wxInvalidObjectID ; } -#endif +#endif // wxUSE_EXTENDED_RTTI