142011 - editing of secondaryTable primary key join columns

2 files changed, 13 insertions, 1 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaEntity.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaEntity.java
index 3312e2f940..b661d91d07 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaEntity.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaEntity.java
@@ -1257,7 +1257,15 @@ public class JavaEntity extends JavaTypeMapping implements IEntity
 	}
 
 	public boolean containsSecondaryTable(String name) {
-		for (ISecondaryTable secondaryTable : getSecondaryTables()) {
+		return containsSecondaryTable(name, getSecondaryTables());
+	}
+	
+	public boolean containsSpecifiedSecondaryTable(String name) {
+		return containsSecondaryTable(name, getSpecifiedSecondaryTables());
+	}
+	
+	private boolean containsSecondaryTable(String name, List<ISecondaryTable> secondaryTables) {
+		for (ISecondaryTable secondaryTable : secondaryTables) {
 			String secondaryTableName = secondaryTable.getName();
 			if (secondaryTableName != null && secondaryTableName.equals(name)) {
 				return true;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaSecondaryTable.java
index 4018777447..651461299b 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaSecondaryTable.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaSecondaryTable.java
@@ -421,6 +421,10 @@ public class JavaSecondaryTable extends AbstractJavaTable
 		return new ISecondaryTable.PrimaryKeyJoinColumnOwner(this);
 	}
 
+	public boolean containsSpecifiedPrimaryKeyJoinColumns() {
+		return !this.getSpecifiedPrimaryKeyJoinColumns().isEmpty();
+	}
+
 	@Override
 	protected JavaUniqueConstraint createJavaUniqueConstraint(int index) {
 		return JavaUniqueConstraint.createSecondaryTableUniqueConstraint(this, getMember(), index);