From ada2d52b6cfaed809691058514c42b091eae3c6b Mon Sep 17 00:00:00 2001 From: Bogdan Gheorghe Date: Fri, 18 Jun 2004 18:03:47 +0000 Subject: [PATCH] Fix for Bug 66933: [Selection Search] Working set name is {0} in search results --- core/org.eclipse.cdt.ui/ChangeLog | 6 ++++++ .../search/actions/FindDeclarationsInWorkingSetAction.java | 3 ++- .../ui/search/actions/FindRefsInWorkingSetAction.java | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index dc881ca9ac2..608372eaeb4 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -4,6 +4,12 @@ fixed other duplicate mnemonices in New Class wizard. *org.eclipse.cdt.ui.wizards/NewWizardMessages.properties +2004-06-18 Bogdan Gheorghe + Fix for Bug 66933: [Selection Search] Working set name is {0} in search results + + * src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsInWorkingSetAction.java + * src/org/eclipse/cdt/internal/ui/search/actions/FindRefsInWorkingSetAction.java + 2004-06-18 Bogdan Gheorghe Part 2 of Fix for Bug 62668: [Search] Search results rely on case of file names in include statement rather then the filesystem diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsInWorkingSetAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsInWorkingSetAction.java index 09bcdafbc42..67e671d92cb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsInWorkingSetAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsInWorkingSetAction.java @@ -62,7 +62,7 @@ public class FindDeclarationsInWorkingSetAction extends FindAction { * @see org.eclipse.cdt.internal.ui.editor.selsearch.FindAction#getScopeDescription() */ protected String getScopeDescription() { - return CSearchMessages.getString("WorkingSetScope"); //$NON-NLS-1$ + return CSearchMessages.getFormattedString("WorkingSetScope", CSearchUtil.toString(fWorkingSet)); //$NON-NLS-1$ } /* (non-Javadoc) * @see org.eclipse.cdt.internal.ui.editor.selsearch.FindAction#getScope() @@ -74,6 +74,7 @@ public class FindDeclarationsInWorkingSetAction extends FindAction { workingSets= CSearchScopeFactory.getInstance().queryWorkingSets(); if (workingSets == null) return null; + fWorkingSet = workingSets; } ICSearchScope scope= CSearchScopeFactory.getInstance().createCSearchScope(workingSets); CSearchUtil.updateLRUWorkingSets(workingSets); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsInWorkingSetAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsInWorkingSetAction.java index 10c08cf8132..47ab60ed448 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsInWorkingSetAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsInWorkingSetAction.java @@ -65,7 +65,7 @@ public class FindRefsInWorkingSetAction extends FindAction { * @see org.eclipse.cdt.internal.ui.editor.selsearch.FindAction#getScopeDescription() */ protected String getScopeDescription() { - return CSearchMessages.getString("WorkingSetScope"); //$NON-NLS-1$ + return CSearchMessages.getFormattedString("WorkingSetScope", CSearchUtil.toString(fWorkingSet)); //$NON-NLS-1$ } /* (non-Javadoc) * @see org.eclipse.cdt.internal.ui.editor.selsearch.FindAction#getScope() @@ -76,6 +76,7 @@ public class FindRefsInWorkingSetAction extends FindAction { workingSets= CSearchScopeFactory.getInstance().queryWorkingSets(); if (workingSets == null) return null; + fWorkingSet = workingSets; } ICSearchScope scope= CSearchScopeFactory.getInstance().createCSearchScope(workingSets); CSearchUtil.updateLRUWorkingSets(workingSets);