[Hibernate-commits] Hibernate2/src/net/sf/hibernate/type AbstractComponentType.java,1.3,1.4 ArrayType.java,1.4,1.5 BagType.java,1.4,1.5 BigDecimalType.java,1.3,1.4 BinaryType.java,1.3,1.4 BlobType.java,1.4,1.5 BooleanType.java,1.3,1.4 ByteType.java,1.3,1.4 CalendarDateType.java,1.3,1.4 CalendarType.java,1.3,1.4 CharacterType.java,1.3,1.4 ClassType.java,1.3,1.4 ClobType.java,1.4,1.5 ComponentType.java,1.3,1.4 CurrencyType.java,1.3,1.4 CustomType.java,1.3,1.4 DateType.java,1.3,1.4 DoubleType.java,1.3,1.4 EntityType.java,1.3,1.4 FloatType.java,1.3,1.4 IntegerType.java,1.3,1.4 ListType.java,1.4,1.5 LocaleType.java,1.3,1.4 LongType.java,1.3,1.4 MapType.java,1.4,1.5 ObjectType.java,1.3,1.4 PersistentCollectionType.java,1.4,1.5 PersistentEnumType.java,1.4,1.5 SerializableType.java,1.3,1.4 SetType.java,1.4,1.5 ShortType.java,1.3,1.4 SortedMapType.java,1.4,1.5 SortedSetType.java,1.4,1.5 StringType.java,1.3,1.4 TimeType.java,1.4,1.5 TimeZoneType.java,1.3,1.4 TimestampType.java,1.5,1.6 Type.java,1.3,1.4

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

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type
In directory sc8-pr-cvs1:/tmp/cvs-serv29025/sf/hibernate/type

Modified Files:
	AbstractComponentType.java ArrayType.java BagType.java 
	BigDecimalType.java BinaryType.java BlobType.java 
	BooleanType.java ByteType.java CalendarDateType.java 
	CalendarType.java CharacterType.java ClassType.java 
	ClobType.java ComponentType.java CurrencyType.java 
	CustomType.java DateType.java DoubleType.java EntityType.java 
	FloatType.java IntegerType.java ListType.java LocaleType.java 
	LongType.java MapType.java ObjectType.java 
	PersistentCollectionType.java PersistentEnumType.java 
	SerializableType.java SetType.java ShortType.java 
	SortedMapType.java SortedSetType.java StringType.java 
	TimeType.java TimeZoneType.java TimestampType.java Type.java 
Log Message:
added DynaBean support


Index: AbstractComponentType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/AbstractComponentType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AbstractComponentType.java	5 Jan 2003 02:11:24 -0000	1.3
--- AbstractComponentType.java	19 Jan 2003 11:47:08 -0000	1.4
***************
*** 5,9 ****
  import net.sf.hibernate.engine.Cascades;
  
! /** Enables other Component-like types to hold collections
   */
  
--- 5,10 ----
  import net.sf.hibernate.engine.Cascades;
  
! /** 
!  * Enables other Component-like types to hold collections
   */
  

Index: ArrayType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/ArrayType.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ArrayType.java	5 Jan 2003 02:11:24 -0000	1.4
--- ArrayType.java	19 Jan 2003 11:47:08 -0000	1.5
***************
*** 26,30 ****
  	}
  	
! 	public Class returnedClass() {
  		return arrayClass;
  	}
--- 26,30 ----
  	}
  	
! 	public Class getReturnedClass() {
  		return arrayClass;
  	}

Index: BagType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/BagType.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BagType.java	5 Jan 2003 02:11:24 -0000	1.4
--- BagType.java	19 Jan 2003 11:47:08 -0000	1.5
***************
*** 21,25 ****
  		}
  		
! 		public Class returnedClass() {
  			return java.util.Collection.class;
  		}
--- 21,25 ----
  		}
  		
! 		public Class getReturnedClass() {
  			return java.util.Collection.class;
  		}

Index: BigDecimalType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/BigDecimalType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BigDecimalType.java	5 Jan 2003 02:11:24 -0000	1.3
--- BigDecimalType.java	19 Jan 2003 11:47:08 -0000	1.4
***************
*** 50,54 ****
  	 * @see net.sf.hibernate.type.Type#returnedClass()
  	 */
! 	public Class returnedClass() {
  		return BigDecimal.class;
  	}
--- 50,54 ----
  	 * @see net.sf.hibernate.type.Type#returnedClass()
  	 */
! 	public Class getReturnedClass() {
  		return BigDecimal.class;
  	}

Index: BinaryType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/BinaryType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BinaryType.java	5 Jan 2003 02:11:24 -0000	1.3
--- BinaryType.java	19 Jan 2003 11:47:08 -0000	1.4
***************
*** 62,66 ****
  	}
  	
! 	public Class returnedClass() {
  		return byte[].class;
  	}
--- 62,66 ----
  	}
  	
! 	public Class getReturnedClass() {
  		return byte[].class;
  	}

Index: BlobType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/BlobType.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BlobType.java	5 Jan 2003 02:11:24 -0000	1.4
--- BlobType.java	19 Jan 2003 11:47:08 -0000	1.5
***************
*** 31,35 ****
  	}
  	
! 	public Class returnedClass() {
  		return Blob.class;
  	}
--- 31,35 ----
  	}
  	
! 	public Class getReturnedClass() {
  		return Blob.class;
  	}

Index: BooleanType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/BooleanType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BooleanType.java	5 Jan 2003 02:11:24 -0000	1.3
--- BooleanType.java	19 Jan 2003 11:47:08 -0000	1.4
***************
*** 23,27 ****
  	}
  	
! 	public Class returnedClass() {
  		return Boolean.class;
  	}
--- 23,27 ----
  	}
  	
! 	public Class getReturnedClass() {
  		return Boolean.class;
  	}

Index: ByteType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/ByteType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ByteType.java	5 Jan 2003 02:11:24 -0000	1.3
--- ByteType.java	19 Jan 2003 11:47:08 -0000	1.4
***************
*** 17,21 ****
  	}
  	
! 	public Class returnedClass() {
  		return Byte.class;
  	}
--- 17,21 ----
  	}
  	
! 	public Class getReturnedClass() {
  		return Byte.class;
  	}

Index: CalendarDateType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/CalendarDateType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CalendarDateType.java	5 Jan 2003 02:11:24 -0000	1.3
--- CalendarDateType.java	19 Jan 2003 11:47:08 -0000	1.4
***************
*** 69,73 ****
  	 * @see net.sf.hibernate.type.Type#returnedClass()
  	 */
! 	public Class returnedClass() {
  		return Calendar.class;
  	}
--- 69,73 ----
  	 * @see net.sf.hibernate.type.Type#returnedClass()
  	 */
! 	public Class getReturnedClass() {
  		return Calendar.class;
  	}

Index: CalendarType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/CalendarType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CalendarType.java	5 Jan 2003 02:11:24 -0000	1.3
--- CalendarType.java	19 Jan 2003 11:47:08 -0000	1.4
***************
*** 69,73 ****
  	 * @see net.sf.hibernate.type.Type#returnedClass()
  	 */
! 	public Class returnedClass() {
  		return Calendar.class;
  	}
--- 69,73 ----
  	 * @see net.sf.hibernate.type.Type#returnedClass()
  	 */
! 	public Class getReturnedClass() {
  		return Calendar.class;
  	}

Index: CharacterType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/CharacterType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CharacterType.java	5 Jan 2003 02:11:24 -0000	1.3
--- CharacterType.java	19 Jan 2003 11:47:08 -0000	1.4
***************
*** 25,29 ****
  	}
  	
! 	public Class returnedClass() {
  		return Character.class;
  	}
--- 25,29 ----
  	}
  	
! 	public Class getReturnedClass() {
  		return Character.class;
  	}

Index: ClassType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/ClassType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ClassType.java	5 Jan 2003 02:11:24 -0000	1.3
--- ClassType.java	19 Jan 2003 11:47:08 -0000	1.4
***************
*** 41,45 ****
  	}
  	
! 	public Class returnedClass() {
  		return Class.class;
  	}
--- 41,45 ----
  	}
  	
! 	public Class getReturnedClass() {
  		return Class.class;
  	}

Index: ClobType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/ClobType.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ClobType.java	5 Jan 2003 02:11:24 -0000	1.4
--- ClobType.java	19 Jan 2003 11:47:08 -0000	1.5
***************
*** 31,35 ****
  	}
  	
! 	public Class returnedClass() {
  		return Clob.class;
  	}
--- 31,35 ----
  	}
  	
! 	public Class getReturnedClass() {
  		return Clob.class;
  	}

Index: ComponentType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/ComponentType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ComponentType.java	5 Jan 2003 02:11:24 -0000	1.3
--- ComponentType.java	19 Jan 2003 11:47:08 -0000	1.4
***************
*** 26,41 ****
  	private final ReflectHelper.Setter[] setters;
  	private final String[] propertyNames;
- 	private final Cascades.CascadeStyle[] cascade;
  	private final int propertySpan;
  	private final int[] joinedFetch;
  	private final String parentProperty;
  	private final ReflectHelper.Setter parentSetter;
  	
! 	public int[] sqlTypes(Mapping pi) throws MappingException {
  		//Not called at runtime so doesn't matter if its slow :)
! 		int[] sqlTypes = new int[ getColumnSpan(pi) ];
  		int n=0;
  		for ( int i=0; i<propertySpan; i++ ) {
! 			int[] subtypes = types[i].sqlTypes(pi);
  			for ( int j=0; j<subtypes.length; j++ ) {
  				sqlTypes[n++] = subtypes[j];
--- 26,41 ----
  	private final ReflectHelper.Setter[] setters;
  	private final String[] propertyNames;
  	private final int propertySpan;
+ 	private final Cascades.CascadeStyle[] cascade;
  	private final int[] joinedFetch;
  	private final String parentProperty;
  	private final ReflectHelper.Setter parentSetter;
  	
! 	public int[] sqlTypes(Mapping mapping) throws MappingException {
  		//Not called at runtime so doesn't matter if its slow :)
! 		int[] sqlTypes = new int[ getColumnSpan(mapping) ];
  		int n=0;
  		for ( int i=0; i<propertySpan; i++ ) {
! 			int[] subtypes = types[i].sqlTypes(mapping);
  			for ( int j=0; j<subtypes.length; j++ ) {
  				sqlTypes[n++] = subtypes[j];
***************
*** 45,52 ****
  	}
  	
! 	public int getColumnSpan(Mapping pi) throws MappingException {
  		int span = 0;
! 		for ( int i=0; i<types.length; i++ ) {
! 			span += types[i].getColumnSpan(pi);
  		}
  		return span;
--- 45,52 ----
  	}
  	
! 	public int getColumnSpan(Mapping mapping) throws MappingException {
  		int span = 0;
! 		for ( int i=0; i<propertySpan; i++ ) {
! 			span += types[i].getColumnSpan(mapping);
  		}
  		return span;
***************
*** 55,63 ****
  	public ComponentType(
  		Class componentClass,
- 		Type[] types,
  		String[] properties,
  		int[] joinedFetch,
! 		Cascades.CascadeStyle[]
! 		cascade,
  		String parentProperty,
  		boolean embedded
--- 55,62 ----
  	public ComponentType(
  		Class componentClass,
  		String[] properties,
+ 		Type[] types,
  		int[] joinedFetch,
! 		Cascades.CascadeStyle[] cascade,
  		String parentProperty,
  		boolean embedded
***************
*** 69,73 ****
  		getters = new ReflectHelper.Getter[propertySpan];
  		setters = new ReflectHelper.Setter[propertySpan];
! 		for ( int i=0; i<properties.length; i++ ) {
  			getters[i] = ReflectHelper.getGetter( componentClass, properties[i] );
  			setters[i] = ReflectHelper.getSetter( componentClass, properties[i] );
--- 68,72 ----
  		getters = new ReflectHelper.Getter[propertySpan];
  		setters = new ReflectHelper.Setter[propertySpan];
! 		for ( int i=0; i<propertySpan; i++ ) {
  			getters[i] = ReflectHelper.getGetter( componentClass, properties[i] );
  			setters[i] = ReflectHelper.getSetter( componentClass, properties[i] );
***************
*** 91,95 ****
  	}
  	
! 	public Class returnedClass() {
  		return componentClass;
  	}
--- 90,94 ----
  	}
  	
! 	public Class getReturnedClass() {
  		return componentClass;
  	}
***************
*** 98,102 ****
  		if (x==y) return true;
  		if (x==null || y==null) return false;
! 		for ( int i=0; i<getters.length; i++ ) {
  			if ( !types[i].equals( getters[i].get(x), getters[i].get(y) ) ) return false;
  		}
--- 97,101 ----
  		if (x==y) return true;
  		if (x==null || y==null) return false;
! 		for ( int i=0; i<propertySpan; i++ ) {
  			if ( !types[i].equals( getters[i].get(x), getters[i].get(y) ) ) return false;
  		}

Index: CurrencyType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/CurrencyType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CurrencyType.java	5 Jan 2003 02:11:24 -0000	1.3
--- CurrencyType.java	19 Jan 2003 11:47:08 -0000	1.4
***************
*** 99,103 ****
  	 * @see net.sf.hibernate.type.Type#returnedClass()
  	 */
! 	public Class returnedClass() {
  		return CURRENCY_CLASS;
  	}
--- 99,103 ----
  	 * @see net.sf.hibernate.type.Type#returnedClass()
  	 */
! 	public Class getReturnedClass() {
  		return CURRENCY_CLASS;
  	}

Index: CustomType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/CustomType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CustomType.java	5 Jan 2003 02:11:24 -0000	1.3
--- CustomType.java	19 Jan 2003 11:47:08 -0000	1.4
***************
*** 59,63 ****
  	 * @see net.sf.hibernate.type.Type#returnedClass()
  	 */
! 	public Class returnedClass() {
  		return userType.returnedClass();
  	}
--- 59,63 ----
  	 * @see net.sf.hibernate.type.Type#returnedClass()
  	 */
! 	public Class getReturnedClass() {
  		return userType.returnedClass();
  	}

Index: DateType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/DateType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DateType.java	5 Jan 2003 02:11:24 -0000	1.3
--- DateType.java	19 Jan 2003 11:47:08 -0000	1.4
***************
*** 17,21 ****
  	}
  	
! 	public Class returnedClass() {
  		return java.util.Date.class;
  	}
--- 17,21 ----
  	}
  	
! 	public Class getReturnedClass() {
  		return java.util.Date.class;
  	}

Index: DoubleType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/DoubleType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DoubleType.java	5 Jan 2003 02:11:24 -0000	1.3
--- DoubleType.java	19 Jan 2003 11:47:08 -0000	1.4
***************
*** 1,3 ****
! //$Id$
package net.sf.hibernate.type;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Types;

public class DoubleType extends PrimitiveType {
	public Object get(ResultSet rs, String name) throws SQLException {
		return new Double(rs.getDouble(name));
	}
	
	public Class primitiveClass() {
		return double.class;
	}
	
	public Class returnedClass() {
		return Double.class;
	}
	
	public void set(PreparedStatement st, Object value, int index)
		throws SQLException {
		
		st.setDouble(index, ((Double) value).doubleValue());
	}
	
	public int sqlType() {
		return Types.DOUBLE;
	}
	public String getName() { return "double"; }

	public String objectToSQLString(Object value) throws Exception {
		return value.toString();
	}
}
  
  
--- 1,3 ----
! //$Id$
package net.sf.hibernate.type;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Types;

public class DoubleType extends PrimitiveType {
	public Object get(ResultSet rs, String name) throws SQLException {
		return new Double(rs.getDouble(name));
	}
	
	public Class primitiveClass() {
		return double.class;
	}
	
	public Class getReturnedClass() {
		return Double.class;
	}
	
	public void set(PreparedStatement st, Object value, int index)
		throws SQLException {
		
		st.setDouble(index, ((Double) value).doubleValue());
	}
	
	public int sqlType() {
		return Types.DOUBLE;
	}
	public String getName() { return "double"; }

	public String objectToSQLString(Object value) throws Exception {
		return value.toString();
	}
}
  
  

Index: EntityType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/EntityType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** EntityType.java	5 Jan 2003 02:11:24 -0000	1.3
--- EntityType.java	19 Jan 2003 11:47:08 -0000	1.4
***************
*** 47,51 ****
  	 * it should return the proxy class, but it doesn't.
  	 */
! 	public final Class returnedClass() {
  		return persistentClass;
  	}
--- 47,51 ----
  	 * it should return the proxy class, but it doesn't.
  	 */
! 	public final Class getReturnedClass() {
  		return persistentClass;
  	}

Index: FloatType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/FloatType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FloatType.java	5 Jan 2003 02:11:24 -0000	1.3
--- FloatType.java	19 Jan 2003 11:47:08 -0000	1.4
***************
*** 17,21 ****
  	}
  	
! 	public Class returnedClass() {
  		return Float.class;
  	}
--- 17,21 ----
  	}
  	
! 	public Class getReturnedClass() {
  		return Float.class;
  	}

Index: IntegerType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/IntegerType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** IntegerType.java	5 Jan 2003 02:11:24 -0000	1.3
--- IntegerType.java	19 Jan 2003 11:47:08 -0000	1.4
***************
*** 19,23 ****
  	}
  	
! 	public Class returnedClass() {
  		return Integer.class;
  	}
--- 19,23 ----
  	}
  	
! 	public Class getReturnedClass() {
  		return Integer.class;
  	}

Index: ListType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/ListType.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ListType.java	5 Jan 2003 02:11:24 -0000	1.4
--- ListType.java	19 Jan 2003 11:47:08 -0000	1.5
***************
*** 17,21 ****
  	}
  	
! 	public Class returnedClass() {
  		return java.util.List.class;
  	}
--- 17,21 ----
  	}
  	
! 	public Class getReturnedClass() {
  		return java.util.List.class;
  	}

Index: LocaleType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/LocaleType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** LocaleType.java	5 Jan 2003 02:11:24 -0000	1.3
--- LocaleType.java	19 Jan 2003 11:47:08 -0000	1.4
***************
*** 41,45 ****
  	}
  	
! 	public Class returnedClass() {
  		return Locale.class;
  	}
--- 41,45 ----
  	}
  	
! 	public Class getReturnedClass() {
  		return Locale.class;
  	}

Index: LongType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/LongType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** LongType.java	5 Jan 2003 02:11:24 -0000	1.3
--- LongType.java	19 Jan 2003 11:47:08 -0000	1.4
***************
*** 19,23 ****
  	}
  	
! 	public Class returnedClass() {
  		return Long.class;
  	}
--- 19,23 ----
  	}
  	
! 	public Class getReturnedClass() {
  		return Long.class;
  	}

Index: MapType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/MapType.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MapType.java	5 Jan 2003 02:11:24 -0000	1.4
--- MapType.java	19 Jan 2003 11:47:08 -0000	1.5
***************
*** 20,24 ****
  	}
  	
! 	public Class returnedClass() {
  		return java.util.Map.class;
  	}
--- 20,24 ----
  	}
  	
! 	public Class getReturnedClass() {
  		return java.util.Map.class;
  	}

Index: ObjectType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/ObjectType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ObjectType.java	5 Jan 2003 02:11:24 -0000	1.3
--- ObjectType.java	19 Jan 2003 11:47:08 -0000	1.4
***************
*** 113,117 ****
  	 * @see net.sf.hibernate.type.Type#returnedClass()
  	 */
! 	public Class returnedClass() {
  		return Object.class;
  	}
--- 113,117 ----
  	 * @see net.sf.hibernate.type.Type#returnedClass()
  	 */
! 	public Class getReturnedClass() {
  		return Object.class;
  	}

Index: PersistentCollectionType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/PersistentCollectionType.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PersistentCollectionType.java	5 Jan 2003 02:11:24 -0000	1.4
--- PersistentCollectionType.java	19 Jan 2003 11:47:08 -0000	1.5
***************
*** 86,90 ****
  	
  	public String getName() {
! 		return returnedClass().getName();
  	}
  	
--- 86,90 ----
  	
  	public String getName() {
! 		return getReturnedClass().getName();
  	}
  	

Index: PersistentEnumType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/PersistentEnumType.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PersistentEnumType.java	5 Jan 2003 02:11:24 -0000	1.4
--- PersistentEnumType.java	19 Jan 2003 11:47:08 -0000	1.5
***************
*** 64,68 ****
  	}
  	
! 	public Class returnedClass() {
  		return enumClass;
  	}
--- 64,68 ----
  	}
  	
! 	public Class getReturnedClass() {
  		return enumClass;
  	}

Index: SerializableType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/SerializableType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SerializableType.java	5 Jan 2003 02:11:24 -0000	1.3
--- SerializableType.java	19 Jan 2003 11:47:08 -0000	1.4
***************
*** 37,41 ****
  	}
  	
! 	public Class returnedClass() {
  		return serializableClass;
  	}
--- 37,41 ----
  	}
  	
! 	public Class getReturnedClass() {
  		return serializableClass;
  	}

Index: SetType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/SetType.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SetType.java	5 Jan 2003 02:11:24 -0000	1.4
--- SetType.java	19 Jan 2003 11:47:08 -0000	1.5
***************
*** 17,21 ****
  	}
  	
! 	public Class returnedClass() {
  		return java.util.Set.class;
  	}
--- 17,21 ----
  	}
  	
! 	public Class getReturnedClass() {
  		return java.util.Set.class;
  	}

Index: ShortType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/ShortType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ShortType.java	5 Jan 2003 02:11:24 -0000	1.3
--- ShortType.java	19 Jan 2003 11:47:08 -0000	1.4
***************
*** 19,23 ****
  	}
  	
! 	public Class returnedClass() {
  		return Integer.class;
  	}
--- 19,23 ----
  	}
  	
! 	public Class getReturnedClass() {
  		return Integer.class;
  	}

Index: SortedMapType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/SortedMapType.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SortedMapType.java	5 Jan 2003 02:11:24 -0000	1.4
--- SortedMapType.java	19 Jan 2003 11:47:08 -0000	1.5
***************
*** 25,29 ****
  	}
  	
! 	public Class returnedClass() {
  		return java.util.SortedMap.class;
  	}
--- 25,29 ----
  	}
  	
! 	public Class getReturnedClass() {
  		return java.util.SortedMap.class;
  	}

Index: SortedSetType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/SortedSetType.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SortedSetType.java	5 Jan 2003 02:11:24 -0000	1.4
--- SortedSetType.java	19 Jan 2003 11:47:08 -0000	1.5
***************
*** 25,29 ****
  	}
  	
! 	public Class returnedClass() {
  		return java.util.SortedSet.class;
  	}
--- 25,29 ----
  	}
  	
! 	public Class getReturnedClass() {
  		return java.util.SortedSet.class;
  	}

Index: StringType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/StringType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** StringType.java	5 Jan 2003 02:11:24 -0000	1.3
--- StringType.java	19 Jan 2003 11:47:08 -0000	1.4
***************
*** 15,19 ****
  	}
  	
! 	public Class returnedClass() {
  		return String.class;
  	}
--- 15,19 ----
  	}
  	
! 	public Class getReturnedClass() {
  		return String.class;
  	}

Index: TimeType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/TimeType.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TimeType.java	5 Jan 2003 02:11:24 -0000	1.4
--- TimeType.java	19 Jan 2003 11:47:08 -0000	1.5
***************
*** 15,19 ****
  		return rs.getTime(name);
  	}
! 	public Class returnedClass() {
  		return java.util.Date.class;
  	}
--- 15,19 ----
  		return rs.getTime(name);
  	}
! 	public Class getReturnedClass() {
  		return java.util.Date.class;
  	}

Index: TimeZoneType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/TimeZoneType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TimeZoneType.java	5 Jan 2003 02:11:24 -0000	1.3
--- TimeZoneType.java	19 Jan 2003 11:47:08 -0000	1.4
***************
*** 52,56 ****
  	 * @see net.sf.hibernate.type.Type#returnedClass()
  	 */
! 	public Class returnedClass() {
  		return TimeZone.class;
  	}
--- 52,56 ----
  	 * @see net.sf.hibernate.type.Type#returnedClass()
  	 */
! 	public Class getReturnedClass() {
  		return TimeZone.class;
  	}

Index: TimestampType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/TimestampType.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TimestampType.java	15 Jan 2003 10:33:17 -0000	1.5
--- TimestampType.java	19 Jan 2003 11:47:08 -0000	1.6
***************
*** 14,18 ****
  		return rs.getTimestamp(name);
  	}
! 	public Class returnedClass() {
  		return java.util.Date.class;
  	}
--- 14,18 ----
  		return rs.getTimestamp(name);
  	}
! 	public Class getReturnedClass() {
  		return java.util.Date.class;
  	}

Index: Type.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/Type.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Type.java	5 Jan 2003 02:11:24 -0000	1.3
--- Type.java	19 Jan 2003 11:47:08 -0000	1.4
***************
*** 69,78 ****
  	
  	/**
! 	 * The class returned by nullSafeGet methods. This is used to establish the
! 	 * class of an array of this type.
  	 *
  	 * @return Class
  	 */
! 	public Class returnedClass();
  	
  	/**
--- 69,78 ----
  	
  	/**
! 	 * The class returned by <tt>nullSafeGet()<tt> methods. This is used to establish 
! 	 * the class of an array of this type.
  	 *
  	 * @return Class
  	 */
! 	public Class getReturnedClass();
  	
  	/**