188493 - code completion inside of attibuteOverride not working

8 files changed, 47 insertions, 32 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/AbstractJavaTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/AbstractJavaTable.java
index d9e9b6c8e3..6bf5e1b0f8 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/AbstractJavaTable.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/AbstractJavaTable.java
@@ -955,6 +955,21 @@ public abstract class AbstractJavaTable extends JavaEObject implements ITable
 		return this.elementTouches(this.member.annotationElementTextRange(elementAdapter, astRoot), pos);
 	}
 
+	@Override
+	public Iterator<String> candidateValuesFor(int pos, Filter<String> filter, CompilationUnit astRoot) {
+		Iterator<String> result = super.candidateValuesFor(pos, filter, astRoot);
+		if (result != null) {
+			return result;
+		}
+		for (IUniqueConstraint constraint : this.getUniqueConstraints()) {
+			result = ((JavaUniqueConstraint) constraint).candidateValuesFor(pos, filter, astRoot);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
 	/**
 	 * called if the database is connected
 	 * name, schema, catalog
@@ -974,12 +989,6 @@ public abstract class AbstractJavaTable extends JavaEObject implements ITable
 		if (this.catalogTouches(pos, astRoot)) {
 			return this.quotedCandidateCatalogs(filter);
 		}
-		for (IUniqueConstraint constraint : this.getUniqueConstraints()) {
-			result = ((JavaUniqueConstraint) constraint).connectedCandidateValuesFor(pos, filter, astRoot);
-			if (result != null) {
-				return result;
-			}
-		}
 		return null;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaAssociationOverride.java
index 47483895e5..1966b57575 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaAssociationOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaAssociationOverride.java
@@ -430,17 +430,17 @@ public class JavaAssociationOverride extends JavaOverride
 
 	@Override
 	protected Iterator<String> candidateNames() {
-		return this.getOwner().getTypeMapping().overridableAssociationNames();
+		return this.getOwner().getTypeMapping().allOverridableAssociationNames();
 	}
 
 	@Override
-	public Iterator<String> connectedCandidateValuesFor(int pos, Filter<String> filter, CompilationUnit astRoot) {
-		Iterator<String> result = super.connectedCandidateValuesFor(pos, filter, astRoot);
+	public Iterator<String> candidateValuesFor(int pos, Filter<String> filter, CompilationUnit astRoot) {
+		Iterator<String> result = super.candidateValuesFor(pos, filter, astRoot);
 		if (result != null) {
 			return result;
 		}
 		for (IJoinColumn column : this.getJoinColumns()) {
-			result = ((JavaJoinColumn) column).connectedCandidateValuesFor(pos, filter, astRoot);
+			result = ((JavaJoinColumn) column).candidateValuesFor(pos, filter, astRoot);
 			if (result != null) {
 				return result;
 			}
@@ -453,7 +453,7 @@ public class JavaAssociationOverride extends JavaOverride
 		super.updateFromJava(astRoot);
 		updateSpecifiedJoinColumnsFromJava(astRoot);
 	}
-	
+
 	/**
 	 * here we just worry about getting the join column lists the same size;
 	 * then we delegate to the join columns to synch themselves up
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaAttributeOverride.java
index 1bd1141e26..467b5a512d 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaAttributeOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaAttributeOverride.java
@@ -224,16 +224,16 @@ public class JavaAttributeOverride extends JavaOverride
 
 	@Override
 	protected Iterator<String> candidateNames() {
-		return this.getOwner().getTypeMapping().overridableAttributeNames();
+		return this.getOwner().getTypeMapping().allOverridableAttributeNames();
 	}
 
 	@Override
-	public Iterator<String> connectedCandidateValuesFor(int pos, Filter<String> filter, CompilationUnit astRoot) {
-		Iterator<String> result = super.connectedCandidateValuesFor(pos, filter, astRoot);
+	public Iterator<String> candidateValuesFor(int pos, Filter<String> filter, CompilationUnit astRoot) {
+		Iterator<String> result = super.candidateValuesFor(pos, filter, astRoot);
 		if (result != null) {
 			return result;
 		}
-		result = this.getJavaColumn().connectedCandidateValuesFor(pos, filter, astRoot);
+		result = this.getJavaColumn().candidateValuesFor(pos, filter, astRoot);
 		if (result != null) {
 			return result;
 		}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaEmbedded.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaEmbedded.java
index 77510b821d..052d94f442 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaEmbedded.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaEmbedded.java
@@ -14,7 +14,6 @@ import java.util.Iterator;
 import java.util.List;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
@@ -538,13 +537,13 @@ public class JavaEmbedded extends JavaAttributeMapping implements IEmbedded
 	}
 
 	@Override
-	public Iterator<String> connectedCandidateValuesFor(int pos, Filter<String> filter, CompilationUnit astRoot) {
-		Iterator<String> result = super.connectedCandidateValuesFor(pos, filter, astRoot);
+	public Iterator<String> candidateValuesFor(int pos, Filter<String> filter, CompilationUnit astRoot) {
+		Iterator<String> result = super.candidateValuesFor(pos, filter, astRoot);
 		if (result != null) {
 			return result;
 		}
 		for (IAttributeOverride override : this.getAttributeOverrides()) {
-			result = ((JavaAttributeOverride) override).connectedCandidateValuesFor(pos, filter, astRoot);
+			result = ((JavaAttributeOverride) override).candidateValuesFor(pos, filter, astRoot);
 			if (result != null) {
 				return result;
 			}
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 cc072976e6..49e6170bba 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
@@ -14,7 +14,6 @@ import java.util.Iterator;
 import java.util.List;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
@@ -2490,7 +2489,7 @@ public class JavaEntity extends JavaTypeMapping implements IEntity
 			}
 		}
 	}
-	
+
 	/**
 	 * here we just worry about getting the attribute override lists the same size;
 	 * then we delegate to the attribute overrides to synch themselves up
@@ -2924,25 +2923,25 @@ public class JavaEntity extends JavaTypeMapping implements IEntity
 			return result;
 		}
 		for (ISecondaryTable sTable : this.getSecondaryTables()) {
-			result = ((JavaSecondaryTable) sTable).connectedCandidateValuesFor(pos, filter, astRoot);
+			result = ((JavaSecondaryTable) sTable).candidateValuesFor(pos, filter, astRoot);
 			if (result != null) {
 				return result;
 			}
 		}
 		for (IPrimaryKeyJoinColumn column : this.getPrimaryKeyJoinColumns()) {
-			result = ((JavaPrimaryKeyJoinColumn) column).connectedCandidateValuesFor(pos, filter, astRoot);
+			result = ((JavaPrimaryKeyJoinColumn) column).candidateValuesFor(pos, filter, astRoot);
 			if (result != null) {
 				return result;
 			}
 		}
 		for (IAttributeOverride override : this.getAttributeOverrides()) {
-			result = ((JavaAttributeOverride) override).connectedCandidateValuesFor(pos, filter, astRoot);
+			result = ((JavaAttributeOverride) override).candidateValuesFor(pos, filter, astRoot);
 			if (result != null) {
 				return result;
 			}
 		}
 		for (IAssociationOverride override : this.getAssociationOverrides()) {
-			result = ((JavaAssociationOverride) override).connectedCandidateValuesFor(pos, filter, astRoot);
+			result = ((JavaAssociationOverride) override).candidateValuesFor(pos, filter, astRoot);
 			if (result != null) {
 				return result;
 			}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaJoinTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaJoinTable.java
index 42c33be4f1..60bbfddf6c 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaJoinTable.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaJoinTable.java
@@ -770,19 +770,19 @@ public class JavaJoinTable extends AbstractJavaTable implements IJoinTable
 	}
 
 	@Override
-	public Iterator<String> connectedCandidateValuesFor(int pos, Filter<String> filter, CompilationUnit astRoot) {
-		Iterator<String> result = super.connectedCandidateValuesFor(pos, filter, astRoot);
+	public Iterator<String> candidateValuesFor(int pos, Filter<String> filter, CompilationUnit astRoot) {
+		Iterator<String> result = super.candidateValuesFor(pos, filter, astRoot);
 		if (result != null) {
 			return result;
 		}
 		for (IJoinColumn column : this.getJoinColumns()) {
-			result = ((JavaJoinColumn) column).connectedCandidateValuesFor(pos, filter, astRoot);
+			result = ((JavaJoinColumn) column).candidateValuesFor(pos, filter, astRoot);
 			if (result != null) {
 				return result;
 			}
 		}
 		for (IJoinColumn column : this.getInverseJoinColumns()) {
-			result = ((JavaJoinColumn) column).connectedCandidateValuesFor(pos, filter, astRoot);
+			result = ((JavaJoinColumn) column).candidateValuesFor(pos, filter, astRoot);
 			if (result != null) {
 				return result;
 			}
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 a0207b3617..ecad438a58 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
@@ -528,13 +528,13 @@ public class JavaSecondaryTable extends AbstractJavaTable
 	}
 
 	@Override
-	public Iterator<String> connectedCandidateValuesFor(int pos, Filter<String> filter, CompilationUnit astRoot) {
-		Iterator<String> result = super.connectedCandidateValuesFor(pos, filter, astRoot);
+	public Iterator<String> candidateValuesFor(int pos, Filter<String> filter, CompilationUnit astRoot) {
+		Iterator<String> result = super.candidateValuesFor(pos, filter, astRoot);
 		if (result != null) {
 			return result;
 		}
 		for (IPrimaryKeyJoinColumn column : this.getPrimaryKeyJoinColumns()) {
-			result = ((JavaPrimaryKeyJoinColumn) column).connectedCandidateValuesFor(pos, filter, astRoot);
+			result = ((JavaPrimaryKeyJoinColumn) column).candidateValuesFor(pos, filter, astRoot);
 			if (result != null) {
 				return result;
 			}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaTypeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaTypeMapping.java
index fcf699ac6e..ed2ae488fe 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaTypeMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/java/mappings/JavaTypeMapping.java
@@ -250,6 +250,14 @@ public abstract class JavaTypeMapping extends JavaEObject
 		return EmptyIterator.instance();
 	}
 
+	public Iterator<String> allOverridableAttributeNames() {
+		return EmptyIterator.instance();
+	}
+
+	public Iterator<String> allOverridableAssociationNames() {
+		return EmptyIterator.instance();
+	}
+
 	public boolean tableNameIsInvalid(String tableName) {
 		return false;
 	}