Attachment #117550 for bug #242431

Lines 141-147 Link Here

(-)plugin.xml (-1 / +1 lines)
141	<extension	141	<extension
142	point="org.eclipse.ui.menus">	142	point="org.eclipse.ui.menus">
143	<menuContribution	143	<menuContribution
144	locationURI="popup:org.eclipse.rse.ui.view.systemView?after=additions">	144	locationURI="popup:org.eclipse.rse.view.menu?after=additions">
145	<command	145	<command
146	commandId="org.eclipse.rse.shells.ui.actions.LaunchShellCommand"	146	commandId="org.eclipse.rse.shells.ui.actions.LaunchShellCommand"
147	icon="icons/full/obj16/systemshell.gif"	147	icon="icons/full/obj16/systemshell.gif"

Lines 13-18 Link Here

(-)UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewPart.java (+2 lines)
13	* Contributors:	13	* Contributors:
14	* Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core	14	* Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
15	* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry	15	* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
		16	* Kevin Doyle (IBM) - [242431] Register a new unique context menu id, so contributions can be made to all our views
16	********************************************************************************/	17	********************************************************************************/
17		18
18	package org.eclipse.rse.internal.ui.view.search;	19	package org.eclipse.rse.internal.ui.view.search;
Lines 535-540 Link Here
535	SystemSearchTableView viewer = new SystemSearchTableView(tabletree, resultSet, this);	536	SystemSearchTableView viewer = new SystemSearchTableView(tabletree, resultSet, this);
536		537
537	getSite().registerContextMenu(viewer.getContextMenuManager(), viewer);	538	getSite().registerContextMenu(viewer.getContextMenuManager(), viewer);
		539	getSite().registerContextMenu(ISystemContextMenuConstants.RSE_CONTEXT_MENU, viewer.getContextMenuManager(), viewer);
538	return viewer;	540	return viewer;
539	}	541	}
540		542




 * 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;

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;

		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)

Lines 34-39 Link Here

(-)UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java (+2 lines)
34	* Kevin Doyle (IBM) - [186769] Enable Contributions to Drop Down menu of Remote Systems view -> Preferences	34	* Kevin Doyle (IBM) - [186769] Enable Contributions to Drop Down menu of Remote Systems view -> Preferences
35	* David McKnight (IBM) - [244807] System view does not handle restore from cache	35	* David McKnight (IBM) - [244807] System view does not handle restore from cache
36	* David McKnight (IBM) - [247544] [performance] Restoring Selection on Restart can cause the UI to freeze	36	* David McKnight (IBM) - [247544] [performance] Restoring Selection on Restart can cause the UI to freeze
		37	* Kevin Doyle (IBM) - [242431] Register a new unique context menu id, so contributions can be made to all our views
37	*******************************************************************************/	38	*******************************************************************************/
38		39
39	package org.eclipse.rse.internal.ui.view;	40	package org.eclipse.rse.internal.ui.view;
Lines 397-402 Link Here
397	// Enable right-click popup menu	398	// Enable right-click popup menu
398	// -----------------------------	399	// -----------------------------
399	getSite().registerContextMenu(systemView.getContextMenuManager(), systemView);	400	getSite().registerContextMenu(systemView.getContextMenuManager(), systemView);
		401	getSite().registerContextMenu(ISystemContextMenuConstants.RSE_CONTEXT_MENU, systemView.getContextMenuManager(), systemView);
400		402
401	// ----------------------------------------------------------------------	403	// ----------------------------------------------------------------------
402	// Enable property sheet updates when tree items are selected.	404	// Enable property sheet updates when tree items are selected.




 * 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;

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;

		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)




 * 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;

		{
			_viewPart.setActiveViewerSelectionProvider(viewer);
			_viewPart.getSite().registerContextMenu(viewer.getContextMenuManager(), viewer);
			_viewPart.getSite().registerContextMenu(ISystemContextMenuConstants.RSE_CONTEXT_MENU, viewer.getContextMenuManager(), viewer);
		}
		monitorViewPage.setFocus();
	}

Lines 12-17 Link Here

(-)UI/org/eclipse/rse/ui/ISystemContextMenuConstants.java (+8 lines)
12	*	12	*
13	* Contributors:	13	* Contributors:
14	* {Name} (company) - description of contribution.	14	* {Name} (company) - description of contribution.
		15	* Kevin Doyle (IBM) - [242431] Register a new unique context menu id, so contributions can be made to all our views
15	********************************************************************************/	16	********************************************************************************/
16		17
17	package org.eclipse.rse.ui;	18	package org.eclipse.rse.ui;
Lines 45-50 Link Here
45	*/	46	*/
46	public interface ISystemContextMenuConstants	47	public interface ISystemContextMenuConstants
47	{	48	{
		49
		50	/**
		51	* Context menu id used by all RSE views, such that menu's can be contributed
		52	* to all views.
		53	*/
		54	public static final String RSE_CONTEXT_MENU = "org.eclipse.rse.view.menu"; //$NON-NLS-1$
		55
48	/**	56	/**
49	* Pop-up menu: name of group for goto actions (value <code>"group.goto"</code>).	57	* Pop-up menu: name of group for goto actions (value <code>"group.goto"</code>).
50	* <p>	58	* <p>

Return to bug 242431

Lines 39-44 Link Here

(-)UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java (+3 lines)
39	* David McKnight (IBM) - [232320] remote system details view restore problem	39	* David McKnight (IBM) - [232320] remote system details view restore problem
40	* David McKnight (IBM) - [233578] Promptable Filter Displayed 3 times when clicking cancel	40	* David McKnight (IBM) - [233578] Promptable Filter Displayed 3 times when clicking cancel
41	* David Dykstal (IBM) - [233678] title string is constructed by concatenation, should be substituted	41	* David Dykstal (IBM) - [233678] title string is constructed by concatenation, should be substituted
		42	* Kevin Doyle (IBM) - [242431] Register a new unique context menu id, so contributions can be made to all our views
42	*******************************************************/	43	*******************************************************/
43		44
44	package org.eclipse.rse.internal.ui.view;	45	package org.eclipse.rse.internal.ui.view;
Lines 92-97 Link Here
92	import org.eclipse.rse.internal.ui.actions.SystemCommonDeleteAction;	93	import org.eclipse.rse.internal.ui.actions.SystemCommonDeleteAction;
93	import org.eclipse.rse.internal.ui.actions.SystemCommonRenameAction;	94	import org.eclipse.rse.internal.ui.actions.SystemCommonRenameAction;
94	import org.eclipse.rse.services.clientserver.messages.SystemMessage;	95	import org.eclipse.rse.services.clientserver.messages.SystemMessage;
		96	import org.eclipse.rse.ui.ISystemContextMenuConstants;
95	import org.eclipse.rse.ui.ISystemIconConstants;	97	import org.eclipse.rse.ui.ISystemIconConstants;
96	import org.eclipse.rse.ui.RSEUIPlugin;	98	import org.eclipse.rse.ui.RSEUIPlugin;
97	import org.eclipse.rse.ui.SystemActionViewerFilter;	99	import org.eclipse.rse.ui.SystemActionViewerFilter;
Lines 1271-1276 Link Here
1271	SystemWidgetHelpers.setHelp(_viewer.getControl(), RSEUIPlugin.HELPPREFIX + "sysd0000"); //$NON-NLS-1$	1273	SystemWidgetHelpers.setHelp(_viewer.getControl(), RSEUIPlugin.HELPPREFIX + "sysd0000"); //$NON-NLS-1$
1272		1274
1273	getSite().registerContextMenu(_viewer.getContextMenuManager(), _viewer);	1275	getSite().registerContextMenu(_viewer.getContextMenuManager(), _viewer);
		1276	getSite().registerContextMenu(ISystemContextMenuConstants.RSE_CONTEXT_MENU, _viewer.getContextMenuManager(), _viewer);
1274	}	1277	}
1275		1278
1276	public void selectionChanged(IWorkbenchPart part, ISelection sel)	1279	public void selectionChanged(IWorkbenchPart part, ISelection sel)

Lines 17-22 Link Here

(-)UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadViewPart.java (+3 lines)
17	* Kevin Doyle (IBM) - [195543] Double Clicking expands wrong folder when duplicate elements shown	17	* Kevin Doyle (IBM) - [195543] Double Clicking expands wrong folder when duplicate elements shown
18	* Kevin Doyle (IBM) - [193155] Double Clicking on a String in Scratchpad Errors	18	* Kevin Doyle (IBM) - [193155] Double Clicking on a String in Scratchpad Errors
19	* Kevin Doyle (IBM) - [194867] Remote Scratchpad should have Refresh Action on toolbar	19	* Kevin Doyle (IBM) - [194867] Remote Scratchpad should have Refresh Action on toolbar
		20	* Kevin Doyle (IBM) - [242431] Register a new unique context menu id, so contributions can be made to all our views
20	********************************************************************************/	21	********************************************************************************/
21		22
22	package org.eclipse.rse.internal.ui.view.scratchpad;	23	package org.eclipse.rse.internal.ui.view.scratchpad;
Lines 43-48 Link Here
43	import org.eclipse.rse.internal.ui.actions.SystemCommonDeleteAction;	44	import org.eclipse.rse.internal.ui.actions.SystemCommonDeleteAction;
44	import org.eclipse.rse.internal.ui.actions.SystemCommonRenameAction;	45	import org.eclipse.rse.internal.ui.actions.SystemCommonRenameAction;
45	import org.eclipse.rse.services.clientserver.messages.SystemMessage;	46	import org.eclipse.rse.services.clientserver.messages.SystemMessage;
		47	import org.eclipse.rse.ui.ISystemContextMenuConstants;
46	import org.eclipse.rse.ui.RSEUIPlugin;	48	import org.eclipse.rse.ui.RSEUIPlugin;
47	import org.eclipse.rse.ui.SystemWidgetHelpers;	49	import org.eclipse.rse.ui.SystemWidgetHelpers;
48	import org.eclipse.rse.ui.actions.SystemCopyToClipboardAction;	50	import org.eclipse.rse.ui.actions.SystemCopyToClipboardAction;
Lines 158-163 Link Here
158	setInput(SystemRegistryUI.getInstance().getSystemScratchPad());	160	setInput(SystemRegistryUI.getInstance().getSystemScratchPad());
159		161
160	getSite().registerContextMenu(_viewer.getContextMenuManager(), _viewer);	162	getSite().registerContextMenu(_viewer.getContextMenuManager(), _viewer);
		163	getSite().registerContextMenu(ISystemContextMenuConstants.RSE_CONTEXT_MENU, _viewer.getContextMenuManager(), _viewer);
161	}	164	}
162		165
163	public void selectionChanged(IWorkbenchPart part, ISelection sel)	166	public void selectionChanged(IWorkbenchPart part, ISelection sel)

Lines 14-25 Link Here

(-)UI/org/eclipse/rse/internal/ui/view/monitor/MonitorViewWorkbook.java (+3 lines)
14	* Contributors:	14	* Contributors:
15	* {Name} (company) - description of contribution.	15	* {Name} (company) - description of contribution.
16	* Kevin Doyle (IBM) - [177587] createTabItem sets the wrapped selection provider	16	* Kevin Doyle (IBM) - [177587] createTabItem sets the wrapped selection provider
		17	* Kevin Doyle (IBM) - [242431] Register a new unique context menu id, so contributions can be made to all our views
17	*******************************************************************************/	18	*******************************************************************************/
18		19
19	package org.eclipse.rse.internal.ui.view.monitor;	20	package org.eclipse.rse.internal.ui.view.monitor;
20		21
21	import org.eclipse.core.runtime.IAdaptable;	22	import org.eclipse.core.runtime.IAdaptable;
22	import org.eclipse.rse.core.subsystems.ISubSystem;	23	import org.eclipse.rse.core.subsystems.ISubSystem;
		24	import org.eclipse.rse.ui.ISystemContextMenuConstants;
23	import org.eclipse.rse.ui.view.ISystemViewElementAdapter;	25	import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
24	import org.eclipse.rse.ui.view.SystemTableView;	26	import org.eclipse.rse.ui.view.SystemTableView;
25	import org.eclipse.swt.SWT;	27	import org.eclipse.swt.SWT;
Lines 234-239 Link Here
234	{	236	{
235	_viewPart.setActiveViewerSelectionProvider(viewer);	237	_viewPart.setActiveViewerSelectionProvider(viewer);
236	_viewPart.getSite().registerContextMenu(viewer.getContextMenuManager(), viewer);	238	_viewPart.getSite().registerContextMenu(viewer.getContextMenuManager(), viewer);
		239	_viewPart.getSite().registerContextMenu(ISystemContextMenuConstants.RSE_CONTEXT_MENU, viewer.getContextMenuManager(), viewer);
237	}	240	}
238	monitorViewPage.setFocus();	241	monitorViewPage.setFocus();
239	}	242	}