Attachment 60941 Details for Bug 168354 – patch

[patch] patch

168354.patch (text/plain), 2.50 KB, created by Martin Aeschlimann

on 2007-03-15 10:11:12 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Aeschlimann

Created: 2007-03-15 10:11:12 EDT

Size: 2.50 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.ui
>Index: ui/org/eclipse/jdt/internal/ui/InterfaceIndicatorLabelDecorator.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/InterfaceIndicatorLabelDecorator.java,v
>retrieving revision 1.8
>diff -u -r1.8 InterfaceIndicatorLabelDecorator.java
>--- ui/org/eclipse/jdt/internal/ui/InterfaceIndicatorLabelDecorator.java	7 Feb 2007 14:50:54 -0000	1.8
>+++ ui/org/eclipse/jdt/internal/ui/InterfaceIndicatorLabelDecorator.java	15 Mar 2007 11:49:16 -0000
>@@ -159,24 +159,22 @@
> 				if (mainType != null) {
> 					return getOverlayFromFlags(mainType.getFlags());
> 				}
>+				return null;
> 			}
>-			return getOverlayWithSearchEngine(unit, null);
>+			String typeName= JavaCore.removeJavaLikeExtension(unit.getElementName());
>+			return getOverlayWithSearchEngine(unit, typeName);
> 		} else if (element instanceof IClassFile) {
> 			IClassFile classFile= (IClassFile) element;
> 			if (classFile.isOpen()) {
> 				return getOverlayFromFlags(classFile.getType().getFlags());
> 			}
>-			/*
>-			 * XXX: This optimization can be removed once JDT Core does
>-			 * it itself, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=168354
>-			 */
> 			String typeName= classFile.getType().getElementName();
>-			return getOverlayWithSearchEngine(classFile, typeName.toCharArray());
>+			return getOverlayWithSearchEngine(classFile, typeName);
> 		}
> 		return null;
> 	}
> 	
>-	private ImageDescriptor getOverlayWithSearchEngine(ITypeRoot element, char[] typeName) {
>+	private ImageDescriptor getOverlayWithSearchEngine(ITypeRoot element, String typeName) {
> 		SearchEngine engine= new SearchEngine();
> 		IJavaSearchScope scope= SearchEngine.createJavaSearchScope(new IJavaElement[] { element });
> 		
>@@ -197,7 +195,9 @@
> 		};
> 		
> 		try {
>-			engine.searchAllTypeNames(null, SearchPattern.R_EXACT_MATCH, typeName, SearchPattern.R_EXACT_MATCH, IJavaSearchConstants.TYPE, scope, requestor, IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH , null);
>+			String packName = element.getParent().getElementName();
>+			int matchRule = SearchPattern.R_EXACT_MATCH | SearchPattern.R_CASE_SENSITIVE;
>+			engine.searchAllTypeNames(packName.toCharArray(), matchRule, typeName.toCharArray(), matchRule, IJavaSearchConstants.TYPE, scope, requestor, IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH , null);
> 		} catch (Result e) {
> 			return getOverlayFromFlags(e.modifiers);
> 		} catch (JavaModelException e) {

Actions: View | Diff

Attachments on bug 168354: 55954 | 55955 | 55956 | 55957 | 60909 | 60913 | 60941