Attachment 191251 Details for Bug 338879 – new patch that limits extensibility

[patch] new patch that limits extensibility

pde-extensible-menus.txt (text/plain), 5.78 KB, created by Jeff McAffer

on 2011-03-15 17:01:41 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff McAffer

Created: 2011-03-15 17:01:41 EDT

Size: 5.78 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.ui
>Index: src/org/eclipse/pde/internal/ui/editor/StructuredViewerSection.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/StructuredViewerSection.java,v
>retrieving revision 1.25
>diff -u -r1.25 StructuredViewerSection.java
>--- src/org/eclipse/pde/internal/ui/editor/StructuredViewerSection.java	27 May 2009 20:38:16 -0000	1.25
>+++ src/org/eclipse/pde/internal/ui/editor/StructuredViewerSection.java	15 Mar 2011 20:58:39 -0000
>@@ -61,6 +61,7 @@
> 		Control control = fViewerPart.getControl();
> 		Menu menu = popupMenuManager.createContextMenu(control);
> 		control.setMenu(menu);
>+		registerPopupMenu(popupMenuManager);
> 		// Initialize drag and drop
> 		if (isDragAndDropEnabled()) {
> 			initializeDragAndDrop();
>@@ -70,6 +71,15 @@
> 		}
> 	}
> 
>+	/**
>+	 * 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));
>Index: src/org/eclipse/pde/internal/ui/editor/feature/RequiresSection.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/RequiresSection.java,v
>retrieving revision 1.51
>diff -u -r1.51 RequiresSection.java
>--- src/org/eclipse/pde/internal/ui/editor/feature/RequiresSection.java	27 May 2009 20:38:18 -0000	1.51
>+++ src/org/eclipse/pde/internal/ui/editor/feature/RequiresSection.java	15 Mar 2011 20:58:39 -0000
>@@ -10,10 +10,6 @@
>  *******************************************************************************/
> package org.eclipse.pde.internal.ui.editor.feature;
> 
>-import org.eclipse.pde.internal.ui.dialogs.PluginSelectionDialog;
>-
>-import org.eclipse.pde.internal.ui.dialogs.FeatureSelectionDialog;
>-
> import java.util.ArrayList;
> import java.util.Iterator;
> import org.eclipse.core.runtime.CoreException;
>@@ -27,11 +23,13 @@
> import org.eclipse.pde.internal.core.ifeature.*;
> import org.eclipse.pde.internal.ui.PDEPlugin;
> import org.eclipse.pde.internal.ui.PDEUIMessages;
>+import org.eclipse.pde.internal.ui.dialogs.FeatureSelectionDialog;
>+import org.eclipse.pde.internal.ui.dialogs.PluginSelectionDialog;
> import org.eclipse.pde.internal.ui.editor.*;
> import org.eclipse.pde.internal.ui.editor.actions.SortAction;
> import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
> import org.eclipse.pde.internal.ui.parts.TablePart;
>-import org.eclipse.pde.internal.ui.wizards.*;
>+import org.eclipse.pde.internal.ui.wizards.ListUtil;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.custom.BusyIndicator;
> import org.eclipse.swt.dnd.Clipboard;
>@@ -40,6 +38,7 @@
> import org.eclipse.swt.graphics.Cursor;
> import org.eclipse.swt.layout.GridData;
> import org.eclipse.swt.widgets.*;
>+import org.eclipse.ui.IWorkbenchActionConstants;
> import org.eclipse.ui.actions.ActionFactory;
> import org.eclipse.ui.forms.widgets.FormToolkit;
> import org.eclipse.ui.forms.widgets.Section;
>@@ -349,6 +348,11 @@
> 			manager.add(new Separator());
> 		}
> 		getPage().getPDEEditor().getContributor().contextMenuAboutToShow(manager);
>+		manager.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS));
>+	}
>+
>+	protected void registerPopupMenu(MenuManager popupMenuManager) {
>+		getPage().getSite().registerContextMenu(popupMenuManager, fViewerPart.getViewer());
> 	}
> 
> 	protected void selectionChanged(IStructuredSelection selection) {
>Index: src/org/eclipse/pde/internal/ui/editor/plugin/RequiresSection.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/RequiresSection.java,v
>retrieving revision 1.54
>diff -u -r1.54 RequiresSection.java
>--- src/org/eclipse/pde/internal/ui/editor/plugin/RequiresSection.java	19 Oct 2008 19:43:02 -0000	1.54
>+++ src/org/eclipse/pde/internal/ui/editor/plugin/RequiresSection.java	15 Mar 2011 20:58:39 -0000
>@@ -10,8 +10,6 @@
>  *******************************************************************************/
> 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;
>@@ -30,6 +28,7 @@
> 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;
>@@ -44,7 +43,7 @@
> import org.eclipse.swt.graphics.Cursor;
> import org.eclipse.swt.layout.GridData;
> import org.eclipse.swt.widgets.*;
>-import org.eclipse.ui.PlatformUI;
>+import org.eclipse.ui.*;
> import org.eclipse.ui.actions.ActionContext;
> import org.eclipse.ui.actions.ActionFactory;
> import org.eclipse.ui.forms.widgets.FormToolkit;
>@@ -336,6 +335,11 @@
> 			manager.add(new Separator());
> 			manager.add(fPropertiesAction);
> 		}
>+		manager.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS));
>+	}
>+
>+	protected void registerPopupMenu(MenuManager popupMenuManager) {
>+		((IEditorSite) getPage().getSite()).registerContextMenu(popupMenuManager, fViewerPart.getViewer(), false);
> 	}
> 
> 	private void handleOpen(ISelection sel) {

Actions: View | Diff

Attachments on bug 338879: 190345 | 190346 | 191251 | 191331