Attachment #77493 for bug #96962

Lines 1606-1611 Link Here

(-)src/org/eclipse/pde/internal/ui/PDEUIMessages.java (+2 lines)
1606	public static String FeatureImportWizard_operation_multiProblem;	1606	public static String FeatureImportWizard_operation_multiProblem;
1607	public static String FeatureImportWizard_operation_creating2;	1607	public static String FeatureImportWizard_operation_creating2;
1608		1608
		1609	public static String ForbiddenAccessProposal_quickfixMessage;
		1610
1609	public static String UpdateBuildpathWizard_wtitle;	1611	public static String UpdateBuildpathWizard_wtitle;
1610	public static String UpdateBuildpathWizard_title;	1612	public static String UpdateBuildpathWizard_title;
1611	public static String UpdateBuildpathWizard_desc;	1613	public static String UpdateBuildpathWizard_desc;

Lines 54-60 Link Here

(-)src/org/eclipse/pde/internal/ui/PDEPluginImages.java (-1 / +3 lines)
54	public static final String OBJ_DESC_GENERATE_CLASS = NAME_PREFIX + "OBJ_DESC_GENERATE_CLASS"; //$NON-NLS-1$	54	public static final String OBJ_DESC_GENERATE_CLASS = NAME_PREFIX + "OBJ_DESC_GENERATE_CLASS"; //$NON-NLS-1$
55	public static final String OBJ_DESC_GENERATE_INTERFACE = NAME_PREFIX + "OBJ_DESC_GENERATE_INTERFACE"; //$NON-NLS-1$	55	public static final String OBJ_DESC_GENERATE_INTERFACE = NAME_PREFIX + "OBJ_DESC_GENERATE_INTERFACE"; //$NON-NLS-1$
56	public static final String OBJ_DESC_PACKAGE = NAME_PREFIX + "OBJ_DESC_PACKAGE"; //$NON-NLS-1$	56	public static final String OBJ_DESC_PACKAGE = NAME_PREFIX + "OBJ_DESC_PACKAGE"; //$NON-NLS-1$
57		57	public static final String OBJ_DESC_BUNDLE = NAME_PREFIX + "OBJ_DESC_BUNDLE"; //$NON-NLS-1$
		58
58	/**	59	/**
59	* OBJ16	60	* OBJ16
60	*/	61	*/
Lines 301-306 Link Here
301	manage(OBJ_DESC_GENERATE_CLASS, DESC_GENERATE_CLASS);	302	manage(OBJ_DESC_GENERATE_CLASS, DESC_GENERATE_CLASS);
302	manage(OBJ_DESC_GENERATE_INTERFACE, DESC_GENERATE_INTERFACE);	303	manage(OBJ_DESC_GENERATE_INTERFACE, DESC_GENERATE_INTERFACE);
303	manage(OBJ_DESC_PACKAGE, DESC_PACKAGE_OBJ);	304	manage(OBJ_DESC_PACKAGE, DESC_PACKAGE_OBJ);
		305	manage(OBJ_DESC_BUNDLE, DESC_BUNDLE_OBJ);
304	}	306	}
305		307
306	private static URL makeImageURL(String prefix, String name) {	308	private static URL makeImageURL(String prefix, String name) {

Lines 1120-1125 Link Here

(-)src/org/eclipse/pde/internal/ui/pderesources.properties (+1 lines)
1120	FeatureImportWizard_operation_creating = Creating projects from features...	1120	FeatureImportWizard_operation_creating = Creating projects from features...
1121	FeatureImportWizard_operation_multiProblem = Problems detected while importing features	1121	FeatureImportWizard_operation_multiProblem = Problems detected while importing features
1122	FeatureImportWizard_operation_creating2 = Creating ''{0}''...	1122	FeatureImportWizard_operation_creating2 = Creating ''{0}''...
		1123	ForbiddenAccessProposal_quickfixMessage=Export the ''{0}'' package from the ''{1}'' plug-in
1123		1124
1124	UpdateBuildpathWizard_wtitle = Java Classpath	1125	UpdateBuildpathWizard_wtitle = Java Classpath
1125	UpdateBuildpathWizard_title = Update Java class path	1126	UpdateBuildpathWizard_title = Update Java class path




		IWorkbenchPreferencePage {
	
	class FrameworkLabelProvider extends LabelProvider {
		private Image image;
		
		public FrameworkLabelProvider() {
			image = PDEPluginImages.DESC_BUNDLE_OBJ.createImage();
		}
		
		public Image getImage(Object element) {
			return PDEPluginImages.get(PDEPluginImages.OBJ_DESC_BUNDLE);
		}
		
		public String getText(Object element) {

			}
			return super.getText(element);
		}
		
		public void dispose() {
			image.dispose();
			super.dispose();
		}
	}

	private TableViewer fTableViewer;

Lines 1753-1756 Link Here

(-)plugin.xml (+7 lines)
1753	parentId="org.eclipse.ui.textEditorScope">	1753	parentId="org.eclipse.ui.textEditorScope">
1754	</context>	1754	</context>
1755	</extension>	1755	</extension>
		1756	<extension
		1757	point="org.eclipse.jdt.ui.quickFixProcessors">
		1758	<quickFixProcessor
		1759	class="org.eclipse.pde.internal.ui.correction.java.QuickFixProcessor"
		1760	id="org.eclipse.jdt.ui.text.correction.QuickFixProcessor">
		1761	</quickFixProcessor>
		1762	</extension>
1756	</plugin>	1763	</plugin>




/*******************************************************************************
 * Copyright (c) 2007 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.pde.internal.ui.correction.java;

import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jdt.core.IPackageFragment;
import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.contentassist.IContextInformation;
import org.eclipse.osgi.util.NLS;
import org.eclipse.pde.core.IBaseModel;
import org.eclipse.pde.internal.core.ibundle.IBundle;
import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;
import org.eclipse.pde.internal.core.text.bundle.ExportPackageHeader;
import org.eclipse.pde.internal.core.text.bundle.ExportPackageObject;
import org.eclipse.pde.internal.ui.PDEPluginImages;
import org.eclipse.pde.internal.ui.PDEUIMessages;
import org.eclipse.pde.internal.ui.util.ModelModification;
import org.eclipse.pde.internal.ui.util.PDEModelUtility;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
import org.osgi.framework.Constants;

public class ForbiddenAccessProposal implements IJavaCompletionProposal {

	private IProject fProject;
	private IPackageFragment fFragment;
	
	public ForbiddenAccessProposal(IPackageFragment fragment, IProject project) {
		fProject = project;
		fFragment = fragment;
	}

	public void apply(IDocument document) {
		ModelModification mod = new ModelModification(fProject){
			protected void modifyModel(IBaseModel model,
					IProgressMonitor monitor) throws CoreException {
				if (model instanceof IBundlePluginModelBase) {
					IBundle bundle = ((IBundlePluginModelBase)model).getBundleModel().getBundle();

					ExportPackageHeader header = (ExportPackageHeader)bundle.getManifestHeader(Constants.EXPORT_PACKAGE);
					if (header == null) {
						bundle.setHeader(Constants.EXPORT_PACKAGE, ""); //$NON-NLS-1$
						header = (ExportPackageHeader)bundle.getManifestHeader(Constants.EXPORT_PACKAGE);
					}
					header.addPackage(new ExportPackageObject(header, fFragment, Constants.VERSION_ATTRIBUTE));
				}
			}
		};
		PDEModelUtility.modifyModel(mod, new NullProgressMonitor());
	}
	
	public String getDisplayString() {
		return NLS.bind(PDEUIMessages.ForbiddenAccessProposal_quickfixMessage, new String[] {fFragment.getElementName(), fProject.getName()});
	}
	
	public Image getImage() {
		return PDEPluginImages.get(PDEPluginImages.OBJ_DESC_BUNDLE);
	}
	
	public int getRelevance() {
		return 100;
	}
	
	public String getAdditionalProposalInfo() {
		return null;
	}
	public IContextInformation getContextInformation() {
		return null;
	}
	public Point getSelection(IDocument document) {
		return null;
	}
}




/*******************************************************************************
 * Copyright (c) 2007 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.pde.internal.ui.correction.java;

import java.util.ArrayList;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IPackageFragment;
import org.eclipse.jdt.core.compiler.IProblem;
import org.eclipse.jdt.core.dom.ASTNode;
import org.eclipse.jdt.core.dom.IBinding;
import org.eclipse.jdt.core.dom.Name;
import org.eclipse.jdt.core.dom.Type;
import org.eclipse.jdt.ui.text.java.IInvocationContext;
import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
import org.eclipse.jdt.ui.text.java.IProblemLocation;
import org.eclipse.jdt.ui.text.java.IQuickFixProcessor;
import org.eclipse.osgi.service.resolver.ExportPackageDescription;
import org.eclipse.pde.core.plugin.IPluginModelBase;
import org.eclipse.pde.internal.core.PDECore;
import org.eclipse.pde.internal.core.WorkspaceModelManager;

public class QuickFixProcessor implements IQuickFixProcessor {

	/* (non-Javadoc)
	 * @see org.eclipse.jdt.ui.text.java.IQuickFixProcessor#getCorrections(org.eclipse.jdt.ui.text.java.IInvocationContext, org.eclipse.jdt.ui.text.java.IProblemLocation[])
	 */
	public IJavaCompletionProposal[] getCorrections(IInvocationContext context,
			IProblemLocation[] locations) throws CoreException {
		ArrayList results = new ArrayList();
		for (int i = 0; i < locations.length; i++) {
			int id = locations[i].getProblemId();
			switch (id) {
				case IProblem.ForbiddenReference:
					handleAccessRestrictionProblem(context, locations[i], results);
				default:
			}
		}
		return (IJavaCompletionProposal[])results.toArray(new IJavaCompletionProposal[results.size()]);
	}
	
	private void handleAccessRestrictionProblem(IInvocationContext context,
			IProblemLocation location, ArrayList results) {
		IBinding referencedElement= null;
		ASTNode node= location.getCoveredNode(context.getASTRoot());
		if (node instanceof Type) {
			referencedElement= ((Type) node).resolveBinding();
		} else if (node instanceof Name) {
			referencedElement= ((Name) node).resolveBinding();
		}
		if (referencedElement != null) {
			// get the project that contains the reference element
			// ensure it exists in the workspace and is a plug-in project
			IJavaProject referencedJavaProject = referencedElement.getJavaElement().getJavaProject();
			if (referencedJavaProject != null && WorkspaceModelManager.isPluginProject(referencedJavaProject.getProject())) {
				// get the packages exported by the referenced plug-in project
				IPluginModelBase referencedModel = PDECore.getDefault().getModelManager().findModel(referencedJavaProject.getProject());
				ExportPackageDescription[] exportPackages = referencedModel.getBundleDescription().getExportPackages();
				// check if the required package is exported already
				boolean packageExported = false;
				IPackageFragment referencedPackage = (IPackageFragment)referencedElement.getJavaElement().getAncestor(IJavaElement.PACKAGE_FRAGMENT);
				if (referencedPackage != null) {
					for (int i = 0; i < exportPackages.length; i++) {
						if (exportPackages[i].getName().equals(referencedPackage.getElementName())){
							packageExported = true;
							break;
						}
					}
					// if the package is not exported, add the quickfix
					if (!packageExported) {
						results.add(new ForbiddenAccessProposal(referencedPackage, referencedJavaProject.getProject()));
					}
				}
			}
		}
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jdt.ui.text.java.IQuickFixProcessor#hasCorrections(org.eclipse.jdt.core.ICompilationUnit, int)
	 */
	public boolean hasCorrections(ICompilationUnit unit, int problemId) {
		switch (problemId) {
			case IProblem.ForbiddenReference:
				IJavaElement parent = unit.getParent();
				if (parent != null) {
					IJavaProject project = parent.getJavaProject();
					if (project != null)
						return WorkspaceModelManager.isPluginProject(project.getProject());
				}
			default:
		}
		return false;
	}

}

Return to bug 96962

Lines 49-62 Link Here

(-)src/org/eclipse/pde/internal/ui/preferences/OSGiFrameworkPreferencePage.java (-12 / +1 lines)
49	IWorkbenchPreferencePage {	49	IWorkbenchPreferencePage {
50		50
51	class FrameworkLabelProvider extends LabelProvider {	51	class FrameworkLabelProvider extends LabelProvider {
52	private Image image;
53
54	public FrameworkLabelProvider() {
55	image = PDEPluginImages.DESC_BUNDLE_OBJ.createImage();
56	}
57
58	public Image getImage(Object element) {	52	public Image getImage(Object element) {
59	return image;	53	return PDEPluginImages.get(PDEPluginImages.OBJ_DESC_BUNDLE);
60	}	54	}
61		55
62	public String getText(Object element) {	56	public String getText(Object element) {
Lines 67-77 Link Here
67	}	61	}
68	return super.getText(element);	62	return super.getText(element);
69	}	63	}
70
71	public void dispose() {
72	image.dispose();
73	super.dispose();
74	}
75	}	64	}
76		65
77	private TableViewer fTableViewer;	66	private TableViewer fTableViewer;

Added Link Here

(-)src/org/eclipse/pde/internal/ui/correction/java/ForbiddenAccessProposal.java (+85 lines)
1	/*******************************************************************************
2	* Copyright (c) 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.pde.internal.ui.correction.java;
12
13	import org.eclipse.core.resources.IProject;
14	import org.eclipse.core.runtime.CoreException;
15	import org.eclipse.core.runtime.IProgressMonitor;
16	import org.eclipse.core.runtime.NullProgressMonitor;
17	import org.eclipse.jdt.core.IPackageFragment;
18	import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
19	import org.eclipse.jface.text.IDocument;
20	import org.eclipse.jface.text.contentassist.IContextInformation;
21	import org.eclipse.osgi.util.NLS;
22	import org.eclipse.pde.core.IBaseModel;
23	import org.eclipse.pde.internal.core.ibundle.IBundle;
24	import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;
25	import org.eclipse.pde.internal.core.text.bundle.ExportPackageHeader;
26	import org.eclipse.pde.internal.core.text.bundle.ExportPackageObject;
27	import org.eclipse.pde.internal.ui.PDEPluginImages;
28	import org.eclipse.pde.internal.ui.PDEUIMessages;
29	import org.eclipse.pde.internal.ui.util.ModelModification;
30	import org.eclipse.pde.internal.ui.util.PDEModelUtility;
31	import org.eclipse.swt.graphics.Image;
32	import org.eclipse.swt.graphics.Point;
33	import org.osgi.framework.Constants;
34
35	public class ForbiddenAccessProposal implements IJavaCompletionProposal {
36
37	private IProject fProject;
38	private IPackageFragment fFragment;
39
40	public ForbiddenAccessProposal(IPackageFragment fragment, IProject project) {
41	fProject = project;
42	fFragment = fragment;
43	}
44
45	public void apply(IDocument document) {
46	ModelModification mod = new ModelModification(fProject){
47	protected void modifyModel(IBaseModel model,
48	IProgressMonitor monitor) throws CoreException {
49	if (model instanceof IBundlePluginModelBase) {
50	IBundle bundle = ((IBundlePluginModelBase)model).getBundleModel().getBundle();
51
52	ExportPackageHeader header = (ExportPackageHeader)bundle.getManifestHeader(Constants.EXPORT_PACKAGE);
53	if (header == null) {
54	bundle.setHeader(Constants.EXPORT_PACKAGE, ""); //$NON-NLS-1$
55	header = (ExportPackageHeader)bundle.getManifestHeader(Constants.EXPORT_PACKAGE);
56	}
57	header.addPackage(new ExportPackageObject(header, fFragment, Constants.VERSION_ATTRIBUTE));
58	}
59	}
60	};
61	PDEModelUtility.modifyModel(mod, new NullProgressMonitor());
62	}
63
64	public String getDisplayString() {
65	return NLS.bind(PDEUIMessages.ForbiddenAccessProposal_quickfixMessage, new String[] {fFragment.getElementName(), fProject.getName()});
66	}
67
68	public Image getImage() {
69	return PDEPluginImages.get(PDEPluginImages.OBJ_DESC_BUNDLE);
70	}
71
72	public int getRelevance() {
73	return 100;
74	}
75
76	public String getAdditionalProposalInfo() {
77	return null;
78	}
79	public IContextInformation getContextInformation() {
80	return null;
81	}
82	public Point getSelection(IDocument document) {
83	return null;
84	}
85	}