From 3d65d89fd74d278b9cc8209a8be3d0b14f4aab62 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Tue, 21 Dec 2004 20:38:06 +0000 Subject: [PATCH] 2004-12-21 Alain Magloire We use TogglePresentation action definition ID rather the one define in the CDT, since now the platfrom defines one. * src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java * src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java * src/org/eclipse/cdt/internal/ui/editor/ICEditorActionDefinitionIds.java * src/org/eclipse/cdt/internal/ui/editor/ToggglePresentationAction.java --- core/org.eclipse.cdt.ui/ChangeLog | 8 ++++++++ .../cdt/internal/ui/editor/CContentOutlinePage.java | 3 ++- .../cdt/internal/ui/editor/CEditorActionContributor.java | 4 +--- .../internal/ui/editor/ICEditorActionDefinitionIds.java | 5 ----- .../cdt/internal/ui/editor/TogglePresentationAction.java | 3 ++- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index 73ae17b19d8..78a98fe9368 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,11 @@ +2004-12-21 Alain Magloire + We use TogglePresentation action definition ID rather the one + define in the CDT, since now the platfrom defines one. + * src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java + * src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java + * src/org/eclipse/cdt/internal/ui/editor/ICEditorActionDefinitionIds.java + * src/org/eclipse/cdt/internal/ui/editor/ToggglePresentationAction.java + 2004-12-21 Alain Magloire Fix PR 81635 patch form Przemek * src/org/eclipse/cdt/internal/ui/editor/CEditor.java diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java index 7d09c94d1d0..5d3efd64e12 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java @@ -51,6 +51,7 @@ import org.eclipse.ui.actions.ActionGroup; import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.ui.part.IPageSite; import org.eclipse.ui.part.Page; +import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds; import org.eclipse.ui.views.contentoutline.IContentOutlinePage; public class CContentOutlinePage extends Page implements IContentOutlinePage, ISelectionChangedListener { @@ -263,7 +264,7 @@ public class CContentOutlinePage extends Page implements IContentOutlinePage, IS site.setSelectionProvider(treeViewer); IActionBars bars= site.getActionBars(); - bars.setGlobalActionHandler(ICEditorActionDefinitionIds.TOGGLE_PRESENTATION, fTogglePresentation); + bars.setGlobalActionHandler(ITextEditorActionDefinitionIds.TOGGLE_SHOW_SELECTED_ELEMENT_ONLY, fTogglePresentation); fSelectionSearchGroup = new SelectionSearchGroup(this); fRefactoringActionGroup = new RefactoringActionGroup(this, null); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java index 44724ecb6b3..f8d6a1c3ece 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java @@ -118,7 +118,7 @@ public class CEditorActionContributor extends TextEditorActionContributor { // actions that are "contributed" to editors, they are considered belonging to the active editor fTogglePresentation= new TogglePresentationAction(); - fTogglePresentation.setActionDefinitionId(ICEditorActionDefinitionIds.TOGGLE_PRESENTATION); + fTogglePresentation.setActionDefinitionId(ITextEditorActionDefinitionIds.TOGGLE_SHOW_SELECTED_ELEMENT_ONLY); //fToggleTextHover= new ToggleTextHoverAction(); @@ -175,8 +175,6 @@ public class CEditorActionContributor extends TextEditorActionContributor { public void contributeToToolBar(IToolBarManager tbm) { super.contributeToToolBar(tbm); tbm.add(new Separator()); - tbm.add(fTogglePresentation); - //tbm.add(fToggleTextHover); tbm.add(fNextError); tbm.add(fPreviousError); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ICEditorActionDefinitionIds.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ICEditorActionDefinitionIds.java index 91626e13556..66970f55567 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ICEditorActionDefinitionIds.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ICEditorActionDefinitionIds.java @@ -63,11 +63,6 @@ public interface ICEditorActionDefinitionIds extends ITextEditorActionDefinition */ public static final String ADD_INCLUDE= "org.eclipse.cdt.ui.edit.text.c.add.include"; //$NON-NLS-1$ - /** - * Action definition ID of the toggle presentation toolbar button action - * (value "org.eclipse.cdt.ui.edit.text.java.toggle.presentation"). - */ - public static final String TOGGLE_PRESENTATION= "org.eclipse.cdt.ui.edit.text.c.toggle.presentation"; //$NON-NLS-1$ /** * Action definition ID of the open declaration action * (value "org.eclipse.cdt.ui.edit.opendecl"). 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 352d3e923ce..634ee1c0fa1 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 @@ -23,6 +23,7 @@ import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.ui.texteditor.ITextEditor; +import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds; import org.eclipse.ui.texteditor.TextEditorAction; @@ -42,7 +43,7 @@ public class TogglePresentationAction extends TextEditorAction implements IPrope super(CEditorMessages.getResourceBundle(), "TogglePresentation.", null); //$NON-NLS-1$ CPluginImages.setImageDescriptors(this, CPluginImages.T_LCL, CPluginImages.IMG_MENU_SEGMENT_EDIT); setToolTipText(CEditorMessages.getString("TogglePresentation.tooltip")); //$NON-NLS-1$ - setActionDefinitionId(ICEditorActionDefinitionIds.TOGGLE_PRESENTATION); + setActionDefinitionId(ITextEditorActionDefinitionIds.TOGGLE_SHOW_SELECTED_ELEMENT_ONLY); WorkbenchHelp.setHelp(this, ICHelpContextIds.TOGGLE_PRESENTATION_ACTION); update(); }