[jbosstools-commits] JBoss Tools SVN: r30517 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm.

[jbosstools-commits at lists.jboss.org]

Author: dgeraskov
Date: 2011-04-12 08:32:47 -0400 (Tue, 12 Apr 2011)
New Revision: 30517

Modified:
   trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmEntityImpl.java
Log:
https://issues.jboss.org/browse/JBIDE-8708
Return valid DBTable name

Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmEntityImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmEntityImpl.java	2011-04-12 11:52:43 UTC (rev 30516)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmEntityImpl.java	2011-04-12 12:32:47 UTC (rev 30517)
@@ -14,6 +14,9 @@
 import java.util.ListIterator;
 
 import org.eclipse.jpt.common.core.utility.TextRange;
+import org.eclipse.jpt.common.utility.internal.CollectionTools;
+import org.eclipse.jpt.common.utility.internal.NotNullFilter;
+import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable;
 import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable;
 import org.eclipse.jpt.common.utility.internal.iterators.EmptyListIterator;
 import org.eclipse.jpt.jpa.core.context.BaseJoinColumn;
@@ -117,18 +120,25 @@
 		return this.getTable().getDBTableName();
 	}
 
-	@Override
 	protected boolean tableNameIsValid(String tableName) {
-		// TODO Auto-generated method stub
-		return super.tableNameIsValid(tableName);
+		return this.tableIsUndefined || CollectionTools.contains(this.getAllAssociatedDBTableNames(), tableName);
 	}
+	
+	public Iterable<String> getAllAssociatedDBTableNames() {
+		return this.convertToDBNames(this.getAllAssociatedTables());
+	}
 
+	/**
+	 * strip out <code>null</code> names
+	 */
+	protected Iterable<String> convertToDBNames(Iterable<ReadOnlyTable> tables) {
+		return new FilteringIterable<String>(this.convertToDBNames_(tables), NotNullFilter.<String>instance());
+	}
 
 	/**
 	 * Convert Table to it's DB name.
 	 */
-	@Override
-	protected Iterable<String> convertToNames_(Iterable<ReadOnlyTable> tables) {
+	protected Iterable<String> convertToDBNames_(Iterable<ReadOnlyTable> tables) {
 		return new TransformationIterable<ReadOnlyTable, String>(tables) {
 			@Override
 			protected String transform(ReadOnlyTable t) {
@@ -141,6 +151,7 @@
 		};
 	}
 
+
 	@Override
 	protected PrimaryKeyJoinColumnOwner buildPrimaryKeyJoinColumnOwner() {
 		return new HibernatePrimaryKeyJoinColumnOwner();