[GME-commit] GMESRC/SDK/BON BONImpl.cpp,1.22,1.23

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

Update of /project/gme-repository/GMESRC/SDK/BON
In directory escher:/tmp/cvs-serv24988

Modified Files:
	BONImpl.cpp 
Log Message:
Bugfix:
-for gerSrc, getDst, getConnEnd if called with explicit parameters now returns something, previously nothing.
-for getConnEnds, genConnEndsAs if called without parameter, from now on will return empty set only if no connections are possible to that kind.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: BONImpl.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/SDK/BON/BONImpl.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** BONImpl.cpp	12 Apr 2005 19:20:51 -0000	1.22
--- BONImpl.cpp	3 Jun 2005 15:59:32 -0000	1.23
***************
*** 2448,2452 ****
  			}
  
! 			return std::multiset<ConnectionEnd>();
  			/*if ( ! bFound ) commented out by ZolMol: do not throw if -- meta NOT specified --
  				ASSERTTHROW( MON::Exception( "? cannot be target of simple MON::Connection!", "ss", getFCOHelper()->getObjectMeta().infoString().c_str() ) );*/
--- 2448,2453 ----
  			}
  
! 			if ( ! bFound )
! 				return std::multiset<ConnectionEnd>();
  			/*if ( ! bFound ) commented out by ZolMol: do not throw if -- meta NOT specified --
  				ASSERTTHROW( MON::Exception( "? cannot be target of simple MON::Connection!", "ss", getFCOHelper()->getObjectMeta().infoString().c_str() ) );*/
***************
*** 2645,2649 ****
  			}
  
! 			return std::multiset<ConnectionEnd>();
  			/*if ( ! bFound ) commented out by ZolMol: do not throw -- if meta NOT specified --
  				ASSERTTHROW( MON::Exception( "? cannot be target of simple MON::Connection!", "ss", getFCOHelper()->getObjectMeta().infoString().c_str() ) );*/
--- 2646,2651 ----
  			}
  
! 			if ( ! bFound )
! 				return std::multiset<ConnectionEnd>();
  			/*if ( ! bFound ) commented out by ZolMol: do not throw -- if meta NOT specified --
  				ASSERTTHROW( MON::Exception( "? cannot be target of simple MON::Connection!", "ss", getFCOHelper()->getObjectMeta().infoString().c_str() ) );*/
***************
*** 5865,5869 ****
  				FCOPtr spTarget;
  				COMTHROW( MGACOLL_ITER->get_Target( spTarget.Addr() ) );
! 				MON::ConnectionEnd::Pair key( Util::Copy( bstrRole ), MON::FCO( getProject()->getProjectMeta().findByName( _getMetaName( spTarget ) ) ) );
  				if ( m_ends.find( key ) == m_ends.end() ) {
  					ConnectionEndImpl* pCE = ConnectionEndImpl::attachI( MGACOLL_ITER, ObjectImpl::m_pProject, key.second );
--- 5867,5871 ----
  				FCOPtr spTarget;
  				COMTHROW( MGACOLL_ITER->get_Target( spTarget.Addr() ) );
! 				MON::Connection::Pair key( Util::Copy( bstrRole ), MON::FCO( getProject()->getProjectMeta().findByName( _getMetaName( spTarget ) ) ) );
  				if ( m_ends.find( key ) == m_ends.end() ) {
  					ConnectionEndImpl* pCE = ConnectionEndImpl::attachI( MGACOLL_ITER, ObjectImpl::m_pProject, key.second );