[hibernate-commits] Hibernate SVN: r16411 - core/branches/antlr3/src/main/java/org/hibernate/sql/ast/tree.

[hibernate-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2009-04-22 16:18:51 -0400 (Wed, 22 Apr 2009)
New Revision: 16411

Modified:
   core/branches/antlr3/src/main/java/org/hibernate/sql/ast/tree/Table.java
Log:
fixed bug in EntityTableSpace

Modified: core/branches/antlr3/src/main/java/org/hibernate/sql/ast/tree/Table.java
===================================================================
--- core/branches/antlr3/src/main/java/org/hibernate/sql/ast/tree/Table.java	2009-04-22 20:01:25 UTC (rev 16410)
+++ core/branches/antlr3/src/main/java/org/hibernate/sql/ast/tree/Table.java	2009-04-22 20:18:51 UTC (rev 16411)
@@ -139,7 +139,7 @@
 
 	public static abstract class AbstractTableSpace implements Table.TableSpace {
 		private final TableAliasGenerator.TableAliasRoot aliasRoot;
-		protected final LinkedHashSet<Table> tables = new LinkedHashSet<Table>();
+		protected final ArrayList<Table> tables = new ArrayList<Table>();
 		protected final HashMap<String,Table> aliasToTableMap = new HashMap<String,Table>();
 		protected final HashMap<String,Table> nameToTableMap = new HashMap<String,Table>();
 
@@ -181,14 +181,13 @@
 
 	public static class EntityTableSpace extends AbstractTableSpace {
 		private final EntityPersisterSpace persisterSpace;
-		private final ArrayList tables;
 
 		public EntityTableSpace(Queryable entityPersister, TableAliasGenerator.TableAliasRoot aliasRoot) {
 			super( aliasRoot );
 			this.persisterSpace = new EntityPersisterSpace( this, entityPersister );
-			int numberOfTables = entityPersister.getMappedTableMetadata().getJoinedTables().length + 1;
-			int listSize = numberOfTables + (int) ( numberOfTables * .75 ) + 1;
-			this.tables = new ArrayList( listSize );
+//			int numberOfTables = entityPersister.getMappedTableMetadata().getJoinedTables().length + 1;
+//			int listSize = numberOfTables + (int) ( numberOfTables * .75 ) + 1;
+//			this.tables = new ArrayList( listSize );
 
 			PersisterTableExpressionGenerator.generateTableExpression(
 					entityPersister,
@@ -206,7 +205,7 @@
 		}
 
 		public Table getDrivingTable() {
-			return ( Table ) tables.get( 0 );
+			return tables.get( 0 );
 		}
 
 		public Table getJoinIntoTable() {
@@ -219,7 +218,7 @@
 
 		public Table getContainingTable(String propertyName) {
 			// todo : probably a better solution here is to iterate the internal collection of tables...
-			return ( Table ) tables.get( getEntityPersister().getSubclassPropertyTableNumber( propertyName ) );
+			return tables.get( getEntityPersister().getSubclassPropertyTableNumber( propertyName ) );
 		}
 
 		public Type getPropertyType(String propertyName) {