From f58571464a578bec1cd744d569f975a66b460abb Mon Sep 17 00:00:00 2001 From: Karen Butzke Date: Wed, 29 Aug 2012 13:00:20 -0400 Subject: 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 --- .../jaxb/core/internal/context/java/GenericJavaXmlElementRef.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlElementRef.java') 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 getJavaCompletionProposals(int pos, Filter filter, CompilationUnit astRoot) { - Iterable result = super.getJavaCompletionProposals(pos, filter, astRoot); + public Iterable getCompletionProposals(int pos) { + Iterable 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; } -- cgit v1.2.3