diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistPreferencePage.java index 2c444825bcc..2ed392ed88f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistPreferencePage.java @@ -42,10 +42,6 @@ public class CodeAssistPreferencePage extends AbstractPreferencePage { protected OverlayPreferenceStore.OverlayKey[] createOverlayStoreKeys() { ArrayList overlayKeys = new ArrayList(); - // temporary - overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, ContentAssistPreference.DONT_USE_DOM)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, ContentAssistPreference.TIME_DOM)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.INT, ContentAssistPreference.AUTOACTIVATION_DELAY)); overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, ContentAssistPreference.AUTOINSERT)); overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, ContentAssistPreference.CODEASSIST_PREFIX_COMPLETION)); @@ -81,10 +77,6 @@ public class CodeAssistPreferencePage extends AbstractPreferencePage { layout.numColumns = 2; contentAssistComposite.setLayout(layout); - // temporary use DOM - addCheckBox(contentAssistComposite, "Use Old Content Assist (Work in progress)", ContentAssistPreference.DONT_USE_DOM, 0); - addCheckBox(contentAssistComposite, "Print Completion Times (Work in progress)", ContentAssistPreference.TIME_DOM, 0); - //&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& // The following three radio buttons are grouped together String label = PreferencesMessages.getString("CEditorPreferencePage.ContentAssistPage.searchGroupTitle"); //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java index d31c935569e..aacf5884fad 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java @@ -11,7 +11,6 @@ import org.eclipse.cdt.internal.ui.editor.CElementHyperlinkDetector; import org.eclipse.cdt.internal.ui.editor.CSourceViewer; import org.eclipse.cdt.internal.ui.text.c.hover.CEditorTextHoverDescriptor; import org.eclipse.cdt.internal.ui.text.c.hover.CEditorTextHoverProxy; -import org.eclipse.cdt.internal.ui.text.contentassist.CCompletionProcessor; import org.eclipse.cdt.internal.ui.text.contentassist.CCompletionProcessor2; import org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistPreference; import org.eclipse.cdt.ui.CElementContentProvider; @@ -43,6 +42,7 @@ import org.eclipse.jface.text.rules.DefaultDamagerRepairer; import org.eclipse.jface.text.rules.RuleBasedScanner; import org.eclipse.jface.text.source.IAnnotationHover; import org.eclipse.jface.text.source.ISourceViewer; +import org.eclipse.jface.text.source.SourceViewerConfiguration; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Shell; @@ -198,10 +198,7 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration { ContentAssistant assistant = new ContentAssistant(); - IContentAssistProcessor processor - = getPreferenceStore().getBoolean(ContentAssistPreference.DONT_USE_DOM) - ? (IContentAssistProcessor)new CCompletionProcessor(getEditor()) - : (IContentAssistProcessor)new CCompletionProcessor2(getEditor()); + IContentAssistProcessor processor = new CCompletionProcessor2(getEditor()); assistant.setContentAssistProcessor(processor, IDocument.DEFAULT_CONTENT_TYPE); //Will this work as a replacement for the configuration lines below? diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProcessor.java index d0c7a67ff0f..ae17e5820bf 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProcessor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProcessor.java @@ -52,6 +52,7 @@ import org.eclipse.ui.IEditorPart; /** * C completion processor. + * @deprecated */ public class CCompletionProcessor implements IContentAssistProcessor { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProcessor2.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProcessor2.java index 29c2efab4d1..7df5e04adaf 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProcessor2.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProcessor2.java @@ -58,13 +58,11 @@ public class CCompletionProcessor2 implements IContentAssistProcessor { public ICompletionProposal[] computeCompletionProposals(final ITextViewer viewer, int offset) { try { - long startTime = System.currentTimeMillis(); IWorkingCopy workingCopy = CUIPlugin.getDefault().getWorkingCopyManager().getWorkingCopy(editor.getEditorInput()); ASTCompletionNode completionNode = CDOM.getInstance().getCompletionNode( (IFile)workingCopy.getResource(), offset, CDOM.getInstance().getCodeReaderFactory(CDOM.PARSE_WORKING_COPY_WHENEVER_POSSIBLE)); - long stopTime = System.currentTimeMillis(); errorMessage = CUIMessages.getString(noCompletions); @@ -120,18 +118,6 @@ public class CCompletionProcessor2 implements IContentAssistProcessor { } } - if (CUIPlugin.getDefault().getPreferenceStore().getBoolean(ContentAssistPreference.TIME_DOM)) { - long propTime = System.currentTimeMillis(); - System.out.print("Completion Parse: " + (stopTime - startTime) + " + Proposals: " //$NON-NLS-1$ //$NON-NLS-2$ - + (propTime - stopTime)); - if (completionNode != null) - System.out.print(" - tokens: " + completionNode.count); - else - System.out.print(" - no completion node"); - System.out.println(); - System.out.flush(); - } - return propsArray; } catch (UnsupportedDialectException e) { @@ -182,4 +168,13 @@ public class CCompletionProcessor2 implements IContentAssistProcessor { return new CParameterListValidator(); } -} + public void setCompletionProposalAutoActivationCharacters(char[] activationSet) { + } + + public void orderProposalsAlphabetically(boolean order) { + } + + public void allowAddingIncludes(boolean allowAddingIncludes) { + } + +} diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistPreference.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistPreference.java index 6636afe6d5f..2a5de20a811 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistPreference.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistPreference.java @@ -22,10 +22,6 @@ import org.eclipse.jface.util.PropertyChangeEvent; public class ContentAssistPreference { - // Temporary to use DOM for assist - public final static String DONT_USE_DOM = "content_assist_dont_use_dom"; //$NON-NLS-1$ - public final static String TIME_DOM = "content_assist_time_dom"; //$NON-NLS-1$ - /** Preference key for content assist auto activation */ //public final static String AUTOACTIVATION= "content_assist_autoactivation"; /** Preference key for content assist auto activation delay */ @@ -73,15 +69,15 @@ public class ContentAssistPreference { return getColor(store, key, textTools.getColorManager()); } - private static CCompletionProcessor getCProcessor(ContentAssistant assistant) { + private static CCompletionProcessor2 getCProcessor(ContentAssistant assistant) { IContentAssistProcessor p= assistant.getContentAssistProcessor(IDocument.DEFAULT_CONTENT_TYPE); - if (p instanceof CCompletionProcessor) - return (CCompletionProcessor) p; + if (p instanceof CCompletionProcessor2) + return (CCompletionProcessor2) p; return null; } private static void configureCProcessor(ContentAssistant assistant, IPreferenceStore store) { - CCompletionProcessor jcp= getCProcessor(assistant); + CCompletionProcessor2 jcp= getCProcessor(assistant); if (jcp == null) return; @@ -154,7 +150,7 @@ public class ContentAssistPreference { private static void changeCProcessor(ContentAssistant assistant, IPreferenceStore store, String key) { - CCompletionProcessor jcp= getCProcessor(assistant); + CCompletionProcessor2 jcp= getCProcessor(assistant); if (jcp == null) return; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/SearchCompletionContributor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/SearchCompletionContributor.java index 9c3184fe6e0..5ee7d577bed 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/SearchCompletionContributor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/SearchCompletionContributor.java @@ -11,7 +11,6 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.ast.ASTCompletionNode; import org.eclipse.cdt.core.dom.ast.IASTFieldReference; import org.eclipse.cdt.core.dom.ast.IASTName;