Attachment 143775 Details for Bug 268985 – fix

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

[patch] fix

scope.patch (text/plain), 26.88 KB, created by Michael Rennie

on 2009-08-07 10:29:38 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Rennie

Created: 2009-08-07 10:29:38 EDT

Size: 26.88 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.api.tools
>Index: src/org/eclipse/pde/api/tools/internal/provisional/search/ApiSearchEngine.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/provisional/search/ApiSearchEngine.java,v
>retrieving revision 1.8
>diff -u -r1.8 ApiSearchEngine.java
>--- src/org/eclipse/pde/api/tools/internal/provisional/search/ApiSearchEngine.java	6 Jul 2009 18:53:24 -0000	1.8
>+++ src/org/eclipse/pde/api/tools/internal/provisional/search/ApiSearchEngine.java	7 Aug 2009 14:31:14 -0000
>@@ -30,6 +30,7 @@
> import org.eclipse.pde.api.tools.internal.provisional.model.IApiComponent;
> import org.eclipse.pde.api.tools.internal.provisional.model.IApiElement;
> import org.eclipse.pde.api.tools.internal.provisional.model.IApiMember;
>+import org.eclipse.pde.api.tools.internal.provisional.model.IApiScope;
> import org.eclipse.pde.api.tools.internal.provisional.model.IApiType;
> import org.eclipse.pde.api.tools.internal.provisional.model.IApiTypeRoot;
> import org.eclipse.pde.api.tools.internal.search.SearchMessages;
>@@ -274,7 +275,7 @@
> 		if(baseline == null || reporter == null || requestor == null) {
> 			return;
> 		}
>-		IApiSearchScope scope = requestor.getScope();
>+		IApiScope scope = requestor.getScope();
> 		if(scope == null) {
> 			return;
> 		}
>@@ -285,7 +286,7 @@
> 		if(requestor.includesInternal() && !requestor.includesAPI()) {
> 			fRequestorContext = SearchMessages.ApiSearchEngine_internal;
> 		}
>-		IApiElement[] scopeelements = scope.getScope();
>+		IApiElement[] scopeelements = scope.getApiElements();
> 		SubMonitor localmonitor = SubMonitor.convert(monitor, 
> 				MessageFormat.format(SearchMessages.ApiSearchEngine_searching_projects, new String[] {fRequestorContext}), scopeelements.length*2+1);
> 		try {
>Index: src/org/eclipse/pde/api/tools/internal/provisional/search/IApiSearchRequestor.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/provisional/search/IApiSearchRequestor.java,v
>retrieving revision 1.2
>diff -u -r1.2 IApiSearchRequestor.java
>--- src/org/eclipse/pde/api/tools/internal/provisional/search/IApiSearchRequestor.java	10 Feb 2009 16:14:42 -0000	1.2
>+++ src/org/eclipse/pde/api/tools/internal/provisional/search/IApiSearchRequestor.java	7 Aug 2009 14:31:14 -0000
>@@ -13,6 +13,7 @@
> import org.eclipse.pde.api.tools.internal.provisional.builder.IReference;
> import org.eclipse.pde.api.tools.internal.provisional.model.IApiComponent;
> import org.eclipse.pde.api.tools.internal.provisional.model.IApiMember;
>+import org.eclipse.pde.api.tools.internal.provisional.model.IApiScope;
> 
> /**
>  * A default search requestor to use for API tools
>@@ -45,11 +46,18 @@
> 	public static final int INCLUDE_NON_API_ENABLED_PROJECTS = 0x0004;
> 	
> 	/**
>-	 * Returns the {@link IApiSearchScope} to be searched
>+	 * Search mask that determines if unresolved {@link IReference}s should be included in results.
> 	 * 
>-	 * @return the {@link IApiSearchScope} to be searched
>+	 * @see 
> 	 */
>-	public IApiSearchScope getScope();
>+	public static final int INCLUDE_UNRESOLVED_REFERENCES = 0x0008;
>+	
>+	/**
>+	 * Returns the {@link IApiScope} to be searched
>+	 * 
>+	 * @return the {@link IApiScope} to be searched
>+	 */
>+	public IApiScope getScope();
> 	
> 	/**
> 	 * Returns whether this requestor cares about the given {@link IApiComponent} or not.
>@@ -113,4 +121,11 @@
> 	 * @return true if non-API projects should be considered in the scope false otherwise
> 	 */
> 	public boolean includesNonApiProjects();
>+	
>+	/**
>+	 * Returns true if any {@link IReference}s that can not be resolved will still be included in the search results
>+	 * 
>+	 * @return true if unresolved {@link IReference}s should be included in the search results
>+	 */
>+	public boolean includesUnresolvedReferences();
> }
>Index: src/org/eclipse/pde/api/tools/internal/provisional/search/IApiSearchScope.java
>===================================================================
>RCS file: src/org/eclipse/pde/api/tools/internal/provisional/search/IApiSearchScope.java
>diff -N src/org/eclipse/pde/api/tools/internal/provisional/search/IApiSearchScope.java
>--- src/org/eclipse/pde/api/tools/internal/provisional/search/IApiSearchScope.java	4 Feb 2009 22:15:09 -0000	1.5
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,39 +0,0 @@
>-/*******************************************************************************
>- * Copyright (c) 2009 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.api.tools.internal.provisional.search;
>-
>-import org.eclipse.core.runtime.CoreException;
>-import org.eclipse.pde.api.tools.internal.provisional.model.IApiElement;
>-
>-/**
>- * An {@link ApiSearchScope} is used  by an {@link IApiSearchRequestor} to denote what
>- * {@link org.eclipse.pde.api.tools.internal.provisional.model.IApiElement}s should be 
>- * searched for any given invocation of an {@link ApiSearchEngine}
>- * 
>- * @since 1.0.0
>- */
>-public interface IApiSearchScope {
>-	
>-	/**
>-	 * Returns the {@link IApiElement}s to be considered during a search.
>-	 * 
>-	 * @return the {@link IApiElement}s to search
>-	 */
>-	public IApiElement[] getScope() throws CoreException;
>-	
>-	/**
>-	 * Returns if this scope encloses the given element
>-	 * 
>-	 * @param element
>-	 * @return true if this scope encloses the given element, false otherwise
>-	 */
>-	public boolean encloses(IApiElement element) throws CoreException;
>-}
>Index: src/org/eclipse/pde/api/tools/internal/provisional/model/IApiScope.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/provisional/model/IApiScope.java,v
>retrieving revision 1.3
>diff -u -r1.3 IApiScope.java
>--- src/org/eclipse/pde/api/tools/internal/provisional/model/IApiScope.java	28 Apr 2009 19:06:22 -0000	1.3
>+++ src/org/eclipse/pde/api/tools/internal/provisional/model/IApiScope.java	7 Aug 2009 14:31:14 -0000
>@@ -14,17 +14,18 @@
> 
> /**
>  * Describes a set of {@link IApiElement}.
>- * <p>The api elements can be of the following types:</p>
>- * <ul>
>- * <li>{@link IApiElement#BASELINE}</li>
>- * <li>{@link IApiElement#COMPONENT}</li>
>- * <li>{@link IApiElement#API_TYPE_CONTAINER}</li>
>- * <li>{@link IApiElement#API_TYPE_ROOT}</li>
>- * </ul>
>  * 
>  * @since 1.1.0
>  */
> public interface IApiScope {
>+	
>+	/**
>+	 * Adds the given {@link IApiElement} to the scope
>+	 * 
>+	 * @param newelements
>+	 */
>+	public void addElement(IApiElement newelement);
>+	
> 	/**
> 	 * Returns all API elements contained within this scope
> 	 * 
>@@ -39,4 +40,12 @@
> 	 * @exception CoreException if unable to visit this scope
> 	 */
> 	void accept(ApiScopeVisitor visitor) throws CoreException;
>+	
>+	/**
>+	 * Returns if this scope encloses the given element
>+	 * 
>+	 * @param element
>+	 * @return true if this scope encloses the given element, false otherwise
>+	 */
>+	public boolean encloses(IApiElement element) throws CoreException;
> }
>Index: src/org/eclipse/pde/api/tools/internal/search/ApiUseSearchScope.java
>===================================================================
>RCS file: src/org/eclipse/pde/api/tools/internal/search/ApiUseSearchScope.java
>diff -N src/org/eclipse/pde/api/tools/internal/search/ApiUseSearchScope.java
>--- src/org/eclipse/pde/api/tools/internal/search/ApiUseSearchScope.java	4 Feb 2009 22:15:09 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,68 +0,0 @@
>-/*******************************************************************************
>- * Copyright (c) 2009 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.api.tools.internal.search;
>-
>-import java.util.ArrayList;
>-import java.util.Iterator;
>-import java.util.List;
>-
>-import org.eclipse.pde.api.tools.internal.provisional.model.IApiComponent;
>-import org.eclipse.pde.api.tools.internal.provisional.model.IApiElement;
>-import org.eclipse.pde.api.tools.internal.provisional.search.IApiSearchScope;
>-
>-/**
>- * Default implementation of {@link IApiSearchScope}
>- * 
>- * @since 1.0.0
>- */
>-public class ApiUseSearchScope implements IApiSearchScope {
>-
>-	/**
>-	 * The raw list of elements in this scope
>-	 */
>-	private List fElements = null;
>-	
>-	/**
>-	 * Constructor
>-	 * @param elements
>-	 */
>-	public ApiUseSearchScope(IApiElement[] elements) {
>-		fElements = new ArrayList(elements.length);
>-		for(int i = 0; i < elements.length; i++) {
>-			fElements.add(elements[i]);
>-		}
>-	}
>-	
>-	/* (non-Javadoc)
>-	 * @see org.eclipse.pde.api.tools.internal.provisional.search.IApiSearchScope#getScope()
>-	 */
>-	public IApiElement[] getScope() {
>-		return (IApiElement[]) fElements.toArray(new IApiComponent[fElements.size()]);
>-	}
>-
>-	/* (non-Javadoc)
>-	 * @see org.eclipse.pde.api.tools.internal.provisional.search.IApiSearchScope#encloses(org.eclipse.pde.api.tools.internal.provisional.model.IApiElement)
>-	 */
>-	public boolean encloses(IApiElement element) {
>-		if(element != null) {
>-			IApiComponent component = element.getApiComponent();
>-			IApiComponent enclosing = null;
>-			for(Iterator iter = fElements.iterator(); iter.hasNext();) {
>-				enclosing = ((IApiElement)iter.next()).getApiComponent();
>-				if(component.equals(enclosing)) {
>-					return true;
>-				}
>-			}
>-		}
>-		return false;
>-	}
>-
>-}
>Index: src/org/eclipse/pde/api/tools/internal/search/ApiUseSearchRequestor.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/ApiUseSearchRequestor.java,v
>retrieving revision 1.8
>diff -u -r1.8 ApiUseSearchRequestor.java
>--- src/org/eclipse/pde/api/tools/internal/search/ApiUseSearchRequestor.java	5 Aug 2009 16:46:12 -0000	1.8
>+++ src/org/eclipse/pde/api/tools/internal/search/ApiUseSearchRequestor.java	7 Aug 2009 14:31:14 -0000
>@@ -12,18 +12,17 @@
> 
> import java.util.Comparator;
> import java.util.Set;
>-import java.util.TreeSet;
> 
> import org.eclipse.core.runtime.CoreException;
>-import org.eclipse.pde.api.tools.internal.provisional.ApiPlugin;
> import org.eclipse.pde.api.tools.internal.provisional.IApiAnnotations;
> import org.eclipse.pde.api.tools.internal.provisional.VisibilityModifiers;
> import org.eclipse.pde.api.tools.internal.provisional.builder.IReference;
>+import org.eclipse.pde.api.tools.internal.provisional.comparator.ApiScope;
> import org.eclipse.pde.api.tools.internal.provisional.model.IApiComponent;
> import org.eclipse.pde.api.tools.internal.provisional.model.IApiElement;
> import org.eclipse.pde.api.tools.internal.provisional.model.IApiMember;
>+import org.eclipse.pde.api.tools.internal.provisional.model.IApiScope;
> import org.eclipse.pde.api.tools.internal.provisional.search.IApiSearchRequestor;
>-import org.eclipse.pde.api.tools.internal.provisional.search.IApiSearchScope;
> 
> /**
>  * Default implementation of an {@link IApiSearchRequestor} to use with the
>@@ -48,7 +47,7 @@
> 	/**
> 	 * The search scope for this requestor
> 	 */
>-	private IApiSearchScope fScope = null;
>+	private IApiScope fScope = null;
> 	
> 	/**
> 	 * Default comparator that orders {@link IApiComponent} by their ID 
>@@ -97,6 +96,9 @@
> 	 * @see org.eclipse.pde.api.tools.internal.provisional.search.IApiSearchRequestor#acceptReference(org.eclipse.pde.api.tools.internal.provisional.builder.IReference)
> 	 */
> 	public boolean acceptReference(IReference reference) {
>+		if(includesUnresolvedReferences()) {
>+			return true;
>+		}
> 		try {
> 			IApiMember member = reference.getResolvedReference();
> 			if(member != null) {
>@@ -107,25 +109,23 @@
> 				if(component.equals(reference.getMember().getApiComponent())) {
> 					return false;
> 				}
>-				if(fSearchMask > 0) {
>-					if(includesAPI() && includesInternal()) {
>+				if(includesAPI() && includesInternal()) {
>+					return true;
>+				}
>+				IApiAnnotations annots = component.getApiDescription().resolveAnnotations(member.getHandle());
>+				if(annots != null) {
>+					int vis = annots.getVisibility();
>+					if(VisibilityModifiers.isAPI(vis) && includesAPI()) {
> 						return true;
> 					}
>-					IApiAnnotations annots = component.getApiDescription().resolveAnnotations(member.getHandle());
>-					if(annots != null) {
>-						int vis = annots.getVisibility();
>-						if(VisibilityModifiers.isAPI(vis) && includesAPI()) {
>-							return true;
>-						}
>-						else if(VisibilityModifiers.isPrivate(vis) && includesInternal()) {
>-							return true;
>-						}
>+					else if(VisibilityModifiers.isPrivate(vis) && includesInternal()) {
>+						return true;
> 					}
> 				}
> 			}
> 		}
> 		catch(CoreException ce) {
>-			ApiPlugin.log(ce);
>+			//ApiPlugin.log(ce);
> 		}
> 		return false;
> 	}
>@@ -144,18 +144,17 @@
> 	 */
> 	private void prepareScope(IApiElement[] elements) {
> 		if(elements != null) {
>-			TreeSet comps = new TreeSet(componentsorter);
>+			fScope = new ApiScope();
> 			for(int i = 0; i < elements.length; i++) {
>-				comps.add(elements[i].getApiComponent());
>+				fScope.addElement(elements[i].getApiComponent());
> 			}
>-			fScope = new ApiUseSearchScope((IApiComponent[]) comps.toArray(new IApiComponent[comps.size()]));
> 		}
> 	}
> 	
> 	/* (non-Javadoc)
> 	 * @see org.eclipse.pde.api.tools.internal.provisional.search.IApiSearchRequestor#getScope()
> 	 */
>-	public IApiSearchScope getScope() {
>+	public IApiScope getScope() {
> 		return fScope;
> 	}
> 	
>@@ -179,4 +178,11 @@
> 	public boolean includesNonApiProjects() {
> 		return (fSearchMask & INCLUDE_NON_API_ENABLED_PROJECTS) > 0;
> 	}
>+	
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.pde.api.tools.internal.provisional.search.IApiSearchRequestor#includesUnresolvedReferences()
>+	 */
>+	public boolean includesUnresolvedReferences() {
>+		return (fSearchMask & INCLUDE_UNRESOLVED_REFERENCES) > 0;
>+	}
> }
>Index: src_ant/org/eclipse/pde/api/tools/internal/tasks/CompareTask.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/apitools/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/CompareTask.java,v
>retrieving revision 1.10
>diff -u -r1.10 CompareTask.java
>--- src_ant/org/eclipse/pde/api/tools/internal/tasks/CompareTask.java	5 Aug 2009 16:46:12 -0000	1.10
>+++ src_ant/org/eclipse/pde/api/tools/internal/tasks/CompareTask.java	7 Aug 2009 14:31:14 -0000
>@@ -94,7 +94,7 @@
> 			IApiComponent[] apiComponents = currentBaseline.getApiComponents();
> 			String[] componentsNames = this.componentsList.split(","); //$NON-NLS-1$
> 			if (componentsNames.length == 0) {
>-				scope.add(currentBaseline);
>+				scope.addElement(currentBaseline);
> 			} else {
> 				for (int i = 0, max = componentsNames.length; i < max; i++) {
> 					String componentName = componentsNames[i];
>@@ -110,7 +110,7 @@
> 								String componentId = apiComponent.getId();
> 								Matcher matcher = pattern.matcher(componentId);
> 								if (matcher.matches()) {
>-									scope.add(apiComponent);
>+									scope.addElement(apiComponent);
> 								}
> 							}
> 						} catch (PatternSyntaxException e) {
>@@ -121,13 +121,13 @@
> 					} else {
> 						IApiComponent apiComponent = currentBaseline.getApiComponent(componentName);
> 						if (apiComponent != null) {
>-							scope.add(apiComponent);
>+							scope.addElement(apiComponent);
> 						}
> 					}
> 				}
> 			}
> 		} else {
>-			scope.add(currentBaseline);
>+			scope.addElement(currentBaseline);
> 		}
> 		try {
> 			delta = ApiComparator.compare(scope, referenceBaseline, this.visibilityModifiers);
>Index: src/org/eclipse/pde/api/tools/internal/provisional/comparator/ApiScope.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/provisional/comparator/ApiScope.java,v
>retrieving revision 1.6
>diff -u -r1.6 ApiScope.java
>--- src/org/eclipse/pde/api/tools/internal/provisional/comparator/ApiScope.java	6 Jul 2009 18:27:08 -0000	1.6
>+++ src/org/eclipse/pde/api/tools/internal/provisional/comparator/ApiScope.java	7 Aug 2009 14:31:14 -0000
>@@ -11,6 +11,7 @@
> package org.eclipse.pde.api.tools.internal.provisional.comparator;
> 
> import java.util.HashSet;
>+import java.util.Iterator;
> import java.util.Set;
> 
> import org.eclipse.core.runtime.CoreException;
>@@ -37,7 +38,7 @@
> 	/**
> 	 * Contains all API elements of this scope
> 	 */
>-	Set apiElements;
>+	Set elements;
> 
> 	/* (non-Javadoc)
> 	 * @see org.eclipse.pde.api.tools.internal.provisional.model.IApiScope#accept(org.eclipse.pde.api.tools.internal.provisional.model.ApiScopeVisitor)
>@@ -84,18 +85,40 @@
> 		}
> 	}
> 
>-	public void add(IApiElement apiElement) {
>-		if (this.apiElements == null) {
>-			this.apiElements = new HashSet();
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.pde.api.tools.internal.provisional.model.IApiScope#addElement(org.eclipse.pde.api.tools.internal.provisional.model.IApiElement)
>+	 */
>+	public void addElement(IApiElement newelement) {
>+		if (this.elements == null) {
>+			this.elements = new HashSet();
> 		}
>-		this.apiElements.add(apiElement);
>+		this.elements.add(newelement);
> 	}
> 
> 	/* (non-Javadoc)
>+	 * @see org.eclipse.pde.api.tools.internal.provisional.model.IApiScope#encloses(org.eclipse.pde.api.tools.internal.provisional.model.IApiElement)
>+	 */
>+	public boolean encloses(IApiElement element) {
>+		if(element != null) {
>+			IApiComponent component = element.getApiComponent();
>+			IApiComponent enclosing = null;
>+			for(Iterator iter = this.elements.iterator(); iter.hasNext();) {
>+				enclosing = ((IApiElement)iter.next()).getApiComponent();
>+				if(component.equals(enclosing)) {
>+					return true;
>+				}
>+			}
>+		}
>+		return false;
>+	}
>+	
>+	/* (non-Javadoc)
> 	 * @see org.eclipse.pde.api.tools.internal.provisional.model.IApiScope#getApiElement()
> 	 */
> 	public IApiElement[] getApiElements() {
>-		if (this.apiElements == null || this.apiElements.size() == 0) return NO_ELEMENTS;
>-		return (IApiElement[]) this.apiElements.toArray(new IApiElement[this.apiElements.size()]);
>+		if (this.elements == null || this.elements.size() == 0) {
>+			return NO_ELEMENTS;
>+		}
>+		return (IApiElement[]) this.elements.toArray(new IApiElement[this.elements.size()]);
> 	}
> }
>#P org.eclipse.pde.api.tools.tests
>Index: src/org/eclipse/pde/api/tools/search/tests/TestRequestor.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/search/tests/TestRequestor.java,v
>retrieving revision 1.1
>diff -u -r1.1 TestRequestor.java
>--- src/org/eclipse/pde/api/tools/search/tests/TestRequestor.java	17 Mar 2009 17:05:19 -0000	1.1
>+++ src/org/eclipse/pde/api/tools/search/tests/TestRequestor.java	7 Aug 2009 14:31:15 -0000
>@@ -10,7 +10,6 @@
>  *******************************************************************************/
> package org.eclipse.pde.api.tools.search.tests;
> 
>-import java.util.ArrayList;
> import java.util.HashSet;
> 
> import org.eclipse.core.runtime.CoreException;
>@@ -18,13 +17,13 @@
> import org.eclipse.pde.api.tools.internal.provisional.IApiAnnotations;
> import org.eclipse.pde.api.tools.internal.provisional.VisibilityModifiers;
> import org.eclipse.pde.api.tools.internal.provisional.builder.IReference;
>+import org.eclipse.pde.api.tools.internal.provisional.comparator.ApiScope;
> import org.eclipse.pde.api.tools.internal.provisional.model.IApiBaseline;
> import org.eclipse.pde.api.tools.internal.provisional.model.IApiComponent;
> import org.eclipse.pde.api.tools.internal.provisional.model.IApiElement;
> import org.eclipse.pde.api.tools.internal.provisional.model.IApiMember;
>+import org.eclipse.pde.api.tools.internal.provisional.model.IApiScope;
> import org.eclipse.pde.api.tools.internal.provisional.search.IApiSearchRequestor;
>-import org.eclipse.pde.api.tools.internal.provisional.search.IApiSearchScope;
>-import org.eclipse.pde.api.tools.internal.search.ApiUseSearchScope;
> import org.eclipse.pde.api.tools.internal.util.Util;
> 
> /**
>@@ -38,7 +37,7 @@
> 	private int searchmask = 0;
> 	private HashSet<String> excluded = new HashSet<String>();
> 	private SearchTest test = null;
>-	private IApiSearchScope scope = null;
>+	private IApiScope scope = null;
> 	
> 	/**
> 	 * Constructor
>@@ -121,24 +120,23 @@
> 	/* (non-Javadoc)
> 	 * @see org.eclipse.pde.api.tools.internal.provisional.search.IApiSearchRequestor#getScope()
> 	 */
>-	public IApiSearchScope getScope() {
>+	public IApiScope getScope() {
> 		if(this.scopebaseline == null) {
> 			return null;
> 		}
> 		if(this.scope == null) {
> 			try {
> 				IApiComponent[] comps = this.scopebaseline.getApiComponents();
>-				ArrayList<IApiComponent> clist = new ArrayList<IApiComponent>(comps.length);
>+				this.scope = new ApiScope();
> 				for (int i = 0; i < comps.length; i++) {
> 					if(comps[i].isSystemComponent()) {
> 						//never include system libraries in the tests
> 						continue;
> 					}
> 					if(acceptComponent0(comps[i])) {
>-						clist.add(comps[i]);
>+						this.scope.addElement(comps[i]);
> 					}
> 				}
>-				this.scope = new ApiUseSearchScope(clist.toArray(new IApiComponent[clist.size()]));
> 			}
> 			catch(Exception e) {
> 				this.test.reportFailure(e.getMessage());
>@@ -199,6 +197,13 @@
> 		return (this.searchmask & INCLUDE_NON_API_ENABLED_PROJECTS) > 0;
> 	}
> 	
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.pde.api.tools.internal.provisional.search.IApiSearchRequestor#includesUnresolvedReferences()
>+	 */
>+	public boolean includesUnresolvedReferences() {
>+		return (this.searchmask & INCLUDE_UNRESOLVED_REFERENCES) > 0;
>+	}
>+	
> 	/**
> 	 * Sets the {@link IApiBaseline} to derive the scope from
> 	 * @param baseline
>Index: src/org/eclipse/pde/api/tools/comparator/tests/ApiScopeDeltaTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/comparator/tests/ApiScopeDeltaTests.java,v
>retrieving revision 1.1
>diff -u -r1.1 ApiScopeDeltaTests.java
>--- src/org/eclipse/pde/api/tools/comparator/tests/ApiScopeDeltaTests.java	17 Mar 2009 15:51:42 -0000	1.1
>+++ src/org/eclipse/pde/api/tools/comparator/tests/ApiScopeDeltaTests.java	7 Aug 2009 14:31:15 -0000
>@@ -60,7 +60,7 @@
> 		IApiComponent afterApiComponent = after.getApiComponent(BUNDLE_NAME);
> 		assertNotNull("no api component", afterApiComponent);
> 		ApiScope scope = new ApiScope();
>-		scope.add(after);
>+		scope.addElement(after);
> 		IApiElement[] apiElement = scope.getApiElements();
> 		assertEquals("Empty", 1, apiElement.length);
> 		IDelta delta = ApiComparator.compare(scope, before, VisibilityModifiers.API);
>@@ -87,7 +87,7 @@
> 		ApiScope scope = new ApiScope();
> 		IApiComponent[] apiComponents = after.getApiComponents();
> 		for (int i = 0, max = apiComponents.length; i < max; i++) {
>-			scope.add(apiComponents[i]);
>+			scope.addElement(apiComponents[i]);
> 		}
> 		IDelta delta = ApiComparator.compare(scope, before, VisibilityModifiers.API, true);
> 		assertNotNull("No delta", delta);
>@@ -116,7 +116,7 @@
> 			IApiTypeContainer[] apiTypeContainers = apiComponents[i].getApiTypeContainers();
> 			for (int j = 0; j < apiTypeContainers.length; j++) {
> 				IApiTypeContainer iApiTypeContainer = apiTypeContainers[j];
>-				scope.add(iApiTypeContainer);
>+				scope.addElement(iApiTypeContainer);
> 			}
> 		}
> 		IDelta delta = ApiComparator.compare(scope, before, VisibilityModifiers.API, true);
>@@ -151,7 +151,7 @@
> 			}
> 		}
> 		if (root != null) {
>-			scope.add(root);
>+			scope.addElement(root);
> 		}
> 		IDelta delta = ApiComparator.compare(scope, before, VisibilityModifiers.API, true);
> 		assertNotNull("No delta", delta);
>@@ -190,7 +190,7 @@
> 			IApiType structure = root.getStructure();
> 			IApiMethod[] methods = structure.getMethods();
> 			for (int i = 0, max = methods.length; i < max; i++) {
>-				scope.add(methods[i]);
>+				scope.addElement(methods[i]);
> 			}
> 		}
> 		try {
>@@ -212,7 +212,7 @@
> 		IApiComponent afterApiComponent = after.getApiComponent(BUNDLE_NAME);
> 		assertNotNull("no api component", afterApiComponent);
> 		ApiScope scope = new ApiScope();
>-		scope.add(after);
>+		scope.addElement(after);
> 		IDelta delta = ApiComparator.compare(scope, before, VisibilityModifiers.API);
> 		assertNotNull("No delta", delta);
> 		assertTrue("Not NO_DELTA", delta == ApiComparator.NO_DELTA);
>@@ -229,7 +229,7 @@
> 		IApiComponent afterApiComponent = after.getApiComponent(BUNDLE_NAME);
> 		assertNotNull("no api component", afterApiComponent);
> 		ApiScope scope = new ApiScope();
>-		scope.add(after);
>+		scope.addElement(after);
> 		try {
> 			ApiComparator.compare((IApiScope) null, before, VisibilityModifiers.API);
> 			assertFalse("Should not be there", true);
>#P org.eclipse.pde.api.tools.ui
>Index: src/org/eclipse/pde/api/tools/ui/internal/wizards/CompareOperation.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/CompareOperation.java,v
>retrieving revision 1.3
>diff -u -r1.3 CompareOperation.java
>--- src/org/eclipse/pde/api/tools/ui/internal/wizards/CompareOperation.java	8 May 2009 19:19:02 -0000	1.3
>+++ src/org/eclipse/pde/api/tools/ui/internal/wizards/CompareOperation.java	7 Aug 2009 14:31:16 -0000
>@@ -169,7 +169,7 @@
> 						case IJavaElement.JAVA_PROJECT:
> 							IApiComponent apiComponent = workspaceBaseline.getApiComponent(javaProject.getElementName());
> 							if (apiComponent != null) {
>-								scope.add(apiComponent);
>+								scope.addElement(apiComponent);
> 							}
> 							break;
> 					}
>@@ -225,7 +225,7 @@
> 		try {
> 			IApiTypeRoot typeRoot = apiComponent.findTypeRoot(classFile.getType().getFullyQualifiedName());
> 			if (typeRoot != null) {
>-				scope.add(typeRoot);
>+				scope.addElement(typeRoot);
> 			}
> 		} catch (CoreException e) {
> 			ApiPlugin.log(e);
>@@ -238,7 +238,7 @@
> 			try {
> 				IApiTypeRoot typeRoot = component.findTypeRoot(types[i].getFullyQualifiedName());
> 				if (typeRoot != null) {
>-					scope.add(typeRoot);
>+					scope.addElement(typeRoot);
> 				}
> 			} catch (CoreException e) {
> 				ApiPlugin.log(e);

Actions: View | Diff

Attachments on bug 268985: 143775