Use the project component api baseline to lookup the component

Currently the api-tools heavily rely on a common shared "workspace
baseline" this baseline can be disposed and then changes at any time.
While this can work in an IDE context, it makes it quite hard for other
tools to use this standalone because there is no way to reliable use an
alternative mean of "workspace baseline".

This now changes the ProjectApiDescription in a way where the baseline
is passed in from the project component and it only fall back to the
static singleton if the baseline is disposed.

apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ApiDescriptionManager.java

@@ -120,17 +120,17 @@ public synchronized static ApiDescriptionManager getManager() {
 	public synchronized IApiDescription getApiDescription(ProjectComponent component, BundleDescription bundle) {
 		IJavaProject project = component.getJavaProject();
 		ProjectApiDescription description = (ProjectApiDescription) fDescriptions.get(project);
-		if (description == null) {
+		if (description == null || description.baseline != component.getBaseline()) {
 			if (Util.isApiProject(project)) {
-				description = new ProjectApiDescription(project);
+				description = new ProjectApiDescription(project, component.getBaseline());
 			} else {
-				description = new NonApiProjectDescription(project);
+				description = new NonApiProjectDescription(project, component.getBaseline());
 			}
 			try {
 				restoreDescription(project, description);
 			} catch (CoreException e) {
 				ApiPlugin.log(e.getStatus());
-				description = new ProjectApiDescription(project);
+				description = new ProjectApiDescription(project, component.getBaseline());
 			}
 			fDescriptions.put(project, description);
 		}

apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/NonApiProjectDescription.java

@@ -15,6 +15,7 @@
 
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.pde.api.tools.internal.provisional.descriptors.IElementDescriptor;
+import org.eclipse.pde.api.tools.internal.provisional.model.IApiBaseline;
 
 /**
  * An API description for a project that does not have an API Tools nature.
@@ -26,9 +27,11 @@ public class NonApiProjectDescription extends ProjectApiDescription {
 
 	/**
 	 * Constructs API description for the given project.
+	 *
+	 * @param baseline
 	 */
-	public NonApiProjectDescription(IJavaProject project) {
-		super(project);
+	NonApiProjectDescription(IJavaProject project, IApiBaseline baseline) {
+		super(project, baseline);
 	}
 
 	@Override

apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ProjectApiDescription.java

@@ -92,6 +92,11 @@ public class ProjectApiDescription extends ApiDescription {
 	 */
 	private volatile boolean fInSynch;
 
+	/**
+	 * this holds the baseline this description is currently connected to
+	 */
+	IApiBaseline baseline;
+
 	/**
 	 * A node for a package.
 	 */
@@ -328,10 +333,13 @@ public String toString() {
 
 	/**
 	 * Constructs a new API description for the given project API component.
+	 *
+	 * @param baseline the baseline this description should be connected with
 	 */
-	public ProjectApiDescription(IJavaProject project) {
+	ProjectApiDescription(IJavaProject project, IApiBaseline baseline) {
 		super(project.getElementName());
 		fProject = project;
+		this.baseline = baseline;
 	}
 
 	@Override
@@ -527,12 +535,12 @@ ManifestNode newNode(ManifestNode parent, IElementDescriptor element, int vis, i
 	 */
 	void refreshPackages() {
 		if (fRefreshingInProgress) {
-			logPackafesRefresh();
+			logPackagesRefresh();
 			return;
 		}
 		synchronized (this) {
 			if (fRefreshingInProgress) {
-				logPackafesRefresh();
+				logPackagesRefresh();
 				return;
 			}
 			// check if in synch
@@ -569,7 +577,7 @@ void refreshPackages() {
 		}
 	}
 
-	private void logPackafesRefresh() {
+	private void logPackagesRefresh() {
 		if (ApiPlugin.DEBUG_API_DESCRIPTION) {
 			StringBuilder buffer = new StringBuilder();
 			buffer.append("Refreshing manifest node: "); //$NON-NLS-1$
@@ -706,8 +714,14 @@ public String toString() {
 	 * @return API component
 	 * @exception CoreException if the API component cannot be located
 	 */
-	private ProjectComponent getApiComponent() throws CoreException {
-		IApiBaseline baseline = ApiBaselineManager.getManager().getWorkspaceBaseline();
+	private synchronized ProjectComponent getApiComponent() throws CoreException {
+		if (baseline == null || baseline.isDisposed()) {
+			baseline = ApiBaselineManager.getManager().getWorkspaceBaseline();
+		}
+		return getApiComponent(baseline);
+	}
+
+	private ProjectComponent getApiComponent(IApiBaseline baseline) throws CoreException {
 		ProjectComponent component = (ProjectComponent) baseline.getApiComponent(getJavaProject().getProject());
 		if (component == null) {
 			throw new CoreException(Status.error("Unable to resolve project API component for API description")); //$NON-NLS-1$