Attachment 161994 Details for Bug 305755 – Proposed fix

[patch] Proposed fix

patch_305755.txt (text/plain), 4.28 KB, created by Olivier Thomann

on 2010-03-14 18:40:47 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2010-03-14 18:40:47 EDT

Size: 4.28 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: search/org/eclipse/jdt/core/search/SearchEngine.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/search/org/eclipse/jdt/core/search/SearchEngine.java,v
>retrieving revision 1.149
>diff -u -r1.149 SearchEngine.java
>--- search/org/eclipse/jdt/core/search/SearchEngine.java	13 Jan 2010 17:38:20 -0000	1.149
>+++ search/org/eclipse/jdt/core/search/SearchEngine.java	14 Mar 2010 22:40:06 -0000
>@@ -190,37 +190,6 @@
> 
> 	/**
> 	 * Returns a Java search scope limited to the hierarchy of the given type and to a given project.
>-	 * The Java elements resulting from a search with this scope will be types in this hierarchy,
>-	 * or members or enclosing types of the types in this hierarchy.
>-	 * 
>-	 * By default, hierarchy scopes include all direct and indirect supertypes and subtypes of the
>-	 * focus type. This method, however, allows to restrict the hierarchy to true subtypes,
>-	 * neither including supertypes nor the focus type itself.
>-	 * 
>-	 * 
>-	 * By default, hierarchy scopes include also member types and enclosing types of those types
>-	 * that actually span the hierarchy. This method, however, allows to inhibit this behavior,
>-	 * by passing <code>true</code> to the parameter <code>noMemberTypes</code>.
>-	 * 
>-	 * 
>-	 * @param project the project to which to constrain the search, or <code>null</code> if
>-	 * search should consider all types in the workspace 
>-	 * @param type the focus of the hierarchy scope
>-	 * @param onlySubtypes if true only subtypes of <code>type</code> are considered
>-	 * @param noMemberTypes if true do not consider member or enclosing types of types in the given type hiearchy
>-	 * @param owner the owner of working copies that take precedence over original compilation units, 
>-	 * or <code>null</code> if the primary working copy owner should be used
>-	 * @return a new hierarchy scope
>-	 * @exception JavaModelException if the hierarchy could not be computed on the given type
>-	 * @deprecated Will be removed shortly before 3.6M5. Use {@link #createStrictHierarchyScope(IJavaProject, IType, boolean, boolean, WorkingCopyOwner)} instead.
>-	 * @since 3.6
>-	 */
>-	public static IJavaSearchScope createHierarchyScope(IJavaProject project, IType type, boolean onlySubtypes, boolean noMemberTypes, WorkingCopyOwner owner) throws JavaModelException {
>-		return BasicSearchEngine.createHierarchyScope(project, type, onlySubtypes, noMemberTypes, owner);
>-	}
>-
>-	/**
>-	 * Returns a Java search scope limited to the hierarchy of the given type and to a given project.
> 	 * The Java elements resulting from a search with this scope will be types in this hierarchy.
> 	 * 
> 	 * Unlike the <code>createHierarchyScope</code> methods, this method creates strict
>Index: search/org/eclipse/jdt/internal/core/search/BasicSearchEngine.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/BasicSearchEngine.java,v
>retrieving revision 1.63
>diff -u -r1.63 BasicSearchEngine.java
>--- search/org/eclipse/jdt/internal/core/search/BasicSearchEngine.java	13 Jan 2010 17:38:20 -0000	1.63
>+++ search/org/eclipse/jdt/internal/core/search/BasicSearchEngine.java	14 Mar 2010 22:40:07 -0000
>@@ -109,14 +109,6 @@
> 	}
> 
> 	/**
>-	 * @see SearchEngine#createHierarchyScope(IJavaProject,IType,boolean,boolean,WorkingCopyOwner) for detailed comment.
>-	 * @deprecated Will be removed shortly before 3.6M5. Use {@link #createHierarchyScope(IJavaProject, IType, boolean, boolean, WorkingCopyOwner)} instead.
>-	 */
>-	public static IJavaSearchScope createHierarchyScope(IJavaProject project, IType type, boolean onlySubtypes, boolean noMemberTypes, WorkingCopyOwner owner) throws JavaModelException {
>-		return new HierarchyScope(project, type, owner, onlySubtypes, noMemberTypes, !onlySubtypes);
>-	}
>-
>-	/**
> 	 * @see SearchEngine#createStrictHierarchyScope(IJavaProject,IType,boolean,boolean,WorkingCopyOwner) for detailed comment.
> 	 */
> 	public static IJavaSearchScope createStrictHierarchyScope(IJavaProject project, IType type, boolean onlySubtypes, boolean includeFocusType, WorkingCopyOwner owner) throws JavaModelException {

Actions: View | Diff

Attachments on bug 305755: 161950 | 161994