[Hibernate-commits] Hibernate Code SVN: r10195 - in trunk/HibernateExt/metadata/src/java/org/hibernate/cfg: . annotations

[<hib...@li...>]

Author: max...@jb...
Date: 2006-08-03 03:53:15 -0400 (Thu, 03 Aug 2006)
New Revision: 10195

Modified:
   trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationConfiguration.java
   trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/CreateKeySecondPass.java
   trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/FkSecondPass.java
   trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/IndexSecondPass.java
   trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/OneToOneSecondPass.java
   trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/CollectionBinder.java
   trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java
Log:
removal of nonused parameter due to HHH-1963 

Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationConfiguration.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationConfiguration.java	2006-08-03 07:53:09 UTC (rev 10194)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationConfiguration.java	2006-08-03 07:53:15 UTC (rev 10195)
@@ -6,7 +6,6 @@
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -285,7 +284,7 @@
 			SecondPass sp = (SecondPass) iter.next();
 			//do the second pass of fk before the others and remove them
 			if ( sp instanceof FkSecondPass ) {
-				sp.doSecondPass( classes, Collections.EMPTY_MAP ); // TODO: align meta-attributes with normal bind...
+				sp.doSecondPass( classes ); 
 				iter.remove();
 			}
 		}
@@ -294,7 +293,7 @@
 			SecondPass sp = (SecondPass) iter.next();
 			//do the second pass of fk before the others and remove them
 			if ( sp instanceof CreateKeySecondPass ) {
-				sp.doSecondPass( classes, Collections.EMPTY_MAP ); // TODO: align meta-attributes with normal bind...
+				sp.doSecondPass( classes ); 
 				iter.remove();
 			}
 		}

Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/CreateKeySecondPass.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/CreateKeySecondPass.java	2006-08-03 07:53:09 UTC (rev 10194)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/CreateKeySecondPass.java	2006-08-03 07:53:15 UTC (rev 10195)
@@ -22,7 +22,7 @@
 		this.joinedSubClass = joinedSubClass;
 	}
 
-	public void doSecondPass(Map persistentClasses, Map inheritedMetas) throws MappingException {
+	public void doSecondPass(Map persistentClasses) throws MappingException {
 		if ( rootClass != null ) {
 			rootClass.createPrimaryKey();
 		}

Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/FkSecondPass.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/FkSecondPass.java	2006-08-03 07:53:09 UTC (rev 10194)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/FkSecondPass.java	2006-08-03 07:53:15 UTC (rev 10195)
@@ -32,7 +32,7 @@
 		this.path = path;
 	}
 
-	public void doSecondPass(java.util.Map persistentClasses, java.util.Map inheritedMetas) throws MappingException {
+	public void doSecondPass(java.util.Map persistentClasses) throws MappingException {
 		if ( value instanceof ManyToOne ) {
 			ManyToOne manyToOne = (ManyToOne) value;
 			PersistentClass ref = (PersistentClass) persistentClasses.get( manyToOne.getReferencedEntityName() );

Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/IndexSecondPass.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/IndexSecondPass.java	2006-08-03 07:53:09 UTC (rev 10194)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/IndexSecondPass.java	2006-08-03 07:53:15 UTC (rev 10195)
@@ -33,7 +33,7 @@
 		this.mappings = mappings;
 	}
 
-	public void doSecondPass(Map persistentClasses, Map inheritedMetas) throws MappingException {
+	public void doSecondPass(Map persistentClasses) throws MappingException {
 		if ( columns != null ) {
 			for ( String columnName : columns ) {
 				addIndexToColumn( columnName );

Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/OneToOneSecondPass.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/OneToOneSecondPass.java	2006-08-03 07:53:09 UTC (rev 10194)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/OneToOneSecondPass.java	2006-08-03 07:53:15 UTC (rev 10195)
@@ -59,7 +59,7 @@
 	}
 
 	//TODO refactor this code, there is a lot of duplication in this method
-	public void doSecondPass(Map persistentClasses, Map inheritedMetas) throws MappingException {
+	public void doSecondPass(Map persistentClasses) throws MappingException {
 		org.hibernate.mapping.OneToOne value = new org.hibernate.mapping.OneToOne(
 				propertyHolder.getTable(), propertyHolder.getPersistentClass()
 		);
@@ -105,7 +105,7 @@
 						value, joinColumns,
 						!optional, //cannot have nullabe and unique on certain DBs
 						path, mappings
-				) ).doSecondPass( persistentClasses, inheritedMetas );
+				) ).doSecondPass( persistentClasses );
 				//no column associated since its a one to one
 				propertyHolder.addProperty( prop );
 			}

Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/CollectionBinder.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/CollectionBinder.java	2006-08-03 07:53:09 UTC (rev 10194)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/CollectionBinder.java	2006-08-03 07:53:15 UTC (rev 10195)
@@ -359,7 +359,7 @@
 				|| property.isAnnotationPresent( CollectionOfElements.class ) ) {
 			// do it right away, otherwise @ManyToon on composite element call addSecondPass 
 			// and raise a ConcurrentModificationException
-			sp.doSecondPass( CollectionHelper.EMPTY_MAP, CollectionHelper.EMPTY_MAP );
+			sp.doSecondPass( CollectionHelper.EMPTY_MAP );
 		}
 		else {
 			mappings.addSecondPass( sp, ! isMappedBy );

Modified: trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java
===================================================================
--- trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java	2006-08-03 07:53:09 UTC (rev 10194)
+++ trunk/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java	2006-08-03 07:53:15 UTC (rev 10195)
@@ -46,7 +46,7 @@
 		this.isDefault = isDefault;
 	}
 
-	public void doSecondPass(Map persistentClasses, Map inheritedMetas) throws MappingException {
+	public void doSecondPass(Map persistentClasses) throws MappingException {
 		//TODO add parameters checkings
 		if ( ann == null ) return;
 		ResultSetMappingDefinition definition = new ResultSetMappingDefinition( ann.name() );