Bug 89013 - Changes to ResultCollector --> API
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayCompletionProcessor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayCompletionProcessor.java
index 23bb9e4..e9f2f70 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayCompletionProcessor.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayCompletionProcessor.java
@@ -40,8 +40,8 @@
import org.eclipse.jdt.internal.ui.text.template.contentassist.TemplateEngine;
import org.eclipse.jdt.internal.ui.text.template.contentassist.TemplateProposal;
import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
-import org.eclipse.jdt.ui.text.java.JavaCompletionProposalComparator;
-import org.eclipse.jdt.ui.text.java.ResultCollector;
+import org.eclipse.jdt.ui.text.java.CompletionProposalComparator;
+import org.eclipse.jdt.ui.text.java.CompletionProposalCollector;
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.Document;
@@ -62,19 +62,19 @@
*/
public class DisplayCompletionProcessor implements IContentAssistProcessor {
- private ResultCollector fCollector;
+ private CompletionProposalCollector fCollector;
private IContextInformationValidator fValidator;
private TemplateEngine fTemplateEngine;
private char[] fProposalAutoActivationSet;
- private JavaCompletionProposalComparator fComparator;
+ private CompletionProposalComparator fComparator;
public DisplayCompletionProcessor() {
TemplateContextType contextType= JavaPlugin.getDefault().getTemplateContextRegistry().getContextType("java"); //$NON-NLS-1$
if (contextType != null) {
fTemplateEngine= new TemplateEngine(contextType);
}
- fComparator= new JavaCompletionProposalComparator();
+ fComparator= new CompletionProposalComparator();
}
/**
@@ -299,7 +299,7 @@
* Configures the display result collection for the current code assist session
*/
protected void configureResultCollector(IJavaProject project, ITextSelection selection) {
- fCollector = new ResultCollector(project);
+ fCollector = new CompletionProposalCollector(project);
if (selection.getLength() != 0) {
fCollector.setReplacementLength(selection.getLength());
}
@@ -422,11 +422,11 @@
fProposalAutoActivationSet= activationSet;
}
- protected ResultCollector getCollector() {
+ protected CompletionProposalCollector getCollector() {
return fCollector;
}
- protected void setCollector(ResultCollector collector) {
+ protected void setCollector(CompletionProposalCollector collector) {
fCollector = collector;
}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetCompletionProcessor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetCompletionProcessor.java
index efc7d8a..6cfdfd7 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetCompletionProcessor.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetCompletionProcessor.java
@@ -20,8 +20,8 @@
import org.eclipse.jdt.internal.ui.text.template.contentassist.TemplateEngine;
import org.eclipse.jdt.internal.ui.text.template.contentassist.TemplateProposal;
import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
-import org.eclipse.jdt.ui.text.java.JavaCompletionProposalComparator;
-import org.eclipse.jdt.ui.text.java.ResultCollector;
+import org.eclipse.jdt.ui.text.java.CompletionProposalComparator;
+import org.eclipse.jdt.ui.text.java.CompletionProposalCollector;
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.text.ITextViewer;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
@@ -36,11 +36,11 @@
*/
public class JavaSnippetCompletionProcessor implements IContentAssistProcessor {
- private ResultCollector fCollector;
+ private CompletionProposalCollector fCollector;
private JavaSnippetEditor fEditor;
private IContextInformationValidator fValidator;
private TemplateEngine fTemplateEngine;
- private JavaCompletionProposalComparator fComparator;
+ private CompletionProposalComparator fComparator;
private char[] fProposalAutoActivationSet;
@@ -51,7 +51,7 @@
fTemplateEngine= new TemplateEngine(contextType);
}
- fComparator= new JavaCompletionProposalComparator();
+ fComparator= new CompletionProposalComparator();
}
/**
@@ -90,7 +90,7 @@
*/
public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int position) {
try {
- fCollector = new ResultCollector(fEditor.getJavaProject());
+ fCollector = new CompletionProposalCollector(fEditor.getJavaProject());
fEditor.codeComplete(fCollector);
} catch (JavaModelException x) {
Shell shell= viewer.getTextWidget().getShell();
