Attachment #191331 for bug #338879




		Control control = fViewerPart.getControl();
		Menu menu = popupMenuManager.createContextMenu(control);
		control.setMenu(menu);
		registerPopupMenu(popupMenuManager);
		// Initialize drag and drop
		if (isDragAndDropEnabled()) {
			initializeDragAndDrop();

		}
	}

	/**
	 * If the context menu for this section should be registered, do it here
	 * with the appropriate id etc.  By default do nothing.
	 * @param popupMenuManager the menu manager to be registered
	 */
	protected void registerPopupMenu(MenuManager popupMenuManager) {
		// do nothing by default
	}

	protected Composite createClientContainer(Composite parent, int span, FormToolkit toolkit) {
		Composite container = toolkit.createComposite(parent);
		container.setLayout(FormLayoutFactory.createSectionClientGridLayout(false, span));

Lines 10-19 Link Here

(-)src/org/eclipse/pde/internal/ui/editor/feature/RequiresSection.java (-5 / +11 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.pde.internal.ui.editor.feature;	11	package org.eclipse.pde.internal.ui.editor.feature;
12		12
13	import org.eclipse.pde.internal.ui.dialogs.PluginSelectionDialog;
14
15	import org.eclipse.pde.internal.ui.dialogs.FeatureSelectionDialog;
16
17	import java.util.ArrayList;	13	import java.util.ArrayList;
18	import java.util.Iterator;	14	import java.util.Iterator;
19	import org.eclipse.core.runtime.CoreException;	15	import org.eclipse.core.runtime.CoreException;
Lines 27-37 Link Here
27	import org.eclipse.pde.internal.core.ifeature.*;	23	import org.eclipse.pde.internal.core.ifeature.*;
28	import org.eclipse.pde.internal.ui.PDEPlugin;	24	import org.eclipse.pde.internal.ui.PDEPlugin;
29	import org.eclipse.pde.internal.ui.PDEUIMessages;	25	import org.eclipse.pde.internal.ui.PDEUIMessages;
		26	import org.eclipse.pde.internal.ui.dialogs.FeatureSelectionDialog;
		27	import org.eclipse.pde.internal.ui.dialogs.PluginSelectionDialog;
30	import org.eclipse.pde.internal.ui.editor.*;	28	import org.eclipse.pde.internal.ui.editor.*;
31	import org.eclipse.pde.internal.ui.editor.actions.SortAction;	29	import org.eclipse.pde.internal.ui.editor.actions.SortAction;
32	import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;	30	import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
33	import org.eclipse.pde.internal.ui.parts.TablePart;	31	import org.eclipse.pde.internal.ui.parts.TablePart;
34	import org.eclipse.pde.internal.ui.wizards.*;	32	import org.eclipse.pde.internal.ui.wizards.ListUtil;
35	import org.eclipse.swt.SWT;	33	import org.eclipse.swt.SWT;
36	import org.eclipse.swt.custom.BusyIndicator;	34	import org.eclipse.swt.custom.BusyIndicator;
37	import org.eclipse.swt.dnd.Clipboard;	35	import org.eclipse.swt.dnd.Clipboard;
Lines 40-45 Link Here
40	import org.eclipse.swt.graphics.Cursor;	38	import org.eclipse.swt.graphics.Cursor;
41	import org.eclipse.swt.layout.GridData;	39	import org.eclipse.swt.layout.GridData;
42	import org.eclipse.swt.widgets.*;	40	import org.eclipse.swt.widgets.*;
		41	import org.eclipse.ui.IEditorSite;
		42	import org.eclipse.ui.IWorkbenchActionConstants;
43	import org.eclipse.ui.actions.ActionFactory;	43	import org.eclipse.ui.actions.ActionFactory;
44	import org.eclipse.ui.forms.widgets.FormToolkit;	44	import org.eclipse.ui.forms.widgets.FormToolkit;
45	import org.eclipse.ui.forms.widgets.Section;	45	import org.eclipse.ui.forms.widgets.Section;
Lines 349-354 Link Here
349	manager.add(new Separator());	349	manager.add(new Separator());
350	}	350	}
351	getPage().getPDEEditor().getContributor().contextMenuAboutToShow(manager);	351	getPage().getPDEEditor().getContributor().contextMenuAboutToShow(manager);
		352	manager.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS));
		353	}
		354
		355	protected void registerPopupMenu(MenuManager popupMenuManager) {
		356	IEditorSite site = (IEditorSite) getPage().getSite();
		357	site.registerContextMenu(site.getId() + ".plugins", popupMenuManager, fViewerPart.getViewer(), false); //$NON-NLS-1$
352	}	358	}
353		359
354	protected void selectionChanged(IStructuredSelection selection) {	360	protected void selectionChanged(IStructuredSelection selection) {




 *******************************************************************************/
package org.eclipse.pde.internal.ui.editor.plugin;

import org.eclipse.pde.internal.ui.dialogs.PluginSelectionDialog;

import java.io.*;
import java.util.*;
import org.eclipse.core.runtime.CoreException;

import org.eclipse.pde.internal.core.text.plugin.PluginDocumentNodeFactory;
import org.eclipse.pde.internal.core.util.VersionUtil;
import org.eclipse.pde.internal.ui.*;
import org.eclipse.pde.internal.ui.dialogs.PluginSelectionDialog;
import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
import org.eclipse.pde.internal.ui.editor.TableSection;
import org.eclipse.pde.internal.ui.editor.actions.SortAction;

import org.eclipse.swt.graphics.Cursor;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.*;
import org.eclipse.ui.*;
import org.eclipse.ui.actions.ActionContext;
import org.eclipse.ui.actions.ActionFactory;
import org.eclipse.ui.forms.widgets.FormToolkit;

			manager.add(new Separator());
			manager.add(fPropertiesAction);
		}
		manager.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS));
	}

	protected void registerPopupMenu(MenuManager popupMenuManager) {
		IEditorSite site = (IEditorSite) getPage().getSite();
		site.registerContextMenu(site.getId() + ".requires", popupMenuManager, fViewerPart.getViewer(), false); //$NON-NLS-1$
	}

	private void handleOpen(ISelection sel) {

Return to bug 338879

Lines 61-66 Link Here

(-)src/org/eclipse/pde/internal/ui/editor/StructuredViewerSection.java (+10 lines)
61	Control control = fViewerPart.getControl();	61	Control control = fViewerPart.getControl();
62	Menu menu = popupMenuManager.createContextMenu(control);	62	Menu menu = popupMenuManager.createContextMenu(control);
63	control.setMenu(menu);	63	control.setMenu(menu);
		64	registerPopupMenu(popupMenuManager);
64	// Initialize drag and drop	65	// Initialize drag and drop
65	if (isDragAndDropEnabled()) {	66	if (isDragAndDropEnabled()) {
66	initializeDragAndDrop();	67	initializeDragAndDrop();
Lines 70-75 Link Here
70	}	71	}
71	}	72	}
72		73
		74	/**
		75	* If the context menu for this section should be registered, do it here
		76	* with the appropriate id etc. By default do nothing.
		77	* @param popupMenuManager the menu manager to be registered
		78	*/
		79	protected void registerPopupMenu(MenuManager popupMenuManager) {
		80	// do nothing by default
		81	}
		82
73	protected Composite createClientContainer(Composite parent, int span, FormToolkit toolkit) {	83	protected Composite createClientContainer(Composite parent, int span, FormToolkit toolkit) {
74	Composite container = toolkit.createComposite(parent);	84	Composite container = toolkit.createComposite(parent);
75	container.setLayout(FormLayoutFactory.createSectionClientGridLayout(false, span));	85	container.setLayout(FormLayoutFactory.createSectionClientGridLayout(false, span));