diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java index ec1c5d1d1ec..1aa92848a1d 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java @@ -39,6 +39,7 @@ * David McKnight (IBM) - [232320] remote system details view restore problem * David McKnight (IBM) - [233578] Promptable Filter Displayed 3 times when clicking cancel * David Dykstal (IBM) - [233678] title string is constructed by concatenation, should be substituted + * Kevin Doyle (IBM) - [242431] Register a new unique context menu id, so contributions can be made to all our views *******************************************************/ package org.eclipse.rse.internal.ui.view; @@ -92,6 +93,7 @@ import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.actions.SystemCommonDeleteAction; import org.eclipse.rse.internal.ui.actions.SystemCommonRenameAction; import org.eclipse.rse.services.clientserver.messages.SystemMessage; +import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemActionViewerFilter; @@ -1271,6 +1273,7 @@ public class SystemTableViewPart extends ViewPart SystemWidgetHelpers.setHelp(_viewer.getControl(), RSEUIPlugin.HELPPREFIX + "sysd0000"); //$NON-NLS-1$ getSite().registerContextMenu(_viewer.getContextMenuManager(), _viewer); + getSite().registerContextMenu(ISystemContextMenuConstants.RSE_CONTEXT_MENU, _viewer.getContextMenuManager(), _viewer); } public void selectionChanged(IWorkbenchPart part, ISelection sel) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java index 05bd303638f..21338da4b71 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java @@ -34,6 +34,7 @@ * Kevin Doyle (IBM) - [186769] Enable Contributions to Drop Down menu of Remote Systems view -> Preferences * David McKnight (IBM) - [244807] System view does not handle restore from cache * David McKnight (IBM) - [247544] [performance] Restoring Selection on Restart can cause the UI to freeze + * Kevin Doyle (IBM) - [242431] Register a new unique context menu id, so contributions can be made to all our views *******************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -397,6 +398,7 @@ public class SystemViewPart // Enable right-click popup menu // ----------------------------- getSite().registerContextMenu(systemView.getContextMenuManager(), systemView); + getSite().registerContextMenu(ISystemContextMenuConstants.RSE_CONTEXT_MENU, systemView.getContextMenuManager(), systemView); // ---------------------------------------------------------------------- // Enable property sheet updates when tree items are selected. diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/MonitorViewWorkbook.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/MonitorViewWorkbook.java index 19b39969e0c..b4a62e4326a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/MonitorViewWorkbook.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/MonitorViewWorkbook.java @@ -14,12 +14,14 @@ * Contributors: * {Name} (company) - description of contribution. * Kevin Doyle (IBM) - [177587] createTabItem sets the wrapped selection provider + * Kevin Doyle (IBM) - [242431] Register a new unique context menu id, so contributions can be made to all our views *******************************************************************************/ package org.eclipse.rse.internal.ui.view.monitor; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.rse.core.subsystems.ISubSystem; +import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.view.ISystemViewElementAdapter; import org.eclipse.rse.ui.view.SystemTableView; import org.eclipse.swt.SWT; @@ -234,6 +236,7 @@ public class MonitorViewWorkbook extends Composite { _viewPart.setActiveViewerSelectionProvider(viewer); _viewPart.getSite().registerContextMenu(viewer.getContextMenuManager(), viewer); + _viewPart.getSite().registerContextMenu(ISystemContextMenuConstants.RSE_CONTEXT_MENU, viewer.getContextMenuManager(), viewer); } monitorViewPage.setFocus(); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadViewPart.java index 452050836a4..af88033f0b0 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadViewPart.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadViewPart.java @@ -17,6 +17,7 @@ * Kevin Doyle (IBM) - [195543] Double Clicking expands wrong folder when duplicate elements shown * Kevin Doyle (IBM) - [193155] Double Clicking on a String in Scratchpad Errors * Kevin Doyle (IBM) - [194867] Remote Scratchpad should have Refresh Action on toolbar + * Kevin Doyle (IBM) - [242431] Register a new unique context menu id, so contributions can be made to all our views ********************************************************************************/ package org.eclipse.rse.internal.ui.view.scratchpad; @@ -43,6 +44,7 @@ import org.eclipse.rse.core.model.ISystemRegistry; import org.eclipse.rse.internal.ui.actions.SystemCommonDeleteAction; import org.eclipse.rse.internal.ui.actions.SystemCommonRenameAction; import org.eclipse.rse.services.clientserver.messages.SystemMessage; +import org.eclipse.rse.ui.ISystemContextMenuConstants; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.actions.SystemCopyToClipboardAction; @@ -158,6 +160,7 @@ public class SystemScratchpadViewPart extends ViewPart setInput(SystemRegistryUI.getInstance().getSystemScratchPad()); getSite().registerContextMenu(_viewer.getContextMenuManager(), _viewer); + getSite().registerContextMenu(ISystemContextMenuConstants.RSE_CONTEXT_MENU, _viewer.getContextMenuManager(), _viewer); } public void selectionChanged(IWorkbenchPart part, ISelection sel) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewPart.java index 3d4d57dcac4..ce0cc0dc5a1 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewPart.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewPart.java @@ -13,6 +13,7 @@ * Contributors: * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry + * Kevin Doyle (IBM) - [242431] Register a new unique context menu id, so contributions can be made to all our views ********************************************************************************/ package org.eclipse.rse.internal.ui.view.search; @@ -535,6 +536,7 @@ public class SystemSearchViewPart extends ViewPart SystemSearchTableView viewer = new SystemSearchTableView(tabletree, resultSet, this); getSite().registerContextMenu(viewer.getContextMenuManager(), viewer); + getSite().registerContextMenu(ISystemContextMenuConstants.RSE_CONTEXT_MENU, viewer.getContextMenuManager(), viewer); return viewer; } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemContextMenuConstants.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemContextMenuConstants.java index 09ede41aa5e..fdc16957962 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemContextMenuConstants.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemContextMenuConstants.java @@ -12,6 +12,7 @@ * * Contributors: * {Name} (company) - description of contribution. + * Kevin Doyle (IBM) - [242431] Register a new unique context menu id, so contributions can be made to all our views ********************************************************************************/ package org.eclipse.rse.ui; @@ -45,6 +46,17 @@ import org.eclipse.ui.IWorkbenchActionConstants; */ public interface ISystemContextMenuConstants { + + /** + * Context menu id used by all RSE views, such that menu's can be contributed + * to all views. + * + * RSE Views: Remote Systems, Remote System Details, Monitor, and Scratchpad + * Note: This does does not work with dialog's which have the SystemView + * embedded in them. + */ + public static final String RSE_CONTEXT_MENU = "org.eclipse.rse.views.common"; //$NON-NLS-1$ + /** * Pop-up menu: name of group for goto actions (value "group.goto"). *