[GME-commit] GMESRC/Paradigms/MetaGME/MONTraverser MONDialog.cpp,1.6,1.7

[gme-commit at list.isis.vanderbilt.edu]

Update of /var/lib/gme/GMESRC/Paradigms/MetaGME/MONTraverser
In directory braindrain:/tmp/cvs-serv5741/Paradigms/MetaGME/MONTraverser

Modified Files:
	MONDialog.cpp 
Log Message:
Preparing for GME Release 4.5.7

CVS User: volgy

Index: MONDialog.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MONTraverser/MONDialog.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MONDialog.cpp	16 Mar 2004 09:21:42 -0000	1.6
--- MONDialog.cpp	6 May 2004 16:12:05 -0000	1.7
***************
*** 478,497 ****
  			PrintFCO( strTabs, reference );
  			if ( m_bFCOLinks ) {
! 				std::set<MON::Containment> setRoles = reference.targetRoles();
! 				std::set<MON::FCO> setFCOs;
! 				for ( std::set<MON::Containment>::iterator itr = setRoles.begin() ; itr != setRoles.end() ; ++itr )
! 					setFCOs.insert( itr->child() );
  				for ( std::set<MON::FCO>::iterator it = setFCOs.begin() ; it != setFCOs.end() ; ++it )
  					TAG( "Target", REF( "ref", *it ) );
  			}
  			else {
! 				std::set<MON::Containment> setRoles = reference.targetRoles();
! 				for ( std::set<MON::Containment>::iterator it = setRoles.begin() ; it != setRoles.end() ; ++it )
! 					if ( m_bNameRef ) {
! 						TAG( "TargetRole", ATTR( "name", it->name() ) + ATTR( "model", it->parent().name() ) );
! 					}
! 					else {
! 						TAG( "Target", REF( "ref", *it ) );
  					}
  			}
  
--- 478,498 ----
  			PrintFCO( strTabs, reference );
  			if ( m_bFCOLinks ) {
! 				std::set<MON::FCO> setFCOs = reference.targetFCOs();
  				for ( std::set<MON::FCO>::iterator it = setFCOs.begin() ; it != setFCOs.end() ; ++it )
  					TAG( "Target", REF( "ref", *it ) );
  			}
  			else {
! 				std::set<MON::FCO> setFCOs = reference.targetFCOs();
! 				for ( std::set<MON::FCO>::iterator it_fco = setFCOs.begin() ; it_fco != setFCOs.end() ; ++it_fco ) {
! 					std::set<MON::Containment> setRoles = (*it_fco).parentContainments();
! 					for ( std::set<MON::Containment>::iterator it = setRoles.begin() ; it != setRoles.end() ; ++it ) {
! 						if ( m_bNameRef ) {
! 							TAG( "TargetRole", ATTR( "name", it->name() ) + ATTR( "model", it->parent().name() ) );
! 						}
! 						else {
! 							TAG( "Target", REF( "ref", *it ) );
! 						}
  					}
+ 				}
  			}