[GME-commit] GMESRC/Java/java/org/isis/gme/bon JBuilderFolder.java,1.5,1.6 JBuilderModel.java,1.8,1.9 JBuilderObject.java,1.7,1.8

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

Update of /project/gme-repository/GMESRC/Java/java/org/isis/gme/bon
In directory escher:/tmp/cvs-serv20686/Java/java/org/isis/gme/bon

Modified Files:
	JBuilderFolder.java JBuilderModel.java JBuilderObject.java 
Log Message:
Added Alex Goos patches to JBON

CVS User: Peter Volgyesi, ISIS (volgy)

Index: JBuilderModel.java
===================================================================
RCS file: /project/gme-repository/GMESRC/Java/java/org/isis/gme/bon/JBuilderModel.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** JBuilderModel.java	6 May 2004 18:22:02 -0000	1.8
--- JBuilderModel.java	14 Mar 2006 15:01:23 -0000	1.9
***************
*** 636,640 ****
  	{	
  		Vector objectlist = (Vector)modelReferenceLists.get(refPartName);
! 		MgaMetaRole role = metaModel.getRoleByName(partName);
  		
  		MgaFCO i;
--- 636,640 ----
  	{	
  		Vector objectlist = (Vector)modelReferenceLists.get(refPartName);
! 		MgaMetaRole role = metaModel.getRoleByName(refPartName);
  		
  		MgaFCO i;
***************
*** 730,734 ****
  		iconn = getIModel().createSimpleConn(role,srcfco,dstfco,srcrefs,dstrefs);
  		
! 		MgaSimpleConnection sconn = (MgaSimpleConnection)iconn;
  		JBuilderConnection conn = addConnection(sconn);
  		conn.resolve();
--- 730,734 ----
  		iconn = getIModel().createSimpleConn(role,srcfco,dstfco,srcrefs,dstrefs);
  		
! 		MgaSimpleConnection sconn = new MgaSimpleConnection(iconn);
  		JBuilderConnection conn = addConnection(sconn);
  		conn.resolve();

Index: JBuilderObject.java
===================================================================
RCS file: /project/gme-repository/GMESRC/Java/java/org/isis/gme/bon/JBuilderObject.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** JBuilderObject.java	24 May 2004 19:28:05 -0000	1.7
--- JBuilderObject.java	14 Mar 2006 15:01:23 -0000	1.8
***************
*** 185,207 ****
  	}
  	
! 	public void getNamePath(String namePath)
! 	{	this.getExtendedName(namePath,"_",true);
! 	}
! 	
! 	public void getExtendedName(String extName, String seperator, boolean startWithRoot)
! 	{	
! 		if(!startWithRoot)
! 			extName += getName();
! 		JBuilderObject parent = this.getParent();
! 		if(parent!=null)
! 		{	if(!startWithRoot)
! 				extName += seperator;
! 			parent.getExtendedName(extName,seperator,startWithRoot);
! 			if(startWithRoot)
! 				extName += seperator;
! 		}
! 		if(startWithRoot)
! 			extName += getName();
! 	}
  	
  	public JBuilderModel getParent()
--- 185,208 ----
  	}
  	
! 	public String getNamePath()
!     {    return this.getExtendedName("","#",true);
!     }
!    
!     public String getExtendedName(String extName, String seperator, boolean startWithRoot)
!     {   
!         if(!startWithRoot)
!             extName += getName();
!         JBuilderObject parent = this.getParent();
!         if(parent!=null)
!         {    if(!startWithRoot)
!                 extName += seperator;
!             parent.getExtendedName(extName,seperator,startWithRoot);
!             if(startWithRoot)
!                 extName += seperator;
!         }
!         if(startWithRoot)
!             extName += getName();
!         return extName;
!     }
  	
  	public JBuilderModel getParent()

Index: JBuilderFolder.java
===================================================================
RCS file: /project/gme-repository/GMESRC/Java/java/org/isis/gme/bon/JBuilderFolder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** JBuilderFolder.java	18 Oct 2004 19:16:19 -0000	1.5
--- JBuilderFolder.java	14 Mar 2006 15:01:23 -0000	1.6
***************
*** 187,190 ****
--- 187,191 ----
  		JBuilderModel o = JBuilderFactory.createModel(im,null);
          //JBuilderModel o = new JBuilderModel(im,null);
+ 		rootModels.add(o);
  		return o;
  	}