From f0f5aa93c370bdcb7f6d324327a75e98c5fd1a2c Mon Sep 17 00:00:00 2001 From: Hoda Amer Date: Fri, 23 Apr 2004 18:11:55 +0000 Subject: [PATCH] Refactoring bug fixes --- core/org.eclipse.cdt.ui/ChangeLog | 3 +++ .../internal/ui/cview/MainActionGroup.java | 2 +- .../ui/editor/CContentOutlinePage.java | 2 +- .../cdt/internal/ui/editor/CEditor.java | 2 +- .../ui/actions/RefactoringActionGroup.java | 19 ++++++++++--------- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index d80029f0e39..de811a7aa9c 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,6 @@ +2004-04-23 Hoda Amer + Fix for bug#Bug 59618 : [Refactoring] Be able to append refactor action group after my own group + 2004-04-23 Alain Magloire Possible NPE. * src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java 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 b39c6198cf4..279dde8b8a3 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 @@ -167,7 +167,7 @@ public class MainActionGroup extends CViewActionGroup { fSearchDialogAction = new SearchDialogAction(viewer, getCView().getViewSite().getWorkbenchWindow()); selectionSearchGroup = new SelectionSearchGroup(getCView().getSite()); - refactoringActionGroup = new RefactoringActionGroup(getCView().getSite()); + refactoringActionGroup = new RefactoringActionGroup(getCView().getSite(), null); } 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 b26cfe739ca..60466920d74 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 @@ -182,7 +182,7 @@ public class CContentOutlinePage extends Page implements IContentOutlinePage, IS registerToolbarActions(); fSelectionSearchGroup = new SelectionSearchGroup(this); - fRefactoringActionGroup = new RefactoringActionGroup(this); + fRefactoringActionGroup = new RefactoringActionGroup(this, null); treeViewer.setInput(fInput); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java index dedad6a4a94..686204ec1c9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java @@ -489,7 +489,7 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IS //Selection Search group fSelectionSearchGroup = new SelectionSearchGroup(this); - fRefactoringActionGroup = new RefactoringActionGroup(this); + fRefactoringActionGroup = new RefactoringActionGroup(this, null); //Search items fFileSearchAction = new FileSearchAction(getSelectionProvider()); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/RefactoringActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/RefactoringActionGroup.java index 9ca5a291a2e..0e38a7447d1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/RefactoringActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/RefactoringActionGroup.java @@ -122,8 +122,8 @@ public class RefactoringActionGroup extends ActionGroup { * * @param part the view part that owns this action group */ - public RefactoringActionGroup(IViewPart part) { - this(part.getSite()); + public RefactoringActionGroup(IViewPart part, String groupName) { + this(part.getSite(), groupName); } /** @@ -133,42 +133,43 @@ public class RefactoringActionGroup extends ActionGroup { * * @param page the page that owns this action group */ - public RefactoringActionGroup(Page page) { - this(page.getSite()); + public RefactoringActionGroup(Page page, String groupName) { + this(page.getSite(), groupName); } /** * Note: This constructor is for internal use only. Clients should not call this constructor. */ - public RefactoringActionGroup(CEditor editor) { + public RefactoringActionGroup(CEditor editor, String groupName) { fSite= editor.getEditorSite(); fEditor= editor; + if((groupName != null) && (groupName.length() > 0)) + fGroupName= groupName; ISelectionProvider provider= editor.getSelectionProvider(); ISelection selection= provider.getSelection(); fEditorActions= new ArrayList(); fRenameAction= new RenameRefactoringAction(editor); -// fRenameAction.setActionDefinitionId(ICEditorActionDefinitionIds.RENAME_ELEMENT); fRenameAction.update(selection); editor.setAction("RenameElement", fRenameAction); //$NON-NLS-1$ fEditorActions.add(fRenameAction); fUndoAction= new UndoRefactoringAction(editor); -// fUndoAction.setActionDefinitionId(ICEditorActionDefinitionIds.UNDO_ACTION); fUndoAction.update(selection); editor.setAction("UndoAction", fUndoAction); //$NON-NLS-1$ fEditorActions.add(fUndoAction); fRedoAction= new RedoRefactoringAction(editor); -// fRedoAction.setActionDefinitionId(ICEditorActionDefinitionIds.REDO_ACTION); fRedoAction.update(selection); editor.setAction("RedoAction", fRedoAction); //$NON-NLS-1$ fEditorActions.add(fRedoAction); } - public RefactoringActionGroup(IWorkbenchSite site) { + public RefactoringActionGroup(IWorkbenchSite site, String groupName) { fSite= site; + if((groupName != null) && (groupName.length() > 0)) + fGroupName= groupName; ISelectionProvider provider= fSite.getSelectionProvider(); ISelection selection= provider.getSelection();