Attachment #201838 for bug #313392

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




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

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 {

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

Lines 17-23 Link Here

(-)src/org/eclipse/pde/internal/ui/views/plugins/ImportActionGroup.java (-4 / +16 lines)
17	import org.eclipse.jface.viewers.ISelection;	17	import org.eclipse.jface.viewers.ISelection;
18	import org.eclipse.jface.viewers.IStructuredSelection;	18	import org.eclipse.jface.viewers.IStructuredSelection;
19	import org.eclipse.jface.wizard.WizardDialog;	19	import org.eclipse.jface.wizard.WizardDialog;
		20	import org.eclipse.osgi.service.resolver.BundleDescription;
		21	import org.eclipse.osgi.service.resolver.BundleSpecification;
20	import org.eclipse.pde.core.plugin.*;	22	import org.eclipse.pde.core.plugin.*;
		23	import org.eclipse.pde.internal.core.PDECore;
21	import org.eclipse.pde.internal.core.project.BundleProjectService;	24	import org.eclipse.pde.internal.core.project.BundleProjectService;
22	import org.eclipse.pde.internal.ui.PDEPlugin;	25	import org.eclipse.pde.internal.ui.PDEPlugin;
23	import org.eclipse.pde.internal.ui.PDEUIMessages;	26	import org.eclipse.pde.internal.ui.PDEUIMessages;
Lines 135-148 Link Here
135		138
136	private static IPluginModelBase getModel(Object next) {	139	private static IPluginModelBase getModel(Object next) {
137	IPluginModelBase model = null;	140	IPluginModelBase model = null;
138	if (next instanceof IPluginModelBase)	141	if (next instanceof IPluginModelBase) {
139	model = (IPluginModelBase) next;	142	model = (IPluginModelBase) next;
140	else if (next instanceof IPluginBase)	143	} else if (next instanceof IPluginBase) {
141	model = ((IPluginBase) next).getPluginModel();	144	model = ((IPluginBase) next).getPluginModel();
142	else if (next instanceof IPluginExtension)	145	} else if (next instanceof IPluginExtension) {
143	model = ((IPluginExtension) next).getPluginModel();	146	model = ((IPluginExtension) next).getPluginModel();
144	else if (next instanceof IPluginExtensionPoint)	147	} else if (next instanceof IPluginExtensionPoint) {
145	model = ((IPluginExtensionPoint) next).getPluginModel();	148	model = ((IPluginExtensionPoint) next).getPluginModel();
		149	} else if (next instanceof BundleDescription) {
		150	model = PDECore.getDefault().getModelManager().findModel((BundleDescription) next);
		151	} else if (next instanceof BundleSpecification) {
		152	BundleDescription desc = (BundleDescription) ((BundleSpecification) next).getSupplier();
		153	if (desc != null) {
		154	model = PDECore.getDefault().getModelManager().findModel(desc);
		155	}
		156	}
146	return model;	157	return model;
		158
147	}	159	}
148	}	160	}




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

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;

				};
			}
			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));
		}
	}

Return to bug 313392

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/ui/views/dependencies/DependenciesViewPage.java (-1 / +11 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2010 IBM Corporation and others.	2	* Copyright (c) 2000, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 28-36 Link Here
28	import org.eclipse.pde.internal.ui.refactoring.RefactoringActionFactory;	28	import org.eclipse.pde.internal.ui.refactoring.RefactoringActionFactory;
29	import org.eclipse.pde.internal.ui.search.dependencies.DependencyExtentAction;	29	import org.eclipse.pde.internal.ui.search.dependencies.DependencyExtentAction;
30	import org.eclipse.pde.internal.ui.search.dependencies.UnusedDependenciesAction;	30	import org.eclipse.pde.internal.ui.search.dependencies.UnusedDependenciesAction;
		31	import org.eclipse.pde.internal.ui.views.plugins.ImportActionGroup;
31	import org.eclipse.swt.widgets.*;	32	import org.eclipse.swt.widgets.*;
32	import org.eclipse.ui.IActionBars;	33	import org.eclipse.ui.IActionBars;
33	import org.eclipse.ui.IWorkbenchActionConstants;	34	import org.eclipse.ui.IWorkbenchActionConstants;
		35	import org.eclipse.ui.actions.ActionContext;
34	import org.eclipse.ui.part.Page;	36	import org.eclipse.ui.part.Page;
35		37
36	public abstract class DependenciesViewPage extends Page {	38	public abstract class DependenciesViewPage extends Page {
Lines 136-141 Link Here
136	manager.add(fOpenAction);	138	manager.add(fOpenAction);
137	manager.add(new Separator());	139	manager.add(new Separator());
138	}	140	}
		141
		142	if (ImportActionGroup.canImport(selection)) {
		143	ImportActionGroup actionGroup = new ImportActionGroup();
		144	actionGroup.setContext(new ActionContext(selection));
		145	actionGroup.fillContextMenu(manager);
		146	manager.add(new Separator());
		147	}
		148
139	fFocusOnSelectionAction.update(getSelectedObject());	149	fFocusOnSelectionAction.update(getSelectedObject());
140	if (fFocusOnSelectionAction.isEnabled())	150	if (fFocusOnSelectionAction.isEnabled())
141	manager.add(fFocusOnSelectionAction);	151	manager.add(fFocusOnSelectionAction);