From 6e61fb28d8edc65d1c27a479982d5fd15341cca2 Mon Sep 17 00:00:00 2001 From: John Camelon Date: Mon, 22 Sep 2003 15:17:30 +0000 Subject: [PATCH] Patch for Andrew Niefer - associate context ID ICHelpContextIds.C_SEARCH_PAGE with the CSearchPage dialog - add C_SEARCH_PAGE to the ICHelpContextIds. --- core/org.eclipse.cdt.ui/ChangeLog | 4 ++++ .../src/org/eclipse/cdt/internal/ui/ICHelpContextIds.java | 1 + .../src/org/eclipse/cdt/internal/ui/search/CSearchPage.java | 4 +++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index ffb4fd75bc3..c01d6378ac8 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,7 @@ +2003-09-22 Andrew Niefer + associate context ID ICHelpContextIds.C_SEARCH_PAGE with the CSearchPage dialog + add C_SEARCH_PAGE to the ICHelpContextIds. + 2003-09-22 Alain Magloire Disable the C-Task Property and Preference page. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ICHelpContextIds.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ICHelpContextIds.java index 4d87a9576cc..5264c7a8cf2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ICHelpContextIds.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ICHelpContextIds.java @@ -51,4 +51,5 @@ public interface ICHelpContextIds { public static final String COLLAPSE_ALL_ACTION= PREFIX + "collapse_all_action"; //$NON-NLS-1$ + public static final String C_SEARCH_PAGE= PREFIX + "c_search_page"; //$NON-NLS-1$ } \ No newline at end of file diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPage.java index 867c3326652..868d2fbfabc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPage.java @@ -27,6 +27,7 @@ import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.search.ICSearchConstants; import org.eclipse.cdt.core.search.ICSearchScope; import org.eclipse.cdt.core.search.SearchEngine; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.runtime.IAdaptable; @@ -62,6 +63,7 @@ import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkingSet; import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.ui.model.IWorkbenchAdapter; /** @@ -179,7 +181,7 @@ public class CSearchPage extends DialogPage implements ISearchPage, ICSearchCons setControl( result ); Dialog.applyDialogFont( result ); - //WorkbenchHelp.setHelp(result, IJavaHelpContextIds.JAVA_SEARCH_PAGE); + WorkbenchHelp.setHelp(result, ICHelpContextIds.C_SEARCH_PAGE); } private Control createExpression( Composite parent ) {