From c605ff0a4e675f455670b389edf099089b8cfadc Mon Sep 17 00:00:00 2001 From: Kushal Munir < kmunir@ca.ibm.com> Date: Tue, 21 Nov 2006 12:47:46 +0000 Subject: [PATCH] [159969] - Rename should be bound to the F2 key. The rename action has been set as a global action for Remote Systems view, table view and scratchpad view. --- .../eclipse/rse/ui/actions/SystemCommonRenameAction.java | 1 + .../UI/org/eclipse/rse/ui/view/SystemTableViewPart.java | 6 ++++++ .../UI/org/eclipse/rse/ui/view/SystemViewPart.java | 1 + .../rse/ui/view/scratchpad/SystemScratchpadViewPart.java | 6 ++++++ 4 files changed, 14 insertions(+) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCommonRenameAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCommonRenameAction.java index 665512c51cb..6cabdbfa360 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCommonRenameAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCommonRenameAction.java @@ -66,6 +66,7 @@ public class SystemCommonRenameAction extends SystemBaseDialogAction { super(SystemResources.ACTION_RENAME_LABEL, SystemResources.ACTION_RENAME_TOOLTIP, RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_RENAME_ID), parent); + setSelectionProvider(target); allowOnMultipleSelection(true); setProcessAllSelections(true); renameTarget = target; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewPart.java index 75a1ee37194..c9e4cbc565a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewPart.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewPart.java @@ -64,6 +64,7 @@ import org.eclipse.rse.ui.SystemPropertyResources; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.actions.SystemCommonDeleteAction; +import org.eclipse.rse.ui.actions.SystemCommonRenameAction; import org.eclipse.rse.ui.actions.SystemCopyToClipboardAction; import org.eclipse.rse.ui.actions.SystemPasteFromClipboardAction; import org.eclipse.rse.ui.actions.SystemRefreshAction; @@ -1069,6 +1070,7 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener, private SystemCopyToClipboardAction _copyAction; private SystemPasteFromClipboardAction _pasteAction; private SystemCommonDeleteAction _deleteAction; + private SystemCommonRenameAction _renameAction; private IMemento _memento = null; private IAdaptable _mementoInput = null; @@ -1160,11 +1162,15 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener, _copyAction = new SystemCopyToClipboardAction(_viewer.getShell(), clipboard); _pasteAction = new SystemPasteFromClipboardAction(_viewer.getShell(), clipboard); _deleteAction = new SystemCommonDeleteAction(_viewer.getShell(), _viewer); + _renameAction = new SystemCommonRenameAction(_viewer.getShell(), _viewer); editorActionHandler.setCopyAction(_copyAction); editorActionHandler.setPasteAction(_pasteAction); editorActionHandler.setDeleteAction(_deleteAction); editorActionHandler.setSelectAllAction(new SelectAllAction()); + + // register rename action as a global handler + getViewSite().getActionBars().setGlobalActionHandler(ActionFactory.RENAME.getId(), _renameAction); registry.addSystemResourceChangeListener(this); registry.addSystemRemoteChangeListener(this); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewPart.java index bf014355561..a384f53eb3f 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewPart.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewPart.java @@ -383,6 +383,7 @@ public class SystemViewPart // added by Phil in 3.0 ... //actionBars.setGlobalActionHandler(IWorkbenchActionConstants.PROPERTIES, systemView.getPropertyDialogAction(); hmm, different one for local vs remote objects actionBars.setGlobalActionHandler(ActionFactory.REFRESH.getId(), systemView.getRefreshAction()); + actionBars.setGlobalActionHandler(ActionFactory.RENAME.getId(), systemView.getRenameAction()); statusLine = actionBars.getStatusLineManager(); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/scratchpad/SystemScratchpadViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/scratchpad/SystemScratchpadViewPart.java index 61b8c77494f..ee930d7c135 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/scratchpad/SystemScratchpadViewPart.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/scratchpad/SystemScratchpadViewPart.java @@ -37,6 +37,7 @@ import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.actions.SystemCommonDeleteAction; +import org.eclipse.rse.ui.actions.SystemCommonRenameAction; import org.eclipse.rse.ui.actions.SystemCopyToClipboardAction; import org.eclipse.rse.ui.actions.SystemPasteFromClipboardAction; import org.eclipse.rse.ui.actions.SystemRefreshAction; @@ -71,6 +72,7 @@ public class SystemScratchpadViewPart extends ViewPart implements ISelectionList private SystemCopyToClipboardAction _copyAction; private SystemPasteFromClipboardAction _pasteAction; private SystemCommonDeleteAction _deleteAction; + private SystemCommonRenameAction _renameAction; private ClearAction _clearAction; private ClearSelectedAction _clearSelectionAction; @@ -128,6 +130,10 @@ public class SystemScratchpadViewPart extends ViewPart implements ISelectionList _copyAction = new SystemCopyToClipboardAction(_viewer.getShell(), clipboard); _pasteAction = new SystemPasteFromClipboardAction(_viewer.getShell(), clipboard); _deleteAction = new SystemCommonDeleteAction(_viewer.getShell(), _viewer); + _renameAction = new SystemCommonRenameAction(_viewer.getShell(), _viewer); + + // register rename action as a global handler + getViewSite().getActionBars().setGlobalActionHandler(ActionFactory.RENAME.getId(), _renameAction); editorActionHandler.setCopyAction(_copyAction); editorActionHandler.setPasteAction(_pasteAction);