### Eclipse Workspace Patch 1.0 #P org.eclipse.jdt.core Index: model/org/eclipse/jdt/internal/core/JavaElement.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaElement.java,v retrieving revision 1.138 diff -u -r1.138 JavaElement.java --- model/org/eclipse/jdt/internal/core/JavaElement.java 30 Mar 2010 05:39:36 -0000 1.138 +++ model/org/eclipse/jdt/internal/core/JavaElement.java 22 Apr 2010 17:41:59 -0000 @@ -31,6 +31,7 @@ import org.eclipse.jdt.core.dom.ASTNode; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jdt.internal.compiler.lookup.Binding; +import org.eclipse.jdt.internal.core.search.BasicSearchEngine; import org.eclipse.jdt.internal.core.util.MementoTokenizer; import org.eclipse.jdt.internal.core.util.Util; @@ -154,9 +155,14 @@ try { getElementInfo(); + if (BasicSearchEngine.VERBOSE) + System.out.println("JavaElement#exists " + this); //$NON-NLS-1$ return true; } catch (JavaModelException e) { // element doesn't exist: return false + if (BasicSearchEngine.VERBOSE) + System.out.println("Logged an exception for " + this); //$NON-NLS-1$ + Util.log(e); } return false; } Index: search/org/eclipse/jdt/internal/core/search/JavaSearchScope.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/JavaSearchScope.java,v retrieving revision 1.79 diff -u -r1.79 JavaSearchScope.java --- search/org/eclipse/jdt/internal/core/search/JavaSearchScope.java 7 Jan 2010 20:18:50 -0000 1.79 +++ search/org/eclipse/jdt/internal/core/search/JavaSearchScope.java 22 Apr 2010 17:41:59 -0000 @@ -581,6 +581,8 @@ * @see AbstractJavaSearchScope#packageFragmentRoot(String, int, String) */ public IPackageFragmentRoot packageFragmentRoot(String resourcePathString, int jarSeparatorIndex, String jarPath) { + if (BasicSearchEngine.VERBOSE) + System.out.println("PackageFragmentRoot for " + resourcePathString); //$NON-NLS-1$ int index = -1; boolean isJarFile = jarSeparatorIndex != -1; if (isJarFile) { @@ -592,6 +594,8 @@ index = indexOf(resourcePathString); } if (index >= 0) { + if (BasicSearchEngine.VERBOSE) + System.out.println("PackageFragmentRoot RelativePath " + this.relativePaths[index]); //$NON-NLS-1$ int idx = this.projectIndexes[index]; String projectPath = idx == -1 ? null : (String) this.projectPaths.get(idx); if (projectPath != null) { Index: search/org/eclipse/jdt/internal/core/search/TypeNameMatchRequestorWrapper.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/TypeNameMatchRequestorWrapper.java,v retrieving revision 1.15 diff -u -r1.15 TypeNameMatchRequestorWrapper.java --- search/org/eclipse/jdt/internal/core/search/TypeNameMatchRequestorWrapper.java 4 Dec 2009 09:12:10 -0000 1.15 +++ search/org/eclipse/jdt/internal/core/search/TypeNameMatchRequestorWrapper.java 22 Apr 2010 17:41:59 -0000 @@ -181,9 +181,11 @@ && (rootPathLength = this.lastPkgFragmentRootPath.length()) > 0 && resourcePath.charAt(rootPathLength) == '/')) { PackageFragmentRoot root = (PackageFragmentRoot) ((AbstractJavaSearchScope)this.scope).packageFragmentRoot(resourcePath, -1/*not a jar*/, null/*no jar path*/); - if (root == null) return null; + if (root == null) return null; this.lastPkgFragmentRoot = root; this.lastPkgFragmentRootPath = root.internalPath().toString(); + if (BasicSearchEngine.VERBOSE) + System.out.println("Got PackageFragmentRoot " + this.lastPkgFragmentRootPath); //$NON-NLS-1$ this.packageHandles = new HashtableOfArrayToObject(5); } // create handle @@ -202,6 +204,8 @@ pkgFragment= ((PackageFragmentRoot) this.lastPkgFragmentRoot).getPackageFragment(pkgName); this.packageHandles.put(pkgName, pkgFragment); } + if (BasicSearchEngine.VERBOSE) + System.out.println("Package Fragment for " + pkgName + " is " + pkgFragment); //$NON-NLS-1$ //$NON-NLS-2$ String simpleName= simpleNames[length]; if (org.eclipse.jdt.internal.core.util.Util.isJavaLikeFileName(simpleName)) { ICompilationUnit unit= pkgFragment.getCompilationUnit(simpleName);