From af17efc7a8f4bc472ff81750f9841c91c7f1ea5d Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Thu, 12 May 2005 14:34:45 +0000 Subject: [PATCH] 2005-05-12 Alain Magloire Fix multiple warnings, the use of: Workbench.setHelp() --> PlatformUI.getWorkbench().getHelpSystem().getHelp() Use IShellProvider instead of shell. * files too many to enumerate --- core/org.eclipse.cdt.ui/ChangeLog | 6 ++++++ .../internal/ui/actions/AbstractToggleLinkingAction.java | 4 ++-- .../eclipse/cdt/internal/ui/actions/SelectAllAction.java | 4 ++-- .../org/eclipse/cdt/internal/ui/cview/CViewMoveAction.java | 4 ++-- .../eclipse/cdt/internal/ui/cview/CViewRenameAction.java | 4 ++-- .../eclipse/cdt/internal/ui/cview/CollapseAllAction.java | 4 ++-- .../src/org/eclipse/cdt/internal/ui/cview/PasteAction.java | 3 +-- .../cdt/internal/ui/editor/GotoAnnotationAction.java | 6 +++--- .../cdt/internal/ui/editor/TogglePresentationAction.java | 4 ++-- .../eclipse/cdt/internal/ui/editor/asm/AsmTextTools.java | 5 +++-- .../cdt/internal/ui/filters/CustomFiltersDialog.java | 4 ++-- .../internal/ui/preferences/CFileTypesPreferencePage.java | 4 ++-- .../cdt/internal/ui/preferences/CFileTypesPropertyPage.java | 4 ++-- .../cdt/internal/ui/preferences/CPluginPreferencePage.java | 4 ++-- .../cdt/internal/ui/preferences/TodoTaskInputDialog.java | 4 ++-- .../cdt/internal/ui/preferences/TodoTaskPreferencePage.java | 4 ++-- .../cdt/internal/ui/preferences/TodoTaskPropertyPage.java | 4 ++-- .../src/org/eclipse/cdt/internal/ui/search/CSearchPage.java | 3 +-- .../eclipse/cdt/internal/ui/search/CSearchResultPage.java | 4 ++-- .../eclipse/cdt/internal/ui/util/CHelpDisplayContext.java | 4 ++-- .../cdt/internal/ui/viewsupport/MemberFilterAction.java | 4 ++-- .../cdt/internal/ui/wizards/NewProjectDropDownAction.java | 4 ++-- .../cdt/internal/ui/wizards/NewTypeDropDownAction.java | 4 ++-- .../ui/wizards/folderwizard/NewSourceFolderWizardPage.java | 4 ++-- .../cdt/internal/ui/workingsets/ClearWorkingSetAction.java | 5 ++--- .../cdt/internal/ui/workingsets/EditWorkingSetAction.java | 3 +-- .../cdt/internal/ui/workingsets/SelectWorkingSetAction.java | 3 +-- .../src/org/eclipse/cdt/ui/actions/OpenAction.java | 4 ++-- .../src/org/eclipse/cdt/ui/actions/OpenViewActionGroup.java | 2 +- .../eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java | 4 ++-- .../src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java | 4 ++-- .../src/org/eclipse/cdt/ui/dialogs/CodeFormatterBlock.java | 4 ++-- .../eclipse/cdt/ui/dialogs/IndexerOptionPropertyPage.java | 4 ++-- .../org/eclipse/cdt/ui/dialogs/MachOBinaryParserPage.java | 4 ++-- 34 files changed, 69 insertions(+), 67 deletions(-) diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index 5e8f4165adf..1410fea4117 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,9 @@ +2005-05-12 Alain Magloire + Fix multiple warnings, the use of: + Workbench.setHelp() --> PlatformUI.getWorkbench().getHelpSystem().getHelp() + Use IShellProvider instead of shell. + * files too many to enumerate + 2005-05-12 Alain Magloire Fix PR 93970 * src/org/eclipse/cdt/internal/ui/cview/SelectionTransferDragAdapter.java diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AbstractToggleLinkingAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AbstractToggleLinkingAction.java index c7755066d09..a22a23dbf07 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AbstractToggleLinkingAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AbstractToggleLinkingAction.java @@ -13,7 +13,7 @@ package org.eclipse.cdt.internal.ui.actions; import org.eclipse.cdt.internal.ui.CPluginImages; import org.eclipse.cdt.internal.ui.ICHelpContextIds; import org.eclipse.jface.action.Action; -import org.eclipse.ui.help.WorkbenchHelp; +import org.eclipse.ui.PlatformUI; /** * This is an action template for actions that toggle whether @@ -31,7 +31,7 @@ public abstract class AbstractToggleLinkingAction extends Action { setDescription(ActionMessages.getString("ToggleLinkingAction.description")); //$NON-NLS-1$ setToolTipText(ActionMessages.getString("ToggleLinkingAction.tooltip")); //$NON-NLS-1$ CPluginImages.setImageDescriptors(this, CPluginImages.T_LCL, "synced.gif"); //$NON-NLS-1$ - WorkbenchHelp.setHelp(this, ICHelpContextIds.LINK_EDITOR_ACTION); + PlatformUI.getWorkbench().getHelpSystem().setHelp(this, ICHelpContextIds.LINK_EDITOR_ACTION); } /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SelectAllAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SelectAllAction.java index 3d34dbfb9e1..991e2f42617 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SelectAllAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SelectAllAction.java @@ -16,7 +16,7 @@ import org.eclipse.jface.action.Action; import org.eclipse.jface.util.Assert; import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.ui.help.WorkbenchHelp; +import org.eclipse.ui.PlatformUI; /** * This action selects all entries currently showing in view. @@ -32,7 +32,7 @@ public class SelectAllAction extends Action { super("selectAll"); //$NON-NLS-1$ setText(ActionMessages.getString("SelectAllAction.label")); //$NON-NLS-1$ setToolTipText(ActionMessages.getString("SelectAllAction.tooltip")); //$NON-NLS-1$ - WorkbenchHelp.setHelp(this, ICHelpContextIds.SELECT_ALL_ACTION); + PlatformUI.getWorkbench().getHelpSystem().setHelp(this, ICHelpContextIds.SELECT_ALL_ACTION); Assert.isNotNull(viewer); fViewer= viewer; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewMoveAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewMoveAction.java index 27ca4fd7ccf..42b82d24a42 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewMoveAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewMoveAction.java @@ -23,9 +23,9 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.MoveProjectAction; import org.eclipse.ui.actions.MoveResourceAction; -import org.eclipse.ui.help.WorkbenchHelp; /** * The ResourceNavigatorMoveAction is a resource move that aso updates the navigator @@ -45,7 +45,7 @@ public class CViewMoveAction extends MoveResourceAction { */ public CViewMoveAction(Shell shell, StructuredViewer structureViewer) { super(shell); - WorkbenchHelp.setHelp(this, ICHelpContextIds.MOVE_ACTION); + PlatformUI.getWorkbench().getHelpSystem().setHelp(this, ICHelpContextIds.MOVE_ACTION); this.viewer = structureViewer; this.moveProjectAction = new MoveProjectAction(shell); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewRenameAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewRenameAction.java index c835f2d9f7e..2f339579ec0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewRenameAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewRenameAction.java @@ -19,8 +19,8 @@ import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.swt.SWT; import org.eclipse.swt.events.KeyEvent; import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.RenameResourceAction; -import org.eclipse.ui.help.WorkbenchHelp; /** @@ -38,7 +38,7 @@ public class CViewRenameAction extends RenameResourceAction { */ public CViewRenameAction(Shell shell, TreeViewer treeViewer) { super(shell, treeViewer.getTree()); - WorkbenchHelp.setHelp( + PlatformUI.getWorkbench().getHelpSystem().setHelp( this, ICHelpContextIds.RENAME_ACTION); this.viewer = treeViewer; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CollapseAllAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CollapseAllAction.java index d5581950851..3fe73cebc1d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CollapseAllAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CollapseAllAction.java @@ -13,7 +13,7 @@ package org.eclipse.cdt.internal.ui.cview; import org.eclipse.cdt.internal.ui.ICHelpContextIds; import org.eclipse.cdt.internal.ui.CPluginImages; import org.eclipse.jface.action.Action; -import org.eclipse.ui.help.WorkbenchHelp; +import org.eclipse.ui.PlatformUI; /** * Collapse all nodes. @@ -28,7 +28,7 @@ class CollapseAllAction extends Action { setToolTipText(CViewMessages.getString("CollapseAllAction.tooltip")); //$NON-NLS-1$ CPluginImages.setImageDescriptors(this, CPluginImages.T_LCL, CPluginImages.IMG_MENU_COLLAPSE_ALL); cview = part; - WorkbenchHelp.setHelp(this, ICHelpContextIds.COLLAPSE_ALL_ACTION); + PlatformUI.getWorkbench().getHelpSystem().setHelp(this, ICHelpContextIds.COLLAPSE_ALL_ACTION); } public void run() { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/PasteAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/PasteAction.java index 34176a651de..3bb4470591b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/PasteAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/PasteAction.java @@ -27,7 +27,6 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.CopyFilesAndFoldersOperation; import org.eclipse.ui.actions.CopyProjectOperation; import org.eclipse.ui.actions.SelectionListenerAction; -import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.ui.part.ResourceTransfer; /** @@ -69,7 +68,7 @@ public class PasteAction extends SelectionListenerAction { this.clipboard = clipboard; setToolTipText(CViewMessages.getString("PasteAction.toolTip")); //$NON-NLS-1$ setId(PasteAction.ID); - WorkbenchHelp.setHelp(this, ICHelpContextIds.PASTE_ACTION); + PlatformUI.getWorkbench().getHelpSystem().setHelp(this, ICHelpContextIds.PASTE_ACTION); } /** * Returns the actual target of the paste action. Returns null diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/GotoAnnotationAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/GotoAnnotationAction.java index d6a4b999511..a03eec421e1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/GotoAnnotationAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/GotoAnnotationAction.java @@ -12,7 +12,7 @@ package org.eclipse.cdt.internal.ui.editor; import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.ui.help.WorkbenchHelp; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.ui.texteditor.TextEditorAction; @@ -26,9 +26,9 @@ public class GotoAnnotationAction extends TextEditorAction { super(CEditorMessages.getResourceBundle(), prefix, null); fForward= forward; if (forward) - WorkbenchHelp.setHelp(this, ICHelpContextIds.GOTO_NEXT_ERROR_ACTION); + PlatformUI.getWorkbench().getHelpSystem().setHelp(this, ICHelpContextIds.GOTO_NEXT_ERROR_ACTION); else - WorkbenchHelp.setHelp(this, ICHelpContextIds.GOTO_PREVIOUS_ERROR_ACTION); + PlatformUI.getWorkbench().getHelpSystem().setHelp(this, ICHelpContextIds.GOTO_PREVIOUS_ERROR_ACTION); } public void run() { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/TogglePresentationAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/TogglePresentationAction.java index 634ee1c0fa1..2f4fcd32b3e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/TogglePresentationAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/TogglePresentationAction.java @@ -21,7 +21,7 @@ import org.eclipse.jface.text.IRegion; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.ui.help.WorkbenchHelp; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds; import org.eclipse.ui.texteditor.TextEditorAction; @@ -44,7 +44,7 @@ public class TogglePresentationAction extends TextEditorAction implements IPrope CPluginImages.setImageDescriptors(this, CPluginImages.T_LCL, CPluginImages.IMG_MENU_SEGMENT_EDIT); setToolTipText(CEditorMessages.getString("TogglePresentation.tooltip")); //$NON-NLS-1$ setActionDefinitionId(ITextEditorActionDefinitionIds.TOGGLE_SHOW_SELECTED_ELEMENT_ONLY); - WorkbenchHelp.setHelp(this, ICHelpContextIds.TOGGLE_PRESENTATION_ACTION); + PlatformUI.getWorkbench().getHelpSystem().setHelp(this, ICHelpContextIds.TOGGLE_PRESENTATION_ACTION); update(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextTools.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextTools.java index d7f99146c1b..7daadb1696a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextTools.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextTools.java @@ -13,7 +13,7 @@ import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.runtime.Preferences; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.IDocumentPartitioner; -import org.eclipse.jface.text.rules.DefaultPartitioner; +import org.eclipse.jface.text.rules.FastPartitioner; import org.eclipse.jface.text.rules.IPartitionTokenScanner; import org.eclipse.jface.text.rules.RuleBasedScanner; import org.eclipse.jface.util.IPropertyChangeListener; @@ -161,7 +161,8 @@ public class AsmTextTools { }; //return new RuleBasedPartitioner(getPartitionScanner(), types); - return new DefaultPartitioner(getPartitionScanner(), types); + //return new DefaultPartitioner(getPartitionScanner(), types); + return new FastPartitioner(getPartitionScanner(), types); } /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/CustomFiltersDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/CustomFiltersDialog.java index 88f6b7e6414..adbe56b8f8c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/CustomFiltersDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/CustomFiltersDialog.java @@ -48,8 +48,8 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.SelectionDialog; -import org.eclipse.ui.help.WorkbenchHelp; public class CustomFiltersDialog extends SelectionDialog { @@ -105,7 +105,7 @@ public class CustomFiltersDialog extends SelectionDialog { setTitle(FilterMessages.getString("CustomFiltersDialog.title")); //$NON-NLS-1$ setMessage(FilterMessages.getString("CustomFiltersDialog.filterList.label")); //$NON-NLS-1$ super.configureShell(shell); - WorkbenchHelp.setHelp(shell, ICHelpContextIds.CUSTOM_FILTERS_DIALOG); + PlatformUI.getWorkbench().getHelpSystem().setHelp(shell, ICHelpContextIds.CUSTOM_FILTERS_DIALOG); } /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferencePage.java index ce2797bb370..c76b300e9e0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferencePage.java @@ -31,7 +31,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; -import org.eclipse.ui.help.WorkbenchHelp; +import org.eclipse.ui.PlatformUI; /* * The preference page used for displaying/editing CDT file @@ -59,7 +59,7 @@ public class CFileTypesPreferencePage extends PreferencePage implements IWorkben fResolver = getResolverModel().getResolver(); fPrefsBlock = new CFileTypesPreferenceBlock(fResolver); - WorkbenchHelp.setHelp( topPane, ICHelpContextIds.FILE_TYPES_PREF_PAGE ); + PlatformUI.getWorkbench().getHelpSystem().setHelp( topPane, ICHelpContextIds.FILE_TYPES_PREF_PAGE ); return fPrefsBlock.createControl(topPane); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java index 10a50098fb8..6a33e1befdd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java @@ -24,8 +24,8 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.PropertyPage; -import org.eclipse.ui.help.WorkbenchHelp; /* * The preference page used for displaying/editing CDT file @@ -96,7 +96,7 @@ public class CFileTypesPropertyPage extends PropertyPage { fUseProject.setSelection(custom); fPrefsBlock.setEnabled(custom); - WorkbenchHelp.setHelp( topPane, ICHelpContextIds.FILE_TYPES_STD_PAGE ); + PlatformUI.getWorkbench().getHelpSystem().setHelp( topPane, ICHelpContextIds.FILE_TYPES_STD_PAGE ); return topPane; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CPluginPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CPluginPreferencePage.java index 4f7d4d98d64..30173a9cd4d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CPluginPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CPluginPreferencePage.java @@ -15,7 +15,7 @@ import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; -import org.eclipse.ui.help.WorkbenchHelp; +import org.eclipse.ui.PlatformUI; /** * The page for setting c plugin preferences. @@ -36,7 +36,7 @@ public class CPluginPreferencePage extends FieldEditorPreferencePage implements */ public void createControl(Composite parent) { super.createControl(parent); - WorkbenchHelp.setHelp(getControl(), ICHelpContextIds.C_PREF_PAGE); + PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), ICHelpContextIds.C_PREF_PAGE); } /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskInputDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskInputDialog.java index 8706652be80..c7e895979ab 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskInputDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskInputDialog.java @@ -19,7 +19,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.help.WorkbenchHelp; +import org.eclipse.ui.PlatformUI; import org.eclipse.cdt.core.CCorePlugin; @@ -157,6 +157,6 @@ public class TodoTaskInputDialog extends StatusDialog { */ protected void configureShell(Shell newShell) { super.configureShell(newShell); - WorkbenchHelp.setHelp(newShell, ICHelpContextIds.TODO_TASK_INPUT_DIALOG); + PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell, ICHelpContextIds.TODO_TASK_INPUT_DIALOG); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskPreferencePage.java index 70309e4add2..44be71810a3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskPreferencePage.java @@ -20,7 +20,7 @@ import org.eclipse.jface.preference.PreferencePage; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; -import org.eclipse.ui.help.WorkbenchHelp; +import org.eclipse.ui.PlatformUI; import org.eclipse.cdt.internal.ui.ICHelpContextIds; import org.eclipse.cdt.ui.CUIPlugin; @@ -58,7 +58,7 @@ public class TodoTaskPreferencePage extends PreferencePage implements IWorkbench public void createControl(Composite parent) { // added for 1GEUGE6: ITPJUI:WIN2000 - Help is the same on all preference pages super.createControl(parent); - WorkbenchHelp.setHelp(getControl(), ICHelpContextIds.TODO_TASK_PREFERENCE_PAGE); + PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), ICHelpContextIds.TODO_TASK_PREFERENCE_PAGE); } /* diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskPropertyPage.java index 888a44a8a00..de59ded6845 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskPropertyPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskPropertyPage.java @@ -28,8 +28,8 @@ import org.eclipse.jface.preference.PreferenceManager; import org.eclipse.jface.preference.PreferenceNode; import org.eclipse.jface.window.Window; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.PropertyPage; -import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; @@ -87,7 +87,7 @@ public class TodoTaskPropertyPage extends PropertyPage { */ public void createControl(Composite parent) { super.createControl(parent); - WorkbenchHelp.setHelp(getControl(), ICHelpContextIds.TODO_TASK_PROPERTY_PAGE); + PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), ICHelpContextIds.TODO_TASK_PROPERTY_PAGE); } /* 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 ce07b2d709f..890ad5c885d 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 @@ -66,7 +66,6 @@ import org.eclipse.ui.IWorkbenchPartSite; 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; /** @@ -187,7 +186,7 @@ public class CSearchPage extends DialogPage implements ISearchPage, ICSearchCons setIndexerMessages(); Dialog.applyDialogFont( result ); - WorkbenchHelp.setHelp(result, ICHelpContextIds.C_SEARCH_PAGE); + PlatformUI.getWorkbench().getHelpSystem().setHelp(result, ICHelpContextIds.C_SEARCH_PAGE); } /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResultPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResultPage.java index ab23ab6d4ae..365db628007 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResultPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResultPage.java @@ -47,7 +47,7 @@ import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PartInitException; -import org.eclipse.ui.help.WorkbenchHelp; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.ide.IDE; import org.eclipse.ui.texteditor.ITextEditor; @@ -79,7 +79,7 @@ public class CSearchResultPage extends AbstractTextSearchViewPage { public void createControl(Composite parent) { super.createControl( parent ); - WorkbenchHelp.setHelp(parent, ICHelpContextIds.C_SEARCH_VIEW); + PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, ICHelpContextIds.C_SEARCH_VIEW); } /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/CHelpDisplayContext.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/CHelpDisplayContext.java index 6dcc4b65214..bbdd2bae163 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/CHelpDisplayContext.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/CHelpDisplayContext.java @@ -32,7 +32,7 @@ import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.ITextSelection; import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.help.WorkbenchHelp; +import org.eclipse.ui.PlatformUI; /** * @@ -49,7 +49,7 @@ public class CHelpDisplayContext implements IContext { if (selected != null && selected.length() > 0) { context= new CHelpDisplayContext(context, editor, selected); } - WorkbenchHelp.displayHelp(context); + PlatformUI.getWorkbench().getHelpSystem().displayHelp(context); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/MemberFilterAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/MemberFilterAction.java index 1a086b247e1..ce094b00917 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/MemberFilterAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/MemberFilterAction.java @@ -11,7 +11,7 @@ package org.eclipse.cdt.internal.ui.viewsupport; import org.eclipse.jface.action.Action; -import org.eclipse.ui.help.WorkbenchHelp; +import org.eclipse.ui.PlatformUI; import org.eclipse.cdt.ui.actions.MemberFilterActionGroup; /** @@ -28,7 +28,7 @@ public class MemberFilterAction extends Action { fFilterActionGroup= actionGroup; fFilterProperty= property; - WorkbenchHelp.setHelp(this, contextHelpId); + PlatformUI.getWorkbench().getHelpSystem().setHelp(this, contextHelpId); setChecked(initValue); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewProjectDropDownAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewProjectDropDownAction.java index 4366d1c6df6..3e41dcf01b1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewProjectDropDownAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewProjectDropDownAction.java @@ -12,13 +12,13 @@ package org.eclipse.cdt.internal.ui.wizards; import org.eclipse.cdt.internal.ui.ICHelpContextIds; import org.eclipse.jface.action.IAction; -import org.eclipse.ui.help.WorkbenchHelp; +import org.eclipse.ui.PlatformUI; public class NewProjectDropDownAction extends AbstractWizardDropDownAction { public NewProjectDropDownAction() { super(); - WorkbenchHelp.setHelp(this, ICHelpContextIds.OPEN_PROJECT_WIZARD_ACTION); + PlatformUI.getWorkbench().getHelpSystem().setHelp(this, ICHelpContextIds.OPEN_PROJECT_WIZARD_ACTION); } protected IAction[] getWizardActions() { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewTypeDropDownAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewTypeDropDownAction.java index 57a2b0f00ec..043932b9484 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewTypeDropDownAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewTypeDropDownAction.java @@ -12,13 +12,13 @@ package org.eclipse.cdt.internal.ui.wizards; import org.eclipse.cdt.internal.ui.ICHelpContextIds; import org.eclipse.jface.action.IAction; -import org.eclipse.ui.help.WorkbenchHelp; +import org.eclipse.ui.PlatformUI; public class NewTypeDropDownAction extends AbstractWizardDropDownAction { public NewTypeDropDownAction() { super(); - WorkbenchHelp.setHelp(this, ICHelpContextIds.OPEN_CLASS_WIZARD_ACTION); + PlatformUI.getWorkbench().getHelpSystem().setHelp(this, ICHelpContextIds.OPEN_CLASS_WIZARD_ACTION); } protected IAction[] getWizardActions() { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewSourceFolderWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewSourceFolderWizardPage.java index 7e06d6653fd..ccd186428ff 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewSourceFolderWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewSourceFolderWizardPage.java @@ -63,10 +63,10 @@ import org.eclipse.jface.window.Window; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.ElementListSelectionDialog; import org.eclipse.ui.dialogs.ElementTreeSelectionDialog; import org.eclipse.ui.dialogs.ISelectionStatusValidator; -import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.ui.model.WorkbenchContentProvider; import org.eclipse.ui.model.WorkbenchLabelProvider; import org.eclipse.ui.views.navigator.ResourceSorter; @@ -207,7 +207,7 @@ public class NewSourceFolderWizardPage extends NewElementWizardPage { setControl(composite); Dialog.applyDialogFont(composite); - WorkbenchHelp.setHelp(composite, ICHelpContextIds.NEW_SRCFLDER_WIZARD_PAGE); + PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, ICHelpContextIds.NEW_SRCFLDER_WIZARD_PAGE); } /* diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/ClearWorkingSetAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/ClearWorkingSetAction.java index 08b6a16509e..db31f1a814a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/ClearWorkingSetAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/ClearWorkingSetAction.java @@ -14,8 +14,7 @@ import org.eclipse.cdt.internal.ui.ICHelpContextIds; import org.eclipse.cdt.internal.ui.workingsets.WorkingSetMessages; import org.eclipse.jface.action.Action; import org.eclipse.jface.util.Assert; - -import org.eclipse.ui.help.WorkbenchHelp; +import org.eclipse.ui.PlatformUI; /** * Clears the selected working set in the action group's view. @@ -31,7 +30,7 @@ public class ClearWorkingSetAction extends Action { Assert.isNotNull(actionGroup); setToolTipText(WorkingSetMessages.getString("ClearWorkingSetAction.toolTip")); //$NON-NLS-1$ setEnabled(actionGroup.getWorkingSet() != null); - WorkbenchHelp.setHelp(this, ICHelpContextIds.CLEAR_WORKING_SET_ACTION); + PlatformUI.getWorkbench().getHelpSystem().setHelp(this, ICHelpContextIds.CLEAR_WORKING_SET_ACTION); fActionGroup= actionGroup; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/EditWorkingSetAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/EditWorkingSetAction.java index dc990ef6350..beaba06a6fb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/EditWorkingSetAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/EditWorkingSetAction.java @@ -24,7 +24,6 @@ import org.eclipse.ui.IWorkingSet; import org.eclipse.ui.IWorkingSetManager; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.IWorkingSetEditWizard; -import org.eclipse.ui.help.WorkbenchHelp; /** @@ -43,7 +42,7 @@ public class EditWorkingSetAction extends Action { setEnabled(actionGroup.getWorkingSet() != null); fShell= shell; fActionGroup= actionGroup; - WorkbenchHelp.setHelp(this, ICHelpContextIds.EDIT_WORKING_SET_ACTION); + PlatformUI.getWorkbench().getHelpSystem().setHelp(this, ICHelpContextIds.EDIT_WORKING_SET_ACTION); } /* diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/SelectWorkingSetAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/SelectWorkingSetAction.java index 0d735403bd9..7882b9e8ff4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/SelectWorkingSetAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/SelectWorkingSetAction.java @@ -20,7 +20,6 @@ import org.eclipse.ui.IWorkingSet; import org.eclipse.ui.IWorkingSetManager; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.IWorkingSetSelectionDialog; -import org.eclipse.ui.help.WorkbenchHelp; /** * Displays an IWorkingSetSelectionDialog and sets the selected @@ -39,7 +38,7 @@ public class SelectWorkingSetAction extends Action { fShell= shell; fActionGroup= actionGroup; - WorkbenchHelp.setHelp(this, ICHelpContextIds.SELECT_WORKING_SET_ACTION); + PlatformUI.getWorkbench().getHelpSystem().setHelp(this, ICHelpContextIds.SELECT_WORKING_SET_ACTION); } /* diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenAction.java index 5ab314f43f4..4a3f64a41c9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenAction.java @@ -39,7 +39,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.IWorkbenchSite; import org.eclipse.ui.PartInitException; -import org.eclipse.ui.help.WorkbenchHelp; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.texteditor.IEditorStatusLine; /** @@ -71,7 +71,7 @@ public class OpenAction extends SelectionDispatchAction { setText(ActionMessages.getString("OpenAction.label")); //$NON-NLS-1$ setToolTipText(ActionMessages.getString("OpenAction.tooltip")); //$NON-NLS-1$ setDescription(ActionMessages.getString("OpenAction.description")); //$NON-NLS-1$ - WorkbenchHelp.setHelp(this, ICHelpContextIds.OPEN_ACTION); + PlatformUI.getWorkbench().getHelpSystem().setHelp(this, ICHelpContextIds.OPEN_ACTION); } /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenViewActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenViewActionGroup.java index 787118c60eb..0d3d54e1d2a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenViewActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenViewActionGroup.java @@ -118,7 +118,7 @@ public class OpenViewActionGroup extends ActionGroup { // fOpenCallHierarchy= new OpenCallHierarchyAction(site); // fOpenCallHierarchy.setActionDefinitionId(IJavaEditorActionDefinitionIds.OPEN_CALL_HIERARCHY); - fOpenPropertiesDialog= new PropertyDialogAction(site.getShell(), site.getSelectionProvider()); + fOpenPropertiesDialog= new PropertyDialogAction(site, site.getSelectionProvider()); fOpenPropertiesDialog.setActionDefinitionId("org.eclipse.ui.file.properties"); //$NON-NLS-1$ initialize(site); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java index 4a93cbcf4d8..4dc37a83540 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java @@ -38,7 +38,7 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; -import org.eclipse.ui.help.WorkbenchHelp; +import org.eclipse.ui.PlatformUI; public abstract class AbstractErrorParserBlock extends AbstractCOptionPage { @@ -256,7 +256,7 @@ public abstract class AbstractErrorParserBlock extends AbstractCOptionPage { Composite composite = new Composite(parent, SWT.NONE); setControl(composite); - WorkbenchHelp.setHelp(getControl(), ICHelpContextIds.ERROR_PARSERS_PAGE); + PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), ICHelpContextIds.ERROR_PARSERS_PAGE); String[] buttonLabels = new String[]{ /* 0 */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java index 77df41f93c1..44e96aa2a30 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java @@ -47,7 +47,7 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; -import org.eclipse.ui.help.WorkbenchHelp; +import org.eclipse.ui.PlatformUI; public class BinaryParserBlock extends AbstractBinaryParserPage { @@ -181,7 +181,7 @@ public class BinaryParserBlock extends AbstractBinaryParserPage { ((GridData) (composite.getLayoutData())).horizontalAlignment = GridData.FILL_HORIZONTAL; setControl(composite); - WorkbenchHelp.setHelp(getControl(), ICHelpContextIds.BINARY_PARSER_PAGE); + PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), ICHelpContextIds.BINARY_PARSER_PAGE); Composite listComposite = ControlFactory.createComposite(composite, 1); LayoutUtil.doDefaultLayout(listComposite, new DialogField[]{binaryList}, true); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CodeFormatterBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CodeFormatterBlock.java index 9b238260fc4..283fac0337e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CodeFormatterBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CodeFormatterBlock.java @@ -34,7 +34,7 @@ import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; -import org.eclipse.ui.help.WorkbenchHelp; +import org.eclipse.ui.PlatformUI; /** * @@ -101,7 +101,7 @@ public class CodeFormatterBlock { ((GridLayout) control.getLayout()).makeColumnsEqualWidth = false; ((GridLayout) control.getLayout()).marginWidth = 5; - WorkbenchHelp.setHelp(control, ICHelpContextIds.CODEFORMATTER_PREFERENCE_PAGE); + PlatformUI.getWorkbench().getHelpSystem().setHelp(control, ICHelpContextIds.CODEFORMATTER_PREFERENCE_PAGE); ControlFactory.createEmptySpace(control, 2); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerOptionPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerOptionPropertyPage.java index 3f1b40944d0..ca671204627 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerOptionPropertyPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerOptionPropertyPage.java @@ -23,8 +23,8 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.PropertyPage; -import org.eclipse.ui.help.WorkbenchHelp; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -51,7 +51,7 @@ public class IndexerOptionPropertyPage extends PropertyPage { composite.setLayout(new FillLayout()); optionPage.createControl(composite); - WorkbenchHelp.setHelp(composite, ICHelpContextIds.PROJECT_INDEXER_PROPERTIES); + PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, ICHelpContextIds.PROJECT_INDEXER_PROPERTIES); initialize(); return composite; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/MachOBinaryParserPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/MachOBinaryParserPage.java index 020f941d9b7..d13c1adc910 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/MachOBinaryParserPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/MachOBinaryParserPage.java @@ -65,7 +65,7 @@ public class MachOBinaryParserPage extends AbstractCOptionPage { IProject proj = getContainer().getProject(); if (proj != null) { String parserID = ""; //$NON-NLS-1$ - ICDescriptor cdesc = CCorePlugin.getDefault().getCProjectDescription(proj); + ICDescriptor cdesc = CCorePlugin.getDefault().getCProjectDescription(proj, false); ICExtensionReference[] cext = cdesc.get(CCorePlugin.BINARY_PARSER_UNIQ_ID); if (cext.length > 0) { IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(CUIPlugin.PLUGIN_ID, "BinaryParserPage"); //$NON-NLS-1$ @@ -184,7 +184,7 @@ public class MachOBinaryParserPage extends AbstractCOptionPage { IProject proj = getContainer().getProject(); if (proj != null) { try { - ICDescriptor cdesc = CCorePlugin.getDefault().getCProjectDescription(proj); + ICDescriptor cdesc = CCorePlugin.getDefault().getCProjectDescription(proj, false); ICExtensionReference[] cext = cdesc.get(CCorePlugin.BINARY_PARSER_UNIQ_ID); if (cext.length > 0) { cppfilt = cext[0].getExtensionData("c++filt"); //$NON-NLS-1$