mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

2005-05-12 Alain Magloire

Browse source 
Fix multiple warnings, the use of:
	Workbench.setHelp() --> PlatformUI.getWorkbench().getHelpSystem().getHelp()
	Use IShellProvider instead of shell.
	* files too many to enumerate
This commit is contained in:
Alain Magloire 2005-05-12 14:34:45 +00:00
parent f1a99f9bca
commit af17efc7a8
34 changed files with 69 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/org.eclipse.cdt.ui/ChangeLog
View file

@ -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

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AbstractToggleLinkingAction.java
View file

@ -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);
}
/**

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SelectAllAction.java
View file

@ -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;
}

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewMoveAction.java
View file

@ -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);
}

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewRenameAction.java
View file

@ -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;

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CollapseAllAction.java
View file

@ -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() {

3
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/PasteAction.java
View file

@ -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

6
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/GotoAnnotationAction.java
View file

@ -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() {

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/TogglePresentationAction.java
View file

@ -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();
}

5
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextTools.java
View file

@ -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);
}
/**

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/CustomFiltersDialog.java
View file

@ -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);
}
/**

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferencePage.java
View file

@ -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);
}

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java
View file

@ -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;
}

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CPluginPreferencePage.java
View file

@ -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);
}
/**

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskInputDialog.java
View file

@ -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);
}
}

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskPreferencePage.java
View file

@ -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);
}
/*

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskPropertyPage.java
View file

@ -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);
}
/*

3
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPage.java
View file

@ -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);
}
/**

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResultPage.java
View file

@ -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);
}
/**

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/CHelpDisplayContext.java
View file

@ -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);
}
}

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/MemberFilterAction.java
View file

@ -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);
}

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewProjectDropDownAction.java
View file

@ -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() {

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewTypeDropDownAction.java
View file

@ -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() {

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewSourceFolderWizardPage.java
View file

@ -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);
}
/*

5
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/ClearWorkingSetAction.java
View file

@ -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;
}

3
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/EditWorkingSetAction.java
View file

@ -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);
}
/*

3
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/SelectWorkingSetAction.java
View file

@ -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);
}
/*

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenAction.java
View file

@ -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);
}
/**

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenViewActionGroup.java
View file

@ -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);

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java
View file

@ -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 */

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java
View file

@ -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);

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CodeFormatterBlock.java
View file

@ -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);

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerOptionPropertyPage.java
View file

@ -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;

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/MachOBinaryParserPage.java
View file

@ -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$