[GME-commit]
GMESRC/Paradigms/MetaGME/BonExtension BON2Component.cpp,1.11,1.12
BON2Component.h,1.7,1.8
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Thu Mar 11 09:53:23 CST 2004
- Previous message: [GME-commit]
GMESRC/Paradigms/UML UML.xmp,1.6,1.7 UMLMeta.xme,1.3,1.4
- Next message: [GME-commit]
GMESRC/Paradigms/MetaGME/BonExtension/Rep AttributeRep.cpp,1.6,1.7
FCO.cpp,1.9,1.10 ModelRep.cpp,1.8,1.9 SetRep.cpp,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension
In directory braindrain:/tmp/cvs-serv7514
Modified Files:
BON2Component.cpp BON2Component.h
Log Message:
Library subfolders issue solved, and TO msgs removed.
CVS User: zolmol
Index: BON2Component.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/BON2Component.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** BON2Component.cpp 10 Mar 2004 02:50:18 -0000 1.11
--- BON2Component.cpp 11 Mar 2004 15:53:19 -0000 1.12
***************
*** 106,109 ****
--- 106,120 ----
+ void Component::scanSubFolders( const std::set<Folder>& subfolders, std::set<Folder>& result)
+ {
+ if (subfolders.empty()) return;
+
+ result.insert( subfolders.begin(), subfolders.end());
+ std::set<Folder>::iterator sub_it = subfolders.begin();
+ for( ; sub_it != subfolders.end(); ++sub_it)
+ scanSubFolders( (*sub_it)->getChildFolders(), result);
+ }
+
+
void Component::scanProject( Project& project)
{
***************
*** 112,119 ****
Folder rf = project->getRootFolder();
this->m_projectRootFolder = rf;
! std::set<Folder> folders = rf->getChildFolders(); // scan folders
folders.insert( rf); // including root folder
! std::set<Folder> libs = project->getLibraries();
! folders.insert( libs.begin(), libs.end());
std::set<Folder>::iterator folder_it = folders.begin();
for( ; folder_it != folders.end(); ++folder_it)
--- 123,132 ----
Folder rf = project->getRootFolder();
this->m_projectRootFolder = rf;
!
! std::set<Folder> folders;
folders.insert( rf); // including root folder
! std::set<Folder> subfolders = rf->getChildFolders(); // scan folders
! folders.insert( subfolders.begin(), subfolders.end());
!
std::set<Folder>::iterator folder_it = folders.begin();
for( ; folder_it != folders.end(); ++folder_it)
***************
*** 124,127 ****
--- 137,156 ----
scanModels( *i, *folder_it); // scan all root models
}
+
+ std::set<Folder> library_rf = project->getLibraries(); // get all libraries
+ std::set<Folder>::iterator lib_rf_it = library_rf.begin();
+ for( ; lib_rf_it != library_rf.end(); ++lib_rf_it)
+ {
+ folders.clear();
+ scanSubFolders( (*lib_rf_it)->getChildFolders(), folders); // get all subfolders of a library root folder
+ folders.insert( *lib_rf_it); // insert the library root folder too
+ for( folder_it = folders.begin(); folder_it != folders.end(); ++folder_it)
+ {
+ std::set<Model> objs = (*folder_it)->getChildModels();
+ std::set<Model>::iterator i = objs.begin();
+ for( ; i != objs.end(); ++i)
+ scanModels( *i, *lib_rf_it); // scan all library contained models, with the library rootfolder as its registry information holder
+ }
+ }
}
catch(...)
***************
*** 194,198 ****
else
{
! TO( std::string("Error: weird aspect member operation\nOp1: ") + (*aspect)->getName() + "\nOp2: " + (*asp_elem)->getName());
}
}
--- 223,227 ----
else
{
! //TO( std::string("Error: weird aspect member operation\nOp1: ") + (*aspect)->getName() + "\nOp2: " + (*asp_elem)->getName());
}
}
***************
*** 1342,1349 ****
m_entities.push_back( Entity( BON::Folder(), rel_it->getOp1()));
if ( ptr != BON::Object())
! TO( std::string("CHECK: Operand 1 of ") + rel_it->getOperationStr() + " is not present in Entities\n" +
! ptr->getName() + " : " + ptr->getObjectMeta().name() + " has been inserted");
else
! TO( std::string("CHECK: Operand 1 of ") + rel_it->getOperationStr() + " is null\n");
}
if ( ent2 == Entity( BON::Folder(), BON::Object()))
--- 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()))
***************
*** 1352,1359 ****
m_entities.push_back( Entity( BON::Folder(), rel_it->getOp2()));
if ( ptr != BON::Object())
! TO( std::string("CHECK: Operand 2 of ") + rel_it->getOperationStr() + " is not present in Entities\n" +
! ptr->getName() + " : " + ptr->getObjectMeta().name() + " has been inserted");
else
! TO( std::string("CHECK: Operand 2 of ") + rel_it->getOperationStr() + " is null\n");
}
if ( ent3 == 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()))
***************
*** 1363,1372 ****
ptr = rel_it->getOp3();
m_entities.push_back( Entity( BON::Folder(), rel_it->getOp3()));
! TO( std::string("CHECK: Operand 3 of ") + rel_it->getOperationStr() + " is not present in Entities\n" +
! ptr->getName() + " : " + ptr->getObjectMeta().name() + " has been inserted");
}
else
{
! TO("CHECK: Association without Connection class: " + o1->getName() + " o " + o2->getName() );
}
}
--- 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" );
}
}
***************
*** 1376,1380 ****
if( rel_it->getOp1() == BON::Object() ||
rel_it->getOp2() == BON::Object() )
! TO( rel_it->getOperationStr() + "has one operand 0");
Entity ent1 = entitySearch( rel_it->getOp1());
--- 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());
***************
*** 1386,1393 ****
m_entities.push_back( Entity( BON::Folder(), rel_it->getOp1()));
if ( ptr != BON::Object())
! TO( std::string("CHECK: Operand 1 of ") + rel_it->getOperationStr() + " is not present in Entities\n" +
! ptr->getName() + " : " + ptr->getObjectMeta().name() + " has been inserted");
else
! TO( std::string("CHECK: Operand 1 of ") + rel_it->getOperationStr() + " is null\n");
}
if ( ent2 == Entity( BON::Folder(), BON::Object()))
--- 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()))
***************
*** 1401,1408 ****
if ( rel_it->getOp2())
peer2 = rel_it->getOp2()->getName() + " " + rel_it->getOp2()->getObjectMeta().name();
! TO( 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
--- 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
***************
*** 1414,1418 ****
//BON::Set set = dynamic_cast<BON::Set>(obj);
BON::Set set = BON::Set( obj);
! if (!set) TO("ERROR during set manipulation");
std::set<FCO> list = set->getMembers();
--- 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();
***************
*** 1427,1431 ****
++list_it;
}
! TO( "Aspect members are:\n" + mmm);
}
}
--- 1449,1453 ----
++list_it;
}
! //TO( "Aspect members are:\n" + mmm);
}
}
***************
*** 1434,1438 ****
{
if (rel_it->getOp3() == BON::Object())
! TO( "(Folder)Containment line object not present in m_relations list");
}
} // end if
--- 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
***************
*** 1458,1463 ****
ObjPointer o2 = rel_it1->getOp2();
! TO("Same attribute " + o2->getName() +
! " contained twice by " + o1->getName());
}
}
--- 1480,1484 ----
ObjPointer o2 = rel_it1->getOp2();
! global_vars.err << std::string( "Same attribute " + o2->getName() + " contained twice by " + o1->getName() + "\n");
}
}
***************
*** 1499,1508 ****
CHECK();
- //Show();
selectFromSameAspectsFolders();
proxyFinder();
- //TO("0--------------- Proxy ---------------0");
- //Show();
equivalenceFinder();
removeProxiesAndEquiv();
--- 1520,1526 ----
***************
*** 1510,1515 ****
bool do_at_all = true;
- //TO("0--------------- Result ---------------0");
- //Show();
if ( do_at_all)
{
--- 1528,1531 ----
Index: BON2Component.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/BON2Component.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** BON2Component.h 10 Mar 2004 02:50:18 -0000 1.7
--- BON2Component.h 11 Mar 2004 15:53:19 -0000 1.8
***************
*** 81,84 ****
--- 81,85 ----
void scanProject( Project& project);
+ void scanSubFolders( const std::set<Folder>& subfolders, std::set<Folder>& result);
void scanModels( const Model& model, const Folder& parent);
void scanSubModels( const Model& model);
- Previous message: [GME-commit]
GMESRC/Paradigms/UML UML.xmp,1.6,1.7 UMLMeta.xme,1.3,1.4
- Next message: [GME-commit]
GMESRC/Paradigms/MetaGME/BonExtension/Rep AttributeRep.cpp,1.6,1.7
FCO.cpp,1.9,1.10 ModelRep.cpp,1.8,1.9 SetRep.cpp,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the GME-commit
mailing list