diff options
author | Karen Butzke | 2012-08-29 17:00:20 +0000 |
---|---|---|
committer | Karen Butzke | 2012-08-29 17:04:11 +0000 |
commit | f58571464a578bec1cd744d569f975a66b460abb (patch) | |
tree | ca0a7dc0d37c6000b984429090b996f7296bf5d6 | |
parent | 0fd4939d7452048274400efa0dd6737cd4353547 (diff) | |
download | webtools.dali-f58571464a578bec1cd744d569f975a66b460abb.tar.gz webtools.dali-f58571464a578bec1cd744d569f975a66b460abb.tar.xz webtools.dali-f58571464a578bec1cd744d569f975a66b460abb.zip |
refactored completion proposal methods to be identical in xml and java
and moved up the hierarchy,
removed Filter and CompilationUnit parameters in both JPA and JAXB
155 files changed, 661 insertions, 1038 deletions
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/java/JavaContextNode.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/java/JavaContextNode.java index c833c9915d..e657019632 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/java/JavaContextNode.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/java/JavaContextNode.java @@ -9,8 +9,6 @@ *******************************************************************************/ package org.eclipse.jpt.jaxb.core.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.jaxb.core.context.JaxbContextNode; @@ -22,5 +20,5 @@ public interface JavaContextNode /** * Return the Java code-completion proposals for the specified position in the source code. */ - Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot); + Iterable<String> getCompletionProposals(int pos); } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaContextNode.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaContextNode.java index 2a20cb3dfa..125f8518a6 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaContextNode.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaContextNode.java @@ -9,11 +9,9 @@ ******************************************************************************/ package org.eclipse.jpt.jaxb.core.internal.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.JptResourceType; import org.eclipse.jpt.common.core.internal.utility.PlatformTools; import org.eclipse.jpt.common.core.resource.java.JavaResourceCompilationUnit; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.jaxb.core.JaxbNode; import org.eclipse.jpt.jaxb.core.context.java.JavaContextNode; @@ -38,8 +36,7 @@ public abstract class AbstractJavaContextNode // **************** content assist **************************************** - public Iterable<String> getJavaCompletionProposals( - int pos, Filter<String> filter, CompilationUnit astRoot) { + public Iterable<String> getCompletionProposals(int pos) { return EmptyIterable.instance(); } } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaElementQName.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaElementQName.java index f4731e9332..37590f5aeb 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaElementQName.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaElementQName.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jaxb.core.internal.context.java; import java.util.List; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; import org.eclipse.jpt.jaxb.core.context.JaxbPackage; @@ -58,7 +57,7 @@ public abstract class AbstractJavaElementQName } @Override - public Iterable<String> getNameProposals(Filter<String> filter) { + public Iterable<String> getNameProposals() { XsdTypeDefinition xsdType = getJaxbClassMapping().getXsdTypeDefinition(); if (xsdType == null) { return EmptyIterable.instance(); @@ -67,12 +66,12 @@ public abstract class AbstractJavaElementQName XmlElementWrapper elementWrapper = getElementWrapper(); if (elementWrapper == null) { - return xsdType.getElementNameProposals(getNamespace(), filter); + return xsdType.getElementNameProposals(getNamespace()); } else { XsdElementDeclaration xsdWrapperElement = elementWrapper.getXsdElementDeclaration(); if (xsdWrapperElement != null) { - return xsdWrapperElement.getElementNameProposals(getNamespace(), filter); + return xsdWrapperElement.getElementNameProposals(getNamespace()); } } @@ -87,9 +86,9 @@ public abstract class AbstractJavaElementQName } @Override - public Iterable<String> getNamespaceProposals(Filter<String> filter) { + public Iterable<String> getNamespaceProposals() { XsdSchema schema = this.getXsdSchema(); - return (schema == null) ? EmptyIterable.<String>instance() : schema.getNamespaceProposals(filter); + return (schema == null) ? EmptyIterable.<String>instance() : schema.getNamespaceProposals(); } @Override diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaQName.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaQName.java index 2e157d714a..8cfed82ffc 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaQName.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaQName.java @@ -10,9 +10,7 @@ package org.eclipse.jpt.jaxb.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; @@ -143,27 +141,26 @@ public abstract class AbstractJavaQName // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals( - int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } if (this.proxy.namespaceTouches(pos)) { - return getNamespaceProposals(filter); + return getNamespaceProposals(); } if (this.proxy.nameTouches(pos)) { - return getNameProposals(filter); + return getNameProposals(); } return EmptyIterable.instance(); } - protected abstract Iterable<String> getNamespaceProposals(Filter<String> filter); + protected abstract Iterable<String> getNamespaceProposals(); - protected abstract Iterable<String> getNameProposals(Filter<String> filter); + protected abstract Iterable<String> getNameProposals(); // ***** validation ***** diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaType.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaType.java index 9ae8bacd3c..4f3a8d8d3b 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaType.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaType.java @@ -12,11 +12,9 @@ package org.eclipse.jpt.jaxb.core.internal.context.java; import java.util.List; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.internal.resource.java.source.SourceNode; import org.eclipse.jpt.common.core.resource.java.JavaResourceAbstractType; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.jaxb.core.context.JaxbContextNode; @@ -270,23 +268,22 @@ public abstract class AbstractJavaType // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals( - int pos, Filter<String> filter, CompilationUnit astRoot) { + public Iterable<String> getCompletionProposals(int pos) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } if (this.mapping != null) { - result = this.mapping.getJavaCompletionProposals(pos, filter, astRoot); + result = this.mapping.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } } if (this.xmlJavaTypeAdapter != null) { - result = this.xmlJavaTypeAdapter.getJavaCompletionProposals(pos, filter, astRoot); + result = this.xmlJavaTypeAdapter.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaTypeMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaTypeMapping.java index 5c59d92fe5..429b517682 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaTypeMapping.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaTypeMapping.java @@ -11,10 +11,8 @@ package org.eclipse.jpt.jaxb.core.internal.context.java; import java.beans.Introspector; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAbstractType; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; @@ -306,26 +304,25 @@ public abstract class AbstractJavaTypeMapping // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals( - int pos, Filter<String> filter, CompilationUnit astRoot) { + public Iterable<String> getCompletionProposals(int pos) { JaxbPackage jaxbPackage = getJaxbPackage(); if (jaxbPackage != null) { getJaxbProject().getSchemaLibrary().refreshSchema(jaxbPackage.getNamespace()); } - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } - result = this.qName.getJavaCompletionProposals(pos, filter, astRoot); + result = this.qName.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } if (this.xmlRootElement != null) { - result = this.xmlRootElement.getJavaCompletionProposals(pos, filter, astRoot); + result = this.xmlRootElement.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } @@ -413,21 +410,21 @@ public abstract class AbstractJavaTypeMapping } @Override - protected Iterable<String> getNamespaceProposals(Filter<String> filter) { + protected Iterable<String> getNamespaceProposals() { XsdSchema schema = this.getXsdSchema(); if (schema == null) { return EmptyIterable.instance(); } - return schema.getNamespaceProposals(filter); + return schema.getNamespaceProposals(); } @Override - protected Iterable<String> getNameProposals(Filter<String> filter) { + protected Iterable<String> getNameProposals() { XsdSchema schema = this.getXsdSchema(); if (schema == null) { return EmptyIterable.instance(); } - return schema.getTypeNameProposals(getNamespace(), filter); + return schema.getTypeNameProposals(getNamespace()); } @Override diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaXmlNodeMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaXmlNodeMapping.java index 8cf22df868..bdc698047b 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaXmlNodeMapping.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/AbstractJavaXmlNodeMapping.java @@ -10,10 +10,8 @@ package org.eclipse.jpt.jaxb.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute; @@ -212,14 +210,14 @@ public abstract class AbstractJavaXmlNodeMapping<A extends Annotation> // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } if (this.xmlSchemaType != null) { - result = this.xmlSchemaType.getJavaCompletionProposals(pos, filter, astRoot); + result = this.xmlSchemaType.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaClassMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaClassMapping.java index 438f26dc1d..f98a1f8b81 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaClassMapping.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaClassMapping.java @@ -15,11 +15,9 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.internal.utility.JDTTools; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.Bag; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.StringTools; @@ -735,22 +733,21 @@ public class GenericJavaClassMapping // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals( - int pos, Filter<String> filter, CompilationUnit astRoot) { + public Iterable<String> getCompletionProposals(int pos) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } if (propTouches(pos)) { - return getPropProposals(filter); + return getPropProposals(); } // TODO - factory methods? for (JaxbPersistentAttribute attribute : this.getAttributes()) { - result = attribute.getJavaCompletionProposals(pos, filter, astRoot); + result = attribute.getCompletionProposals(pos); if (!CollectionTools.isEmpty(result)) { return result; } @@ -759,16 +756,14 @@ public class GenericJavaClassMapping return EmptyIterable.instance(); } - protected Iterable<String> getPropProposals(Filter<String> filter) { + protected Iterable<String> getPropProposals() { return StringTools.convertToJavaStringLiterals( - new FilteringIterable<String>( - new TransformationIterable<JaxbPersistentAttribute, String>(getAllLocallyDefinedAttributes()) { - @Override - protected String transform(JaxbPersistentAttribute o) { - return o.getName(); - } - }, - filter)); + new TransformationIterable<JaxbPersistentAttribute, String>(getAllLocallyDefinedAttributes()) { + @Override + protected String transform(JaxbPersistentAttribute o) { + return o.getName(); + } + }); } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaElementFactoryMethod.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaElementFactoryMethod.java index be563d02d3..00d9521f61 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaElementFactoryMethod.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaElementFactoryMethod.java @@ -10,10 +10,8 @@ package org.eclipse.jpt.jaxb.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.Tools; @@ -176,18 +174,18 @@ public class GenericJavaElementFactoryMethod // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } - result = this.qName.getJavaCompletionProposals(pos, filter, astRoot); + result = this.qName.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } - result = this.substitutionHeadQName.getJavaCompletionProposals(pos, filter, astRoot); + result = this.substitutionHeadQName.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } @@ -261,7 +259,7 @@ public class GenericJavaElementFactoryMethod } @Override - public Iterable<String> getNameProposals(Filter<String> filter) { + public Iterable<String> getNameProposals() { if (! GenericJavaElementFactoryMethod.this.isGlobalScope()) { String fqScope = GenericJavaElementFactoryMethod.this.getFullyQualifiedScope(); JaxbTypeMapping scopeTypeMapping = @@ -269,23 +267,23 @@ public class GenericJavaElementFactoryMethod if (scopeTypeMapping != null) { XsdTypeDefinition xsdType = scopeTypeMapping.getXsdTypeDefinition(); if (xsdType != null) { - return xsdType.getElementNameProposals(getNamespace(), filter, true); + return xsdType.getElementNameProposals(getNamespace(), true); } } } XsdSchema xsdSchema = this.getXsdSchema(); if (xsdSchema != null) { - return xsdSchema.getElementNameProposals(getNamespace(), filter); + return xsdSchema.getElementNameProposals(getNamespace()); } return EmptyIterable.instance(); } @Override - public Iterable<String> getNamespaceProposals(Filter<String> filter) { + public Iterable<String> getNamespaceProposals() { XsdSchema xsdSchema = this.getXsdSchema(); - return (xsdSchema == null) ? EmptyIterable.<String>instance() : xsdSchema.getNamespaceProposals(filter); + return (xsdSchema == null) ? EmptyIterable.<String>instance() : xsdSchema.getNamespaceProposals(); } @Override @@ -357,29 +355,29 @@ public class GenericJavaElementFactoryMethod } @Override - public Iterable<String> getNameProposals(Filter<String> filter) { + public Iterable<String> getNameProposals() { String fqScope = GenericJavaElementFactoryMethod.this.getFullyQualifiedScope(); JaxbTypeMapping scopeTypeMapping = GenericJavaElementFactoryMethod.this.getJaxbProject().getContextRoot().getTypeMapping(fqScope); if (scopeTypeMapping != null) { XsdTypeDefinition xsdType = scopeTypeMapping.getXsdTypeDefinition(); if (xsdType != null) { - return xsdType.getElementNameProposals(getNamespace(), filter); + return xsdType.getElementNameProposals(getNamespace()); } } XsdSchema xsdSchema = this.getXsdSchema(); if (xsdSchema != null) { - return xsdSchema.getElementNameProposals(getNamespace(), filter); + return xsdSchema.getElementNameProposals(getNamespace()); } return EmptyIterable.instance(); } @Override - public Iterable<String> getNamespaceProposals(Filter<String> filter) { + public Iterable<String> getNamespaceProposals() { XsdSchema xsdSchema = this.getXsdSchema(); - return (xsdSchema == null) ? EmptyIterable.<String>instance() : xsdSchema.getNamespaceProposals(filter); + return (xsdSchema == null) ? EmptyIterable.<String>instance() : xsdSchema.getNamespaceProposals(); } @Override diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaEnumConstant.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaEnumConstant.java index f4bb276003..eca8533a81 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaEnumConstant.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaEnumConstant.java @@ -10,10 +10,8 @@ package org.eclipse.jpt.jaxb.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceEnumConstant; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.jaxb.core.context.JaxbEnumConstant; @@ -106,8 +104,8 @@ public class GenericJavaEnumConstant // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } @@ -116,7 +114,7 @@ public class GenericJavaEnumConstant XsdTypeDefinition<?> xsdType = getEnumMapping().getXsdTypeDefinition(); if (xsdType != null && xsdType.getKind() == XsdTypeDefinition.Kind.SIMPLE) { XsdSimpleTypeDefinition xsdSimpleType = (XsdSimpleTypeDefinition) xsdType; - return xsdSimpleType.getEnumValueProposals(filter); + return xsdSimpleType.getEnumValueProposals(); } } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaEnumMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaEnumMapping.java index 630eeeb5f3..ea3cd0c273 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaEnumMapping.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaEnumMapping.java @@ -10,11 +10,9 @@ package org.eclipse.jpt.jaxb.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceEnum; import org.eclipse.jpt.common.core.resource.java.JavaResourceEnumConstant; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; @@ -197,14 +195,14 @@ public class GenericJavaEnumMapping // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } for (JaxbEnumConstant constant : getEnumConstants()) { - result = constant.getJavaCompletionProposals(pos, filter, astRoot); + result = constant.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaPackageInfo.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaPackageInfo.java index 531d02a23c..af98d645fe 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaPackageInfo.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaPackageInfo.java @@ -12,12 +12,10 @@ package org.eclipse.jpt.jaxb.core.internal.context.java; import java.util.List; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.internal.resource.java.source.SourceNode; import org.eclipse.jpt.common.core.resource.java.JavaResourcePackage; import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; @@ -325,21 +323,21 @@ public class GenericJavaPackageInfo //This doesn't actually work yet because of JDT bug (bugs.eclipse.org/326610) @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { + public Iterable<String> getCompletionProposals(int pos) { getJaxbProject().getSchemaLibrary().refreshSchema(getJaxbPackage().getNamespace()); - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } - result = this.xmlSchema.getJavaCompletionProposals(pos, filter, astRoot); + result = this.xmlSchema.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } for (XmlSchemaType xmlSchemaType : this.getXmlSchemaTypes()) { - result = xmlSchemaType.getJavaCompletionProposals(pos, filter, astRoot); + result = xmlSchemaType.getCompletionProposals(pos); if (!CollectionTools.isEmpty(result)) { return result; } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaPersistentAttribute.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaPersistentAttribute.java index d98231e1ee..ac3c02fae5 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaPersistentAttribute.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaPersistentAttribute.java @@ -10,14 +10,12 @@ package org.eclipse.jpt.jaxb.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.Tools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; @@ -392,13 +390,13 @@ public class GenericJavaPersistentAttribute // **************** content assist **************************************** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } - result = this.mapping.getJavaCompletionProposals(pos, filter, astRoot); + result = this.mapping.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlAnyElementMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlAnyElementMapping.java index 2adf2d4f33..9cf3342ba3 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlAnyElementMapping.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlAnyElementMapping.java @@ -10,9 +10,7 @@ package org.eclipse.jpt.jaxb.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; @@ -309,19 +307,19 @@ public class GenericJavaXmlAnyElementMapping // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } - result = this.xmlElementRefs.getJavaCompletionProposals(pos, filter, astRoot); + result = this.xmlElementRefs.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } if (this.xmlElementWrapper != null) { - result = this.xmlElementWrapper.getJavaCompletionProposals(pos, filter, astRoot); + result = this.xmlElementWrapper.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlAttributeMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlAttributeMapping.java index 6ff2e165a6..f57bf15b31 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlAttributeMapping.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlAttributeMapping.java @@ -10,9 +10,7 @@ package org.eclipse.jpt.jaxb.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable; @@ -162,13 +160,13 @@ public class GenericJavaXmlAttributeMapping // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } - result = this.qName.getJavaCompletionProposals(pos, filter, astRoot); + result = this.qName.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } @@ -249,9 +247,9 @@ public class GenericJavaXmlAttributeMapping } @Override - public Iterable<String> getNameProposals(Filter<String> filter) { + public Iterable<String> getNameProposals() { XsdTypeDefinition xsdType = GenericJavaXmlAttributeMapping.this.getJaxbClassMapping().getXsdTypeDefinition(); - return (xsdType == null) ? EmptyIterable.instance() : xsdType.getAttributeNameProposals(getNamespace(), filter); + return (xsdType == null) ? EmptyIterable.<String>instance() : xsdType.getAttributeNameProposals(getNamespace()); } @Override @@ -262,9 +260,9 @@ public class GenericJavaXmlAttributeMapping } @Override - public Iterable<String> getNamespaceProposals(Filter<String> filter) { + public Iterable<String> getNamespaceProposals() { XsdSchema schema = this.getXsdSchema(); - return (schema == null) ? EmptyIterable.<String>instance() : schema.getNamespaceProposals(filter); + return (schema == null) ? EmptyIterable.<String>instance() : schema.getNamespaceProposals(); } @Override diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElement.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElement.java index aefc1e4988..9ca8bd9373 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElement.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElement.java @@ -10,10 +10,8 @@ package org.eclipse.jpt.jaxb.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.internal.utility.JDTTools; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; @@ -324,13 +322,13 @@ public class GenericJavaXmlElement // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } - result = this.qName.getJavaCompletionProposals(pos, filter, astRoot); + result = this.qName.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementMapping.java index 95517d2838..e9398671cb 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementMapping.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementMapping.java @@ -10,9 +10,7 @@ package org.eclipse.jpt.jaxb.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; @@ -203,19 +201,19 @@ public class GenericJavaXmlElementMapping // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } - result = this.xmlElement.getJavaCompletionProposals(pos, filter, astRoot); + result = this.xmlElement.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } if (this.xmlElementWrapper != null) { - result = this.xmlElementWrapper.getJavaCompletionProposals(pos, filter, astRoot); + result = this.xmlElementWrapper.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementRef.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementRef.java index 1e14a794d6..7b3244236d 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementRef.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementRef.java @@ -10,10 +10,8 @@ package org.eclipse.jpt.jaxb.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.internal.utility.JDTTools; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.Tools; @@ -211,13 +209,13 @@ public class GenericJavaXmlElementRef // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } - result = this.qName.getJavaCompletionProposals(pos, filter, astRoot); + result = this.qName.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementRefMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementRefMapping.java index 6faac68cb8..913cd672de 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementRefMapping.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementRefMapping.java @@ -10,8 +10,6 @@ package org.eclipse.jpt.jaxb.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.jaxb.core.MappingKeys; @@ -234,19 +232,19 @@ public class GenericJavaXmlElementRefMapping // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } - result = this.xmlElementRef.getJavaCompletionProposals(pos, filter, astRoot); + result = this.xmlElementRef.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } if (this.xmlElementWrapper != null) { - result = this.xmlElementWrapper.getJavaCompletionProposals(pos, filter, astRoot); + result = this.xmlElementWrapper.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementRefs.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementRefs.java index 9695ca3750..3f06df6f57 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementRefs.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementRefs.java @@ -11,9 +11,7 @@ package org.eclipse.jpt.jaxb.core.internal.context.java; import java.util.List; import javax.xml.namespace.QName; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.Bag; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.HashBag; @@ -111,14 +109,14 @@ public class GenericJavaXmlElementRefs // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } for (XmlElementRef elementRef : getXmlElementRefs()) { - result = elementRef.getJavaCompletionProposals(pos, filter, astRoot); + result = elementRef.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementRefsMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementRefsMapping.java index 782d553e2a..57f42f5472 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementRefsMapping.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementRefsMapping.java @@ -10,9 +10,7 @@ package org.eclipse.jpt.jaxb.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; @@ -242,19 +240,19 @@ public class GenericJavaXmlElementRefsMapping // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } - result = this.xmlElementRefs.getJavaCompletionProposals(pos, filter, astRoot); + result = this.xmlElementRefs.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } if (this.xmlElementWrapper != null) { - result = this.xmlElementWrapper.getJavaCompletionProposals(pos, filter, astRoot); + result = this.xmlElementWrapper.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementWrapper.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementWrapper.java index 179cf08df9..92e03913e6 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementWrapper.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementWrapper.java @@ -10,9 +10,7 @@ package org.eclipse.jpt.jaxb.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.jaxb.core.context.JaxbAttributeMapping; @@ -181,14 +179,14 @@ public class GenericJavaXmlElementWrapper // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } - result = this.qName.getJavaCompletionProposals(pos, filter, astRoot); + result = this.qName.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } @@ -275,15 +273,15 @@ public class GenericJavaXmlElementWrapper } @Override - public Iterable<String> getNameProposals(Filter<String> filter) { + public Iterable<String> getNameProposals() { XsdTypeDefinition xsdType = GenericJavaXmlElementWrapper.this.getJaxbClassMapping().getXsdTypeDefinition(); - return (xsdType == null) ? EmptyIterable.instance() : xsdType.getElementNameProposals(getNamespace(), filter); + return (xsdType == null) ? EmptyIterable.instance() : xsdType.getElementNameProposals(getNamespace()); } @Override - public Iterable<String> getNamespaceProposals(Filter<String> filter) { + public Iterable<String> getNamespaceProposals() { XsdSchema schema = this.getXsdSchema(); - return (schema == null) ? EmptyIterable.<String>instance() : schema.getNamespaceProposals(filter); + return (schema == null) ? EmptyIterable.<String>instance() : schema.getNamespaceProposals(); } @Override diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementsMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementsMapping.java index bbcc19feb8..a75d67717c 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementsMapping.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementsMapping.java @@ -11,9 +11,7 @@ package org.eclipse.jpt.jaxb.core.internal.context.java; import java.util.List; import javax.xml.namespace.QName; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.Bag; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.HashBag; @@ -290,21 +288,21 @@ public class GenericJavaXmlElementsMapping // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } for (XmlElement xmlElement : getXmlElements()) { - result = xmlElement.getJavaCompletionProposals(pos, filter, astRoot); + result = xmlElement.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } } if (this.xmlElementWrapper != null) { - result = this.xmlElementWrapper.getJavaCompletionProposals(pos, filter, astRoot); + result = this.xmlElementWrapper.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlNs.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlNs.java index 9752b6048c..2d30d4d855 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlNs.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlNs.java @@ -9,10 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.jaxb.core.internal.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourcePackage; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; @@ -118,24 +116,22 @@ public class GenericJavaXmlNs // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals( - int pos, Filter<String> filter, CompilationUnit astRoot) { + public Iterable<String> getCompletionProposals( + int pos) { if (getResourceXmlNs().namespaceURITouches(pos)) { - return getNamespaceURICompletionProposals(pos, filter); + return getNamespaceURICompletionProposals(pos); } return EmptyIterable.instance(); } - protected Iterable<String> getNamespaceURICompletionProposals( - int pos, Filter<String> filter) { - + protected Iterable<String> getNamespaceURICompletionProposals(int pos) { String packageNamespace = getJaxbPackageInfo().getJaxbPackage().getNamespace(); Iterable<String> result = (StringTools.stringIsEmpty(packageNamespace)) ? EmptyIterable.instance() : new SingleElementIterable(StringTools.convertToJavaStringLiteral(packageNamespace)); XsdSchema schema = getJaxbPackageInfo().getJaxbPackage().getXsdSchema(); if (schema != null) { - result = new CompositeIterable<String>(result, schema.getNamespaceProposals(filter)); + result = new CompositeIterable<String>(result, schema.getNamespaceProposals()); } return CollectionTools.set(result); } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlRegistry.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlRegistry.java index f2718fbb9d..d6c8cccef3 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlRegistry.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlRegistry.java @@ -13,11 +13,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import javax.xml.namespace.QName; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.Bag; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.HashBag; @@ -137,14 +135,14 @@ public class GenericJavaXmlRegistry // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } for (JaxbElementFactoryMethod efm : getElementFactoryMethods()) { - result = efm.getJavaCompletionProposals(pos, filter, astRoot); + result = efm.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlRootElement.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlRootElement.java index 3ab4c4de01..0898fdcc85 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlRootElement.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlRootElement.java @@ -11,9 +11,7 @@ package org.eclipse.jpt.jaxb.core.internal.context.java; import java.beans.Introspector; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.jaxb.core.context.JaxbPackage; @@ -91,13 +89,13 @@ public class GenericJavaXmlRootElement // **************** content assist **************************************** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } - result = this.qName.getJavaCompletionProposals(pos, filter, astRoot); + result = this.qName.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } @@ -155,21 +153,21 @@ public class GenericJavaXmlRootElement } @Override - protected Iterable<String> getNamespaceProposals(Filter<String> filter) { + protected Iterable<String> getNamespaceProposals() { XsdSchema schema = this.getXsdSchema(); if (schema == null) { return EmptyIterable.instance(); } - return schema.getNamespaceProposals(filter); + return schema.getNamespaceProposals(); } @Override - protected Iterable<String> getNameProposals(Filter<String> filter) { + protected Iterable<String> getNameProposals() { XsdSchema schema = this.getXsdSchema(); if (schema == null) { return EmptyIterable.instance(); } - return schema.getElementNameProposals(getNamespace(), filter); + return schema.getElementNameProposals(getNamespace()); } @Override diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlSchema.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlSchema.java index d4aca90eed..fa57eba990 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlSchema.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlSchema.java @@ -10,14 +10,11 @@ package org.eclipse.jpt.jaxb.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourcePackage; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; import org.eclipse.jpt.jaxb.core.SchemaEntry; @@ -250,19 +247,18 @@ public class GenericJavaXmlSchema // **************** content assist **************************************** @Override - public Iterable<String> getJavaCompletionProposals( - int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } if (namespaceTouches(pos)) { - return getNamespaceProposals(filter); + return getNamespaceProposals(); } for (XmlNs xmlns : getXmlNsPrefixes()) { - result = xmlns.getJavaCompletionProposals(pos, filter, astRoot); + result = xmlns.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } @@ -275,17 +271,15 @@ public class GenericJavaXmlSchema return getXmlSchemaAnnotation().namespaceTouches(pos); } - protected Iterable<String> getNamespaceProposals(Filter<String> filter) { + protected Iterable<String> getNamespaceProposals() { return StringTools.convertToJavaStringLiterals( - new FilteringIterable<String>( new TransformationIterable<SchemaEntry, String>( getJaxbProject().getSchemaLibrary().getSchemaEntries()) { @Override protected String transform(SchemaEntry o) { return o.getNamespace(); } - }, - filter)); + }); } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlSchemaType.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlSchemaType.java index 562cdc8eac..d5a0c15752 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlSchemaType.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlSchemaType.java @@ -10,9 +10,7 @@ package org.eclipse.jpt.jaxb.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; @@ -127,13 +125,13 @@ public abstract class GenericJavaXmlSchemaType // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } - result = this.qName.getJavaCompletionProposals(pos, filter, astRoot); + result = this.qName.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } @@ -201,21 +199,21 @@ public abstract class GenericJavaXmlSchemaType } @Override - protected Iterable<String> getNamespaceProposals(Filter<String> filter) { + protected Iterable<String> getNamespaceProposals() { XsdSchema schema = this.getXsdSchema(); if (schema == null) { return EmptyIterable.instance(); } - return schema.getNamespaceProposals(filter); + return schema.getNamespaceProposals(); } @Override - protected Iterable<String> getNameProposals(Filter<String> filter) { + protected Iterable<String> getNameProposals() { XsdSchema schema = this.getXsdSchema(); if (schema == null) { return EmptyIterable.instance(); } - return schema.getSimpleTypeNameProposals(getNamespace(), filter); + return schema.getSimpleTypeNameProposals(getNamespace()); } @Override diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/xsd/XsdElementDeclaration.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/xsd/XsdElementDeclaration.java index 4f9572fb0e..f0db77029a 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/xsd/XsdElementDeclaration.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/xsd/XsdElementDeclaration.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 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 @@ -10,7 +10,6 @@ package org.eclipse.jpt.jaxb.core.xsd; import org.eclipse.emf.common.util.EList; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.xsd.XSDElementDeclaration; import org.eclipse.xsd.XSDSubstitutionGroupExclusions; import org.eclipse.xsd.XSDTypeDefinition; @@ -65,7 +64,7 @@ public class XsdElementDeclaration return (type == null) ? null : type.getElement(namespace, name); } - public Iterable<String> getElementNameProposals(String namespace, Filter<String> filter) { - return getType().getElementNameProposals(namespace, filter); + public Iterable<String> getElementNameProposals(String namespace) { + return getType().getElementNameProposals(namespace); } } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/xsd/XsdSchema.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/xsd/XsdSchema.java index 8fc31d0473..fc98c5565e 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/xsd/XsdSchema.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/xsd/XsdSchema.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 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 @@ -9,7 +9,6 @@ *******************************************************************************/ package org.eclipse.jpt.jaxb.core.xsd; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; @@ -180,44 +179,37 @@ public class XsdSchema return new SnapshotCloneIterable(getXSDSchema().getElementDeclarations()); } - public Iterable<String> getNamespaceProposals(Filter<String> filter) { - return StringTools.convertToJavaStringLiterals( - new FilteringIterable<String>(getNamespaces(), filter)); + public Iterable<String> getNamespaceProposals() { + return StringTools.convertToJavaStringLiterals(getNamespaces()); } - public Iterable<String> getTypeNameProposals(String namespace, Filter<String> filter) { + public Iterable<String> getTypeNameProposals(String namespace) { return StringTools.convertToJavaStringLiterals( - new FilteringIterable<String>( new TransformationIterable<XsdTypeDefinition, String>(this.getTypeDefinitions(namespace)) { @Override protected String transform(XsdTypeDefinition o) { return o.getName(); } - }, - filter)); + }); } - public Iterable<String> getSimpleTypeNameProposals(String namespace, Filter<String> filter) { + public Iterable<String> getSimpleTypeNameProposals(String namespace) { return StringTools.convertToJavaStringLiterals( - new FilteringIterable<String>( new TransformationIterable<XsdSimpleTypeDefinition, String>(this.getSimpleTypeDefinitions(namespace)) { @Override protected String transform(XsdSimpleTypeDefinition o) { return o.getName(); } - }, - filter)); + }); } - public Iterable<String> getElementNameProposals(String namespace, Filter<String> filter) { + public Iterable<String> getElementNameProposals(String namespace) { return StringTools.convertToJavaStringLiterals( - new FilteringIterable<String>( new TransformationIterable<XsdElementDeclaration, String>(this.getElementDeclarations(namespace)) { @Override protected String transform(XsdElementDeclaration o) { return o.getName(); } - }, - filter)); + }); } } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/xsd/XsdSimpleTypeDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/xsd/XsdSimpleTypeDefinition.java index ee467ba76f..ab70c88271 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/xsd/XsdSimpleTypeDefinition.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/xsd/XsdSimpleTypeDefinition.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 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 @@ -9,10 +9,8 @@ *******************************************************************************/ package org.eclipse.jpt.jaxb.core.xsd; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; import org.eclipse.xsd.XSDEnumerationFacet; import org.eclipse.xsd.XSDSimpleTypeDefinition; @@ -96,15 +94,13 @@ public class XsdSimpleTypeDefinition return EmptyIterable.instance(); } - public Iterable<String> getEnumValueProposals(Filter<String> filter) { + public Iterable<String> getEnumValueProposals() { return StringTools.convertToJavaStringLiterals( - new FilteringIterable<String>( new TransformationIterable<XSDEnumerationFacet, String>(getXSDComponent().getEnumerationFacets()) { @Override protected String transform(XSDEnumerationFacet enumFacet) { return enumFacet.getLexicalValue(); } - }, - filter)); + }); } } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/xsd/XsdTypeDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/xsd/XsdTypeDefinition.java index ea01a47c96..05ad2a3297 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/xsd/XsdTypeDefinition.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/xsd/XsdTypeDefinition.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 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 @@ -9,9 +9,7 @@ *******************************************************************************/ package org.eclipse.jpt.jaxb.core.xsd; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.xsd.XSDTypeDefinition; /** @@ -23,7 +21,7 @@ import org.eclipse.xsd.XSDTypeDefinition; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 3.2 + * @version 3.3 * @since 3.1 */ public abstract class XsdTypeDefinition<A extends XSDTypeDefinition> @@ -68,9 +66,8 @@ public abstract class XsdTypeDefinition<A extends XSDTypeDefinition> public abstract XsdAttributeUse getAttribute(String namespace, String name); - public Iterable<String> getAttributeNameProposals(String namespace, Filter<String> filter) { - return StringTools.convertToJavaStringLiterals( - new FilteringIterable<String>(getAttributeNames(namespace), filter)); + public Iterable<String> getAttributeNameProposals(String namespace) { + return StringTools.convertToJavaStringLiterals(getAttributeNames(namespace)); } public abstract Iterable<String> getAttributeNames(String namespace); @@ -81,13 +78,12 @@ public abstract class XsdTypeDefinition<A extends XSDTypeDefinition> public abstract XsdElementDeclaration getElement(String namespace, String name, boolean recurseChildren); - public Iterable<String> getElementNameProposals(String namespace, Filter<String> filter) { - return getElementNameProposals(namespace, filter, false); + public Iterable<String> getElementNameProposals(String namespace) { + return getElementNameProposals(namespace, false); } - public Iterable getElementNameProposals(String namespace, Filter<String> filter, boolean recurseChildren) { - return StringTools.convertToJavaStringLiterals( - new FilteringIterable<String>(getElementNames(namespace, recurseChildren), filter)); + public Iterable<String> getElementNameProposals(String namespace, boolean recurseChildren) { + return StringTools.convertToJavaStringLiterals(getElementNames(namespace, recurseChildren)); } public abstract Iterable<String> getElementNames(String namespace, boolean recurseChildren); diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaClassMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaClassMapping.java index 42725266f4..e6c679ef20 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaClassMapping.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaClassMapping.java @@ -10,8 +10,6 @@ package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.NotNullFilter; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; @@ -237,16 +235,15 @@ public class ELJavaClassMapping // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals( - int pos, Filter<String> filter, CompilationUnit astRoot) { + public Iterable<String> getCompletionProposals(int pos) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } if (this.xmlDiscriminatorNode != null) { - result = this.xmlDiscriminatorNode.getJavaCompletionProposals(pos, filter, astRoot); + result = this.xmlDiscriminatorNode.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAnyAttributeMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAnyAttributeMapping.java index b5e80cdcad..6e75c876cd 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAnyAttributeMapping.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAnyAttributeMapping.java @@ -10,8 +10,6 @@ package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.jaxb.core.context.JaxbAttributeMapping; @@ -114,14 +112,14 @@ public class ELJavaXmlAnyAttributeMapping // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } if (this.xmlPath != null) { - result = this.xmlPath.getJavaCompletionProposals(pos, filter, astRoot); + result = this.xmlPath.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAnyElementMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAnyElementMapping.java index bc9621b330..b983ea6b42 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAnyElementMapping.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAnyElementMapping.java @@ -10,8 +10,6 @@ package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.jaxb.core.context.JaxbAttributeMapping; @@ -134,14 +132,14 @@ public class ELJavaXmlAnyElementMapping // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } if (this.xmlPath != null) { - result = this.xmlPath.getJavaCompletionProposals(pos, filter, astRoot); + result = this.xmlPath.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAttributeMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAttributeMapping.java index 3f81228661..21ad795659 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAttributeMapping.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlAttributeMapping.java @@ -10,8 +10,6 @@ package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; @@ -215,14 +213,14 @@ public class ELJavaXmlAttributeMapping // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } if (this.xmlPath != null) { - result = this.xmlPath.getJavaCompletionProposals(pos, filter, astRoot); + result = this.xmlPath.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlDiscriminatorNode.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlDiscriminatorNode.java index c984731697..b553157b65 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlDiscriminatorNode.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlDiscriminatorNode.java @@ -10,9 +10,7 @@ package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.jaxb.core.JaxbNode; @@ -93,13 +91,12 @@ public class ELJavaXmlDiscriminatorNode // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals( - int pos, Filter<String> filter, CompilationUnit astRoot) { + public Iterable<String> getCompletionProposals(int pos) { if (getAnnotation().valueTouches(pos) && this.value != null) { XsdTypeDefinition xsdType = getClassMapping().getXsdTypeDefinition(); XPath xpath = XPathFactory.instance().getXpath(this.value); - return xpath.getCompletionProposals(new XPathContext(), xsdType, pos, filter); + return xpath.getCompletionProposals(new XPathContext(), xsdType, pos); } return EmptyIterable.instance(); diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementMapping.java index 3519eec2f7..1bcbe33641 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementMapping.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementMapping.java @@ -10,8 +10,6 @@ package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; @@ -290,14 +288,14 @@ public class ELJavaXmlElementMapping // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } if (this.xmlPath != null) { - result = this.xmlPath.getJavaCompletionProposals(pos, filter, astRoot); + result = this.xmlPath.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementsMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementsMapping.java index a252c8f3a0..e3bba4328d 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementsMapping.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlElementsMapping.java @@ -12,11 +12,9 @@ package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java; import java.util.Iterator; import java.util.List; import javax.xml.namespace.QName; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.Bag; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; @@ -125,14 +123,14 @@ public class ELJavaXmlElementsMapping // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } for (ELJavaXmlPath xmlPath : this.xmlPathContainer.getContextElements()) { - result = xmlPath.getJavaCompletionProposals(pos, filter, astRoot); + result = xmlPath.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlInverseReferenceMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlInverseReferenceMapping.java index c53dd0346b..45c9b856ee 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlInverseReferenceMapping.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlInverseReferenceMapping.java @@ -10,9 +10,7 @@ package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.ArrayTools; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.StringTools; @@ -125,14 +123,14 @@ public class ELJavaXmlInverseReferenceMapping // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } if (getXmlInverseReferenceAnnotation().mappedByTouches(pos)) { - result = getMappedByProposals(filter); + result = getMappedByProposals(); } if (! CollectionTools.isEmpty(result)) { return result; @@ -141,7 +139,7 @@ public class ELJavaXmlInverseReferenceMapping return EmptyIterable.instance(); } - protected Iterable<String> getMappedByProposals(Filter<String> filter) { + protected Iterable<String> getMappedByProposals() { JaxbClassMapping referencedClassMapping = getReferencedClassMapping(); if (referencedClassMapping == null) { diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlJoinNode.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlJoinNode.java index 63ae1c3b21..132b5c56d0 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlJoinNode.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlJoinNode.java @@ -10,9 +10,7 @@ package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; @@ -137,13 +135,13 @@ public class ELJavaXmlJoinNode // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals( - int pos, Filter<String> filter, CompilationUnit astRoot) { + public Iterable<String> getCompletionProposals( + int pos) { if (getAnnotation().xmlPathTouches(pos) && this.xmlPath != null) { XsdTypeDefinition xsdType = getClassMapping().getXsdTypeDefinition(); XPath xpath = XPathFactory.instance().getXpath(this.xmlPath); - return xpath.getCompletionProposals(new XmlPathContext(), xsdType, pos, filter); + return xpath.getCompletionProposals(new XmlPathContext(), xsdType, pos); } if (getAnnotation().referencedXmlPathTouches(pos) && this.referencedXmlPath != null) { @@ -151,7 +149,7 @@ public class ELJavaXmlJoinNode XsdTypeDefinition xsdType = getAttributeMapping().getReferencedXsdTypeDefinition(); XPath xpath = XPathFactory.instance().getXpath(this.referencedXmlPath); - Iterable<String> result = xpath.getCompletionProposals(new ReferencedXmlPathContext(), xsdType, pos, filter); + Iterable<String> result = xpath.getCompletionProposals(new ReferencedXmlPathContext(), xsdType, pos); ELClassMapping referencedClassMapping = this.context.getAttributeMapping().getReferencedClassMapping(); if (referencedClassMapping != null) { diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlJoinNodesMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlJoinNodesMapping.java index 31edb8815e..beb0e7906d 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlJoinNodesMapping.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlJoinNodesMapping.java @@ -10,11 +10,9 @@ package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.Bag; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.HashBag; @@ -153,16 +151,15 @@ public class ELJavaXmlJoinNodesMapping // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals( - int pos, Filter<String> filter, CompilationUnit astRoot) { + public Iterable<String> getCompletionProposals(int pos) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + Iterable<String> result = super.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } for (ELJavaXmlJoinNode xmlJoinNode : this.xmlJoinNodeContainer.getContextElements()) { - result = xmlJoinNode.getJavaCompletionProposals(pos, filter, astRoot); + result = xmlJoinNode.getCompletionProposals(pos); if (! CollectionTools.isEmpty(result)) { return result; } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlPath.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlPath.java index 6e9339b0f7..30c4c279fe 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlPath.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/java/ELJavaXmlPath.java @@ -10,9 +10,7 @@ package org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.jaxb.core.JaxbNode; @@ -103,13 +101,12 @@ public class ELJavaXmlPath // ***** content assist ***** @Override - public Iterable<String> getJavaCompletionProposals( - int pos, Filter<String> filter, CompilationUnit astRoot) { + public Iterable<String> getCompletionProposals(int pos) { if (getAnnotation().valueTouches(pos) && this.value != null) { XsdTypeDefinition xsdType = getClassMapping().getXsdTypeDefinition(); XPath xpath = XPathFactory.instance().getXpath(this.value); - return xpath.getCompletionProposals(new XPathContext(), xsdType, pos, filter); + return xpath.getCompletionProposals(new XPathContext(), xsdType, pos); } return EmptyIterable.instance(); diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/xpath/java/XPath.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/xpath/java/XPath.java index 0415dbb21d..18e581d9f3 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/xpath/java/XPath.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/xpath/java/XPath.java @@ -13,13 +13,11 @@ import java.util.List; import java.util.Vector; import org.eclipse.jpt.common.core.internal.utility.SimpleTextRange; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.ArrayTools; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable; import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; import org.eclipse.jpt.jaxb.core.JaxbNode; @@ -179,9 +177,9 @@ public class XPath { // ***** content assist ***** public Iterable<String> getCompletionProposals( - Context context, XsdTypeDefinition xsdType, int pos, Filter<String> filter) { + Context context, XsdTypeDefinition xsdType, int pos) { - return getFirstStep().getCompletionProposals(context, xsdType, StringTools.EMPTY_STRING, pos, filter); + return getFirstStep().getCompletionProposals(context, xsdType, StringTools.EMPTY_STRING, pos); } @@ -494,11 +492,10 @@ public class XPath { protected Iterable<String> getCompletionProposals( Context context, XsdTypeDefinition previousType, - final String prefix, int pos, Filter<String> filter) { + final String prefix, int pos) { if (getTextRange(context).includes(pos) || getNextStep() == null) { return StringTools.convertToJavaStringLiterals( - new FilteringIterable<String>( new TransformationIterable<String, String>( new CompositeIterable<String>( getTextProposals(context, previousType), @@ -508,14 +505,13 @@ public class XPath { protected String transform(String o) { return StringTools.concatenate(prefix, o); } - }, - filter)); + }); } Step nextStep = getNextStep(); XsdTypeDefinition nextType = resolveNextType(context, previousType); if (nextStep != null && nextType != null) { - return nextStep.getCompletionProposals(context, nextType, prefix + getValue() + DELIM, pos, filter); + return nextStep.getCompletionProposals(context, nextType, prefix + getValue() + DELIM, pos); } return new SingleElementIterable(TEXT); diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/JaxbJavaCompletionProposalComputer.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/JaxbJavaCompletionProposalComputer.java index 004e2e89f2..85ca7bd50e 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/JaxbJavaCompletionProposalComputer.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/JaxbJavaCompletionProposalComputer.java @@ -18,18 +18,14 @@ import org.eclipse.core.runtime.content.IContentType; import org.eclipse.jdt.core.CompletionContext; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jdt.ui.text.java.ContentAssistInvocationContext; import org.eclipse.jdt.ui.text.java.IJavaCompletionProposalComputer; import org.eclipse.jdt.ui.text.java.JavaContentAssistInvocationContext; import org.eclipse.jface.text.contentassist.CompletionProposal; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jpt.common.core.internal.utility.PlatformTools; -import org.eclipse.jpt.common.core.internal.utility.jdt.ASTTools; import org.eclipse.jpt.common.core.resource.java.JavaResourceCompilationUnit; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; -import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.jaxb.core.JaxbProject; import org.eclipse.jpt.jaxb.core.JptJaxbCorePlugin; import org.eclipse.jpt.jaxb.core.context.java.JavaContextNode; @@ -48,7 +44,7 @@ public class JaxbJavaCompletionProposalComputer // do nothing } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public List computeCompletionProposals(ContentAssistInvocationContext context, IProgressMonitor monitor) { return (context instanceof JavaContentAssistInvocationContext) ? computeCompletionProposals((JavaContentAssistInvocationContext) context) @@ -117,10 +113,6 @@ public class JaxbJavaCompletionProposalComputer CompletionContext cc = context.getCoreContext(); - // the context's "token" is really a sort of "prefix" - it does NOT - // correspond to the "start" and "end" we get below... - char[] prefix = cc.getToken(); - Filter<String> filter = ((prefix == null) ? Filter.Transparent.<String>instance() : new IgnoreCasePrefixFilter(prefix)); // the token "start" is the offset of the token's first character int tokenStart = cc.getTokenStart(); // the token "end" is the offset of the token's last character (yuk) @@ -129,7 +121,6 @@ public class JaxbJavaCompletionProposalComputer return Collections.emptyList(); } -// System.out.println("prefix: " + ((prefix == null) ? "[null]" : new String(prefix))); // System.out.println("token start: " + tokenStart); // System.out.println("token end: " + tokenEnd); // String source = cu.getSource(); @@ -138,11 +129,9 @@ public class JaxbJavaCompletionProposalComputer // String snippet = source.substring(Math.max(0, tokenStart - 20), Math.min(source.length(), tokenEnd + 21)); // System.out.println("surrounding snippet: =>" + snippet + "<="); - // TODO move this parser call into the model... - CompilationUnit astRoot = ASTTools.buildASTRoot(cu); List<ICompletionProposal> proposals = new ArrayList<ICompletionProposal>(); for (JavaContextNode javaNode : javaNodes) { - for (String proposal : javaNode.getJavaCompletionProposals(context.getInvocationOffset(), filter, astRoot)) { + for (String proposal : javaNode.getCompletionProposals(context.getInvocationOffset())) { // using proposal.length() -1 as cursor position puts the cursor just inside end quotes // useful for further content assist if necessary proposals.add(new CompletionProposal(proposal, tokenStart, tokenEnd - tokenStart + 1, proposal.length() - 1)); @@ -160,7 +149,7 @@ public class JaxbJavaCompletionProposalComputer } } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public List computeContextInformation(ContentAssistInvocationContext context, IProgressMonitor monitor) { return Collections.emptyList(); } @@ -173,15 +162,4 @@ public class JaxbJavaCompletionProposalComputer // do nothing } - private static class IgnoreCasePrefixFilter implements Filter<String> { - private final char[] prefix; - IgnoreCasePrefixFilter(char[] prefix) { - super(); - this.prefix = prefix; - } - public boolean accept(String s) { - return StringTools.stringStartsWithIgnoreCase(s.toCharArray(), this.prefix); - } - } - } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JpaContextNode.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JpaContextNode.java index 8fbdc50d54..e44216cc55 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JpaContextNode.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JpaContextNode.java @@ -69,6 +69,15 @@ public interface JpaContextNode void validate(List<IMessage> messages, IReporter reporter); + // *********** completion proposals *********** + + /** + * Return the content assist proposals for the specified position + * in the file. + */ + Iterable<String> getCompletionProposals(int pos); + + // ********** synchronize/update ********** /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/XmlContextNode.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/XmlContextNode.java index 1e0ddf1051..8802478011 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/XmlContextNode.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/XmlContextNode.java @@ -21,14 +21,10 @@ package org.eclipse.jpt.jpa.core.context; * @version 3.3 * @since 2.1 */ -// TODO bjv rename to XmlJpaContextNode +// TODO bjv rename to XmlJpaContextNode +// TODO kfb or delete it? public interface XmlContextNode extends JpaContextNode { - /** - * Return the content assist proposals for the specified position - * in the XML file. - */ - Iterable<String> getXmlCompletionProposals(int pos); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJpaContextNode.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJpaContextNode.java index 84c4bb3702..faa95bfb74 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJpaContextNode.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJpaContextNode.java @@ -9,8 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.jpa.core.context.JpaContextNode; /** @@ -28,10 +26,5 @@ import org.eclipse.jpt.jpa.core.context.JpaContextNode; public interface JavaJpaContextNode extends JpaContextNode { - /** - * Return the Java code-completion proposals for the specified position - * in the source code. - */ - Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/AbstractJpaContextNode.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/AbstractJpaContextNode.java index a88c0924eb..42f466c378 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/AbstractJpaContextNode.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/AbstractJpaContextNode.java @@ -149,6 +149,31 @@ public abstract class AbstractJpaContextNode } + // *********** completion proposals *********** + + public Iterable<String> getCompletionProposals(int pos) { + if (this.connectionProfileIsActive()) { + Iterable<String> result = this.getConnectedCompletionProposals(pos); + if (result != null) { + return result; + } + } + return null; + } + + /** + * This method is called if the database is connected, allowing us to + * get candidates from the various database tables etc. + * This method should <em>not</em> be cascaded to "child" objects; it should + * only return candidates for the current object. The cascading is + * handled by {@link #getCompletionProposals(int)}. + */ + @SuppressWarnings("unused") + protected Iterable<String> getConnectedCompletionProposals(int pos) { + return null; + } + + // ********** database stuff ********** public Schema getContextDefaultDbSchema() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/AbstractXmlContextNode.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/AbstractXmlContextNode.java index d9dccef777..87f08553ea 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/AbstractXmlContextNode.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/AbstractXmlContextNode.java @@ -20,27 +20,4 @@ public abstract class AbstractXmlContextNode super(parent); } - - // *********** completion proposals *********** - - public Iterable<String> getXmlCompletionProposals(int pos) { - if (this.connectionProfileIsActive()) { - Iterable<String> result = this.getConnectedXmlCompletionProposals(pos); - if (result != null) { - return result; - } - } - return null; - } - - /** - * This method is called if the database is connected, allowing us to - * get candidates from the various database tables etc. - * This method should <em>not</em> be cascaded to "child" objects; it should - * only return candidates for the current object. The cascading is - * handled by {@link #getXmlCompletionProposals(int)}. - */ - protected Iterable<String> getConnectedXmlCompletionProposals(int pos) { - return null; - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseColumn.java index 79e8e32744..426a7aa894 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseColumn.java @@ -9,11 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.java.JavaBaseColumn; import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; @@ -330,13 +327,13 @@ public abstract class AbstractJavaBaseColumn<A extends BaseColumnAnnotation, O e // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } if (this.tableTouches(pos)) { - return this.getJavaCandidateTableNames(filter); + return this.getJavaCandidateTableNames(); } return null; } @@ -345,12 +342,8 @@ public abstract class AbstractJavaBaseColumn<A extends BaseColumnAnnotation, O e return this.getColumnAnnotation().tableTouches(pos); } - protected Iterable<String> getJavaCandidateTableNames(Filter<String> filter) { - return StringTools.convertToJavaStringLiterals(this.getCandidateTableNames(filter)); - } - - protected Iterable<String> getCandidateTableNames(Filter<String> filter) { - return new FilteringIterable<String>(this.getCandidateTableNames(), filter); + protected Iterable<String> getJavaCandidateTableNames() { + return StringTools.convertToJavaStringLiterals(this.getCandidateTableNames()); } public Iterable<String> getCandidateTableNames() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java index 214c3f7f6a..4468022cdd 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java @@ -10,11 +10,9 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceMember; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.Transformer; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; @@ -188,13 +186,13 @@ public abstract class AbstractJavaBaseEmbeddedMapping<A extends Annotation> // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.attributeOverrideContainer.getJavaCompletionProposals(pos, filter, astRoot); + result = this.attributeOverrideContainer.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java index 32f6ba3ded..5f96d1255e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java @@ -10,10 +10,8 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.Association; import org.eclipse.jpt.common.utility.internal.SimpleAssociation; import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; @@ -352,16 +350,16 @@ public abstract class AbstractJavaBasicMapping // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.column.getJavaCompletionProposals(pos, filter, astRoot); + result = this.column.getCompletionProposals(pos); if (result != null) { return result; } - result = this.converter.getJavaCompletionProposals(pos, filter, astRoot); + result = this.converter.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedMapping.java index a3c1a18e17..a8f8dcb6d5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedMapping.java @@ -10,10 +10,8 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.jpa.core.MappingKeys; @@ -181,13 +179,13 @@ public abstract class AbstractJavaEmbeddedMapping // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.associationOverrideContainer.getJavaCompletionProposals(pos, filter, astRoot); + result = this.associationOverrideContainer.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java index 4fc14e78b9..7442b2ee7b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java @@ -12,12 +12,10 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.Iterator; import java.util.List; import java.util.Vector; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceMember; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.NotNullFilter; import org.eclipse.jpt.common.utility.internal.StringTools; @@ -1261,40 +1259,40 @@ public abstract class AbstractJavaEntity // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.table.getJavaCompletionProposals(pos, filter, astRoot); + result = this.table.getCompletionProposals(pos); if (result != null) { return result; } for (JavaSecondaryTable secondaryTable : this.getSecondaryTables()) { - result = secondaryTable.getJavaCompletionProposals(pos, filter, astRoot); + result = secondaryTable.getCompletionProposals(pos); if (result != null) { return result; } } for (JavaPrimaryKeyJoinColumn pkJoinColumn : this.getPrimaryKeyJoinColumns()) { - result = pkJoinColumn.getJavaCompletionProposals(pos, filter, astRoot); + result = pkJoinColumn.getCompletionProposals(pos); if (result != null) { return result; } } - result = this.attributeOverrideContainer.getJavaCompletionProposals(pos, filter, astRoot); + result = this.attributeOverrideContainer.getCompletionProposals(pos); if (result != null) { return result; } - result = this.associationOverrideContainer.getJavaCompletionProposals(pos, filter, astRoot); + result = this.associationOverrideContainer.getCompletionProposals(pos); if (result != null) { return result; } - result = this.discriminatorColumn.getJavaCompletionProposals(pos, filter, astRoot); + result = this.discriminatorColumn.getCompletionProposals(pos); if (result != null) { return result; } - result = this.generatorContainer.getJavaCompletionProposals(pos, filter, astRoot); + result = this.generatorContainer.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java index 1c85bfdd19..3e64c3f3ea 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java @@ -10,12 +10,10 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.resource.java.JavaResourceMember; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.ArrayTools; import org.eclipse.jpt.common.utility.internal.Association; import org.eclipse.jpt.common.utility.internal.SimpleAssociation; @@ -403,30 +401,30 @@ public abstract class AbstractJavaIdMapping // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.column.getJavaCompletionProposals(pos, filter, astRoot); + result = this.column.getCompletionProposals(pos); if (result != null) { return result; } - result = this.generatorContainer.getJavaCompletionProposals(pos, filter, astRoot); + result = this.generatorContainer.getCompletionProposals(pos); if (result != null) { return result; } if (this.generatedValue != null) { - result = this.generatedValue.getJavaCompletionProposals(pos, filter, astRoot); + result = this.generatedValue.getCompletionProposals(pos); if (result != null) { return result; } } - result = this.converter.getJavaCompletionProposals(pos, filter, astRoot); + result = this.converter.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinColumnRelationshipStrategy.java index 3208673c87..b9497dcead 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinColumnRelationshipStrategy.java @@ -10,8 +10,6 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; @@ -298,13 +296,13 @@ public abstract class AbstractJavaJoinColumnRelationshipStrategy // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } for (JavaJoinColumn joinColumn : this.getJoinColumns()) { - result = joinColumn.getJavaCompletionProposals(pos, filter, astRoot); + result = joinColumn.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinTableRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinTableRelationshipStrategy.java index d66bb74e56..536a6ad0cd 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinTableRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinTableRelationshipStrategy.java @@ -10,8 +10,6 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.Tools; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTableRelationshipStrategy; @@ -171,13 +169,13 @@ public abstract class AbstractJavaJoinTableRelationshipStrategy // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } if (this.joinTable != null) { - result = this.joinTable.getJavaCompletionProposals(pos, filter, astRoot); + result = this.joinTable.getCompletionProposals(pos); } return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJpaContextNode.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJpaContextNode.java index 494412bda8..81849bc8f9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJpaContextNode.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJpaContextNode.java @@ -9,9 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.JptResourceType; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; import org.eclipse.jpt.jpa.core.internal.context.AbstractJpaContextNode; @@ -28,27 +26,4 @@ public abstract class AbstractJavaJpaContextNode public JptResourceType getResourceType() { return JavaSourceFileDefinition.instance().getResourceType(); } - - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - if (this.connectionProfileIsActive()) { - Iterable<String> result = this.getConnectedJavaCompletionProposals(pos, filter, astRoot); - if (result != null) { - return result; - } - } - return null; - } - - /** - * This method is called if the database is connected, allowing us to - * get candidates from the various database tables etc. - * This method should <em>not</em> be cascaded to "child" objects; it should - * only return candidates for the current object. The cascading is - * handled by {@link #getJavaCompletionProposals(int, Filter, CompilationUnit)}. - */ - @SuppressWarnings("unused") - protected Iterable<String> getConnectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - return null; - } - } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java index 118f1e7611..7720c87251 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java @@ -11,12 +11,10 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.ArrayList; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.Association; import org.eclipse.jpt.common.utility.internal.SimpleAssociation; import org.eclipse.jpt.common.utility.internal.StringTools; @@ -24,7 +22,6 @@ import org.eclipse.jpt.common.utility.internal.Tools; import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; import org.eclipse.jpt.common.utility.internal.iterables.SubListIterableWrapper; @@ -881,35 +878,35 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.orderable.getJavaCompletionProposals(pos, filter, astRoot); + result = this.orderable.getCompletionProposals(pos); if (result != null) { return result; } if (this.mapKeyNameTouches(pos)) { - return this.javaCandidateMapKeyNames(filter); + return this.getJavaCandidateMapKeyNames(); } - result = this.mapKeyColumn.getJavaCompletionProposals(pos, filter, astRoot); + result = this.mapKeyColumn.getCompletionProposals(pos); if (result != null) { return result; } - result = this.mapKeyConverter.getJavaCompletionProposals(pos, filter, astRoot); + result = this.mapKeyConverter.getCompletionProposals(pos); if (result != null) { return result; } - result = this.mapKeyAttributeOverrideContainer.getJavaCompletionProposals(pos, filter, astRoot); + result = this.mapKeyAttributeOverrideContainer.getCompletionProposals(pos); if (result != null) { return result; } for (JavaJoinColumn joinColumn : this.getMapKeyJoinColumns()) { - result = joinColumn.getJavaCompletionProposals(pos, filter, astRoot); + result = joinColumn.getCompletionProposals(pos); if (result != null) { return result; } @@ -923,12 +920,8 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi return (mapKeyAnnotation != null) && mapKeyAnnotation.nameTouches(pos); } - protected Iterable<String> javaCandidateMapKeyNames(Filter<String> filter) { - return StringTools.convertToJavaStringLiterals(this.getCandidateMapKeyNames(filter)); - } - - protected Iterable<String> getCandidateMapKeyNames(Filter<String> filter) { - return new FilteringIterable<String>(this.getCandidateMapKeyNames(), filter); + protected Iterable<String> getJavaCandidateMapKeyNames() { + return StringTools.convertToJavaStringLiterals(this.getCandidateMapKeyNames()); } public Iterable<String> getCandidateMapKeyNames() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumn.java index c9ea6f80f4..e2a552f0af 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumn.java @@ -10,12 +10,9 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; import org.eclipse.jpt.jpa.core.context.java.JavaNamedColumn; @@ -214,13 +211,13 @@ public abstract class AbstractJavaNamedColumn<A extends NamedColumnAnnotation, O // ********** Java completion proposals ********** @Override - protected Iterable<String> getConnectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getConnectedJavaCompletionProposals(pos, filter, astRoot); + protected Iterable<String> getConnectedCompletionProposals(int pos) { + Iterable<String> result = super.getConnectedCompletionProposals(pos); if (result != null) { return result; } if (this.nameTouches(pos)) { - return this.getJavaCandidateNames(filter); + return this.getJavaCandidateNames(); } return null; } @@ -229,12 +226,8 @@ public abstract class AbstractJavaNamedColumn<A extends NamedColumnAnnotation, O return this.getColumnAnnotation().nameTouches(pos); } - protected Iterable<String> getJavaCandidateNames(Filter<String> filter) { - return StringTools.convertToJavaStringLiterals(this.getCandidateNames(filter)); - } - - protected Iterable<String> getCandidateNames(Filter<String> filter) { - return new FilteringIterable<String>(this.getCandidateNames(), filter); + protected Iterable<String> getJavaCandidateNames() { + return StringTools.convertToJavaStringLiterals(this.getCandidateNames()); } protected Iterable<String> getCandidateNames() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOverride.java index b42fd98fd5..ca38f18f39 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOverride.java @@ -10,11 +10,8 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyOverride; import org.eclipse.jpt.jpa.core.context.ReadOnlyTableColumn.Owner; @@ -184,13 +181,13 @@ public abstract class AbstractJavaOverride<C extends JavaOverrideContainer, A ex // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } if (this.nameTouches(pos)) { - return this.getJavaCandidateNames(filter); + return this.getJavaCandidateNames(); } return null; } @@ -199,12 +196,8 @@ public abstract class AbstractJavaOverride<C extends JavaOverrideContainer, A ex return this.overrideAnnotation.nameTouches(pos); } - protected Iterable<String> getJavaCandidateNames(Filter<String> filter) { - return StringTools.convertToJavaStringLiterals(this.getCandidateNames(filter)); - } - - private Iterable<String> getCandidateNames(Filter<String> filter) { - return new FilteringIterable<String>(this.getCandidateNames(), filter); + protected Iterable<String> getJavaCandidateNames() { + return StringTools.convertToJavaStringLiterals(this.getCandidateNames()); } protected abstract Iterable<String> getCandidateNames(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java index cdd5354400..673af62c25 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java @@ -11,7 +11,6 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; import org.eclipse.core.runtime.content.IContentType; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.internal.utility.JDTTools; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.resource.java.JavaResourceCompilationUnit; @@ -20,7 +19,6 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod; import org.eclipse.jpt.common.core.resource.java.JavaResourcePackageFragmentRoot; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.core.utility.jdt.TypeBinding; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.ClassName; import org.eclipse.jpt.common.utility.internal.ReflectionTools; import org.eclipse.jpt.common.utility.internal.Tools; @@ -651,12 +649,12 @@ public abstract class AbstractJavaPersistentAttribute // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - return this.mapping.getJavaCompletionProposals(pos, filter, astRoot); + return this.mapping.getCompletionProposals(pos); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java index 6b4d04b97e..672b586cab 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java @@ -17,7 +17,6 @@ import java.util.List; import java.util.Vector; import org.eclipse.core.resources.IResource; import org.eclipse.jdt.core.IPackageFragment; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceAbstractType; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; @@ -988,17 +987,17 @@ public abstract class AbstractJavaPersistentType // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - Iterable<String> values = this.mapping.getJavaCompletionProposals(pos, filter, astRoot); + Iterable<String> values = this.mapping.getCompletionProposals(pos); if (values != null) { return values; } for (JavaPersistentAttribute attribute : this.getAttributes()) { - values = attribute.getJavaCompletionProposals(pos, filter, astRoot); + values = attribute.getCompletionProposals(pos); if (values != null) { return values; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaRelationshipMapping.java index bbd66f5847..dcf43e031d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaRelationshipMapping.java @@ -11,10 +11,8 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; import org.eclipse.jdt.core.IType; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.internal.utility.JDTTools; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; @@ -293,13 +291,13 @@ public abstract class AbstractJavaRelationshipMapping<A extends RelationshipMapp // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.relationship.getJavaCompletionProposals(pos, filter, astRoot); + result = this.relationship.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSequenceGenerator.java index 1307e361ec..185506f6e9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSequenceGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSequenceGenerator.java @@ -9,12 +9,9 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.Tools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.jpa.core.context.DbGenerator; import org.eclipse.jpt.jpa.core.context.SequenceGenerator; import org.eclipse.jpt.jpa.core.context.java.JavaGeneratorContainer; @@ -106,13 +103,13 @@ public abstract class AbstractJavaSequenceGenerator<A extends SequenceGeneratorA * sequenceName */ @Override - protected Iterable<String> getConnectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getConnectedJavaCompletionProposals(pos, filter, astRoot); + protected Iterable<String> getConnectedCompletionProposals(int pos) { + Iterable<String> result = super.getConnectedCompletionProposals(pos); if (result != null) { return result; } if (this.sequenceNameTouches(pos)) { - return this.getJavaCandidateSequences(filter); + return this.getJavaCandidateSequences(); } return null; } @@ -121,12 +118,8 @@ public abstract class AbstractJavaSequenceGenerator<A extends SequenceGeneratorA return this.generatorAnnotation.sequenceNameTouches(pos); } - protected Iterable<String> getJavaCandidateSequences(Filter<String> filter) { - return StringTools.convertToJavaStringLiterals(this.getCandidateSequences(filter)); - } - - protected Iterable<String> getCandidateSequences(Filter<String> filter) { - return new FilteringIterable<String>(this.getCandidateSequences(), filter); + protected Iterable<String> getJavaCandidateSequences() { + return StringTools.convertToJavaStringLiterals(this.getCandidateSequences()); } protected Iterable<String> getCandidateSequences() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java index abd87dc939..b6f51b43f3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java @@ -10,8 +10,6 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.jpa.core.context.FetchType; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.NullJavaDerivedIdentity2_0; @@ -130,13 +128,13 @@ public abstract class AbstractJavaSingleRelationshipMapping<A extends SingleRela // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.derivedIdentity.getJavaCompletionProposals(pos, filter, astRoot); + result = this.derivedIdentity.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTable.java index 662abdb1af..311e7acfb4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTable.java @@ -10,13 +10,10 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.NameTools; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; @@ -393,13 +390,13 @@ public abstract class AbstractJavaTable<A extends BaseTableAnnotation> // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } for (JavaUniqueConstraint constraint : this.getUniqueConstraints()) { - result = constraint.getJavaCompletionProposals(pos, filter, astRoot); + result = constraint.getCompletionProposals(pos); if (result != null) { return result; } @@ -412,19 +409,19 @@ public abstract class AbstractJavaTable<A extends BaseTableAnnotation> * name, schema, catalog */ @Override - protected Iterable<String> getConnectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getConnectedJavaCompletionProposals(pos, filter, astRoot); + protected Iterable<String> getConnectedCompletionProposals(int pos) { + Iterable<String> result = super.getConnectedCompletionProposals(pos); if (result != null) { return result; } if (this.nameTouches(pos)) { - return this.getJavaCandidateNames(filter); + return this.getJavaCandidateNames(); } if (this.schemaTouches(pos)) { - return this.getJavaCandidateSchemata(filter); + return this.getJavaCandidateSchemata(); } if (this.catalogTouches(pos)) { - return this.getJavaCandidateCatalogs(filter); + return this.getJavaCandidateCatalogs(); } return null; } @@ -433,12 +430,8 @@ public abstract class AbstractJavaTable<A extends BaseTableAnnotation> return this.getTableAnnotation().nameTouches(pos); } - protected Iterable<String> getJavaCandidateNames(Filter<String> filter) { - return StringTools.convertToJavaStringLiterals(this.getCandidateNames(filter)); - } - - protected Iterable<String> getCandidateNames(Filter<String> filter) { - return new FilteringIterable<String>(this.getCandidateNames(), filter); + protected Iterable<String> getJavaCandidateNames() { + return StringTools.convertToJavaStringLiterals(this.getCandidateNames()); } protected Iterable<String> getCandidateNames() { @@ -450,12 +443,8 @@ public abstract class AbstractJavaTable<A extends BaseTableAnnotation> return this.getTableAnnotation().schemaTouches(pos); } - protected Iterable<String> getJavaCandidateSchemata(Filter<String> filter) { - return StringTools.convertToJavaStringLiterals(this.getCandidateSchemata(filter)); - } - - protected Iterable<String> getCandidateSchemata(Filter<String> filter) { - return new FilteringIterable<String>(this.getCandidateSchemata(), filter); + protected Iterable<String> getJavaCandidateSchemata() { + return StringTools.convertToJavaStringLiterals(this.getCandidateSchemata()); } protected Iterable<String> getCandidateSchemata() { @@ -466,12 +455,8 @@ public abstract class AbstractJavaTable<A extends BaseTableAnnotation> return this.getTableAnnotation().catalogTouches(pos); } - protected Iterable<String> getJavaCandidateCatalogs(Filter<String> filter) { - return StringTools.convertToJavaStringLiterals(this.getCandidateCatalogs(filter)); - } - - protected Iterable<String> getCandidateCatalogs(Filter<String> filter) { - return new FilteringIterable<String>(this.getCandidateCatalogs(), filter); + protected Iterable<String> getJavaCandidateCatalogs() { + return StringTools.convertToJavaStringLiterals(this.getCandidateCatalogs()); } protected Iterable<String> getCandidateCatalogs() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java index 26695518b9..fefe19d1b9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java @@ -10,10 +10,8 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.ArrayTools; import org.eclipse.jpt.common.utility.internal.Association; import org.eclipse.jpt.common.utility.internal.SimpleAssociation; @@ -254,16 +252,16 @@ public abstract class AbstractJavaVersionMapping // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.column.getJavaCompletionProposals(pos, filter, astRoot); + result = this.column.getCompletionProposals(pos); if (result != null) { return result; } - result = this.converter.getJavaCompletionProposals(pos, filter, astRoot); + result = this.converter.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToManyRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToManyRelationship.java index 58751beb54..a26376385c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToManyRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToManyRelationship.java @@ -10,8 +10,6 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.MappedByRelationship; @@ -173,18 +171,18 @@ public class GenericJavaManyToManyRelationship // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.mappedByStrategy.getJavaCompletionProposals(pos, filter, astRoot); + result = this.mappedByStrategy.getCompletionProposals(pos); if (result != null) { return result; } - return this.joinTableStrategy.getJavaCompletionProposals(pos, filter, astRoot); + return this.joinTableStrategy.getCompletionProposals(pos); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToOneRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToOneRelationship.java index d0c5cc8c05..2290d04a57 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToOneRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToOneRelationship.java @@ -10,8 +10,6 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumnRelationship; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTableRelationship; import org.eclipse.jpt.jpa.core.context.Relationship; @@ -169,18 +167,18 @@ public class GenericJavaManyToOneRelationship // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.joinColumnStrategy.getJavaCompletionProposals(pos, filter, astRoot); + result = this.joinColumnStrategy.getCompletionProposals(pos); if (result != null) { return result; } - return this.joinTableStrategy.getJavaCompletionProposals(pos, filter, astRoot); + return this.joinTableStrategy.getCompletionProposals(pos); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappedByRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappedByRelationshipStrategy.java index 762088dcc8..d7a4d19056 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappedByRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappedByRelationshipStrategy.java @@ -10,13 +10,10 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.ArrayTools; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.MappedByRelationshipStrategy; @@ -170,14 +167,14 @@ public class GenericJavaMappedByRelationshipStrategy // ********** java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } OwnableRelationshipMappingAnnotation annotation = this.getMappingAnnotation(); if ((annotation != null) && annotation.mappedByTouches(pos)) { - result = this.getJavaCandidateMappedByAttributeNames(filter); + result = this.getJavaCandidateMappedByAttributeNames(); } return result; } @@ -186,12 +183,8 @@ public class GenericJavaMappedByRelationshipStrategy return this.getRelationshipMapping().getTargetEntityNonTransientAttributeNames(); } - protected Iterable<String> getCandidateMappedByAttributeNames(Filter<String> filter) { - return new FilteringIterable<String>(this.getCandidateMappedByAttributeNames(), filter); - } - - protected Iterable<String> getJavaCandidateMappedByAttributeNames(Filter<String> filter) { - return StringTools.convertToJavaStringLiterals(this.getCandidateMappedByAttributeNames(filter)); + protected Iterable<String> getJavaCandidateMappedByAttributeNames() { + return StringTools.convertToJavaStringLiterals(this.getCandidateMappedByAttributeNames()); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToManyRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToManyRelationship.java index 815f50a3e0..6f08cfe209 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToManyRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToManyRelationship.java @@ -10,8 +10,6 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.MappedByRelationship; @@ -242,23 +240,23 @@ public class GenericJavaOneToManyRelationship // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.mappedByStrategy.getJavaCompletionProposals(pos, filter, astRoot); + result = this.mappedByStrategy.getCompletionProposals(pos); if (result != null) { return result; } - result = this.joinTableStrategy.getJavaCompletionProposals(pos, filter, astRoot); + result = this.joinTableStrategy.getCompletionProposals(pos); if (result != null) { return result; } - return this.joinColumnStrategy.getJavaCompletionProposals(pos, filter, astRoot); + return this.joinColumnStrategy.getCompletionProposals(pos); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToOneRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToOneRelationship.java index ae00df91e4..2be62c732e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToOneRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToOneRelationship.java @@ -10,8 +10,6 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.MappedByRelationship; @@ -265,28 +263,28 @@ public class GenericJavaOneToOneRelationship // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.mappedByStrategy.getJavaCompletionProposals(pos, filter, astRoot); + result = this.mappedByStrategy.getCompletionProposals(pos); if (result != null) { return result; } - result = this.primaryKeyJoinColumnStrategy.getJavaCompletionProposals(pos, filter, astRoot); + result = this.primaryKeyJoinColumnStrategy.getCompletionProposals(pos); if (result != null) { return result; } - result = this.joinTableStrategy.getJavaCompletionProposals(pos, filter, astRoot); + result = this.joinTableStrategy.getCompletionProposals(pos); if (result != null) { return result; } - return this.joinColumnStrategy.getJavaCompletionProposals(pos, filter, astRoot); + return this.joinColumnStrategy.getCompletionProposals(pos); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaPrimaryKeyJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaPrimaryKeyJoinColumnRelationshipStrategy.java index a208be5d5e..0b24dd4942 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaPrimaryKeyJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaPrimaryKeyJoinColumnRelationshipStrategy.java @@ -10,11 +10,9 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.common.utility.internal.iterables.SubListIterableWrapper; import org.eclipse.jpt.jpa.core.context.Entity; @@ -238,13 +236,13 @@ public class GenericJavaPrimaryKeyJoinColumnRelationshipStrategy // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } for (JavaPrimaryKeyJoinColumn column : this.getPrimaryKeyJoinColumns()) { - result = column.getJavaCompletionProposals(pos, filter, astRoot); + result = column.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java index 273ca0ef5d..3aad51d827 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java @@ -1183,28 +1183,28 @@ public abstract class AbstractEntityMappings // ************ completion proposals************** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.queryContainer.getXmlCompletionProposals(pos); + result = this.queryContainer.getCompletionProposals(pos); if (result != null) { return result; } for (OrmTableGenerator tableGenerator : this.getTableGenerators()) { - result = tableGenerator.getXmlCompletionProposals(pos); + result = tableGenerator.getCompletionProposals(pos); if (result != null) { return result; } } for (OrmSequenceGenerator seqGenerator : this.getSequenceGenerators()) { - result = seqGenerator.getXmlCompletionProposals(pos); + result = seqGenerator.getCompletionProposals(pos); if (result != null) { return result; } } - result = this.persistenceUnitMetadata.getXmlCompletionProposals(pos); + result = this.persistenceUnitMetadata.getCompletionProposals(pos); if (result != null) { return result; } @@ -1212,7 +1212,7 @@ public abstract class AbstractEntityMappings return this.getCandidatePackages(); } for (OrmPersistentType persistentType : this.getPersistentTypes()) { - result = persistentType.getXmlCompletionProposals(pos); + result = persistentType.getCompletionProposals(pos); if (result != null) { return result; } @@ -1221,8 +1221,8 @@ public abstract class AbstractEntityMappings } @Override - protected Iterable<String> getConnectedXmlCompletionProposals(int pos) { - Iterable<String> result = super.getConnectedXmlCompletionProposals(pos); + protected Iterable<String> getConnectedCompletionProposals(int pos) { + Iterable<String> result = super.getConnectedCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmAttributeMapping.java index 0ca2b5295d..b0cd04a200 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmAttributeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmAttributeMapping.java @@ -511,8 +511,8 @@ public abstract class AbstractOrmAttributeMapping<X extends XmlAttributeMapping> // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseColumn.java index 272f7c1f16..457ee512b0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseColumn.java @@ -296,8 +296,8 @@ public abstract class AbstractOrmBaseColumn<X extends XmlBaseColumn, O extends R // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java index 751246c4d9..29da43dc92 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java @@ -231,12 +231,12 @@ public abstract class AbstractOrmBaseEmbeddedMapping<X extends AbstractXmlEmbedd // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.attributeOverrideContainer.getXmlCompletionProposals(pos); + result = this.attributeOverrideContainer.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java index 54edef49d7..3d51c09769 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java @@ -370,16 +370,16 @@ public abstract class AbstractOrmBasicMapping<X extends XmlBasic> // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.column.getXmlCompletionProposals(pos); + result = this.column.getCompletionProposals(pos); if (result != null) { return result; } - result = this.converter.getXmlCompletionProposals(pos); + result = this.converter.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmDbGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmDbGenerator.java index a7e23987b5..519164d48a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmDbGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmDbGenerator.java @@ -148,8 +148,8 @@ public abstract class AbstractOrmDbGenerator<X extends XmlGenerator> * table, schema, catalog, pkColumnName, valueColumnName */ @Override - protected Iterable<String> getConnectedXmlCompletionProposals(int pos) { - Iterable<String> result = super.getConnectedXmlCompletionProposals(pos); + protected Iterable<String> getConnectedCompletionProposals(int pos) { + Iterable<String> result = super.getConnectedCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java index 4690e3b2ab..319af5deba 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java @@ -1944,40 +1944,40 @@ public abstract class AbstractOrmEntity<X extends XmlEntity> // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.table.getXmlCompletionProposals(pos); + result = this.table.getCompletionProposals(pos); if (result != null) { return result; } for (OrmSecondaryTable secondaryTable : this.getSpecifiedSecondaryTables()) { - result = secondaryTable.getXmlCompletionProposals(pos); + result = secondaryTable.getCompletionProposals(pos); if (result != null) { return result; } } for (OrmPrimaryKeyJoinColumn pkJoinColumn : this.getSpecifiedPrimaryKeyJoinColumns()) { - result = pkJoinColumn.getXmlCompletionProposals(pos); + result = pkJoinColumn.getCompletionProposals(pos); if (result != null) { return result; } } - result = this.attributeOverrideContainer.getXmlCompletionProposals(pos); + result = this.attributeOverrideContainer.getCompletionProposals(pos); if (result != null) { return result; } - result = this.associationOverrideContainer.getXmlCompletionProposals(pos); + result = this.associationOverrideContainer.getCompletionProposals(pos); if (result != null) { return result; } - result = this.discriminatorColumn.getXmlCompletionProposals(pos); + result = this.discriminatorColumn.getCompletionProposals(pos); if (result != null) { return result; } - result = this.generatorContainer.getXmlCompletionProposals(pos); + result = this.generatorContainer.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdMapping.java index b9e8cc7918..6ad3ea7056 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdMapping.java @@ -451,26 +451,26 @@ public abstract class AbstractOrmIdMapping<X extends XmlId> // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.column.getXmlCompletionProposals(pos); + result = this.column.getCompletionProposals(pos); if (result != null) { return result; } - result = this.generatorContainer.getXmlCompletionProposals(pos); + result = this.generatorContainer.getCompletionProposals(pos); if (result != null) { return result; } if (this.generatedValue != null) { - result = this.generatedValue.getXmlCompletionProposals(pos); + result = this.generatedValue.getCompletionProposals(pos); if (result != null) { return result; } } - result = this.converter.getXmlCompletionProposals(pos); + result = this.converter.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinColumnRelationshipStrategy.java index f294d1322a..e4e5d78dc3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinColumnRelationshipStrategy.java @@ -310,13 +310,13 @@ public abstract class AbstractOrmJoinColumnRelationshipStrategy // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } for (OrmJoinColumn joinColumn : this.getJoinColumns()) { - result = joinColumn.getXmlCompletionProposals(pos); + result = joinColumn.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinTableRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinTableRelationshipStrategy.java index bbd2c0b3e0..d457d0c5a8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinTableRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinTableRelationshipStrategy.java @@ -129,13 +129,13 @@ public abstract class AbstractOrmJoinTableRelationshipStrategy // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } if (this.joinTable != null) { - result = this.joinTable.getXmlCompletionProposals(pos); + result = this.joinTable.getCompletionProposals(pos); } return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java index 0ccc534292..d1916024ff 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java @@ -1068,32 +1068,32 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.orderable.getXmlCompletionProposals(pos); + result = this.orderable.getCompletionProposals(pos); if (result != null) { return result; } if (this.mapKeyNameTouches(pos)) { return this.getCandidateMapKeyNames(); } - result = this.mapKeyColumn.getXmlCompletionProposals(pos); + result = this.mapKeyColumn.getCompletionProposals(pos); if (result != null) { return result; } - result = this.mapKeyConverter.getXmlCompletionProposals(pos); + result = this.mapKeyConverter.getCompletionProposals(pos); if (result != null) { return result; } - result = this.mapKeyAttributeOverrideContainer.getXmlCompletionProposals(pos); + result = this.mapKeyAttributeOverrideContainer.getCompletionProposals(pos); if (result != null) { return result; } for (OrmJoinColumn joinColumn : this.getMapKeyJoinColumns()) { - result = joinColumn.getXmlCompletionProposals(pos); + result = joinColumn.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmNamedColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmNamedColumn.java index cca2a36030..01e205b954 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmNamedColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmNamedColumn.java @@ -250,8 +250,8 @@ public abstract class AbstractOrmNamedColumn<X extends XmlNamedColumn, O extends // ********** completion proposals ********** @Override - protected Iterable<String> getConnectedXmlCompletionProposals(int pos) { - Iterable<String> result = super.getConnectedXmlCompletionProposals(pos); + protected Iterable<String> getConnectedCompletionProposals(int pos) { + Iterable<String> result = super.getConnectedCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmRelationshipMapping.java index 3af6e596e8..00c400ec30 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmRelationshipMapping.java @@ -446,12 +446,12 @@ public abstract class AbstractOrmRelationshipMapping<X extends AbstractXmlRelati // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.relationship.getXmlCompletionProposals(pos); + result = this.relationship.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSequenceGenerator.java index 1e173befff..df49573125 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSequenceGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSequenceGenerator.java @@ -126,8 +126,8 @@ public abstract class AbstractOrmSequenceGenerator * sequenceName */ @Override - protected Iterable<String> getConnectedXmlCompletionProposals(int pos) { - Iterable<String> result = super.getConnectedXmlCompletionProposals(pos); + protected Iterable<String> getConnectedCompletionProposals(int pos) { + Iterable<String> result = super.getConnectedCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSingleRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSingleRelationshipMapping.java index 08101580bb..4e3a929346 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSingleRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSingleRelationshipMapping.java @@ -142,12 +142,12 @@ public abstract class AbstractOrmSingleRelationshipMapping<X extends AbstractXml // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.derivedIdentity.getXmlCompletionProposals(pos); + result = this.derivedIdentity.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTable.java index 2dd10bb563..5bcadef46c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTable.java @@ -468,13 +468,13 @@ public abstract class AbstractOrmTable<X extends AbstractXmlTable> // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } for (OrmUniqueConstraint constraint : this.getUniqueConstraints()) { - result = constraint.getXmlCompletionProposals(pos); + result = constraint.getCompletionProposals(pos); if (result != null) { return result; } @@ -487,8 +487,8 @@ public abstract class AbstractOrmTable<X extends AbstractXmlTable> * name, schema, catalog */ @Override - protected Iterable<String> getConnectedXmlCompletionProposals(int pos) { - Iterable<String> result = super.getConnectedXmlCompletionProposals(pos); + protected Iterable<String> getConnectedCompletionProposals(int pos) { + Iterable<String> result = super.getConnectedCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java index 4c7d6324d6..098272c0e6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java @@ -603,8 +603,8 @@ public abstract class AbstractOrmTypeMapping<X extends XmlTypeMapping> // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVersionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVersionMapping.java index 6d8a4248e3..cb86f0fcaf 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVersionMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVersionMapping.java @@ -293,16 +293,16 @@ public abstract class AbstractOrmVersionMapping<X extends XmlVersion> // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.column.getXmlCompletionProposals(pos); + result = this.column.getCompletionProposals(pos); if (result != null) { return result; } - result = this.converter.getXmlCompletionProposals(pos); + result = this.converter.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmManyToManyRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmManyToManyRelationship.java index 793c82627e..c9aba0dfb6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmManyToManyRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmManyToManyRelationship.java @@ -175,16 +175,16 @@ public class GenericOrmManyToManyRelationship // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.mappedByStrategy.getXmlCompletionProposals(pos); + result = this.mappedByStrategy.getCompletionProposals(pos); if (result != null) { return result; } - result = this.joinTableStrategy.getXmlCompletionProposals(pos); + result = this.joinTableStrategy.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmManyToOneRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmManyToOneRelationship.java index 2aa0160f42..2746d84366 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmManyToOneRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmManyToOneRelationship.java @@ -180,16 +180,16 @@ public class GenericOrmManyToOneRelationship // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.joinColumnStrategy.getXmlCompletionProposals(pos); + result = this.joinColumnStrategy.getCompletionProposals(pos); if (result != null) { return result; } - result = this.joinTableStrategy.getXmlCompletionProposals(pos); + result = this.joinTableStrategy.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappedByRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappedByRelationshipStrategy.java index e5141fd8a5..1990986c09 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappedByRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappedByRelationshipStrategy.java @@ -226,8 +226,8 @@ public class GenericOrmMappedByRelationshipStrategy // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOneToManyRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOneToManyRelationship.java index deb9dc59d7..1044a31a1e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOneToManyRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOneToManyRelationship.java @@ -245,20 +245,20 @@ public class GenericOrmOneToManyRelationship // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.mappedByStrategy.getXmlCompletionProposals(pos); + result = this.mappedByStrategy.getCompletionProposals(pos); if (result != null) { return result; } - result = this.joinTableStrategy.getXmlCompletionProposals(pos); + result = this.joinTableStrategy.getCompletionProposals(pos); if (result != null) { return result; } - result = this.joinColumnStrategy.getXmlCompletionProposals(pos); + result = this.joinColumnStrategy.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOneToOneRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOneToOneRelationship.java index 53a4c7eddb..c5c15f3921 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOneToOneRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOneToOneRelationship.java @@ -268,24 +268,24 @@ public class GenericOrmOneToOneRelationship // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.mappedByStrategy.getXmlCompletionProposals(pos); + result = this.mappedByStrategy.getCompletionProposals(pos); if (result != null) { return result; } - result = this.primaryKeyJoinColumnStrategy.getXmlCompletionProposals(pos); + result = this.primaryKeyJoinColumnStrategy.getCompletionProposals(pos); if (result != null) { return result; } - result = this.joinTableStrategy.getXmlCompletionProposals(pos); + result = this.joinTableStrategy.getCompletionProposals(pos); if (result != null) { return result; } - result = this.joinColumnStrategy.getXmlCompletionProposals(pos); + result = this.joinColumnStrategy.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnRelationshipStrategy.java index e94602d64d..9cca0f8773 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnRelationshipStrategy.java @@ -239,13 +239,13 @@ public class GenericOrmPrimaryKeyJoinColumnRelationshipStrategy // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } for (OrmPrimaryKeyJoinColumn column : this.getPrimaryKeyJoinColumns()) { - result = column.getXmlCompletionProposals(pos); + result = column.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentAttribute.java index 87774cdcab..8340ba98af 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentAttribute.java @@ -532,12 +532,12 @@ public abstract class SpecifiedOrmPersistentAttribute // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.mapping.getXmlCompletionProposals(pos); + result = this.mapping.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java index acdc0b2ae0..ab4153a683 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java @@ -1299,17 +1299,17 @@ public abstract class SpecifiedOrmPersistentType // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.mapping.getXmlCompletionProposals(pos); + result = this.mapping.getCompletionProposals(pos); if (result != null) { return result; } for (OrmPersistentAttribute attribute : this.getSpecifiedAttributes()) { - result = attribute.getXmlCompletionProposals(pos); + result = attribute.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java index 18fcd8875a..bfe87d03f0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java @@ -12,12 +12,10 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import java.util.Iterator; import java.util.List; import java.util.Vector; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceMember; import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.NotNullFilter; import org.eclipse.jpt.common.utility.internal.iterables.CompositeListIterable; @@ -549,13 +547,13 @@ public abstract class AbstractJavaOverrideContainer< // ********** code completion ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } for (R override : this.getOverrides()) { - result = override.getJavaCompletionProposals(pos, filter, astRoot); + result = override.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAssociationOverride.java index 0bb359f33b..e30ff8da57 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAssociationOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAssociationOverride.java @@ -10,8 +10,6 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.jpa.core.context.ReadOnlyAssociationOverride; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; @@ -102,12 +100,12 @@ public class GenericJavaAssociationOverride // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.relationship.getJavaCompletionProposals(pos, filter, astRoot); + result = this.relationship.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAttributeOverride.java index 944f081e09..cf00e3ad03 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAttributeOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAttributeOverride.java @@ -10,8 +10,6 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.jpa.core.context.ReadOnlyAttributeOverride; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; @@ -120,12 +118,12 @@ public class GenericJavaAttributeOverride // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.column.getJavaCompletionProposals(pos, filter, astRoot); + result = this.column.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratedValue.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratedValue.java index 00eaff0d3d..6b3243edbf 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratedValue.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratedValue.java @@ -10,11 +10,8 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.jpa.core.context.GenerationType; import org.eclipse.jpt.jpa.core.context.Generator; import org.eclipse.jpt.jpa.core.context.java.JavaGeneratedValue; @@ -162,13 +159,13 @@ public class GenericJavaGeneratedValue // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } if (this.generatorTouches(pos)) { - return this.getJavaCandidateGeneratorNames(filter); + return this.getJavaCandidateGeneratorNames(); } return null; } @@ -177,12 +174,8 @@ public class GenericJavaGeneratedValue return this.generatedValueAnnotation.generatorTouches(pos); } - protected Iterable<String> getJavaCandidateGeneratorNames(Filter<String> filter) { - return StringTools.convertToJavaStringLiterals(this.getCandidateGeneratorNames(filter)); - } - - protected Iterable<String> getCandidateGeneratorNames(Filter<String> filter) { - return new FilteringIterable<String>(this.getCandidateGeneratorNames(), filter); + protected Iterable<String> getJavaCandidateGeneratorNames() { + return StringTools.convertToJavaStringLiterals(this.getCandidateGeneratorNames()); } protected Iterable<String> getCandidateGeneratorNames() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratorContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratorContainer.java index 23827c028f..441a1612bf 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratorContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratorContainer.java @@ -10,9 +10,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.NotNullFilter; import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; @@ -200,19 +198,19 @@ public class GenericJavaGeneratorContainer // ********** code completion ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } if (this.tableGenerator != null) { - result = this.tableGenerator.getJavaCompletionProposals(pos, filter, astRoot); + result = this.tableGenerator.getCompletionProposals(pos); if (result != null) { return result; } } if (this.sequenceGenerator != null) { - result = this.sequenceGenerator.getJavaCompletionProposals(pos, filter, astRoot); + result = this.sequenceGenerator.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinColumn.java index b3e3fdeb20..3624ad13ec 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinColumn.java @@ -9,12 +9,9 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; @@ -156,13 +153,13 @@ public class GenericJavaJoinColumn // ********** Java completion proposals ********** @Override - protected Iterable<String> getConnectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getConnectedJavaCompletionProposals(pos, filter, astRoot); + protected Iterable<String> getConnectedCompletionProposals(int pos) { + Iterable<String> result = super.getConnectedCompletionProposals(pos); if (result != null) { return result; } if (this.referencedColumnNameTouches(pos)) { - return this.getJavaCandidateReferencedColumnNames(filter); + return this.getJavaCandidateReferencedColumnNames(); } return null; } @@ -171,12 +168,8 @@ public class GenericJavaJoinColumn return this.getColumnAnnotation().referencedColumnNameTouches(pos); } - protected Iterable<String> getJavaCandidateReferencedColumnNames(Filter<String> filter) { - return StringTools.convertToJavaStringLiterals(this.getCandidateReferencedColumnNames(filter)); - } - - protected Iterable<String> getCandidateReferencedColumnNames(Filter<String> filter) { - return new FilteringIterable<String>(this.getCandidateReferencedColumnNames(), filter); + protected Iterable<String> getJavaCandidateReferencedColumnNames() { + return StringTools.convertToJavaStringLiterals(this.getCandidateReferencedColumnNames()); } protected Iterable<String> getCandidateReferencedColumnNames() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinTable.java index 920e2a7f83..fe633db1cf 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinTable.java @@ -10,9 +10,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.Tools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; @@ -289,13 +287,13 @@ public class GenericJavaJoinTable // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } for (JavaJoinColumn column : this.getInverseJoinColumns()) { - result = column.getJavaCompletionProposals(pos, filter, astRoot); + result = column.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java index b6beaffb6f..2050331a80 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java @@ -10,10 +10,8 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; @@ -403,13 +401,13 @@ public class GenericJavaOrderable // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - return this.orderColumn.getJavaCompletionProposals(pos, filter, astRoot); + return this.orderColumn.getCompletionProposals(pos); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOverrideRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOverrideRelationship.java index 4b8352f93d..8ee8605110 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOverrideRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOverrideRelationship.java @@ -10,9 +10,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.MappedByRelationship; import org.eclipse.jpt.jpa.core.context.OverrideRelationship; @@ -281,13 +279,13 @@ public class GenericJavaOverrideRelationship // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - return this.strategy.getJavaCompletionProposals(pos, filter, astRoot); + return this.strategy.getCompletionProposals(pos); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaPrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaPrimaryKeyJoinColumn.java index 479581ac9f..b44ca45d28 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaPrimaryKeyJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaPrimaryKeyJoinColumn.java @@ -9,12 +9,9 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; import org.eclipse.jpt.jpa.core.context.java.JavaPrimaryKeyJoinColumn; @@ -152,13 +149,13 @@ public class GenericJavaPrimaryKeyJoinColumn // ********** Java completion proposals ********** @Override - protected Iterable<String> getConnectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getConnectedJavaCompletionProposals(pos, filter, astRoot); + protected Iterable<String> getConnectedCompletionProposals(int pos) { + Iterable<String> result = super.getConnectedCompletionProposals(pos); if (result != null) { return result; } if (this.referencedColumnNameTouches(pos)) { - return this.getJavaCandidateReferencedColumnNames(filter); + return this.getJavaCandidateReferencedColumnNames(); } return null; } @@ -167,12 +164,8 @@ public class GenericJavaPrimaryKeyJoinColumn return this.columnAnnotation.referencedColumnNameTouches(pos); } - protected Iterable<String> getJavaCandidateReferencedColumnNames(Filter<String> filter) { - return StringTools.convertToJavaStringLiterals(this.getCandidateReferencedColumnNames(filter)); - } - - protected Iterable<String> getCandidateReferencedColumnNames(Filter<String> filter) { - return new FilteringIterable<String>(this.getCandidateReferencedColumnNames(), filter); + protected Iterable<String> getJavaCandidateReferencedColumnNames() { + return StringTools.convertToJavaStringLiterals(this.getCandidateReferencedColumnNames()); } protected Iterable<String> getCandidateReferencedColumnNames() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java index b2bf515610..722bfb5b6b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java @@ -10,8 +10,6 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; @@ -250,13 +248,13 @@ public abstract class GenericJavaReferenceTable<A extends ReferenceTableAnnotati // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } for (JavaJoinColumn column : this.getJoinColumns()) { - result = column.getJavaCompletionProposals(pos, filter, astRoot); + result = column.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSecondaryTable.java index c780b8cc14..75780e9a3e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSecondaryTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSecondaryTable.java @@ -10,9 +10,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; @@ -299,13 +297,13 @@ public class GenericJavaSecondaryTable // ********** code completion ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } for (JavaPrimaryKeyJoinColumn column : this.getPrimaryKeyJoinColumns()) { - result = column.getJavaCompletionProposals(pos, filter, astRoot); + result = column.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTableGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTableGenerator.java index a2060da19a..aabe2d850e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTableGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTableGenerator.java @@ -11,7 +11,6 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import java.util.ArrayList; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.StringTools; @@ -428,13 +427,13 @@ public class GenericJavaTableGenerator // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } for (JavaUniqueConstraint constraint : this.getUniqueConstraints()) { - result = constraint.getJavaCompletionProposals(pos, filter, astRoot); + result = constraint.getCompletionProposals(pos); if (result != null) { return result; } @@ -447,22 +446,22 @@ public class GenericJavaTableGenerator * table, schema, catalog, pkColumnName, valueColumnName */ @Override - protected Iterable<String> getConnectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getConnectedJavaCompletionProposals(pos, filter, astRoot); + protected Iterable<String> getConnectedCompletionProposals(int pos) { + Iterable<String> result = super.getConnectedCompletionProposals(pos); if (result != null) { return result; } if (this.tableTouches(pos)) { - return this.getJavaCandidateTables(filter); + return this.getJavaCandidateTables(); } if (this.schemaTouches(pos)) { - return this.getJavaCandidateSchemata(filter); + return this.getJavaCandidateSchemata(); } if (this.pkColumnNameTouches(pos)) { - return this.getJavaCandidateColumnNames(filter); + return this.getJavaCandidateColumnNames(); } if (this.valueColumnNameTouches(pos)) { - return this.getJavaCandidateColumnNames(filter); + return this.getJavaCandidateColumnNames(); } return null; } @@ -473,12 +472,8 @@ public class GenericJavaTableGenerator return this.generatorAnnotation.tableTouches(pos); } - protected Iterable<String> getJavaCandidateTables(Filter<String> filter) { - return StringTools.convertToJavaStringLiterals(this.getCandidateTables(filter)); - } - - protected Iterable<String> getCandidateTables(Filter<String> filter) { - return new FilteringIterable<String>(this.getCandidateTables(), filter); + protected Iterable<String> getJavaCandidateTables() { + return StringTools.convertToJavaStringLiterals(this.getCandidateTables()); } protected Iterable<String> getCandidateTables() { @@ -492,12 +487,8 @@ public class GenericJavaTableGenerator return this.generatorAnnotation.schemaTouches(pos); } - protected Iterable<String> getJavaCandidateSchemata(Filter<String> filter) { - return StringTools.convertToJavaStringLiterals(this.getCandidateSchemata(filter)); - } - - protected Iterable<String> getCandidateSchemata(Filter<String> filter) { - return new FilteringIterable<String>(this.getCandidateSchemata(), filter); + protected Iterable<String> getJavaCandidateSchemata() { + return StringTools.convertToJavaStringLiterals(this.getCandidateSchemata()); } protected Iterable<String> getCandidateSchemata() { @@ -530,12 +521,8 @@ public class GenericJavaTableGenerator return this.generatorAnnotation.pkColumnNameTouches(pos); } - protected Iterable<String> getJavaCandidateColumnNames(Filter<String> filter) { - return StringTools.convertToJavaStringLiterals(this.getCandidateColumnNames(filter)); - } - - protected Iterable<String> getCandidateColumnNames(Filter<String> filter) { - return new FilteringIterable<String>(this.getCandidateColumnNames(), filter); + protected Iterable<String> getJavaCandidateColumnNames() { + return StringTools.convertToJavaStringLiterals(this.getCandidateColumnNames()); } protected Iterable<String> getCandidateColumnNames() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaUniqueConstraint.java index b4f4d88c0d..894a1b93d8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaUniqueConstraint.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaUniqueConstraint.java @@ -9,12 +9,9 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; import org.eclipse.jpt.jpa.core.context.UniqueConstraint; import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; @@ -86,13 +83,13 @@ public class GenericJavaUniqueConstraint // ********** Java completion proposals ********** @Override - protected Iterable<String> getConnectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getConnectedJavaCompletionProposals(pos, filter, astRoot); + protected Iterable<String> getConnectedCompletionProposals(int pos) { + Iterable<String> result = super.getConnectedCompletionProposals(pos); if (result != null) { return result; } if (this.columnNamesTouches(pos)) { - return this.javaCandidateColumnNames(filter); + return this.getJavaCandidateColumnNames(); } return null; } @@ -101,12 +98,8 @@ public class GenericJavaUniqueConstraint return this.uniqueConstraintAnnotation.columnNamesTouches(pos); } - protected Iterable<String> javaCandidateColumnNames(Filter<String> filter) { - return StringTools.convertToJavaStringLiterals(this.getCandidateColumnNames(filter)); - } - - protected Iterable<String> getCandidateColumnNames(Filter<String> filter) { - return new FilteringIterable<String>(this.getCandidateColumnNames(), filter); + protected Iterable<String> getJavaCandidateColumnNames() { + return StringTools.convertToJavaStringLiterals(this.getCandidateColumnNames()); } protected Iterable<String> getCandidateColumnNames() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedMapping.java index 2aefecf3bb..cc5de86264 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedMapping.java @@ -219,12 +219,12 @@ public abstract class AbstractOrmEmbeddedMapping<X extends XmlEmbedded> // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.associationOverrideContainer.getXmlCompletionProposals(pos); + result = this.associationOverrideContainer.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverride.java index b41cbc93f8..b3b3ebe869 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverride.java @@ -167,8 +167,8 @@ public abstract class AbstractOrmOverride<C extends OrmOverrideContainer, X exte // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java index 7ab0fe394b..e9c7b09171 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java @@ -473,13 +473,13 @@ public abstract class AbstractOrmOverrideContainer< // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } for (R override : this.getOverrides()) { - result = override.getXmlCompletionProposals(pos); + result = override.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmPersistenceUnitDefaults.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmPersistenceUnitDefaults.java index 6798f57c11..2f128f4036 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmPersistenceUnitDefaults.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmPersistenceUnitDefaults.java @@ -363,8 +363,8 @@ public abstract class AbstractOrmPersistenceUnitDefaults // ********** completion proposals ********* @Override - protected Iterable<String> getConnectedXmlCompletionProposals(int pos) { - Iterable<String> result = super.getConnectedXmlCompletionProposals(pos); + protected Iterable<String> getConnectedCompletionProposals(int pos) { + Iterable<String> result = super.getConnectedCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmPersistenceUnitMetadata.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmPersistenceUnitMetadata.java index a7bd86e6ce..b1c1c19514 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmPersistenceUnitMetadata.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmPersistenceUnitMetadata.java @@ -191,12 +191,12 @@ public abstract class AbstractOrmPersistenceUnitMetadata // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.persistenceUnitDefaults.getXmlCompletionProposals(pos); + result = this.persistenceUnitDefaults.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverride.java index 6bfa16dba8..86fcd2cd43 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverride.java @@ -118,12 +118,12 @@ public class GenericOrmAssociationOverride // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.relationship.getXmlCompletionProposals(pos); + result = this.relationship.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAttributeOverride.java index c6c768f403..75ff37f4dc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAttributeOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAttributeOverride.java @@ -154,12 +154,12 @@ public class GenericOrmAttributeOverride // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.column.getXmlCompletionProposals(pos); + result = this.column.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmGeneratedValue.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmGeneratedValue.java index 049ec7fcbb..fe87c4edca 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmGeneratedValue.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmGeneratedValue.java @@ -193,8 +193,8 @@ public class GenericOrmGeneratedValue // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmGeneratorContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmGeneratorContainer.java index 0cf8af22e9..3cb73061f3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmGeneratorContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmGeneratorContainer.java @@ -215,19 +215,19 @@ public class GenericOrmGeneratorContainer // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } if (this.tableGenerator != null) { - result = this.tableGenerator.getXmlCompletionProposals(pos); + result = this.tableGenerator.getCompletionProposals(pos); if (result != null) { return result; } } if (this.sequenceGenerator != null) { - result = this.sequenceGenerator.getXmlCompletionProposals(pos); + result = this.sequenceGenerator.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinColumn.java index 25bdf524e1..748e66b03b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinColumn.java @@ -170,8 +170,8 @@ public class GenericOrmJoinColumn // ********** completion proposals ********** @Override - protected Iterable<String> getConnectedXmlCompletionProposals(int pos) { - Iterable<String> result = super.getConnectedXmlCompletionProposals(pos); + protected Iterable<String> getConnectedCompletionProposals(int pos) { + Iterable<String> result = super.getConnectedCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java index e81482812d..8742ac68b3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java @@ -307,13 +307,13 @@ public class GenericOrmJoinTable // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } for (OrmJoinColumn column : this.getInverseJoinColumns()) { - result = column.getXmlCompletionProposals(pos); + result = column.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOrderable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOrderable.java index 18203e77d9..8bffd4425e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOrderable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOrderable.java @@ -402,15 +402,15 @@ public class GenericOrmOrderable // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } // orderColumn is null for JPA 1.0 mappings so adding a null // check here to prevent NPE - Bug 375670 if (this.orderColumn != null) { - result = this.orderColumn.getXmlCompletionProposals(pos); + result = this.orderColumn.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOverrideRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOverrideRelationship.java index 3b8657c647..785a544f5f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOverrideRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOverrideRelationship.java @@ -306,12 +306,12 @@ public class GenericOrmOverrideRelationship // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.strategy.getXmlCompletionProposals(pos); + result = this.strategy.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPrimaryKeyJoinColumn.java index 8d22194f05..a6629abe65 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPrimaryKeyJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPrimaryKeyJoinColumn.java @@ -167,8 +167,8 @@ public class GenericOrmPrimaryKeyJoinColumn // ********** completion proposals ********** @Override - protected Iterable<String> getConnectedXmlCompletionProposals(int pos) { - Iterable<String> result = super.getConnectedXmlCompletionProposals(pos); + protected Iterable<String> getConnectedCompletionProposals(int pos) { + Iterable<String> result = super.getConnectedCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmReferenceTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmReferenceTable.java index ca18fc757d..51da3a9c34 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmReferenceTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmReferenceTable.java @@ -269,13 +269,13 @@ public abstract class GenericOrmReferenceTable<X extends AbstractXmlReferenceTab // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } for (OrmJoinColumn column : this.getJoinColumns()) { - result = column.getXmlCompletionProposals(pos); + result = column.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSecondaryTable.java index 8947aad617..6cafdd7d08 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSecondaryTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSecondaryTable.java @@ -340,13 +340,13 @@ public class GenericOrmSecondaryTable // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } for (OrmPrimaryKeyJoinColumn column : this.getPrimaryKeyJoinColumns()) { - result = column.getXmlCompletionProposals(pos); + result = column.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTableGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTableGenerator.java index b06b66cc0b..5d0bf362f7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTableGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTableGenerator.java @@ -482,13 +482,13 @@ public class GenericOrmTableGenerator // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } for (OrmUniqueConstraint constraint : this.getUniqueConstraints()) { - result = constraint.getXmlCompletionProposals(pos); + result = constraint.getCompletionProposals(pos); if (result != null) { return result; } @@ -501,8 +501,8 @@ public class GenericOrmTableGenerator * table, schema, catalog, pkColumnName, valueColumnName */ @Override - protected Iterable<String> getConnectedXmlCompletionProposals(int pos) { - Iterable<String> result = super.getConnectedXmlCompletionProposals(pos); + protected Iterable<String> getConnectedCompletionProposals(int pos) { + Iterable<String> result = super.getConnectedCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmUniqueConstraint.java index 04c89c27dd..84de8a1eb3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmUniqueConstraint.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmUniqueConstraint.java @@ -108,8 +108,8 @@ public class GenericOrmUniqueConstraint // ********** completion proposals ********** @Override - protected Iterable<String> getConnectedXmlCompletionProposals(int pos) { - Iterable<String> result = super.getConnectedXmlCompletionProposals(pos); + protected Iterable<String> getConnectedCompletionProposals(int pos) { + Iterable<String> result = super.getConnectedCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java index 1381216ddb..76c7dae3b4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java @@ -11,13 +11,11 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; import java.util.ArrayList; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.resource.java.JavaResourceMember; import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.Association; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.SimpleAssociation; @@ -28,7 +26,6 @@ import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; import org.eclipse.jpt.common.utility.internal.iterables.SubListIterableWrapper; @@ -1370,52 +1367,52 @@ public abstract class AbstractJavaElementCollectionMapping2_0 // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.collectionTable.getJavaCompletionProposals(pos, filter, astRoot); + result = this.collectionTable.getCompletionProposals(pos); if (result != null) { return result; } - result = this.valueColumn.getJavaCompletionProposals(pos, filter, astRoot); + result = this.valueColumn.getCompletionProposals(pos); if (result != null) { return result; } - result = this.converter.getJavaCompletionProposals(pos, filter, astRoot); + result = this.converter.getCompletionProposals(pos); if (result != null) { return result; } - result = this.orderable.getJavaCompletionProposals(pos, filter, astRoot); + result = this.orderable.getCompletionProposals(pos); if (result != null) { return result; } - result = this.valueAttributeOverrideContainer.getJavaCompletionProposals(pos, filter, astRoot); + result = this.valueAttributeOverrideContainer.getCompletionProposals(pos); if (result != null) { return result; } - result = this.valueAssociationOverrideContainer.getJavaCompletionProposals(pos, filter, astRoot); + result = this.valueAssociationOverrideContainer.getCompletionProposals(pos); if (result != null) { return result; } if (this.mapKeyNameTouches(pos)) { - return this.getJavaCandidateMapKeyNames(filter); + return this.getJavaCandidateMapKeyNames(); } - result = this.mapKeyColumn.getJavaCompletionProposals(pos, filter, astRoot); + result = this.mapKeyColumn.getCompletionProposals(pos); if (result != null) { return result; } - result = this.mapKeyConverter.getJavaCompletionProposals(pos, filter, astRoot); + result = this.mapKeyConverter.getCompletionProposals(pos); if (result != null) { return result; } - result = this.mapKeyAttributeOverrideContainer.getJavaCompletionProposals(pos, filter, astRoot); + result = this.mapKeyAttributeOverrideContainer.getCompletionProposals(pos); if (result != null) { return result; } for (JavaJoinColumn joinColumn : this.getMapKeyJoinColumns()) { - result = joinColumn.getJavaCompletionProposals(pos, filter, astRoot); + result = joinColumn.getCompletionProposals(pos); if (result != null) { return result; } @@ -1423,12 +1420,8 @@ public abstract class AbstractJavaElementCollectionMapping2_0 return null; } - protected Iterable<String> getJavaCandidateMapKeyNames(Filter<String> filter) { - return StringTools.convertToJavaStringLiterals(this.getCandidateMapKeyNames(filter)); - } - - protected Iterable<String> getCandidateMapKeyNames(Filter<String> filter) { - return new FilteringIterable<String>(this.getCandidateMapKeyNames(), filter); + protected Iterable<String> getJavaCandidateMapKeyNames() { + return StringTools.convertToJavaStringLiterals(this.getCandidateMapKeyNames()); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaDerivedIdentity2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaDerivedIdentity2_0.java index 3d4720bece..88ba9ebcda 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaDerivedIdentity2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaDerivedIdentity2_0.java @@ -10,9 +10,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode; import org.eclipse.jpt.jpa.core.jpa2.context.DerivedIdentityStrategy2_0; @@ -157,13 +155,13 @@ public class GenericJavaDerivedIdentity2_0 // ********** java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } if (this.strategy != null) { - result = ((JavaJpaContextNode) this.strategy).getJavaCompletionProposals(pos, filter, astRoot); + result = ((JavaJpaContextNode) this.strategy).getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaMapsIdDerivedIdentityStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaMapsIdDerivedIdentityStrategy2_0.java index 75a15ea9e8..5809b946b5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaMapsIdDerivedIdentityStrategy2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaMapsIdDerivedIdentityStrategy2_0.java @@ -11,10 +11,8 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; import java.util.Iterator; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.ArrayTools; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.StringTools; @@ -264,19 +262,19 @@ public class GenericJavaMapsIdDerivedIdentityStrategy2_0 // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } if (this.getAnnotation().valueTouches(pos)) { - result = this.getSortedJavaValueChoices(filter); + result = this.getSortedJavaValueChoices(); } return result; } - protected Iterable<String> getSortedJavaValueChoices(Filter<String> filter) { - return StringTools.convertToJavaStringLiterals(new FilteringIterable<String>(this.getSortedCandidateIdAttributeNames(), filter)); + protected Iterable<String> getSortedJavaValueChoices() { + return StringTools.convertToJavaStringLiterals(this.getSortedCandidateIdAttributeNames()); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java index 9f333f7fb6..e16b2a36dd 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java @@ -1741,52 +1741,52 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.collectionTable.getXmlCompletionProposals(pos); + result = this.collectionTable.getCompletionProposals(pos); if (result != null) { return result; } - result = this.valueColumn.getXmlCompletionProposals(pos); + result = this.valueColumn.getCompletionProposals(pos); if (result != null) { return result; } - result = this.converter.getXmlCompletionProposals(pos); + result = this.converter.getCompletionProposals(pos); if (result != null) { return result; } - result = this.orderable.getXmlCompletionProposals(pos); + result = this.orderable.getCompletionProposals(pos); if (result != null) { return result; } - result = this.valueAttributeOverrideContainer.getXmlCompletionProposals(pos); + result = this.valueAttributeOverrideContainer.getCompletionProposals(pos); if (result != null) { return result; } - result = this.valueAssociationOverrideContainer.getXmlCompletionProposals(pos); + result = this.valueAssociationOverrideContainer.getCompletionProposals(pos); if (result != null) { return result; } if (this.mapKeyNameTouches(pos)) { return this.getCandidateMapKeyNames(); } - result = this.mapKeyColumn.getXmlCompletionProposals(pos); + result = this.mapKeyColumn.getCompletionProposals(pos); if (result != null) { return result; } - result = this.mapKeyConverter.getXmlCompletionProposals(pos); + result = this.mapKeyConverter.getCompletionProposals(pos); if (result != null) { return result; } - result = this.mapKeyAttributeOverrideContainer.getXmlCompletionProposals(pos); + result = this.mapKeyAttributeOverrideContainer.getCompletionProposals(pos); if (result != null) { return result; } for (OrmJoinColumn joinColumn : this.getMapKeyJoinColumns()) { - result = joinColumn.getXmlCompletionProposals(pos); + result = joinColumn.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmDerivedIdentity2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmDerivedIdentity2_0.java index 70d8b5f36c..6a83fa239d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmDerivedIdentity2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmDerivedIdentity2_0.java @@ -174,13 +174,13 @@ public class GenericOrmDerivedIdentity2_0 // ************** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } if (this.strategy != null) { - result = ((XmlContextNode) this.strategy).getXmlCompletionProposals(pos); + result = ((XmlContextNode) this.strategy).getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTenantDiscriminatorColumn2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTenantDiscriminatorColumn2_3.java index 6abdf9ce6f..04d80b4477 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTenantDiscriminatorColumn2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTenantDiscriminatorColumn2_3.java @@ -9,17 +9,13 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaNamedColumn; import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.AbstractJavaNamedDiscriminatorColumn; import org.eclipse.jpt.jpa.eclipselink.core.context.ReadOnlyTenantDiscriminatorColumn2_3; -import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaReadOnlyTenantDiscriminatorColumn2_3; import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaTenantDiscriminatorColumn2_3; import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkTenantDiscriminatorColumnAnnotation2_3; @@ -239,13 +235,13 @@ public class EclipseLinkJavaTenantDiscriminatorColumn2_3 // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } if (this.tableTouches(pos)) { - return this.getJavaCandidateTableNames(filter); + return this.getJavaCandidateTableNames(); } return null; } @@ -254,12 +250,8 @@ public class EclipseLinkJavaTenantDiscriminatorColumn2_3 return this.getColumnAnnotation().tableTouches(pos); } - protected Iterable<String> getJavaCandidateTableNames(Filter<String> filter) { - return StringTools.convertToJavaStringLiterals(this.getCandidateTableNames(filter)); - } - - protected Iterable<String> getCandidateTableNames(Filter<String> filter) { - return new FilteringIterable<String>(this.getCandidateTableNames(), filter); + protected Iterable<String> getJavaCandidateTableNames() { + return StringTools.convertToJavaStringLiterals(this.getCandidateTableNames()); } public Iterable<String> getCandidateTableNames() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkArrayMapping2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkArrayMapping2_3.java index 814459c351..0dc837eeab 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkArrayMapping2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkArrayMapping2_3.java @@ -10,11 +10,9 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.Association; import org.eclipse.jpt.common.utility.internal.SimpleAssociation; import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; @@ -302,16 +300,16 @@ public class JavaEclipseLinkArrayMapping2_3 // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.column.getJavaCompletionProposals(pos, filter, astRoot); + result = this.column.getCompletionProposals(pos); if (result != null) { return result; } - result = this.converter.getJavaCompletionProposals(pos, filter, astRoot); + result = this.converter.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConvert.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConvert.java index 5e4592ca56..acf02acbc8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConvert.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConvert.java @@ -10,12 +10,9 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import java.util.Arrays; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.Annotation; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.context.Converter; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; @@ -116,13 +113,13 @@ public class JavaEclipseLinkConvert // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } if (this.convertValueTouches(pos)) { - result = this.getJavaCandidateConverterNames(filter); + result = this.getJavaCandidateConverterNames(); if (result != null) { return result; } @@ -134,12 +131,8 @@ public class JavaEclipseLinkConvert return this.convertAnnotation.valueTouches(pos); } - protected Iterable<String> getJavaCandidateConverterNames(Filter<String> filter) { - return StringTools.convertToJavaStringLiterals(this.getCandidateConverterNames(filter)); - } - - protected Iterable<String> getCandidateConverterNames(Filter<String> filter) { - return new FilteringIterable<String>(this.getConverterNames(), filter); + protected Iterable<String> getJavaCandidateConverterNames() { + return StringTools.convertToJavaStringLiterals(this.getConverterNames()); } /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkEntityImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkEntityImpl.java index d9e9956fc0..8d25f60d02 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkEntityImpl.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkEntityImpl.java @@ -10,9 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.NotNullFilter; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; @@ -258,12 +256,12 @@ public class JavaEclipseLinkEntityImpl // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.multitenancy.getJavaCompletionProposals(pos, filter, astRoot); + result = this.multitenancy.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkGeneratorContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkGeneratorContainer.java index 26d62497b4..c62a51451e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkGeneratorContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkGeneratorContainer.java @@ -9,8 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; import org.eclipse.jpt.jpa.core.context.Generator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.GenericJavaGeneratorContainer; @@ -116,13 +114,13 @@ public class JavaEclipseLinkGeneratorContainer // ********** code completion ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } if (this.uuidGenerator != null) { - result = this.uuidGenerator.getJavaCompletionProposals(pos, filter, astRoot); + result = this.uuidGenerator.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkMappedSuperclassImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkMappedSuperclassImpl.java index e18d42e84e..79d382d040 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkMappedSuperclassImpl.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkMappedSuperclassImpl.java @@ -10,9 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.NotNullFilter; import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; @@ -237,12 +235,12 @@ public class JavaEclipseLinkMappedSuperclassImpl // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.multitenancy.getJavaCompletionProposals(pos, filter, astRoot); + result = this.multitenancy.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkMultitenancyImpl2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkMultitenancyImpl2_3.java index 5b8a6acd50..cc76f05fa2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkMultitenancyImpl2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkMultitenancyImpl2_3.java @@ -10,11 +10,9 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import java.util.List; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; @@ -653,13 +651,13 @@ public class JavaEclipseLinkMultitenancyImpl2_3 // ********** Java completion proposals ********** @Override - public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) { - Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } for (JavaTenantDiscriminatorColumn2_3 tenantDiscriminatorColumn : this.getSpecifiedTenantDiscriminatorColumns()) { - result = tenantDiscriminatorColumn.getJavaCompletionProposals(pos, filter, astRoot); + result = tenantDiscriminatorColumn.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTenantDiscriminatorColumn2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTenantDiscriminatorColumn2_3.java index bfd7021447..815070d048 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTenantDiscriminatorColumn2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTenantDiscriminatorColumn2_3.java @@ -246,8 +246,8 @@ public class EclipseLinkOrmTenantDiscriminatorColumn2_3 // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkArrayMapping2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkArrayMapping2_3.java index ddeb5749f6..e9f8646a24 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkArrayMapping2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkArrayMapping2_3.java @@ -349,16 +349,16 @@ public class OrmEclipseLinkArrayMapping2_3 // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.column.getXmlCompletionProposals(pos); + result = this.column.getCompletionProposals(pos); if (result != null) { return result; } - result = this.converter.getXmlCompletionProposals(pos); + result = this.converter.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkConvert.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkConvert.java index d65bc785d2..f2605192bf 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkConvert.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkConvert.java @@ -120,8 +120,8 @@ public class OrmEclipseLinkConvert // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkEntityImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkEntityImpl.java index 6343a35ece..4578fca4be 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkEntityImpl.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkEntityImpl.java @@ -468,12 +468,12 @@ public class OrmEclipseLinkEntityImpl // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.multitenancy.getXmlCompletionProposals(pos); + result = this.multitenancy.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkGeneratorContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkGeneratorContainer.java index c18d25eac1..ba06094a90 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkGeneratorContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkGeneratorContainer.java @@ -122,13 +122,13 @@ public class OrmEclipseLinkGeneratorContainer // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } if (this.uuidGenerator != null) { - result = this.uuidGenerator.getXmlCompletionProposals(pos); + result = this.uuidGenerator.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMappedSuperclassImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMappedSuperclassImpl.java index 947487d6f5..978b9cadf2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMappedSuperclassImpl.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMappedSuperclassImpl.java @@ -415,12 +415,12 @@ public class OrmEclipseLinkMappedSuperclassImpl // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } - result = this.multitenancy.getXmlCompletionProposals(pos); + result = this.multitenancy.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMultitenancyImpl2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMultitenancyImpl2_3.java index 256d00b8f4..60020f563e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMultitenancyImpl2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMultitenancyImpl2_3.java @@ -785,13 +785,13 @@ public class OrmEclipseLinkMultitenancyImpl2_3 // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } for (OrmTenantDiscriminatorColumn2_3 tenantDiscriminatorColumn : this.getSpecifiedTenantDiscriminatorColumns()) { - result = tenantDiscriminatorColumn.getXmlCompletionProposals(pos); + result = tenantDiscriminatorColumn.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistenceUnitDefaults.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistenceUnitDefaults.java index eb45bdf12f..adeaf498f8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistenceUnitDefaults.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistenceUnitDefaults.java @@ -356,13 +356,13 @@ public class OrmEclipseLinkPersistenceUnitDefaults // ********** completion proposals ********** @Override - public Iterable<String> getXmlCompletionProposals(int pos) { - Iterable<String> result = super.getXmlCompletionProposals(pos); + public Iterable<String> getCompletionProposals(int pos) { + Iterable<String> result = super.getCompletionProposals(pos); if (result != null) { return result; } for (OrmTenantDiscriminatorColumn2_3 tenantDiscriminatorColumn : this.getTenantDiscriminatorColumns()) { - result = tenantDiscriminatorColumn.getXmlCompletionProposals(pos); + result = tenantDiscriminatorColumn.getCompletionProposals(pos); if (result != null) { return result; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaJavaCompletionProposalComputer.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaJavaCompletionProposalComputer.java index 376fd315d5..5afb4eb5b0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaJavaCompletionProposalComputer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaJavaCompletionProposalComputer.java @@ -18,16 +18,12 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jdt.core.CompletionContext; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jdt.ui.text.java.ContentAssistInvocationContext; import org.eclipse.jdt.ui.text.java.IJavaCompletionProposalComputer; import org.eclipse.jdt.ui.text.java.JavaContentAssistInvocationContext; import org.eclipse.jface.text.contentassist.CompletionProposal; import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.jpt.common.core.internal.utility.jdt.ASTTools; -import org.eclipse.jpt.common.utility.Filter; import org.eclipse.jpt.common.utility.internal.CollectionTools; -import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.jpa.core.JpaFile; import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; @@ -117,10 +113,6 @@ public class JpaJavaCompletionProposalComputer CompletionContext cc = context.getCoreContext(); - // the context's "token" is really a sort of "prefix" - it does NOT - // correspond to the "start" and "end" we get below... - char[] prefix = cc.getToken(); - Filter<String> filter = this.buildPrefixFilter(prefix); // the token "start" is the offset of the token's first character int tokenStart = cc.getTokenStart(); // the token "end" is the offset of the token's last character (yuk) @@ -129,7 +121,6 @@ public class JpaJavaCompletionProposalComputer return Collections.emptyList(); } -// System.out.println("prefix: " + ((prefix == null) ? "[null]" : new String(prefix))); // System.out.println("token start: " + tokenStart); // System.out.println("token end: " + tokenEnd); // String source = cu.getSource(); @@ -138,11 +129,9 @@ public class JpaJavaCompletionProposalComputer // String snippet = source.substring(Math.max(0, tokenStart - 20), Math.min(source.length(), tokenEnd + 21)); // System.out.println("surrounding snippet: =>" + snippet + "<="); - // TODO move this parser call into the model... - CompilationUnit astRoot = ASTTools.buildASTRoot(cu); List<ICompletionProposal> proposals = new ArrayList<ICompletionProposal>(); for (JpaStructureNode structureNode : rootStructureNodes) { - for (String s : ((JavaPersistentType) structureNode).getJavaCompletionProposals(context.getInvocationOffset(), filter, astRoot)) { + for (String s : ((JavaPersistentType) structureNode).getCompletionProposals(context.getInvocationOffset())) { proposals.add(new CompletionProposal(s, tokenStart, tokenEnd - tokenStart + 1, s.length())); } } @@ -174,23 +163,4 @@ public class JpaJavaCompletionProposalComputer public void sessionEnded() { // do nothing } - - private Filter<String> buildPrefixFilter(char[] prefix) { - return (prefix == null) ? - Filter.Transparent.<String>instance() : - new IgnoreCasePrefixFilter(prefix); - } - - private static class IgnoreCasePrefixFilter - implements Filter<String> - { - private final String prefix; - IgnoreCasePrefixFilter(char[] prefix) { - super(); - this.prefix = new String(prefix); - } - public boolean accept(String s) { - return StringTools.stringStartsWithIgnoreCase(s, this.prefix); - } - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaXmlCompletionProposalComputer.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaXmlCompletionProposalComputer.java index e5c2bff977..64d92653e8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaXmlCompletionProposalComputer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaXmlCompletionProposalComputer.java @@ -179,7 +179,7 @@ public class JpaXmlCompletionProposalComputer extends DefaultJpaXmlCompletionPro List<String> list = new ArrayList<String>(); for (JpaStructureNode node : rootStructureNodes) { - CollectionTools.addAll(list, ((XmlFile.Root) node).getXmlCompletionProposals(documentPosition)); + CollectionTools.addAll(list, ((XmlFile.Root) node).getCompletionProposals(documentPosition)); } return list; } |