From 42e7ccb4628387d3a7415ac965083ba9f9c79c1e Mon Sep 17 00:00:00 2001 From: Bogdan Gheorghe Date: Mon, 16 Aug 2004 15:18:19 +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 f6810941ffe..5ba00350d0e 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-13 Chris Wiebe add namespace to class wizard. 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;