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

Refactoring bug fixes

Browse source
This commit is contained in:
Hoda Amer 2004-04-23 18:11:55 +00:00
parent 809934b921
commit f0f5aa93c3
5 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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 2004-04-23 Alain Magloire
Possible NPE. Possible NPE.
* src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java * src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java
View file

@ -167,7 +167,7 @@ public class MainActionGroup extends CViewActionGroup {
fSearchDialogAction = new SearchDialogAction(viewer, getCView().getViewSite().getWorkbenchWindow()); fSearchDialogAction = new SearchDialogAction(viewer, getCView().getViewSite().getWorkbenchWindow());
selectionSearchGroup = new SelectionSearchGroup(getCView().getSite()); selectionSearchGroup = new SelectionSearchGroup(getCView().getSite());
refactoringActionGroup = new RefactoringActionGroup(getCView().getSite()); refactoringActionGroup = new RefactoringActionGroup(getCView().getSite(), null);
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java
View file

@ -182,7 +182,7 @@ public class CContentOutlinePage extends Page implements IContentOutlinePage, IS
registerToolbarActions(); registerToolbarActions();
fSelectionSearchGroup = new SelectionSearchGroup(this); fSelectionSearchGroup = new SelectionSearchGroup(this);
fRefactoringActionGroup = new RefactoringActionGroup(this); fRefactoringActionGroup = new RefactoringActionGroup(this, null);
treeViewer.setInput(fInput); treeViewer.setInput(fInput);

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
View file

@ -489,7 +489,7 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IS
//Selection Search group //Selection Search group
fSelectionSearchGroup = new SelectionSearchGroup(this); fSelectionSearchGroup = new SelectionSearchGroup(this);
fRefactoringActionGroup = new RefactoringActionGroup(this); fRefactoringActionGroup = new RefactoringActionGroup(this, null);
//Search items //Search items
fFileSearchAction = new FileSearchAction(getSelectionProvider()); fFileSearchAction = new FileSearchAction(getSelectionProvider());

19
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/RefactoringActionGroup.java
View file

@ -122,8 +122,8 @@ public class RefactoringActionGroup extends ActionGroup {
* *
* @param part the view part that owns this action group * @param part the view part that owns this action group
*/ */
public RefactoringActionGroup(IViewPart part) { public RefactoringActionGroup(IViewPart part, String groupName) {
this(part.getSite()); this(part.getSite(), groupName);
} }
/** /**
@ -133,42 +133,43 @@ public class RefactoringActionGroup extends ActionGroup {
* *
* @param page the page that owns this action group * @param page the page that owns this action group
*/ */
public RefactoringActionGroup(Page page) { public RefactoringActionGroup(Page page, String groupName) {
this(page.getSite()); this(page.getSite(), groupName);
} }
/** /**
* Note: This constructor is for internal use only. Clients should not call this constructor. * 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(); fSite= editor.getEditorSite();
fEditor= editor; fEditor= editor;
if((groupName != null) && (groupName.length() > 0))
fGroupName= groupName;
ISelectionProvider provider= editor.getSelectionProvider(); ISelectionProvider provider= editor.getSelectionProvider();
ISelection selection= provider.getSelection(); ISelection selection= provider.getSelection();
fEditorActions= new ArrayList(); fEditorActions= new ArrayList();
fRenameAction= new RenameRefactoringAction(editor); fRenameAction= new RenameRefactoringAction(editor);
// fRenameAction.setActionDefinitionId(ICEditorActionDefinitionIds.RENAME_ELEMENT);
fRenameAction.update(selection); fRenameAction.update(selection);
editor.setAction("RenameElement", fRenameAction); //$NON-NLS-1$ editor.setAction("RenameElement", fRenameAction); //$NON-NLS-1$
fEditorActions.add(fRenameAction); fEditorActions.add(fRenameAction);
fUndoAction= new UndoRefactoringAction(editor); fUndoAction= new UndoRefactoringAction(editor);
// fUndoAction.setActionDefinitionId(ICEditorActionDefinitionIds.UNDO_ACTION);
fUndoAction.update(selection); fUndoAction.update(selection);
editor.setAction("UndoAction", fUndoAction); //$NON-NLS-1$ editor.setAction("UndoAction", fUndoAction); //$NON-NLS-1$
fEditorActions.add(fUndoAction); fEditorActions.add(fUndoAction);
fRedoAction= new RedoRefactoringAction(editor); fRedoAction= new RedoRefactoringAction(editor);
// fRedoAction.setActionDefinitionId(ICEditorActionDefinitionIds.REDO_ACTION);
fRedoAction.update(selection); fRedoAction.update(selection);
editor.setAction("RedoAction", fRedoAction); //$NON-NLS-1$ editor.setAction("RedoAction", fRedoAction); //$NON-NLS-1$
fEditorActions.add(fRedoAction); fEditorActions.add(fRedoAction);
} }
public RefactoringActionGroup(IWorkbenchSite site) { public RefactoringActionGroup(IWorkbenchSite site, String groupName) {
fSite= site; fSite= site;
if((groupName != null) && (groupName.length() > 0))
fGroupName= groupName;
ISelectionProvider provider= fSite.getSelectionProvider(); ISelectionProvider provider= fSite.getSelectionProvider();
ISelection selection= provider.getSelection(); ISelection selection= provider.getSelection();