From 848b4c999ba5143eedcc6971ad94fbf15c3a85a4 Mon Sep 17 00:00:00 2001 From: Bogdan Gheorghe Date: Mon, 16 Aug 2004 14:56:24 +0000 Subject: [PATCH] Fix for 70113: Search for Template member declarations causes Assertion --- core/org.eclipse.cdt.ui/ChangeLog | 3 +++ .../org/eclipse/cdt/ui/CSearchResultLabelProvider.java | 10 ++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index 14ce1937149..b0e7f77102f 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,6 @@ +2004-08-16 Bogdan Gheorghe + Fix for 70113: Search for Template member declarations causes Assertion + 2004-08-03 Tanya Wolff Fix for 71033: English "Find Refs" in Workbench Key preferences. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CSearchResultLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CSearchResultLabelProvider.java index 1fb6f77ea5f..a0083e97d80 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CSearchResultLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CSearchResultLabelProvider.java @@ -93,7 +93,7 @@ public class CSearchResultLabelProvider extends LabelProvider { } - + int flags = 0; ImageDescriptor imageDescriptor = null; switch( elementType ){ @@ -128,9 +128,15 @@ public class CSearchResultLabelProvider extends LabelProvider { } break; } + + case ICElement.C_TEMPLATE_CLASS:{ + imageDescriptor = CPluginImages.DESC_OBJS_CLASS; + flags |= CElementImageDescriptor.TEMPLATE; + break; + } } - int flags = 0; + if (match != null){ if( match.isStatic() ) flags |= CElementImageDescriptor.STATIC;