From 1be0c22c6a276b9a62a049587a39e4c4061611f7 Mon Sep 17 00:00:00 2001 From: Hoda Amer Date: Fri, 16 Apr 2004 20:29:07 +0000 Subject: [PATCH] Bug fixes --- core/org.eclipse.cdt.ui/ChangeLog | 4 ++++ .../text/contentassist/CompletionEngine.java | 14 ++++++------ .../cdt/ui/wizards/NewClassWizard.java | 22 +++++++++++++++++-- 3 files changed, 31 insertions(+), 9 deletions(-) diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index fa29da7998f..e05e051e62f 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,7 @@ +2004-04-16 Hoda Amer + Fix for bug#44364 : [Content Assist] case sensitivity option + Fix for bug#53446 : [New Class Wizard] Be able to configure new class wizard to not open source + 2004-04-16 David Inglis Work in Progress - CPath ui stuff diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionEngine.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionEngine.java index 298c81b33c1..53d3e29243e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionEngine.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionEngine.java @@ -364,16 +364,16 @@ public class CompletionEngine implements RelevanceConstants { log("No of Keywords = " + numOfKeywords); //$NON-NLS-1$ } - private void addMacroToCompletions (String macroName){ - int relevance = MACRO_TYPE_RELEVANCE; + private void addMacroToCompletions (String prefix, String macroName){ + int relevance = computeRelevance(ICElement.C_MACRO, prefix, macroName); requestor.acceptMacro(macroName, completionStart, completionLength, relevance); } - private void addMacrosToCompletions(Iterator macros){ + private void addMacrosToCompletions(String prefix, Iterator macros){ int numOfMacros = 0; while (macros.hasNext()){ String macro = (String) macros.next(); - addMacroToCompletions(macro); + addMacroToCompletions(prefix, macro); numOfMacros++; } log("No of Macros = " + numOfMacros); //$NON-NLS-1$ @@ -547,7 +547,7 @@ public class CompletionEngine implements RelevanceConstants { addToCompletions(result); List macros = lookupMacros(completionNode.getCompletionPrefix()); - addMacrosToCompletions(macros.iterator()); + addMacrosToCompletions(prefix, macros.iterator()); } else // prefix is empty { @@ -602,7 +602,7 @@ public class CompletionEngine implements RelevanceConstants { IASTScope searchNode = completionNode.getCompletionScope(); // only look for macros List result = lookupMacros(completionNode.getCompletionPrefix()); - addMacrosToCompletions(result.iterator()); + addMacrosToCompletions(completionNode.getCompletionPrefix(), result.iterator()); } private void completionOnNewTypeReference(IASTCompletionNode completionNode){ // 1. Get the search scope node @@ -643,7 +643,7 @@ public class CompletionEngine implements RelevanceConstants { addToCompletions(result); List macros = lookupMacros(completionNode.getCompletionPrefix()); - addMacrosToCompletions(macros.iterator()); + addMacrosToCompletions(prefix, macros.iterator()); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassWizard.java index 51f6258bda8..149424786ad 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassWizard.java @@ -30,6 +30,8 @@ import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard; public class NewClassWizard extends BasicNewResourceWizard implements INewWizard { private NewClassWizardPage fPage; private String wz_title; + // a boolean to programatically control opening the sources in the editor + private boolean openInEditor = true; private static final String WZ_TITLE = "NewClassWizard.title"; //$NON-NLS-1$ private static final String WZ_DESC = "NewClassWizard.description"; //$NON-NLS-1$ @@ -58,12 +60,16 @@ public class NewClassWizard extends BasicNewResourceWizard implements INewWizard if (headerTU != null) { IResource resource= headerTU.getResource(); selectAndReveal(resource); - openResource((IFile) resource); + if(doOpenInEditor()){ + openResource((IFile) resource); + } } if (bodyTU != null) { IResource resource= bodyTU.getResource(); selectAndReveal(resource); - openResource((IFile) resource); + if(doOpenInEditor()){ + openResource((IFile) resource); + } } } } @@ -128,4 +134,16 @@ public class NewClassWizard extends BasicNewResourceWizard implements INewWizard public ICElement getCreatedClassElement(){ return fPage.getCreatedClassElement(); } + /** + * @return Returns the openInEditor. + */ + public boolean doOpenInEditor() { + return openInEditor; + } + /** + * @param openInEditor The openInEditor to set. + */ + public void setOpenInEditor(boolean openInEditor) { + this.openInEditor = openInEditor; + } }