[GME-commit]
GMESRC/Paradigms/MetaGME/BonExtension BON2Component.cpp,1.13,1.14
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Thu May 6 18:30:28 CDT 2004
Update of /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension
In directory braindrain:/tmp/cvs-serv8100/BonExtension
Modified Files:
BON2Component.cpp
Log Message:
A few verbose error messages introduced.
CVS User: zolmol
Index: BON2Component.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/BON2Component.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** BON2Component.cpp 17 Mar 2004 00:24:13 -0000 1.13
--- BON2Component.cpp 6 May 2004 22:30:26 -0000 1.14
***************
*** 31,38 ****
Globals global_vars;
- #define show_to_be_removed 0
- #define show_entities 1
- #define show_relations 1
-
namespace BON
{
--- 31,34 ----
***************
*** 83,87 ****
if ( m_sheet != 0)
{
! TO( "The merged paradigm sheet still exists");
delete m_sheet;
m_sheet = 0;
--- 79,83 ----
if ( m_sheet != 0)
{
! TO( "Internal error: Merged Paradigm Sheet object still exists.");
delete m_sheet;
m_sheet = 0;
***************
*** 191,195 ****
// it cannot be of type set (aspect), or type model
- //TO( std::string("Aspect member operand\nOp1: ") + (*aspect)->getName() + "\nOp2: " + (*asp_elem)->getName());
if ((*asp_elem)->getObjectMeta().type() == MON::OT_Atom ||
(*asp_elem)->getObjectMeta().type() == MON::OT_Reference)
--- 187,190 ----
***************
*** 222,228 ****
}
else
! {
! //TO( std::string("Error: weird aspect member operation\nOp1: ") + (*aspect)->getName() + "\nOp2: " + (*asp_elem)->getName());
! }
}
}
--- 217,221 ----
}
else
! global_vars.err << "Error: Cannot handle AspectMember operation. Op1: " << (*aspect)->getName() << " Op2: " << (*asp_elem)->getName() << "\n";
}
}
***************
*** 250,260 ****
std::string conn_kind = (*conn_it)->getObjectMeta().name();
! if ( conn_kind == "Containment" ||
! conn_kind == "FolderContainment" ||
! conn_kind == "SetMembership" ||
! conn_kind == "ReferTo" ||
! conn_kind == "HasAspect" ||
! conn_kind == "HasConstraint" ||
! conn_kind == "HasAttribute")
{
Object src = FCO((*conn_it)->getSrc());
--- 243,253 ----
std::string conn_kind = (*conn_it)->getObjectMeta().name();
! if ( conn_kind == Relation::containment_str ||
! conn_kind == Relation::folder_containment_str ||
! conn_kind == Relation::set_membership_str ||
! conn_kind == Relation::refer_to_str ||
! conn_kind == Relation::has_aspect_str ||
! conn_kind == Relation::has_constraint_str ||
! conn_kind == Relation::has_attribute_str)
{
Object src = FCO((*conn_it)->getSrc());
***************
*** 263,289 ****
Relation rela( Relation::CONTAINMENT_OP, dst, src); // create a relation object
! std::string relation_name = (*conn_it)->getObjectMeta().name();
! if ( relation_name == Relation::containment_str)
{
rela.setOperation( Relation::CONTAINMENT_OP);
rela.setOp3( *conn_it);
}
! else if ( relation_name == Relation::folder_containment_str)
{
rela.setOperation( Relation::FOLDER_CONTAINMENT_OP);
rela.setOp3( *conn_it);
}
! else if ( relation_name == Relation::set_membership_str)
rela.setOperation( Relation::SET_MEMBER_OP);
! else if ( relation_name == Relation::refer_to_str)
rela.setOperation( Relation::REFER_TO_OP);
! else if ( relation_name == Relation::has_aspect_str)
rela.setOperation( Relation::HAS_ASPECT_OP);
! else if ( relation_name == Relation::has_constraint_str)
rela.setOperation( Relation::HAS_CONSTRAINT_OP);
! else if ( relation_name == Relation::has_attribute_str)
rela.setOperation( Relation::HAS_ATTRIBUTE_OP);
else
! global_vars.err << "ERROR in entity Builder: unhandled entity.\n";
m_relations.push_back(rela);
--- 256,281 ----
Relation rela( Relation::CONTAINMENT_OP, dst, src); // create a relation object
! if ( conn_kind == Relation::containment_str)
{
rela.setOperation( Relation::CONTAINMENT_OP);
rela.setOp3( *conn_it);
}
! else if ( conn_kind == Relation::folder_containment_str)
{
rela.setOperation( Relation::FOLDER_CONTAINMENT_OP);
rela.setOp3( *conn_it);
}
! else if ( conn_kind == Relation::set_membership_str)
rela.setOperation( Relation::SET_MEMBER_OP);
! else if ( conn_kind == Relation::refer_to_str)
rela.setOperation( Relation::REFER_TO_OP);
! else if ( conn_kind == Relation::has_aspect_str)
rela.setOperation( Relation::HAS_ASPECT_OP);
! else if ( conn_kind == Relation::has_constraint_str)
rela.setOperation( Relation::HAS_CONSTRAINT_OP);
! else if ( conn_kind == Relation::has_attribute_str)
rela.setOperation( Relation::HAS_ATTRIBUTE_OP);
else
! global_vars.err << "ERROR: Unknown connection kind.\n";
m_relations.push_back(rela);
***************
*** 303,309 ****
FCO referred = (*ref_it)->getReferred();
this->m_realObj[ *ref_it] = referred;
- std::string m1, m2;
- m1 = referred->getName();
- m2 = (*ref_it)->getName();
}
catch( ... )
--- 295,298 ----
***************
*** 347,352 ****
in_connection_line = * con_list_ptr_i.begin();
obj1 = in_connection_line->getSrc();
- //std::string o01 = BON::FCO((*con_list_ptr_i.begin())->getSrc())->getName();
- std::string o1 = BON::FCO(obj1)->getName();
}
if ( !con_list_ptr_o.empty())
--- 336,339 ----
***************
*** 354,362 ****
out_connection_line = * con_list_ptr_o.begin();
obj2 = out_connection_line->getDst();
-
- //std::string o2 = BON::FCO(*obj2)->getName();
}
if ( !in_connection_line || !out_connection_line)
! global_vars.err << "ERROR during entity builder - handling connector \"" << (*atom_it)->getName() << "\"\n";
--- 341,347 ----
out_connection_line = * con_list_ptr_o.begin();
obj2 = out_connection_line->getDst();
}
if ( !in_connection_line || !out_connection_line)
! global_vars.err << "ERROR: connector \"" << (*atom_it)->getName() << "\" does not have both SourceToConnector and ConnectorToDestination connections attached.\n";
***************
*** 370,379 ****
{
obja = * a_out_list.begin();
- //TO(g_curr_elem + s + " [Out, C2A] "+ obja->getName() +" | " + obja->getObjectMeta().name());
}
else if ( !a_in_list.empty()) // if not found outgoings check for incoming AssociationClass connections
{
obja = * a_in_list.begin();
- //TO(g_curr_elem + s + " [Out, C2A] "+ obja->getName() +" | " + obja->getObjectMeta().name());
}
else
--- 355,362 ----
***************
*** 384,388 ****
// src: obj1, dest: obj2, association class: obja, in line, and out_line
if ( !obj1 || !obj2 || !obja || !in_connection_line || !out_connection_line)
! global_vars.err << "ERROR: Association can not be inserted into Relations\n";
else
{
--- 367,376 ----
// src: obj1, dest: obj2, association class: obja, in line, and out_line
if ( !obj1 || !obj2 || !obja || !in_connection_line || !out_connection_line)
! {
! if ( obja)
! global_vars.err << "ERROR: Association \"" << FCO( obja)->getName() << "\" disregarded.\n";
! else
! global_vars.err << "ERROR: Association disregarded.\n";
! }
else
{
***************
*** 410,419 ****
obj1 = * in_it;
++how_many_bases;
! if ( how_many_bases > 1) global_vars.err << "Warning: Too many base classes\n";
! //TO(g_curr_elem + s + " [IN, Base] "+ obj1->getName() +" | " + obj1->getObjectMeta().name());
for( ; out_it != out_list.end(); ++out_it)
{
- //std::string s(Relation::inheritance_derived.c_str());
- //TO(g_curr_elem + s + " [Out, Derived] "+ obj2->getName() +" | " + obj2->getObjectMeta().name());
obj2 = * out_it;
--- 398,404 ----
obj1 = * in_it;
++how_many_bases;
! if ( how_many_bases > 1) global_vars.err << "Warning: Too many base classes. Multiple inheritance should be used with two different operators.\n";
for( ; out_it != out_list.end(); ++out_it)
{
obj2 = * out_it;
***************
*** 436,445 ****
obj1 = * in_it;
++how_many_bases;
! if ( how_many_bases > 1) global_vars.err << "Warning: Too many base classes\n";
! //TO(g_curr_elem + s + " [IN, Base] "+ obj1->getName() +" | " + obj1->getObjectMeta().name());
for( ; out_it != out_list.end(); ++out_it)
{
- //std::string s(Relation::inheritance_derived.c_str());
- //TO(g_curr_elem + s + " [Out, Derived] "+ obj2->getName() +" | " + obj2->getObjectMeta().name());
obj2 = * out_it;
--- 421,427 ----
obj1 = * in_it;
++how_many_bases;
! if ( how_many_bases > 1) global_vars.err << "Warning: Too many base classes. Multiple inheritance should be used with two different operators.\n";
for( ; out_it != out_list.end(); ++out_it)
{
obj2 = * out_it;
***************
*** 462,471 ****
obj1 = * in_it;
++how_many_bases;
! if ( how_many_bases > 1) global_vars.err << "Warning: Too many base classes\n";
! //TO(g_curr_elem + s + " [IN, Base] "+ obj1->getName() +" | " + obj1->getObjectMeta().name());
for( ; out_it != out_list.end(); ++out_it)
{
- //std::string s(Relation::inheritance_derived.c_str());
- //TO(g_curr_elem + s + " [Out, Derived] "+ obj2->getName() +" | " + obj2->getObjectMeta().name());
obj2 = * out_it;
--- 444,450 ----
obj1 = * in_it;
++how_many_bases;
! if ( how_many_bases > 1) global_vars.err << "Warning: Too many base classes. Multiple inheritance should be used with two different operators.\n";
for( ; out_it != out_list.end(); ++out_it)
{
obj2 = * out_it;
***************
*** 483,497 ****
std::multiset<ConnectionEnd>::iterator out_it = out_list.begin();
- int how_many_bases = 0;
for( ; in_it != in_list.end(); ++in_it ) // if outer cycle performs more than once should be an error
{
obj1 = * in_it;
- ++how_many_bases;
- if ( how_many_bases > 1) global_vars.err << "Warning: Too many base classes\n";
- //TO(g_curr_elem + s + " [IN, Base] "+ obj1->getName() +" | " + obj1->getObjectMeta().name());
for( ; out_it != out_list.end(); ++out_it)
{
- //std::string s(Relation::inheritance_derived.c_str());
- //TO(g_curr_elem + s + " [Out, Derived] "+ obj2->getName() +" | " + obj2->getObjectMeta().name());
obj2 = * out_it;
--- 462,470 ----
***************
*** 512,520 ****
{
obj1 = * in_it;
- //TO(g_curr_elem + s + " [IN, Base] "+ obj1->getName() +" | " + obj1->getObjectMeta().name());
for( ; out_it != out_list.end(); ++out_it)
{
- //std::string s(Relation::inheritance_derived.c_str());
- //TO(g_curr_elem + s + " [Out, Derived] "+ obj2->getName() +" | " + obj2->getObjectMeta().name());
obj2 = * out_it;
--- 485,490 ----
***************
*** 535,543 ****
{
obj1 = * in_it;
- //TO(g_curr_elem + s + " [IN, Base] "+ obj1->getName() +" | " + obj1->getObjectMeta().name());
for( ; out_it != out_list.end(); ++out_it)
{
- //std::string s(Relation::inheritance_derived.c_str());
- //TO(g_curr_elem + s + " [Out, Derived] "+ obj2->getName() +" | " + obj2->getObjectMeta().name());
obj2 = * out_it;
--- 505,510 ----
***************
*** 828,906 ****
void Component::Show()
{
- std::string msg = "";
- #if(show_to_be_removed)
-
- Entity_Iterator it_1(m_toBeDeletedEntities.begin());
- for( ; it_1 != m_toBeDeletedEntities.end(); ++it_1)
- {
- const CBuilderObject * obj = static_cast<const CBuilderObject *>(it_1->getPointer());
- msg += obj->getName() + " / " + obj->getObjectMeta().name() + "\n";
- }
- TO(msg.c_str());
- #endif
-
- msg = " / / / / / E N T I T I E S \\ \\ \\ \\ \\ \n";
-
- #if(show_entities)
-
- Entity_Iterator it_2( m_entities.begin());
- for( ; it_2 != m_entities.end(); ++it_2)
- {
- char dst[32];
- sprintf( dst, "%x", it_2->getPointer());
- msg += it_2->getPointer()->getName() + " / " + it_2->getPointer()->getObjectMeta().name() + " Addr: " + dst;
-
- // if proxy show its real objs
- ObjPointer objreal = m_realObj[it_2->getPointer()];
- if ( objreal != BON::Object())
- {
- msg += " is a proxy to " + objreal->getName() + "/" + objreal->getObjectMeta().name();
- }
- msg += "\n";
- }
- TO(msg.c_str());
-
- #endif
-
- msg = " * * * * * * R E L A T I O N S * * * * * *\n";
-
- #if(show_relations)
-
-
- Relation_Const_Iterator it_3 (m_relations.begin());
- for( ; it_3 != m_relations.end(); ++it_3)
- {
- ObjPointer obj1 = it_3->getOp1();
- ObjPointer obj2 = it_3->getOp2();
- ObjPointer obj3 = it_3->getOp3();
- ObjPointer obj4 = it_3->getOp4();
- ObjPointer obj5 = it_3->getOp5();
- msg += it_3->getOperationStr() + " between ";
- if ( obj1!=BON::Object() && obj2 != BON::Object() )
- msg += obj1->getName() + ":" + obj1->getObjectMeta().name() + " + " + obj2->getName() + ":" + obj2->getObjectMeta().name();
- else TO("Error in relations list\n");
-
- if ( obj3 != BON::Object() )
- msg += " A:" + obj3->getName() /*+ ":" + obj3->getObjectMeta().name()*/;
-
- if ( obj4 != BON::Object() )
- msg += " L:" + obj4->getName() /* + ":" + obj4->getObjectMeta().name()*/;
- if ( obj5 != BON::Object() )
- msg += " L:" + obj5->getName() /*+ ":" + obj5->getObjectMeta().name()*/;
-
- if ( it_3->getOperation() == Relation::HAS_ASPECT_OP ||
- it_3->getOperation() == Relation::ASPECT_MEMBER_OP )
- {
- char dst1[32], dst2[32];
- sprintf( dst1, "%x", obj1);
- sprintf( dst2, "%x", obj2);
- msg += "Addr1: " + std::string( dst1) + " Addr2: " + std::string( dst2);
- }
-
- msg += "\n";
- }
- TO(msg.c_str());
-
- #endif
}
--- 795,798 ----
***************
*** 1088,1092 ****
base->addChild( new_relation[inh_type], derived);
derived->addParent( new_relation[inh_type], base);
- //TO( "some inh " + obj1->getName() + " <|-- " + obj2->getName());
}
else
--- 980,983 ----
***************
*** 1136,1140 ****
- //TO( src_role + ":"+ dst_role +"|" + src_card +":"+dst_card);
ConnJoint::SDList list_op1, list_op2;
list_op1.push_back( op1);
--- 1027,1030 ----
***************
*** 1150,1154 ****
if (conn_obj) conn_obj->addJoint( assoc ); // op3 describes the association of op1 and op2
else global_vars.err << "ERROR after dynamic_cast - conn\n";
- //TO( obj3->getName() + " : " + obj1->getName() + " >--> " + obj2->getName());
}
else if ( obj3 == BON::Object() )
--- 1040,1043 ----
***************
*** 1171,1180 ****
if ( set != 0 && member != 0)
{
! if ( set->getMyKind() != Any::SET ) global_vars.err << "Not a set on left hand side of set_member relation\n";
SetRep * set_obj = dynamic_cast< SetRep * > ( set );
if (set_obj) set_obj->addMember( member);
! else global_vars.err << "ERROR after dynamic_cast - set\n";
- //TO( obj1->getName() + " has member " + obj2->getName() );
}
else
--- 1060,1068 ----
if ( set != 0 && member != 0)
{
! if ( set->getMyKind() != Any::SET ) global_vars.err << "Internal Error: Not a set on left hand side of set_member relation\n";
SetRep * set_obj = dynamic_cast< SetRep * > ( set );
if (set_obj) set_obj->addMember( member);
! else global_vars.err << "Internal error: After dynamic_cast - set\n";
}
else
***************
*** 1206,1211 ****
ref_obj->addInitialReferee( elem);
elem->addRefersToMe( ref_obj);
-
- //TO( obj2->getName() + " ----> " + obj1->getName() );
}
else
--- 1094,1097 ----
***************
*** 1291,1295 ****
{
::FCO * fco = dynamic_cast< ::FCO *>( any);
! if (!fco) global_vars.err << "ERROR after dynamic cast - folder containment - subfolder is 0\n";
else folder_obj->addFCO( fco, card);
}
--- 1177,1181 ----
{
::FCO * fco = dynamic_cast< ::FCO *>( any);
! if ( !fco) global_vars.err << "ERROR after dynamic cast - folder containment - subfolder is 0\n";
else folder_obj->addFCO( fco, card);
}
***************
*** 1357,1361 ****
rel_it->getOp4() == BON::Object() ||
rel_it->getOp5() == BON::Object() )
! global_vars.err << "Error: ASSOCIATION has one operand 0\n";
Entity ent1 = entitySearch( rel_it->getOp1());
Entity ent2 = entitySearch( rel_it->getOp2());
--- 1243,1247 ----
rel_it->getOp4() == BON::Object() ||
rel_it->getOp5() == BON::Object() )
! global_vars.err << "Internal error: Assocation has one operand 0\n";
Entity ent1 = entitySearch( rel_it->getOp1());
Entity ent2 = entitySearch( rel_it->getOp2());
***************
*** 1371,1377 ****
m_entities.push_back( Entity( BON::Folder(), rel_it->getOp1()));
if ( ptr != BON::Object())
! global_vars.err << std::string( "CHECK: Operand 1 of " + rel_it->getOperationStr() + " is not present in Entities\n" + ptr->getName() + " : " + ptr->getObjectMeta().name() + " has been inserted\n");
else
! global_vars.err << std::string("CHECK: Operand 1 of " + rel_it->getOperationStr() + " is null\n");
}
if ( ent2 == Entity( BON::Folder(), BON::Object()))
--- 1257,1264 ----
m_entities.push_back( Entity( BON::Folder(), rel_it->getOp1()));
if ( ptr != BON::Object())
! global_vars.err << "Internal error: Operand 1 of " << rel_it->getOperationStr() << " is not present in Entities\n" <<
! ptr->getName() << " : " << ptr->getObjectMeta().name() << " has been inserted";
else
! global_vars.err << "Internal error: Operand 1 of " << rel_it->getOperationStr() << " is null\n";
}
if ( ent2 == Entity( BON::Folder(), BON::Object()))
***************
*** 1380,1386 ****
m_entities.push_back( Entity( BON::Folder(), rel_it->getOp2()));
if ( ptr != BON::Object())
! global_vars.err << std::string("CHECK: Operand 2 of " + rel_it->getOperationStr() + " is not present in Entities\n" + ptr->getName() + " : " + ptr->getObjectMeta().name() + " has been inserted\n");
else
! global_vars.err << std::string("CHECK: Operand 2 of " + rel_it->getOperationStr() + " is null\n");
}
if ( ent3 == Entity( BON::Folder(), BON::Object()))
--- 1267,1274 ----
m_entities.push_back( Entity( BON::Folder(), rel_it->getOp2()));
if ( ptr != BON::Object())
! global_vars.err << "Internal error: Operand 2 of " << rel_it->getOperationStr() << " is not present in Entities\n" <<
! ptr->getName() << " : " << ptr->getObjectMeta().name() << " has been inserted";
else
! global_vars.err << "Internal error: Operand 2 of " << rel_it->getOperationStr() << " is null\n";
}
if ( ent3 == Entity( BON::Folder(), BON::Object()))
***************
*** 1390,1398 ****
ptr = rel_it->getOp3();
m_entities.push_back( Entity( BON::Folder(), rel_it->getOp3()));
! global_vars.err << std::string("CHECK: Operand 3 of " + rel_it->getOperationStr() + " is not present in Entities\n" + ptr->getName() + " : " + ptr->getObjectMeta().name() + " has been inserted\n");
}
else
{
! global_vars.err << std::string("CHECK: Association without Connection class: " + o1->getName() + " o " + o2->getName() + "\n" );
}
}
--- 1278,1287 ----
ptr = rel_it->getOp3();
m_entities.push_back( Entity( BON::Folder(), rel_it->getOp3()));
! global_vars.err << "Internal error: Operand 3 of " << rel_it->getOperationStr() << " is not present in Entities\n" <<
! ptr->getName() << " : " << ptr->getObjectMeta().name() << " has been inserted";
}
else
{
! global_vars.err << "Internal error: Association without Connection class: " << o1->getName() << " o " << o2->getName() << "\n";
}
}
***************
*** 1402,1406 ****
if( rel_it->getOp1() == BON::Object() ||
rel_it->getOp2() == BON::Object() )
! global_vars.err << std::string( rel_it->getOperationStr() + "has one operand 0\n");
Entity ent1 = entitySearch( rel_it->getOp1());
--- 1291,1295 ----
if( rel_it->getOp1() == BON::Object() ||
rel_it->getOp2() == BON::Object() )
! global_vars.err << "Internal error: " << rel_it->getOperationStr() << " has one operand 0\n";
Entity ent1 = entitySearch( rel_it->getOp1());
***************
*** 1412,1418 ****
m_entities.push_back( Entity( BON::Folder(), rel_it->getOp1()));
if ( ptr != BON::Object())
! global_vars.err << std::string("CHECK: Operand 1 of " + rel_it->getOperationStr() + " is not present in Entities\n" + ptr->getName() + " : " + ptr->getObjectMeta().name() + " has been inserted\n");
else
! global_vars.err << std::string("CHECK: Operand 1 of " + rel_it->getOperationStr() + " is null\n");
}
if ( ent2 == Entity( BON::Folder(), BON::Object()))
--- 1301,1308 ----
m_entities.push_back( Entity( BON::Folder(), rel_it->getOp1()));
if ( ptr != BON::Object())
! global_vars.err << "Internal error: Operand 1 of " << rel_it->getOperationStr() << " is not present in Entities\n" <<
! ptr->getName() << " : " << ptr->getObjectMeta().name() << " has been inserted";
else
! global_vars.err << "Internal error: Operand 1 of " << rel_it->getOperationStr() + " is null\n";
}
if ( ent2 == Entity( BON::Folder(), BON::Object()))
***************
*** 1426,1430 ****
if ( rel_it->getOp2())
peer2 = rel_it->getOp2()->getName() + " " + rel_it->getOp2()->getObjectMeta().name();
! global_vars.err << std::string("CHECK: Operand 2 of " + rel_it->getOperationStr() + " is not present in Entities\n" + ptr->getName() + " : " + ptr->getObjectMeta().name() + " has been inserted\n" + "Operand1: " + peer1 + "\n" + "Operand2: " + peer2 + "\n");
// try to check the members of a set
--- 1316,1323 ----
if ( rel_it->getOp2())
peer2 = rel_it->getOp2()->getName() + " " + rel_it->getOp2()->getObjectMeta().name();
! global_vars.err << "Internal error: Operand 2 of " << rel_it->getOperationStr() << " is not present in Entities\n" <<
! ptr->getName() << " : " << ptr->getObjectMeta().name() << " has been inserted\n" <<
! "Operand1: " << peer1 << "\n" <<
! "Operand2: " << peer2 << "\n";
// try to check the members of a set
***************
*** 1436,1440 ****
//BON::Set set = dynamic_cast<BON::Set>(obj);
BON::Set set = BON::Set( obj);
! if (!set) global_vars.err << std::string("ERROR during set manipulation\n");
std::set<FCO> list = set->getMembers();
--- 1329,1333 ----
//BON::Set set = dynamic_cast<BON::Set>(obj);
BON::Set set = BON::Set( obj);
! if (!set) global_vars.err << "Internal error: during set manipulation\n";
std::set<FCO> list = set->getMembers();
***************
*** 1449,1453 ****
++list_it;
}
! //TO( "Aspect members are:\n" + mmm);
}
}
--- 1342,1346 ----
++list_it;
}
! global_vars.err << "Internal error: Aspect members are:\n" << mmm << "\n";
}
}
***************
*** 1456,1460 ****
{
if (rel_it->getOp3() == BON::Object())
! global_vars.err << std::string("(Folder)Containment line object not present in m_relations list\n");
}
} // end if
--- 1349,1353 ----
{
if (rel_it->getOp3() == BON::Object())
! global_vars.err << "Internal error: (Folder)Containment line object not present in m_relations list\n";
}
} // end if
***************
*** 1480,1484 ****
ObjPointer o2 = rel_it1->getOp2();
! global_vars.err << std::string( "Same attribute " + o2->getName() + " contained twice by " + o1->getName() + "\n");
}
}
--- 1373,1378 ----
ObjPointer o2 = rel_it1->getOp2();
! global_vars.err << "Internal error: Same attribute " << o2->getName() <<
! " contained twice by " << o1->getName() << "\n";
}
}
***************
*** 1543,1564 ****
success = executeSheet();
else
! global_vars.err << "PopulateSheet returned with error\n";
}
catch( MON::Exception p)
{
! global_vars.err << p.getKind() << " exception caught during populate/execute\n";
}
catch( std::string exc_str)
{
! global_vars.err << "Exception caught during populate/execute. Msg: " << exc_str << "\n";
}
catch(...)
{
! global_vars.err << "Exception caught during populate/execute.\n";
}
if ( !Sheet::checkInstance())
! global_vars.err << "Internal error: sheet doesn't exist\n";
deleteSheet();
--- 1437,1458 ----
success = executeSheet();
else
! global_vars.err << "Internal error: PopulateSheet returned with error\n";
}
catch( MON::Exception p)
{
! global_vars.err << "Internal error: " << p.getKind() << " exception caught during populate/execute\n";
}
catch( std::string exc_str)
{
! global_vars.err << "Internal error: Exception caught during populate/execute. Msg: " << exc_str << "\n";
}
catch(...)
{
! global_vars.err << "Internal error: Exception caught during populate/execute.\n";
}
if ( !Sheet::checkInstance())
! global_vars.err << "Internal error: Merged Sheet object doesn't exist\n";
deleteSheet();
***************
*** 1566,1570 ****
else
global_vars.err << "Exited before populating the Merged Paradigm Sheet. Proxy or other problem may exist.\n";
! } catch (...) {
global_vars.err << "Internal error: Exception thrown by Component.\n";
deleteSheet();
--- 1460,1465 ----
else
global_vars.err << "Exited before populating the Merged Paradigm Sheet. Proxy or other problem may exist.\n";
! } catch (...)
! {
global_vars.err << "Internal error: Exception thrown by Component.\n";
deleteSheet();
***************
*** 1572,1576 ****
if ( Sheet::checkInstance())
! global_vars.err << "Internal error: Merged Paradigm Sheet still exists\n";
global_vars.err << "\nEND OF LOG";
--- 1467,1471 ----
if ( Sheet::checkInstance())
! global_vars.err << "Internal error: Merged Paradigm Sheet object still exists\n";
global_vars.err << "\nEND OF LOG";
More information about the GME-commit
mailing list