From e7ebb3a57aabbf4eb31ba8b6109f98e9d740c182 Mon Sep 17 00:00:00 2001
From: Alain Magloire <alain@qnx.com>
Date: Sun, 23 Jan 2005 04:46:25 +0000
Subject: [PATCH] 2005-01-22 Alain Magloire 	PR 38958 	*
 src/org/eclipse/cdt/internal/ui/viewsupport/CElementImageProvider.java

---
 core/org.eclipse.cdt.ui/ChangeLog             |  8 +++-
 .../ui/viewsupport/CElementImageProvider.java | 42 +++++++++++--------
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index a6592109a89..b81433fa8bf 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,5 +1,9 @@
-2005-01-20
-	PR 82964
+2005-01-22 Alain Magloire
+	PR 38958
+	* src/org/eclipse/cdt/internal/ui/viewsupport/CElementImageProvider.java
+
+2005-01-20 Alain Magloire
+	PR 82964 patch form Przemek
 	* icons/full/cview16/view_menu.gif
 	* src/org/eclipse/cdt/internal.ui/CPluginImages.java
 	* src/org/eclipse/cdt/internal/ui/actions/ActionMessages.properties
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementImageProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementImageProvider.java
index bd6ca9d2c5a..104ce60b791 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementImageProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementImageProvider.java
@@ -181,7 +181,10 @@ public class CElementImageProvider {
 				
 			case ICElement.C_FUNCTION:
 				return CPluginImages.DESC_OBJS_FUNCTION;
-		
+
+			case ICElement.C_STRUCT_DECLARATION:
+			case ICElement.C_CLASS_DECLARATION:
+			case ICElement.C_UNION_DECLARATION:
 			case ICElement.C_VARIABLE_DECLARATION:
 				return CPluginImages.DESC_OBJS_VAR_DECLARARION;
 			
@@ -337,34 +340,37 @@ public class CElementImageProvider {
 				return getEnumeratorImageDescriptor();
 
 			case ICElement.C_FIELD:
-			try {
-				IField  field = (IField)celement;
-				ASTAccessVisibility visibility = field.getVisibility();
-				return getFieldImageDescriptor(visibility);
-			} catch (CModelException e) {
-				return null;
-			}
+				try {
+					IField  field = (IField)celement;
+					ASTAccessVisibility visibility = field.getVisibility();
+					return getFieldImageDescriptor(visibility);
+				} catch (CModelException e) {
+					return null;
+				}
 			
 			case ICElement.C_METHOD:  
 			case ICElement.C_METHOD_DECLARATION:
 			case ICElement.C_TEMPLATE_METHOD:
-			try {
-				
-				IMethodDeclaration  md= (IMethodDeclaration)celement;
-				ASTAccessVisibility visibility =md.getVisibility();
-				return getMethodImageDescriptor(visibility); 
-			} catch (CModelException e) {
-				return null;
-			}
+				try {
+					
+					IMethodDeclaration  md= (IMethodDeclaration)celement;
+					ASTAccessVisibility visibility =md.getVisibility();
+					return getMethodImageDescriptor(visibility); 
+				} catch (CModelException e) {
+					return null;
+				}
 			case ICElement.C_VARIABLE:
 			case ICElement.C_TEMPLATE_VARIABLE:
 				return getVariableImageDescriptor();
 				
 			case ICElement.C_FUNCTION:
 				return getFunctionImageDescriptor();
-		
+
+			case ICElement.C_STRUCT_DECLARATION:
+			case ICElement.C_CLASS_DECLARATION:
+			case ICElement.C_UNION_DECLARATION:
 			case ICElement.C_VARIABLE_DECLARATION:
-			return getVariableDeclarationImageDescriptor();
+				return getVariableDeclarationImageDescriptor();
 			
 			case ICElement.C_FUNCTION_DECLARATION:
 			case ICElement.C_TEMPLATE_FUNCTION: