From 5f424df50d1bce298935cfe526943ab4307b8616 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Fri, 20 Feb 2004 17:58:23 +0000 Subject: [PATCH] Fix PR 52618 --- core/org.eclipse.cdt.ui/ChangeLog | 7 +++++ .../internal/ui/cview/MainActionGroup.java | 26 +++---------------- 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index 705d66068fa..ff0bc86d6f9 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,10 @@ +2004-02-20 Alain Magloire + + Fix for PR 52618 + Added the global action handlers for the Property Dialog. + + * src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java + 2003-02-20 Andrew Niefer bug 52567 change the extension IDs for the C Search sorters to avoid conflict with the JDT diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java index a9678cadf72..c32860ef2b9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java @@ -28,9 +28,6 @@ import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.Viewer; import org.eclipse.swt.events.KeyEvent; @@ -39,6 +36,7 @@ import org.eclipse.ui.IActionBars; import org.eclipse.ui.IWorkbenchActionConstants; import org.eclipse.ui.IWorkingSet; import org.eclipse.ui.actions.ActionContext; +import org.eclipse.ui.actions.ActionFactory; import org.eclipse.ui.actions.AddBookmarkAction; import org.eclipse.ui.actions.AddTaskAction; import org.eclipse.ui.actions.ExportResourcesAction; @@ -144,24 +142,7 @@ public class MainActionGroup extends CViewActionGroup { addBookmarkAction = new AddBookmarkAction(shell); addTaskAction = new AddTaskAction(shell); - propertyDialogAction = new PropertyDialogAction(shell, new ISelectionProvider() { - - public void addSelectionChangedListener(ISelectionChangedListener listener) { - viewer.addSelectionChangedListener(listener); - } - - public ISelection getSelection() { - return SelectionConverter.convertSelectionToResources(viewer.getSelection()); - } - - public void removeSelectionChangedListener(ISelectionChangedListener listener) { - viewer.removeSelectionChangedListener(listener); - } - - public void setSelection(ISelection selection) { - viewer.setSelection(selection); - } - }); + propertyDialogAction = new PropertyDialogAction(shell, viewer); // Importing/exporting. importAction = new ImportResourcesAction(getCView().getSite().getWorkbenchWindow()); @@ -310,7 +291,8 @@ public class MainActionGroup extends CViewActionGroup { public void fillActionBars(IActionBars actionBars) { actionBars.setGlobalActionHandler(IDEActionFactory.BOOKMARK.getId(), addBookmarkAction); - actionBars.setGlobalActionHandler(IDEActionFactory.ADD_TASK.getId(), addTaskAction); + actionBars.setGlobalActionHandler(IDEActionFactory.ADD_TASK.getId(), addTaskAction); + actionBars.setGlobalActionHandler(ActionFactory.PROPERTIES.getId(), propertyDialogAction); workingSetGroup.fillActionBars(actionBars); gotoGroup.fillActionBars(actionBars);