[GME-commit] GMESRC/SDK/BON Builder.cpp,1.26,1.27

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

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

Modified Files:
	Builder.cpp 
Log Message:
Folders can contain Refs, Atoms, Conns, Sets also.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: Builder.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/SDK/BON/Builder.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Builder.cpp	13 Apr 2004 16:34:57 -0000	1.26
--- Builder.cpp	4 Jan 2006 16:42:37 -0000	1.27
***************
*** 230,235 ****
  	MGACOLL_ITERATE(IMgaFCO, psa) {
  		CComPtr<IMgaModel> mm;
  		MGACOLL_ITER.QueryInterface(&mm);
! 		if(mm) rootModels.AddTail( CBuilderFactory::Create(mm, NULL) );
  	} MGACOLL_ITERATE_END;
  
--- 230,257 ----
  	MGACOLL_ITERATE(IMgaFCO, psa) {
  		CComPtr<IMgaModel> mm;
+ 		CComPtr<IMgaAtom> aa;
+ 		CComPtr<IMgaReference> rr;
+ 		CComPtr<IMgaSimpleConnection> cc;
+ 		CComPtr<IMgaSet> ss;
  		MGACOLL_ITER.QueryInterface(&mm);
! 		MGACOLL_ITER.QueryInterface(&aa);
! 		MGACOLL_ITER.QueryInterface(&rr);
! 		MGACOLL_ITER.QueryInterface(&cc);
! 		MGACOLL_ITER.QueryInterface(&ss);
! 		if(mm) {
! 			CBuilderModel * bm = CBuilderFactory::Create(mm, NULL);
! 			rootModels.AddTail( bm);
! 			rootObjects.AddTail( bm);
! 		}
! 		else if( aa)
! 			rootObjects.AddTail( CBuilderFactory::Create( aa, NULL));
! 		else if( rr)
! 			rootObjects.AddTail( CBuilderFactory::Create( rr, NULL));
! 		else if( cc)
! 			rootObjects.AddTail( CBuilderFactory::Create( cc, NULL));
! 		else if( ss)
! 			rootObjects.AddTail( CBuilderFactory::Create( ss, NULL));
! 		else // unknown kind
! 			ASSERT(0);
  	} MGACOLL_ITERATE_END;