[DEV] a little change in the exml lib

This commit is contained in:
Edouard DUPIN 2013-06-28 22:13:21 +02:00
parent 0a12bd17ed
commit 1864f9aa75
2 changed files with 9 additions and 9 deletions

View File

@ -157,7 +157,7 @@ void classColorManager::LoadFile(const etk::UString& _xmlFilename)
continue; continue;
} }
if (pGuiNode->GetValue()!="color") { if (pGuiNode->GetValue()!="color") {
APPL_ERROR("(l "<<pGuiNode->Pos()<<") node not suported : \""<<pGuiNode->GetValue()<<"\" must be [color]"); APPL_ERROR("(l "<<pGuiNode->GetPos()<<") node not suported : \""<<pGuiNode->GetValue()<<"\" must be [color]");
continue; continue;
} }
//-------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------
@ -165,7 +165,7 @@ void classColorManager::LoadFile(const etk::UString& _xmlFilename)
//-------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------
etk::UString colorName = pGuiNode->GetAttribute("name"); etk::UString colorName = pGuiNode->GetAttribute("name");
if (colorName.Size()==0) { if (colorName.Size()==0) {
APPL_ERROR("(l "<< pGuiNode->Pos() <<") node with no name"); APPL_ERROR("(l "<< pGuiNode->GetPos() <<") node with no name");
continue; continue;
} }
int32_t id = 0; int32_t id = 0;
@ -190,7 +190,7 @@ void classColorManager::LoadFile(const etk::UString& _xmlFilename)
} else if (colorName=="LIST_textModify") { } else if (colorName=="LIST_textModify") {
id = COLOR_LIST_TEXT_MODIFY; id = COLOR_LIST_TEXT_MODIFY;
} else { } else {
APPL_ERROR("(l "<<pGuiNode->Pos()<<") Unknown basic gui color : \"" << colorName << "\"" ); APPL_ERROR("(l "<<pGuiNode->GetPos()<<") Unknown basic gui color : \"" << colorName << "\"" );
continue; continue;
} }
etk::UString color = pGuiNode->GetAttribute("val"); etk::UString color = pGuiNode->GetAttribute("val");
@ -205,7 +205,7 @@ void classColorManager::LoadFile(const etk::UString& _xmlFilename)
continue; continue;
} }
if (pGuiNode->GetValue()!="color") { if (pGuiNode->GetValue()!="color") {
APPL_ERROR(PFX"(l "<<pGuiNode->Pos()<<") node not suported : \""<<pGuiNode->GetValue()<<"\" must be [color]"); APPL_ERROR(PFX"(l "<<pGuiNode->GetPos()<<") node not suported : \""<<pGuiNode->GetValue()<<"\" must be [color]");
continue; continue;
} }
//-------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------
@ -214,12 +214,12 @@ void classColorManager::LoadFile(const etk::UString& _xmlFilename)
// get the name of the Chaine // get the name of the Chaine
etk::UString colorName = pGuiNode->GetAttribute("name"); etk::UString colorName = pGuiNode->GetAttribute("name");
if (colorName.Size()==0) { if (colorName.Size()==0) {
APPL_ERROR(PFX"(l "<< pGuiNode->Pos() <<") node with no name"); APPL_ERROR(PFX"(l "<< pGuiNode->GetPos() <<") node with no name");
continue; continue;
} }
Colorize* myNewColor = new Colorize(); Colorize* myNewColor = new Colorize();
if (NULL==myNewColor) { if (NULL==myNewColor) {
APPL_ERROR(PFX"(l "<< pGuiNode->Pos() <<") ==> allocation error"); APPL_ERROR(PFX"(l "<< pGuiNode->GetPos() <<") ==> allocation error");
continue; continue;
} }
myNewColor->SetName(colorName); myNewColor->SetName(colorName);

View File

@ -63,7 +63,7 @@ Highlight::Highlight(const etk::UString& _xmlFilename)
continue; continue;
} }
if (passChild->GetValue() != "rule") { if (passChild->GetValue() != "rule") {
APPL_ERROR("(l "<< passChild->Pos() << ") node not suported : \""<< passChild->GetValue() << "\" must be [rule]" ); APPL_ERROR("(l "<< passChild->GetPos() << ") node not suported : \""<< passChild->GetValue() << "\" must be [rule]" );
continue; continue;
} }
ParseRules(passChild, m_listHighlightPass1, level1++); ParseRules(passChild, m_listHighlightPass1, level1++);
@ -76,13 +76,13 @@ Highlight::Highlight(const etk::UString& _xmlFilename)
continue; continue;
} }
if (passChild->GetValue() != "rule") { if (passChild->GetValue() != "rule") {
APPL_ERROR("(l "<< passChild->Pos() << ") node not suported : \""<< passChild->GetValue() << "\" must be [rule]" ); APPL_ERROR("(l "<< passChild->GetPos() << ") node not suported : \""<< passChild->GetValue() << "\" must be [rule]" );
continue; continue;
} }
ParseRules(passChild, m_listHighlightPass2, level2++); ParseRules(passChild, m_listHighlightPass2, level2++);
} }
} else { } else {
APPL_ERROR("(l "<< child->Pos() << ") node not suported : \""<< child->GetValue() << "\" must be [ext,pass1,pass2]" ); APPL_ERROR("(l "<< child->GetPos() << ") node not suported : \""<< child->GetValue() << "\" must be [ext,pass1,pass2]" );
} }
} }
} }