From 0202a904bd7c0e69c79430a416250a34cc74381f Mon Sep 17 00:00:00 2001 From: David Inglis Date: Fri, 1 Apr 2005 19:08:44 +0000 Subject: use IWorkbenchHelpSystem --- .../cdt/make/internal/ui/MakeProjectOptionBlock.java | 19 ++++++++++--------- .../ui/preferences/MakefileEditorPreferencePage.java | 4 ++-- .../src/org/eclipse/cdt/make/ui/views/MakeView.java | 4 ++-- .../make/ui/wizards/MakeProjectWizardOptionPage.java | 4 ++-- .../cdt/make/ui/wizards/NewMakeProjectWizard.java | 3 +-- 5 files changed, 17 insertions(+), 17 deletions(-) (limited to 'build/org.eclipse.cdt.make.ui') diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeProjectOptionBlock.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeProjectOptionBlock.java index 9b09c9cf24f..eec5f290b3c 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeProjectOptionBlock.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeProjectOptionBlock.java @@ -25,7 +25,7 @@ import org.eclipse.cdt.ui.dialogs.ICOptionPage; import org.eclipse.cdt.ui.dialogs.TabFolderOptionBlock; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.ui.help.WorkbenchHelp; +import org.eclipse.ui.help.IWorkbenchHelpSystem; public class MakeProjectOptionBlock extends TabFolderOptionBlock { private ICOptionContainer optionContainer; @@ -56,19 +56,20 @@ public class MakeProjectOptionBlock extends TabFolderOptionBlock { Iterator iter = optionPages.iterator(); for( int i = 0; i < 4 && iter.hasNext(); i++ ){ ICOptionPage page = (ICOptionPage) iter.next(); + IWorkbenchHelpSystem helpSystem = MakeUIPlugin.getDefault().getWorkbench().getHelpSystem(); if( optionContainer != null && optionContainer instanceof MakePropertyPage ) switch( i ){ - case 0 : WorkbenchHelp.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_PROP_BUILDER_SETTINGS); break; - case 1 : WorkbenchHelp.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_PROP_ERROR_PARSER ); break; - case 2 : WorkbenchHelp.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_PROP_BINARY_PARSER ); break; - case 3 : WorkbenchHelp.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_PROP_DISCOVERY ); break; + case 0 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_PROP_BUILDER_SETTINGS); break; + case 1 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_PROP_ERROR_PARSER ); break; + case 2 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_PROP_BINARY_PARSER ); break; + case 3 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_PROP_DISCOVERY ); break; } else switch( i ){ - case 0 : WorkbenchHelp.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_BUILDER_SETTINGS); break; - case 1 : WorkbenchHelp.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_PREF_ERROR_PARSER ); break; - case 2 : WorkbenchHelp.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_PREF_BINARY_PARSER ); break; - case 3 : WorkbenchHelp.setHelp(page.getControl(), IMakeHelpContextIds.SCANNER_CONFIG_DISCOVERY_OPTIONS ); break; + case 0 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_BUILDER_SETTINGS); break; + case 1 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_PREF_ERROR_PARSER ); break; + case 2 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.MAKE_PREF_BINARY_PARSER ); break; + case 3 : helpSystem.setHelp(page.getControl(), IMakeHelpContextIds.SCANNER_CONFIG_DISCOVERY_OPTIONS ); break; } } diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/MakefileEditorPreferencePage.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/MakefileEditorPreferencePage.java index 86092279818..641db2e9172 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/MakefileEditorPreferencePage.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/MakefileEditorPreferencePage.java @@ -14,6 +14,7 @@ package org.eclipse.cdt.make.internal.ui.preferences; import java.util.ArrayList; import java.util.Map; +import org.eclipse.cdt.make.internal.ui.MakeUIPlugin; import org.eclipse.cdt.make.internal.ui.text.ColorManager; import org.eclipse.cdt.make.ui.IMakeHelpContextIds; import org.eclipse.cdt.ui.PreferenceConstants; @@ -41,7 +42,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.TabFolder; import org.eclipse.swt.widgets.TabItem; -import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.ui.model.WorkbenchViewerSorter; @@ -241,7 +241,7 @@ public class MakefileEditorPreferencePage extends AbstractMakefileEditorPreferen * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) */ protected Control createContents(Composite parent) { - WorkbenchHelp.setHelp(getControl(), IMakeHelpContextIds.MAKE_EDITOR_PREFERENCE_PAGE); + MakeUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(getControl(), IMakeHelpContextIds.MAKE_EDITOR_PREFERENCE_PAGE); getOverlayStore().load(); getOverlayStore().start(); diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/MakeView.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/MakeView.java index de9859ff88d..60f4ae49d31 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/MakeView.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/MakeView.java @@ -11,6 +11,7 @@ package org.eclipse.cdt.make.ui.views; +import org.eclipse.cdt.make.internal.ui.MakeUIPlugin; import org.eclipse.cdt.make.ui.IMakeHelpContextIds; import org.eclipse.cdt.make.ui.MakeContentProvider; import org.eclipse.cdt.make.ui.MakeLabelProvider; @@ -33,7 +34,6 @@ import org.eclipse.swt.events.KeyEvent; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Menu; import org.eclipse.ui.IActionBars; -import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.ui.part.DrillDownAdapter; import org.eclipse.ui.part.ViewPart; @@ -61,7 +61,7 @@ public class MakeView extends ViewPart { * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite) */ public void createPartControl(Composite parent) { - WorkbenchHelp.setHelp(parent, IMakeHelpContextIds.MAKE_VIEW); + MakeUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(parent, IMakeHelpContextIds.MAKE_VIEW); viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL); viewer.setUseHashlookup(true); viewer.setContentProvider(new MakeContentProvider()); diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/wizards/MakeProjectWizardOptionPage.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/wizards/MakeProjectWizardOptionPage.java index a4c089d2473..ca6544ef958 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/wizards/MakeProjectWizardOptionPage.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/wizards/MakeProjectWizardOptionPage.java @@ -10,6 +10,7 @@ import java.util.List; import org.eclipse.cdt.make.core.MakeCorePlugin; import org.eclipse.cdt.make.internal.ui.MakeProjectOptionBlock; +import org.eclipse.cdt.make.internal.ui.MakeUIPlugin; import org.eclipse.cdt.make.ui.IMakeHelpContextIds; import org.eclipse.cdt.ui.dialogs.ICOptionContainer; import org.eclipse.cdt.ui.dialogs.ICOptionPage; @@ -20,7 +21,6 @@ import org.eclipse.cdt.ui.wizards.NewCProjectWizard; import org.eclipse.cdt.ui.wizards.NewCProjectWizardOptionPage; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.Preferences; -import org.eclipse.ui.help.WorkbenchHelp; /** * Standard main page for a wizard that is creates a project resource. @@ -68,7 +68,7 @@ public class MakeProjectWizardOptionPage extends NewCProjectWizardOptionPage { case 4 : id = IMakeHelpContextIds.MAKE_PROJ_WIZ_DISCOVERY_TAB; break; case 5 : id = IMakeHelpContextIds.MAKE_PROJ_WIZ_INDEXER_TAB; break; } - WorkbenchHelp.setHelp(page.getControl(), id); + MakeUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(page.getControl(), id); } } } diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/wizards/NewMakeProjectWizard.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/wizards/NewMakeProjectWizard.java index 9af3c6cf878..ce4e4b7619b 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/wizards/NewMakeProjectWizard.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/wizards/NewMakeProjectWizard.java @@ -23,7 +23,6 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.swt.widgets.Composite; -import org.eclipse.ui.help.WorkbenchHelp; /** */ @@ -70,7 +69,7 @@ public abstract class NewMakeProjectWizard extends NewCProjectWizard { IWizardPage [] pages = getPages(); if( pages != null && pages.length == 2 ){ - WorkbenchHelp.setHelp(pages[0].getControl(), IMakeHelpContextIds.MAKE_PROJ_WIZ_NAME_PAGE); + MakeUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(pages[0].getControl(), IMakeHelpContextIds.MAKE_PROJ_WIZ_NAME_PAGE); MakeProjectWizardOptionPage optionPage = (MakeProjectWizardOptionPage) pages[1]; optionPage.setupHelpContextIds(); -- cgit v1.2.3