[Hibernate-commits] HibernateExt/metadata/src/java/org/hibernate/cfg/annotations QueryBinder.java,1.21,1.22 CollectionBinder.java,1.32,1.33 SimpleValueBinder.java,1.8,1.9

[<pao...@us...>]

Update of /cvsroot/hibernate/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21308/metadata/src/java/org/hibernate/cfg/annotations

Modified Files:
	QueryBinder.java CollectionBinder.java SimpleValueBinder.java 
Log Message:
Support for generics in reflection layer

Index: QueryBinder.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/QueryBinder.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- QueryBinder.java	25 Jan 2006 21:48:20 -0000	1.21
+++ QueryBinder.java	13 Feb 2006 19:14:35 -0000	1.22
@@ -26,7 +26,6 @@
 import org.hibernate.loader.custom.SQLQueryReturn;
 import org.hibernate.loader.custom.SQLQueryRootReturn;
 import org.hibernate.loader.custom.SQLQueryScalarReturn;
-import org.hibernate.reflection.ReflectionManager;
 
 /**
  * Query binder
@@ -90,7 +89,7 @@
 					getBoolean(queryName, "org.hibernate.callable", hints)
 			);
 		}
-		else if ( ! ReflectionManager.INSTANCE.toXClass( void.class ).equals( queryAnn.resultClass() ) ) {
+		else if ( ! void.class.equals( queryAnn.resultClass() ) ) {
 			//class mapping usage
 			//FIXME should be done in a second pass due to entity name?
 			final SQLQueryRootReturn entityQueryReturn =
@@ -145,7 +144,7 @@
 					queryAnn.callable()
 			);
 		}
-		else if ( ! ReflectionManager.INSTANCE.toXClass( void.class ).equals( queryAnn.resultClass() ) ) {
+		else if ( ! void.class.equals( queryAnn.resultClass() ) ) {
 			//class mapping usage
 			//FIXME should be done in a second pass due to entity name?
 			final SQLQueryRootReturn entityQueryReturn =

Index: CollectionBinder.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/CollectionBinder.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- CollectionBinder.java	27 Jan 2006 10:18:49 -0000	1.32
+++ CollectionBinder.java	13 Feb 2006 19:14:35 -0000	1.33
@@ -168,7 +168,7 @@
 	) {
         XProperty property = inferredData.getProperty();
 		if ( property.isArray() ) {
-			if ( property.getClassOrElementClass().isPrimitive() ) {
+			if ( property.getElementClass().isPrimitive() ) {
 				return new PrimitiveArrayBinder();
 			}
 			else {

Index: SimpleValueBinder.java
===================================================================
RCS file: /cvsroot/hibernate/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/SimpleValueBinder.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- SimpleValueBinder.java	6 Feb 2006 09:16:01 -0000	1.8
+++ SimpleValueBinder.java	13 Feb 2006 19:14:35 -0000	1.9
@@ -66,7 +66,7 @@
 		XClass returnedClassOrElement = returnedClass;
 		boolean isArray = false;
 		if ( property.isArray() ) {
-			returnedClassOrElement = property.getClassOrElementClass();
+			returnedClassOrElement = property.getElementClass();
 			isArray = true;
 		}
 		Properties typeParameters = this.typeParameters;
@@ -90,24 +90,24 @@
 		}
 		else if ( property.isAnnotationPresent( Lob.class ) ) {
 
-			if ( ReflectionManager.INSTANCE.toXClass( java.sql.Clob.class ).equals( returnedClassOrElement ) ) {
+			if ( ReflectionManager.INSTANCE.equals( returnedClassOrElement, java.sql.Clob.class ) ) {
 				type = "clob";
 			}
-			else if ( ReflectionManager.INSTANCE.toXClass( java.sql.Blob.class ).equals( returnedClassOrElement ) ) {
+			else if ( ReflectionManager.INSTANCE.equals( returnedClassOrElement, java.sql.Blob.class ) ) {
 				type = "blob";
 			}
-			else if ( ReflectionManager.INSTANCE.toXClass( String.class ).equals( returnedClassOrElement ) ) {
+			else if ( ReflectionManager.INSTANCE.equals( returnedClassOrElement, String.class ) ) {
 				type = StringClobType.class.getName();
 			}
-			else if ( ReflectionManager.INSTANCE.toXClass( Character.class ).equals( returnedClassOrElement ) && isArray ) {
+			else if ( ReflectionManager.INSTANCE.equals( returnedClassOrElement, Character.class ) && isArray ) {
 				type = CharacterArrayClobType.class.getName();
 			}
-			else if ( ReflectionManager.INSTANCE.toXClass( char.class ).equals( returnedClassOrElement ) && isArray ) {
+			else if ( ReflectionManager.INSTANCE.equals( returnedClassOrElement, char.class ) && isArray ) {
 				type = PrimitiveCharacterArrayClobType.class.getName();
-			} else if ( ReflectionManager.INSTANCE.toXClass( Byte.class ).equals( returnedClassOrElement ) && isArray ) {
+			} else if ( ReflectionManager.INSTANCE.equals( returnedClassOrElement, Byte.class ) && isArray ) {
 				type = ByteArrayBlobType.class.getName();
 			}
-			else if ( ReflectionManager.INSTANCE.toXClass( byte.class ).equals( returnedClassOrElement ) && isArray ) {
+			else if ( ReflectionManager.INSTANCE.equals( returnedClassOrElement, byte.class ) && isArray ) {
 				type = PrimitiveByteArrayBlobType.class.getName();
 			}
 			else if ( ReflectionManager.INSTANCE.toXClass( Serializable.class ).isAssignableFrom( returnedClassOrElement ) ) {