Attachment 126482 Details for Bug 265630 – Proposed patch

[patch] Proposed patch

v02.txt (text/plain), 1.95 KB, created by Frederic Fusier

on 2009-02-23 12:42:47 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Frederic Fusier

Created: 2009-02-23 12:42:47 EST

Size: 1.95 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: model/org/eclipse/jdt/internal/core/NameLookup.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/NameLookup.java,v
>retrieving revision 1.123
>diff -u -r1.123 NameLookup.java
>--- model/org/eclipse/jdt/internal/core/NameLookup.java	17 Feb 2009 10:39:56 -0000	1.123
>+++ model/org/eclipse/jdt/internal/core/NameLookup.java	23 Feb 2009 17:10:09 -0000
>@@ -508,19 +508,20 @@
> 	 *		<code>false</code> otherwise.
> 	 */
> 	public IPackageFragment[] findPackageFragments(String name, boolean partialMatch, boolean patternMatch) {
>-		boolean hasPatternChars = patternMatch && (name.indexOf('*') >= 0 || name.indexOf('?') >= 0);
>+		boolean isStarPattern = name.equals("*"); //$NON-NLS-1$
>+		boolean hasPatternChars = isStarPattern || (patternMatch && (name.indexOf('*') >= 0 || name.indexOf('?') >= 0));
> 		if (partialMatch || hasPatternChars) {
> 			String[] splittedName = Util.splitOn('.', name, 0, name.length());
> 			IPackageFragment[] oneFragment = null;
> 			ArrayList pkgs = null;
>-			char[] lowercaseName = name.toLowerCase().toCharArray();
>+			char[] lowercaseName = hasPatternChars && !isStarPattern ? name.toLowerCase().toCharArray() : null;
> 			Object[][] keys = this.packageFragments.keyTable;
> 			for (int i = 0, length = keys.length; i < length; i++) {
> 				String[] pkgName = (String[]) keys[i];
> 				if (pkgName != null) {
>-					boolean match = hasPatternChars
>+					boolean match = isStarPattern || (hasPatternChars
> 						? CharOperation.match(lowercaseName, Util.concatCompoundNameToCharArray(pkgName), false)
>-						: Util.startsWithIgnoreCase(pkgName, splittedName, partialMatch);
>+						: Util.startsWithIgnoreCase(pkgName, splittedName, partialMatch));
> 					if (match) {
> 						Object value = this.packageFragments.valueTable[i];
> 						if (value instanceof PackageFragmentRoot) {

Actions: View | Diff

Attachments on bug 265630: 126482