Attachment 59563 Details for Bug 174349 – Enhancement inside patch

[patch] Enhancement inside patch

patch_174349_20070222.txt (text/plain), 2.03 KB, created by Krzysztof Michalski

on 2007-02-22 09:02:07 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof Michalski

Created: 2007-02-22 09:02:07 EST

Size: 2.03 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/dialogs/SearchPattern.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/SearchPattern.java,v
>retrieving revision 1.9
>diff -u -r1.9 SearchPattern.java
>--- Eclipse UI/org/eclipse/ui/dialogs/SearchPattern.java	4 Jan 2007 15:53:33 -0000	1.9
>+++ Eclipse UI/org/eclipse/ui/dialogs/SearchPattern.java	22 Feb 2007 13:58:57 -0000
>@@ -212,6 +212,12 @@
> 			return;
> 		}
> 
>+		if (validateMatchRule(pattern, RULE_CAMELCASE_MATCH) == RULE_CAMELCASE_MATCH) {
>+			matchRule = RULE_CAMELCASE_MATCH;
>+			stringPattern = pattern;
>+			return;
>+		}
>+		
> 		if (last == END_SYMBOL) {
> 			matchRule = RULE_EXACT_MATCH;
> 			stringPattern = pattern.substring(0, length - 1);
>@@ -224,12 +230,6 @@
> 			return;
> 		}
> 
>-		if (validateMatchRule(pattern, RULE_CAMELCASE_MATCH) == RULE_CAMELCASE_MATCH) {
>-			matchRule = RULE_CAMELCASE_MATCH;
>-			stringPattern = pattern;
>-			return;
>-		}
>-
> 		matchRule = RULE_PREFIX_MATCH;
> 		stringPattern = pattern;
> 
>@@ -483,13 +483,21 @@
> 			// name
> 			while (true) {
> 				if (iName == nameEnd) {
>-					// We have exhausted name (and not pattern), so it's not a
>-					// match
>+					if (patternChar == END_SYMBOL || patternChar == BLANK)
>+						return true;
> 					return false;
> 				}
> 
> 				nameChar = name.charAt(iName);
> 
>+				if (patternChar == END_SYMBOL || patternChar == BLANK) {
>+					if (isNameCharAllowed(nameChar)) {
>+						return false;
>+					}
>+					iName++;
>+					continue;
>+				}
>+
> 				if (!isNameCharAllowed(nameChar)) {
> 					// nameChar is lowercase
> 					iName++;
>@@ -516,7 +524,7 @@
> 	 * @return true if patternChar is in set of allowed characters for pattern
> 	 */
> 	protected boolean isPatternCharAllowed(char patternChar) {
>-		return Character.isUpperCase(patternChar);
>+		return Character.isUpperCase(patternChar) || patternChar == END_SYMBOL || patternChar == BLANK;
> 	}
> 
> 	/**

Actions: View | Diff

Attachments on bug 174349: 59563 | 59802 | 59856 | 68637 | 68638 | 68647 | 68650