rename ReferenceTable to SpecifiedReferenceTable

8 files changed, 30 insertions, 26 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JoinTable.java
index dc76a5a889..e9574b67f8 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JoinTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JoinTable.java
@@ -24,7 +24,7 @@ import org.eclipse.jpt.common.utility.iterable.ListIterable;
  * @since 2.0
  */
 public interface JoinTable
-	extends ReferenceTable, ReadOnlyJoinTable
+	extends SpecifiedReferenceTable, ReadOnlyJoinTable
 {
 	SpecifiedJoinTableRelationshipStrategy getParent();
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReferenceTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/SpecifiedReferenceTable.java
index 07519c9f20..a70d5473b8 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReferenceTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/SpecifiedReferenceTable.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2013 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -26,7 +26,7 @@ import org.eclipse.jpt.common.utility.iterable.ListIterable;
  * @version 2.3
  * @since 2.3
  */
-public interface ReferenceTable
+public interface SpecifiedReferenceTable
 	extends SpecifiedTable, ReadOnlyReferenceTable
 {
 	// ********** join columns **********
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Table.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Table.java
index c1df7b79a0..cc6f2542c7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Table.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Table.java
@@ -19,8 +19,12 @@ import org.eclipse.jpt.jpa.db.Schema;
 import org.eclipse.jpt.jpa.db.SchemaContainer;
 
 /**
- * Read-only table
- * <p>
+ * <ul>
+ * <li>table
+ * <li>secondary table
+ * <li>join table
+ * <li>collection table
+ * </ul>
  * Provisional API: This interface is part of an interim API that is still
  * under development and expected to change significantly before reaching
  * stability. It is available at this early stage to solicit feedback from
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReferenceTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReferenceTable.java
index e9ca50e243..d4e446b7ee 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReferenceTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReferenceTable.java
@@ -10,7 +10,7 @@
 package org.eclipse.jpt.jpa.core.context.java;
 
 import org.eclipse.jpt.common.utility.iterable.ListIterable;
-import org.eclipse.jpt.jpa.core.context.ReferenceTable;
+import org.eclipse.jpt.jpa.core.context.SpecifiedReferenceTable;
 import org.eclipse.jpt.jpa.core.resource.java.ReferenceTableAnnotation;
 
 /**
@@ -26,7 +26,7 @@ import org.eclipse.jpt.jpa.core.resource.java.ReferenceTableAnnotation;
  * @since 2.3
  */
 public interface JavaReferenceTable
-	extends ReferenceTable, JavaTable
+	extends SpecifiedReferenceTable, JavaTable
 {
 	ReferenceTableAnnotation getTableAnnotation();
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReferenceTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReferenceTable.java
index 0eadc2c15d..b40bccb930 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReferenceTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReferenceTable.java
@@ -10,7 +10,7 @@
 package org.eclipse.jpt.jpa.core.context.orm;
 
 import org.eclipse.jpt.common.utility.iterable.ListIterable;
-import org.eclipse.jpt.jpa.core.context.ReferenceTable;
+import org.eclipse.jpt.jpa.core.context.SpecifiedReferenceTable;
 
 /**
  * <code>orm.xml</code> join table or collection table
@@ -25,7 +25,7 @@ import org.eclipse.jpt.jpa.core.context.ReferenceTable;
  * @since 2.3
  */
 public interface OrmReferenceTable
-	extends ReferenceTable, OrmTable
+	extends SpecifiedReferenceTable, OrmTable
 {
 	// ********** join columns **********
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/MappingTools.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/MappingTools.java
index aacd60779c..fe4ba27d02 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/MappingTools.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/MappingTools.java
@@ -46,7 +46,7 @@ import org.eclipse.jpt.jpa.core.context.AttributeOverride;
 import org.eclipse.jpt.jpa.core.context.JoinColumn;
 import org.eclipse.jpt.jpa.core.context.PersistentAttribute;
 import org.eclipse.jpt.jpa.core.context.Relationship;
-import org.eclipse.jpt.jpa.core.context.ReferenceTable;
+import org.eclipse.jpt.jpa.core.context.SpecifiedReferenceTable;
 import org.eclipse.jpt.jpa.core.context.SpecifiedRelationship;
 import org.eclipse.jpt.jpa.core.context.RelationshipMapping;
 import org.eclipse.jpt.jpa.core.context.TypeMapping;
@@ -383,7 +383,7 @@ public final class MappingTools {
 		return null;
 	}
 
-	public static void convertReferenceTableDefaultToSpecifiedJoinColumn(ReferenceTable referenceTable) {
+	public static void convertReferenceTableDefaultToSpecifiedJoinColumn(SpecifiedReferenceTable referenceTable) {
 		SpecifiedJoinColumn defaultJoinColumn = referenceTable.getDefaultJoinColumn();
 		if (defaultJoinColumn != null) {
 			String columnName = defaultJoinColumn.getDefaultName();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/CollectionTable2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/CollectionTable2_0.java
index 62784130c5..0ba2c6f382 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/CollectionTable2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/CollectionTable2_0.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.core.jpa2.context;
 
-import org.eclipse.jpt.jpa.core.context.ReferenceTable;
+import org.eclipse.jpt.jpa.core.context.SpecifiedReferenceTable;
 
 /**
  * Used by element collection mappings.
@@ -24,7 +24,7 @@ import org.eclipse.jpt.jpa.core.context.ReferenceTable;
  * @since 2.3
  */
 public interface CollectionTable2_0
-	extends ReferenceTable
+	extends SpecifiedReferenceTable
 {
 	ElementCollectionMapping2_0 getParent();
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ReferenceTableComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ReferenceTableComposite.java
index a951451cd6..4101e08719 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ReferenceTableComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ReferenceTableComposite.java
@@ -29,7 +29,7 @@ import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn;
 import org.eclipse.jpt.jpa.core.context.JoinColumn;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyReferenceTable;
 import org.eclipse.jpt.jpa.core.context.Table;
-import org.eclipse.jpt.jpa.core.context.ReferenceTable;
+import org.eclipse.jpt.jpa.core.context.SpecifiedReferenceTable;
 import org.eclipse.jpt.jpa.db.Schema;
 import org.eclipse.jpt.jpa.db.SchemaContainer;
 import org.eclipse.jpt.jpa.ui.internal.details.JoinColumnsComposite.JoinColumnsEditor;
@@ -76,7 +76,7 @@ public abstract class ReferenceTableComposite<T extends ReadOnlyReferenceTable>
 	}
 
 	SpecifiedJoinColumn addJoinColumnFromDialog(JoinColumnInReferenceTableStateObject stateObject) {
-		SpecifiedJoinColumn joinColumn = ((ReferenceTable) getSubject()).addSpecifiedJoinColumn();
+		SpecifiedJoinColumn joinColumn = ((SpecifiedReferenceTable) getSubject()).addSpecifiedJoinColumn();
 		stateObject.updateJoinColumn(joinColumn);
 		return joinColumn;
 	}
@@ -121,7 +121,7 @@ public abstract class ReferenceTableComposite<T extends ReadOnlyReferenceTable>
 
 			@Override
 			protected void setValue(String value) {
-				((ReferenceTable) this.getSubject()).setSpecifiedCatalog(value);
+				((SpecifiedReferenceTable) this.getSubject()).setSpecifiedCatalog(value);
 			}
 
 			@Override
@@ -164,7 +164,7 @@ public abstract class ReferenceTableComposite<T extends ReadOnlyReferenceTable>
 
 			@Override
 			protected void setValue(String value) {
-				((ReferenceTable) this.getSubject()).setSpecifiedSchema(value);
+				((SpecifiedReferenceTable) this.getSubject()).setSpecifiedSchema(value);
 			}
 
 			@Override
@@ -174,13 +174,13 @@ public abstract class ReferenceTableComposite<T extends ReadOnlyReferenceTable>
 			
 			@Override
 			protected SchemaContainer getDbSchemaContainer_() {
-				ReferenceTable table = this.getTable();
+				SpecifiedReferenceTable table = this.getTable();
 				return (table == null) ? null : table.getDbSchemaContainer();
 			}
 
-			protected ReferenceTable getTable() {
+			protected SpecifiedReferenceTable getTable() {
 				ReadOnlyReferenceTable table = this.getSubject();
-				return (table instanceof ReferenceTable) ? (ReferenceTable) table : null;
+				return (table instanceof SpecifiedReferenceTable) ? (SpecifiedReferenceTable) table : null;
 			}
 
 			@Override
@@ -223,7 +223,7 @@ public abstract class ReferenceTableComposite<T extends ReadOnlyReferenceTable>
 
 			@Override
 			protected void setValue(String value) {
-				((ReferenceTable) this.getSubject()).setSpecifiedName(value);
+				((SpecifiedReferenceTable) this.getSubject()).setSpecifiedName(value);
 			}
 
 			@Override
@@ -233,13 +233,13 @@ public abstract class ReferenceTableComposite<T extends ReadOnlyReferenceTable>
 
 			@Override
 			protected Schema getDbSchema_() {
-				ReferenceTable table = this.getTable();
+				SpecifiedReferenceTable table = this.getTable();
 				return (table == null) ? null : table.getDbSchema();
 			}
 
-			protected ReferenceTable getTable() {
+			protected SpecifiedReferenceTable getTable() {
 				ReadOnlyReferenceTable table = this.getSubject();
-				return (table instanceof ReferenceTable) ? (ReferenceTable) table : null;
+				return (table instanceof SpecifiedReferenceTable) ? (SpecifiedReferenceTable) table : null;
 			}
 
 			@Override
@@ -274,7 +274,7 @@ public abstract class ReferenceTableComposite<T extends ReadOnlyReferenceTable>
 			return;
 		}
 		
-		ReferenceTable referenceTable = (ReferenceTable) this.getSubject();
+		SpecifiedReferenceTable referenceTable = (SpecifiedReferenceTable) this.getSubject();
 		if (referenceTable == null) {
 			return;
 		}
@@ -321,7 +321,7 @@ public abstract class ReferenceTableComposite<T extends ReadOnlyReferenceTable>
 		}
 
 		public void removeJoinColumn(T subject, SpecifiedJoinColumn joinColumn) {
-			((ReferenceTable) subject).removeSpecifiedJoinColumn(joinColumn);
+			((SpecifiedReferenceTable) subject).removeSpecifiedJoinColumn(joinColumn);
 		}
 
 		public ListIterable<JoinColumn> getSpecifiedJoinColumns(T subject) {