From 5178ef3ea956aa8665d8c3938bb03662d5f2961a Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Mon, 15 Mar 2004 17:00:40 +0000 Subject: [PATCH] The build actions were always disable. --- .../eclipse/cdt/internal/ui/cview/BuildGroup.java | 4 ++-- .../src/org/eclipse/cdt/internal/ui/cview/CView.java | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/BuildGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/BuildGroup.java index 891814b1ffb..5fa17e26993 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/BuildGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/BuildGroup.java @@ -44,8 +44,8 @@ public class BuildGroup extends CViewActionGroup { } public void fillActionBars(IActionBars actionBars) { - actionBars.setGlobalActionHandler(IDEActionFactory.BUILD.getId(), buildAction); - actionBars.setGlobalActionHandler(IDEActionFactory.BUILD_PROJECT.getId(), rebuildAction); + actionBars.setGlobalActionHandler(IDEActionFactory.BUILD_PROJECT.getId(), buildAction); + actionBars.setGlobalActionHandler(IDEActionFactory.REBUILD_PROJECT.getId(), rebuildAction); } /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java index 1c51a92418e..f2edcd9dfc7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java @@ -533,20 +533,22 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha initContextMenu(); - // Make the Actions for the Context Menu - makeActions(); - getActionGroup().fillActionBars(getViewSite().getActionBars()); - updateActionBars((IStructuredSelection) viewer.getSelection()); - //Add the property changes after all of the UI work has been done. IWorkingSetManager wsmanager = getViewSite().getWorkbenchWindow().getWorkbench().getWorkingSetManager(); wsmanager.addPropertyChangeListener(workingSetListener); viewer.addTreeListener(expansionListener); + // Needs to be done before the actions getSite().setSelectionProvider(viewer); getSite().getPage().addPartListener(partListener); + // Make the Actions for the Context Menu + makeActions(); + getActionGroup().fillActionBars(getViewSite().getActionBars()); + updateActionBars((IStructuredSelection) viewer.getSelection()); + + if (memento != null) { restoreState(memento); }