Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

was missing in xti merge

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-01-05 09:56:32 +00:00
parent 9dbd8fc741
commit 5e8b5272d8
1 changed files with 201 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
src/common/xtixml.cpp
View File

@@ -29,9 +29,10 @@
#include "wx/xml/xml.h"
#include "wx/tokenzr.h"
#include "wx/txtstrm.h"
#include "wx/xtistrm.h"
// STL headers
#include "wx/beforestd.h"
#include <map>
#include <vector>
@@ -40,9 +41,12 @@
using namespace std;
//
// XML Streaming
//
// ----------------------------------------------------------------------------
// wxObjectXmlWriter
// ----------------------------------------------------------------------------
// convenience functions
@@ -59,7 +63,7 @@ wxString wxXmlGetContentFromNode( wxXmlNode *node )
return wxEmptyString;
}
struct wxXmlWriter::wxXmlWriterInternal
struct wxObjectXmlWriter::wxObjectXmlWriterInternal
{
wxXmlNode *m_root;
wxXmlNode *m_current;
@@ -78,60 +82,62 @@ struct wxXmlWriter::wxXmlWriterInternal
}
};
wxXmlWriter::wxXmlWriter( wxXmlNode * rootnode )
wxObjectXmlWriter::wxObjectXmlWriter( wxXmlNode * rootnode )
{
m_data = new wxXmlWriterInternal() ;
m_data = new wxObjectXmlWriterInternal();
m_data->m_root = rootnode;
m_data->m_current = rootnode;
}
wxXmlWriter::~wxXmlWriter()
wxObjectXmlWriter::~wxObjectXmlWriter()
{
delete m_data;
}
void wxXmlWriter::DoBeginWriteTopLevelEntry( const wxString &name )
void wxObjectXmlWriter::DoBeginWriteTopLevelEntry( const wxString &name )
{
wxXmlNode *pnode;
pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("entry"));
pnode->AddAttribute(wxString(wxT("name")), name);
pnode->AddProperty(wxString(wxT("name")), name);
m_data->m_current->AddChild(pnode);
m_data->Push( pnode );
}
void wxXmlWriter::DoEndWriteTopLevelEntry( const wxString &WXUNUSED(name) )
void wxObjectXmlWriter::DoEndWriteTopLevelEntry( const wxString &WXUNUSED(name) )
{
m_data->Pop();
}
void wxXmlWriter::DoBeginWriteObject(const wxObject *WXUNUSED(object), const wxClassInfo *classInfo, int objectID , wxxVariantArray &metadata )
void wxObjectXmlWriter::DoBeginWriteObject(const wxObject *WXUNUSED(object),
const wxClassInfo *classInfo,
int objectID, wxVariantBaseArray &metadata )
{
wxXmlNode *pnode;
pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("object"));
pnode->AddAttribute(wxT("class"), wxString(classInfo->GetClassName()));
pnode->AddAttribute(wxT("id"), wxString::Format( wxT("%d") , objectID ) );
pnode->AddProperty(wxT("class"), wxString(classInfo->GetClassName()));
pnode->AddProperty(wxT("id"), wxString::Format( wxT("%d"), objectID ) );
for ( size_t i = 0; i < metadata.GetCount(); ++i )
{
pnode->AddAttribute( metadata[i].GetName() , metadata[i].GetAsString() ) ;
pnode->AddProperty( metadata[i].GetName(), metadata[i].GetAsString() );
}
m_data->m_current->AddChild(pnode);
m_data->Push( pnode );
}
// end of writing the root object
void wxXmlWriter::DoEndWriteObject(const wxObject *WXUNUSED(object), const wxClassInfo *WXUNUSED(classInfo), int WXUNUSED(objectID) )
void wxObjectXmlWriter::DoEndWriteObject(const wxObject *WXUNUSED(object),
const wxClassInfo *WXUNUSED(classInfo),
int WXUNUSED(objectID) )
{
m_data->Pop();
}
// writes a property in the stream format
void wxXmlWriter::DoWriteSimpleType( wxxVariant &value )
void wxObjectXmlWriter::DoWriteSimpleType( wxVariantBase &value )
{
wxXmlAddContentToNode( m_data->m_current,value.GetAsString() );
}
void wxXmlWriter::DoBeginWriteElement()
void wxObjectXmlWriter::DoBeginWriteElement()
{
wxXmlNode *pnode;
pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("element") );
@@ -139,62 +145,57 @@ void wxXmlWriter::DoBeginWriteElement()
m_data->Push( pnode );
}
void wxXmlWriter::DoEndWriteElement()
void wxObjectXmlWriter::DoEndWriteElement()
{
m_data->Pop();
}
void wxXmlWriter::DoBeginWriteProperty(const wxPropertyInfo *pi )
void wxObjectXmlWriter::DoBeginWriteProperty(const wxPropertyInfo *pi )
{
wxXmlNode *pnode;
pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("prop") );
pnode->AddAttribute(wxT("name"), pi->GetName() );
pnode->AddProperty(wxT("name"), pi->GetName() );
m_data->m_current->AddChild(pnode);
m_data->Push( pnode );
}
void wxXmlWriter::DoEndWriteProperty(const wxPropertyInfo *WXUNUSED(propInfo) )
void wxObjectXmlWriter::DoEndWriteProperty(const wxPropertyInfo *WXUNUSED(propInfo) )
{
m_data->Pop();
}
// insert an object reference to an already written object
void wxXmlWriter::DoWriteRepeatedObject( int objectID )
void wxObjectXmlWriter::DoWriteRepeatedObject( int objectID )
{
wxXmlNode *pnode;
pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("object"));
pnode->AddAttribute(wxString(wxT("href")), wxString::Format( wxT("%d") , objectID ) );
pnode->AddProperty(wxString(wxT("href")), wxString::Format( wxT("%d"), objectID ) );
m_data->m_current->AddChild(pnode);
}
// insert a null reference
void wxXmlWriter::DoWriteNullObject()
void wxObjectXmlWriter::DoWriteNullObject()
{
wxXmlNode *pnode;
pnode = new wxXmlNode(wxXML_ELEMENT_NODE, wxT("object"));
m_data->m_current->AddChild(pnode);
}
// writes a delegate in the stream format
void wxXmlWriter::DoWriteDelegate( const wxObject *WXUNUSED(object), const wxClassInfo* WXUNUSED(classInfo) , const wxPropertyInfo *WXUNUSED(pi) ,
const wxObject *eventSink, int sinkObjectID , const wxClassInfo* WXUNUSED(eventSinkClassInfo) , const wxHandlerInfo* handlerInfo )
void wxObjectXmlWriter::DoWriteDelegate( const wxObject *WXUNUSED(object),
const wxClassInfo* WXUNUSED(classInfo),
const wxPropertyInfo *WXUNUSED(pi),
const wxObject *eventSink, int sinkObjectID,
const wxClassInfo* WXUNUSED(eventSinkClassInfo),
const wxHandlerInfo* handlerInfo )
{
if ( eventSink != NULL && handlerInfo != NULL )
{
wxXmlAddContentToNode( m_data->m_current ,wxString::Format(wxT("%d.%s"), sinkObjectID , handlerInfo->GetName().c_str()) ) ;
wxXmlAddContentToNode( m_data->m_current,
wxString::Format(wxT("%d.%s"), sinkObjectID, handlerInfo->GetName().c_str()) );
}
}
// ----------------------------------------------------------------------------
// reading objects in
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// reading xml in
// wxObjectXmlReader
// ----------------------------------------------------------------------------
/*
@@ -203,13 +204,13 @@ as properties are always sought by typeinfo over all levels
and create params are always toplevel class only
*/
int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
int wxObjectXmlReader::ReadComponent(wxXmlNode *node, wxObjectWriterCallback *callbacks)
{
wxASSERT_MSG( callbacks, wxT("Does not support reading without a Depersistor") );
wxString className;
wxClassInfo *classInfo;
wxxVariant *createParams ;
wxVariantBase *createParams;
int *createParamOids;
const wxClassInfo** createClassInfos;
wxXmlNode *children;
@@ -220,7 +221,7 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
if (!children)
{
// check for a null object or href
if (node->GetAttribute(wxT("href") , &ObjectIdString ) )
if (node->GetPropVal(wxT("href"), &ObjectIdString ) )
{
objectID = atoi( ObjectIdString.ToAscii() );
if ( HasObjectClassInfo( objectID ) )
@@ -233,16 +234,17 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
return wxInvalidObjectID;
}
}
if ( !node->GetAttribute(wxT("id") , &ObjectIdString ) )
if ( !node->GetPropVal(wxT("id"), &ObjectIdString ) )
{
return wxNullObjectID;
}
}
if (!node->GetAttribute(wxT("class"), &className))
if (!node->GetPropVal(wxT("class"), &className))
{
// No class name. Eek. FIXME: error handling
return wxInvalidObjectID;
}
classInfo = wxClassInfo::FindClass(className);
if ( classInfo == NULL )
{
@@ -255,13 +257,14 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
wxLogError(_("objects cannot have XML Text Nodes") );
return wxInvalidObjectID;
}
if (!node->GetAttribute(wxT("id"), &ObjectIdString))
if (!node->GetPropVal(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
if ( HasObjectClassInfo( objectID ) )
{
@@ -273,13 +276,14 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
// first make the object know to our internal registry
SetObjectClassInfo( objectID, classInfo );
wxxVariantArray metadata ;
wxXmlAttribute *xp = node->GetAttributes() ;
wxVariantBaseArray metadata;
wxXmlProperty *xp = node->GetProperties();
while ( xp )
{
if ( xp->GetName() != wxString(wxT("class")) && xp->GetName() != wxString(wxT("id")) )
if ( xp->GetName() != wxString(wxT("class")) &&
xp->GetName() != wxString(wxT("id")) )
{
metadata.Add( new wxxVariant( xp->GetValue() , xp->GetName() ) ) ;
metadata.Add( new wxVariantBase( xp->GetValue(), xp->GetName() ) );
}
xp = xp->GetNext();
}
@@ -288,7 +292,7 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
//
// stream back the Create parameters first
createParams = new wxxVariant[ classInfo->GetCreateParamCount() ] ;
createParams = new wxVariantBase[ classInfo->GetCreateParamCount() ];
createParamOids = new int[classInfo->GetCreateParamCount() ];
createClassInfos = new const wxClassInfo*[classInfo->GetCreateParamCount() ];
@@ -305,7 +309,7 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
while( children )
{
wxString name;
children->GetAttribute( wxT("name") , &name ) ;
children->GetPropVal( wxT("name"), &name );
propertyNames.push_back( (const wxChar*)name.c_str() );
propertyNodes[(const wxChar*)name.c_str()] = children->GetChildren();
children = children->GetNext();
@@ -318,7 +322,7 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
const wxPropertyInfo* pi = classInfo->FindPropertyInfo( paramName );
if ( pi == 0 )
{
wxLogError( wxString::Format(_("Unknown Property %s"),paramName) ) ;
wxLogError( wxString::Format(_("Unkown Property %s"),paramName) );
}
// if we don't have the value of a create param set in the xml
// we use the default value
@@ -328,7 +332,8 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
if ( pi->GetTypeInfo()->IsObjectType() )
{
createParamOids[i] = ReadComponent( prop, callbacks );
createClassInfos[i] = dynamic_cast<const wxClassTypeInfo*>(pi->GetTypeInfo())->GetClassInfo() ;
createClassInfos[i] =
wx_dynamic_cast(const wxClassTypeInfo*, pi->GetTypeInfo())->GetClassInfo();
}
else
{
@@ -336,12 +341,13 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
createParams[i] = ReadValue( prop, pi->GetTypeInfo() );
if( pi->GetFlags() & wxPROP_ENUM_STORE_LONG )
{
const wxEnumTypeInfo *eti = dynamic_cast<const wxEnumTypeInfo*>( pi->GetTypeInfo() ) ;
const wxEnumTypeInfo *eti =
wx_dynamic_cast(const wxEnumTypeInfo*, pi->GetTypeInfo() );
if ( eti )
{
long realval;
eti->ConvertToLong( createParams[i], realval );
createParams[i] = wxxVariant( realval ) ;
createParams[i] = wxVariantBase( realval );
}
else
{
@@ -365,7 +371,8 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
if ( pi->GetTypeInfo()->IsObjectType() )
{
createParamOids[i] = wxNullObjectID;
createClassInfos[i] = dynamic_cast<const wxClassTypeInfo*>(pi->GetTypeInfo())->GetClassInfo() ;
createClassInfos[i] =
wx_dynamic_cast(const wxClassTypeInfo*, pi->GetTypeInfo())->GetClassInfo();
}
else
{
@@ -385,7 +392,8 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
classInfo->GetCreateParamCount(),
createParams, createParamOids, createClassInfos, metadata );
// now stream in the rest of the properties, in the sequence their properties were written in the xml
// now stream in the rest of the properties, in the sequence their
// properties were written in the xml
for ( size_t j = 0; j < propertyNames.size(); ++j )
{
if ( propertyNames[j].length() )
@@ -394,10 +402,12 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
if ( propiter != propertyNodes.end() )
{
wxXmlNode* prop = propiter->second;
const wxPropertyInfo* pi = classInfo->FindPropertyInfo( propertyNames[j].c_str() ) ;
const wxPropertyInfo* pi =
classInfo->FindPropertyInfo( propertyNames[j].c_str() );
if ( pi->GetTypeInfo()->GetKind() == wxT_COLLECTION )
{
const wxCollectionTypeInfo* collType = dynamic_cast< const wxCollectionTypeInfo* >( pi->GetTypeInfo() ) ;
const wxCollectionTypeInfo* collType =
wx_dynamic_cast( const wxCollectionTypeInfo*, pi->GetTypeInfo() );
const wxTypeInfo * elementType = collType->GetElementType();
while( prop )
{
@@ -406,6 +416,7 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
wxLogError( _("A non empty collection must consist of 'element' nodes" ) );
break;
}
wxXmlNode* elementContent = prop->GetChildren();
if ( elementContent )
{
@@ -424,7 +435,7 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
}
else
{
wxxVariant elementValue = ReadValue( elementContent , elementType ) ;
wxVariantBase elementValue = ReadValue( elementContent, elementType );
if ( pi->GetAccessor()->HasAdder() )
callbacks->AddToPropertyCollection( objectID, classInfo,pi, elementValue );
}
@@ -451,7 +462,7 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
else
{
wxASSERT( pi->GetTypeInfo()->HasStringConverters() );
wxxVariant nodeval = ReadValue( prop , pi->GetTypeInfo() ) ;
wxVariantBase nodeval = ReadValue( prop, pi->GetTypeInfo() );
callbacks->SetProperty( objectID, classInfo,pi, nodeval );
}
}
@@ -480,15 +491,16 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
}
else
{
wxxVariant nodeval = ReadValue( prop , pi->GetTypeInfo() ) ;
wxVariantBase nodeval = ReadValue( prop, pi->GetTypeInfo() );
if( pi->GetFlags() & wxPROP_ENUM_STORE_LONG )
{
const wxEnumTypeInfo *eti = dynamic_cast<const wxEnumTypeInfo*>( pi->GetTypeInfo() ) ;
const wxEnumTypeInfo *eti =
wx_dynamic_cast(const wxEnumTypeInfo*, pi->GetTypeInfo() );
if ( eti )
{
long realval;
eti->ConvertToLong( nodeval, realval );
nodeval = wxxVariant( realval ) ;
nodeval = wxVariantBase( realval );
}
else
{
@@ -508,24 +520,24 @@ int wxXmlReader::ReadComponent(wxXmlNode *node, wxDepersister *callbacks)
return objectID;
}
wxxVariant wxXmlReader::ReadValue(wxXmlNode *node,
wxVariantBase wxObjectXmlReader::ReadValue(wxXmlNode *node,
const wxTypeInfo *type )
{
wxString content;
if ( node )
content = node->GetContent();
wxxVariant result ;
wxVariantBase result;
type->ConvertFromString( content, result );
return result;
}
int wxXmlReader::ReadObject( const wxString &name , wxDepersister *callbacks)
int wxObjectXmlReader::ReadObject( const wxString &name, wxObjectWriterCallback *callbacks)
{
wxXmlNode *iter = m_parent->GetChildren();
while ( iter )
{
wxString entryName;
if ( iter->GetAttribute(wxT("name"), &entryName) )
if ( iter->GetPropVal(wxT("name"), &entryName) )
{
if ( entryName == name )
return ReadComponent( iter->GetChildren(), callbacks );