[Hibernate-commits] Hibernate/cirrus/hibernate/map Root.java,1.36,1.37

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/map
In directory sc8-pr-cvs1:/tmp/cvs-serv18672/hibernate/map

Modified Files:
	Root.java 
Log Message:
removed deprecated IDGenerator interface, renamedand improved the exception class

Index: Root.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/map/Root.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** Root.java	14 Dec 2002 09:27:55 -0000	1.36
--- Root.java	25 Dec 2002 06:57:57 -0000	1.37
***************
*** 215,231 ****
  		IdentifierGenerator idgen;
          Object gen = null;
!         try {
! 		  gen = idgenClass.getConstructor(argTypes).newInstance(args);
!         } catch(NoSuchMethodException e) {
!              throw new MappingException("Exception while trying to instantiate " + idgenClass.getName() + " with " + list,e);
!         }
! 		if ( gen instanceof IDGenerator) {
! 			idgen = new Adaptor( (IDGenerator) gen );
  		}
! 		else {
! 			idgen = (IdentifierGenerator) gen;
  		}
- 		if ( PersistentIdentifierGenerator.class.isAssignableFrom(idgenClass) ) 
- 			generators.put( ( (PersistentIdentifierGenerator) idgen ).generatorKey(), idgen);
  		return idgen;
  	}
--- 215,230 ----
  		IdentifierGenerator idgen;
          Object gen = null;
! 		try {
! 			gen = idgenClass.getConstructor(argTypes).newInstance(args);
  		}
! 		catch(NoSuchMethodException e) {
! 			throw new MappingException("Exception while trying to instantiate " + idgenClass.getName() + " with " + list,e);
! 		}
! 		
! 		idgen = (IdentifierGenerator) gen;
! 
! 		if ( PersistentIdentifierGenerator.class.isAssignableFrom(idgenClass) ) {
! 			generators.put( ( (PersistentIdentifierGenerator) idgen ).generatorKey(), idgen );
  		}
  		return idgen;
  	}