[GME-commit] GMESRC/Java/java/org/isis/gme/bon JBuilderFolder.java,1.4,1.5

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

Update of /var/lib/gme/GMESRC/Java/java/org/isis/gme/bon
In directory braindrain:/tmp/cvs-serv529/Java/java/org/isis/gme/bon

Modified Files:
	JBuilderFolder.java 
Log Message:
fixed javaBON bug:
originally, the javaBON only looked for Models inside of Folders,
however, any FCO may reside inside Folders. Now all FCOs
residing directly in a Folder will get instantiated.

CVS User: brianw

Index: JBuilderFolder.java
===================================================================
RCS file: /var/lib/gme/GMESRC/Java/java/org/isis/gme/bon/JBuilderFolder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** JBuilderFolder.java	13 Feb 2004 23:05:13 -0000	1.4
--- JBuilderFolder.java	18 Oct 2004 19:16:19 -0000	1.5
***************
*** 10,13 ****
--- 10,14 ----
  	protected MgaFolder ciFolder;
  	protected Vector rootModels;
+ 	protected Vector rootFCOs;
  	protected Vector subfolders;
  	protected JBuilderFolder parentfolder;
***************
*** 23,26 ****
--- 24,28 ----
  		rootModels =  new Vector();
  		subfolders = new Vector();
+ 		rootFCOs = new Vector();
  		name = ciFolder.getName();
  		
***************
*** 29,44 ****
  		
  		
! 		//MgaFCOs psa = ciFolder.getChildFCOs();
!         MgaObjects psa = ciFolder.getChildObjects();           
  		
  		int psaCount = psa.getCount();
!                 //if(psaCount == 0) System.out.println("no child FCOs?");
  		for(int i=0;i<psaCount;i++)
! 		{	MgaObject item = psa.getItem(i);
              if(item.getObjType() == MgaObject.OBJTYPE_MODEL)
  			{	
                  MgaModel rootModel = new MgaModel((Dispatch)item);
! 				rootModels.addElement(JBuilderFactory.createModel(rootModel,null));
!                 //rootModels.addElement(new JBuilderModel(rootModel,null));
  			}
  		}
--- 31,99 ----
  		
  		
! 		MgaFCOs psa = ciFolder.getChildFCOs();
!         //MgaObjects psa = ciFolder.getChildObjects();           
  		
  		int psaCount = psa.getCount();
!         //if(psaCount == 0) System.out.println("no objects");
  		for(int i=0;i<psaCount;i++)
! 		{	MgaFCO item = psa.getItem(i);
              if(item.getObjType() == MgaObject.OBJTYPE_MODEL)
  			{	
                  MgaModel rootModel = new MgaModel((Dispatch)item);
!                 JBuilderModel m = JBuilderFactory.createModel(rootModel,null);
! 				rootModels.addElement(m);
! 				rootFCOs.addElement(m);
! 			}
! 			//any FCO can reside in a folder
! 			if(item.getObjType() == MgaObject.OBJTYPE_ATOM)
! 			{
! 				MgaAtom rootAtom = new MgaAtom((Dispatch)item);
! 				JBuilderAtom a = JBuilderFactory.createAtom(rootAtom,null);
! 				rootFCOs.addElement(a);
! 			}
! 			if(item.getObjType() == MgaObject.OBJTYPE_CONNECTION)
! 			{
! 				MgaSimpleConnection rootConn = new MgaSimpleConnection((Dispatch)item);
! 				JBuilderConnection c = JBuilderFactory.createConn(rootConn,null);
! 				rootFCOs.addElement(c);
! 			}
! 			if(item.getObjType() == MgaObject.OBJTYPE_SET)
! 			{
! 				MgaSet rootSet = new MgaSet((Dispatch)item);
! 				JBuilderSet s = JBuilderFactory.createSet(rootSet,null);
! 				rootFCOs.addElement(s);
! 			}
! 			if(item.getObjType() == MgaObject.OBJTYPE_REFERENCE)
! 			{
! 				MgaReference rootRef = new MgaReference((Dispatch)item);
! 				
! 				MgaFCO r = item;
! 				int ot = item.getObjType();
! 				while(ot == MgaObject.OBJTYPE_REFERENCE)
! 				{	
! 					try
! 					{
! 						MgaFCO rr;
! 						rr = (new MgaReference(r)).getReferred();
! 						r = rr;
! 					}
! 					catch(Exception e)//handle when the referred is null
! 					{
! 						r = null;
! 					}
! 					if(r==null)	break;
! 					ot = r.getObjType();
! 				}
! 				if(ot== MgaObject.OBJTYPE_MODEL)
! 				{	
! 					JBuilderModelReference oo = JBuilderFactory.createModelRef(rootRef,null);
! 					rootFCOs.addElement(oo);					
! 				}
! 						
! 				else
! 				{	
! 					JBuilderReference oo = JBuilderFactory.createReference(rootRef,null);
! 					rootFCOs.addElement(oo);
! 				}
  			}
  		}
***************
*** 57,64 ****
  		
  	public void resolve()
! 	{	int rootCount = rootModels.size();
  		for(int i=0;i<rootCount;i++)
! 		{	JBuilderModel rootModel = (JBuilderModel)rootModels.elementAt(i);
! 			rootModel.resolve();
  		}
  		
--- 112,125 ----
  		
  	public void resolve()
! 	{	//int rootCount = rootModels.size();
! 		//for(int i=0;i<rootCount;i++)
! 		//{	JBuilderModel rootModel = (JBuilderModel)rootModels.elementAt(i);
! 		//	rootModel.resolve();
! 		//}
! 		int rootCount = rootFCOs.size();
  		for(int i=0;i<rootCount;i++)
! 		{
! 			JBuilderObject rootObject = (JBuilderObject)rootFCOs.elementAt(i);
! 			rootObject.resolve();
  		}
  		
***************
*** 93,96 ****
--- 154,162 ----
  	public Vector getSubFolders()
  	{	return subfolders;
+ 	}
+ 	
+ 	public Vector getRootFCOs()
+ 	{
+ 		return rootFCOs;
  	}