[GME-commit] GMESRC/Java/java/org/isis/gme/bon JBuilderReference.java,1.3,1.4 JBuilderModel.java,1.6,1.7

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

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

Modified Files:
	JBuilderReference.java JBuilderModel.java 
Log Message:
Deal with null reference properly

CVS User: brianw

Index: JBuilderReference.java
===================================================================
RCS file: /var/lib/gme/GMESRC/Java/java/org/isis/gme/bon/JBuilderReference.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JBuilderReference.java	12 Feb 2004 22:47:14 -0000	1.3
--- JBuilderReference.java	29 Apr 2004 21:30:35 -0000	1.4
***************
*** 15,23 ****
  	public void resolve()
  	{	MgaFCO i;
! 		i = getIRef().getReferred();
! 		if(i!=null)		
! 			ref = JBuilder.theInstance.findObject(i);
! 		else
  			ref = null;
  	}
  
--- 15,29 ----
  	public void resolve()
  	{	MgaFCO i;
! 		try
! 		{
! 			i = getIRef().getReferred();
! 		}
! 		catch(Exception e)//handle when the referred is null
! 		{
  			ref = null;
+ 			return;
+ 		}		
+ 			ref = JBuilder.theInstance.findObject(i);
+ 			
  	}
  

Index: JBuilderModel.java
===================================================================
RCS file: /var/lib/gme/GMESRC/Java/java/org/isis/gme/bon/JBuilderModel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** JBuilderModel.java	23 Feb 2004 19:15:01 -0000	1.6
--- JBuilderModel.java	29 Apr 2004 21:30:35 -0000	1.7
***************
*** 120,126 ****
  			MgaFCO r = chd;
  			while(ot == MgaObject.OBJTYPE_REFERENCE)
! 			{	MgaFCO rr;
! 				rr = (new MgaReference(r)).getReferred();
! 				r = rr;
  				if(r==null)	break;
  				ot = r.getObjType();
--- 120,134 ----
  			MgaFCO r = chd;
  			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();