Attachment 201838 Details for Bug 313392 – Fix

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fix

clipboard.txt (text/plain), 6.13 KB, created by Curtis Windatt

on 2011-08-19 16:49:06 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Curtis Windatt

Created: 2011-08-19 16:49:06 EDT

Size: 6.13 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.ui
>Index: src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesViewPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesViewPage.java,v
>retrieving revision 1.14
>diff -u -r1.14 DependenciesViewPage.java
>--- src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesViewPage.java	20 Aug 2010 20:08:21 -0000	1.14
>+++ src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesViewPage.java	19 Aug 2011 20:46:03 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2010 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -28,9 +28,11 @@
> import org.eclipse.pde.internal.ui.refactoring.RefactoringActionFactory;
> import org.eclipse.pde.internal.ui.search.dependencies.DependencyExtentAction;
> import org.eclipse.pde.internal.ui.search.dependencies.UnusedDependenciesAction;
>+import org.eclipse.pde.internal.ui.views.plugins.ImportActionGroup;
> import org.eclipse.swt.widgets.*;
> import org.eclipse.ui.IActionBars;
> import org.eclipse.ui.IWorkbenchActionConstants;
>+import org.eclipse.ui.actions.ActionContext;
> import org.eclipse.ui.part.Page;
> 
> public abstract class DependenciesViewPage extends Page {
>@@ -136,6 +138,14 @@
> 			manager.add(fOpenAction);
> 			manager.add(new Separator());
> 		}
>+
>+		if (ImportActionGroup.canImport(selection)) {
>+			ImportActionGroup actionGroup = new ImportActionGroup();
>+			actionGroup.setContext(new ActionContext(selection));
>+			actionGroup.fillContextMenu(manager);
>+			manager.add(new Separator());
>+		}
>+
> 		fFocusOnSelectionAction.update(getSelectedObject());
> 		if (fFocusOnSelectionAction.isEnabled())
> 			manager.add(fFocusOnSelectionAction);
>Index: src/org/eclipse/pde/internal/ui/views/plugins/ImportActionGroup.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/plugins/ImportActionGroup.java,v
>retrieving revision 1.9
>diff -u -r1.9 ImportActionGroup.java
>--- src/org/eclipse/pde/internal/ui/views/plugins/ImportActionGroup.java	22 Feb 2011 16:50:32 -0000	1.9
>+++ src/org/eclipse/pde/internal/ui/views/plugins/ImportActionGroup.java	19 Aug 2011 20:46:03 -0000
>@@ -17,7 +17,10 @@
> import org.eclipse.jface.viewers.ISelection;
> import org.eclipse.jface.viewers.IStructuredSelection;
> import org.eclipse.jface.wizard.WizardDialog;
>+import org.eclipse.osgi.service.resolver.BundleDescription;
>+import org.eclipse.osgi.service.resolver.BundleSpecification;
> import org.eclipse.pde.core.plugin.*;
>+import org.eclipse.pde.internal.core.PDECore;
> import org.eclipse.pde.internal.core.project.BundleProjectService;
> import org.eclipse.pde.internal.ui.PDEPlugin;
> import org.eclipse.pde.internal.ui.PDEUIMessages;
>@@ -135,14 +138,23 @@
> 
> 	private static IPluginModelBase getModel(Object next) {
> 		IPluginModelBase model = null;
>-		if (next instanceof IPluginModelBase)
>+		if (next instanceof IPluginModelBase) {
> 			model = (IPluginModelBase) next;
>-		else if (next instanceof IPluginBase)
>+		} else if (next instanceof IPluginBase) {
> 			model = ((IPluginBase) next).getPluginModel();
>-		else if (next instanceof IPluginExtension)
>+		} else if (next instanceof IPluginExtension) {
> 			model = ((IPluginExtension) next).getPluginModel();
>-		else if (next instanceof IPluginExtensionPoint)
>+		} else if (next instanceof IPluginExtensionPoint) {
> 			model = ((IPluginExtensionPoint) next).getPluginModel();
>+		} else if (next instanceof BundleDescription) {
>+			model = PDECore.getDefault().getModelManager().findModel((BundleDescription) next);
>+		} else if (next instanceof BundleSpecification) {
>+			BundleDescription desc = (BundleDescription) ((BundleSpecification) next).getSupplier();
>+			if (desc != null) {
>+				model = PDECore.getDefault().getModelManager().findModel(desc);
>+			}
>+		}
> 		return model;
>+
> 	}
> }
>Index: src/org/eclipse/pde/internal/ui/views/target/StateViewPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/target/StateViewPage.java,v
>retrieving revision 1.4
>diff -u -r1.4 StateViewPage.java
>--- src/org/eclipse/pde/internal/ui/views/target/StateViewPage.java	20 Aug 2010 20:05:59 -0000	1.4
>+++ src/org/eclipse/pde/internal/ui/views/target/StateViewPage.java	19 Aug 2011 20:46:03 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2009, 2010 IBM Corporation and others.
>+ * Copyright (c) 2009, 2011 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -27,11 +27,13 @@
> import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
> import org.eclipse.pde.internal.ui.util.SharedLabelProvider;
> import org.eclipse.pde.internal.ui.views.dependencies.DependenciesViewComparator;
>+import org.eclipse.pde.internal.ui.views.plugins.ImportActionGroup;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.graphics.Image;
> import org.eclipse.swt.layout.*;
> import org.eclipse.swt.widgets.*;
> import org.eclipse.ui.IWorkbenchActionConstants;
>+import org.eclipse.ui.actions.ActionContext;
> import org.eclipse.ui.dialogs.FilteredTree;
> import org.eclipse.ui.dialogs.PatternFilter;
> import org.eclipse.ui.part.Page;
>@@ -392,6 +394,12 @@
> 				};
> 			}
> 			menu.add(fOpenAction);
>+			if (ImportActionGroup.canImport(selection)) {
>+				ImportActionGroup actionGroup = new ImportActionGroup();
>+				actionGroup.setContext(new ActionContext(selection));
>+				actionGroup.fillContextMenu(menu);
>+				menu.add(new Separator());
>+			}
> 			menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
> 		}
> 	}

Actions: View | Diff

Attachments on bug 313392: 201838 | 202255