From 1df94abba2c6550165e2f63dd70e21721ab73e09 Mon Sep 17 00:00:00 2001
From: Alain Magloire <alain@qnx.com>
Date: Thu, 18 Mar 2004 22:51:00 +0000
Subject: [PATCH] New icons

---
 core/org.eclipse.cdt.ui/ChangeLog               |   6 ++++++
 .../icons/full/obj16/cfolder_obj.gif            | Bin 173 -> 166 bytes
 .../ui/BaseCElementContentProvider.java         |   6 ++++--
 .../cdt/internal/ui/CElementImageProvider.java  |  14 ++++++++++++++
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 4c53a70b856..c1aca9319b5 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-18 Alain Magloire
+	New icons
+	* icons/full/obj16/cfolder_obj.gif
+	* src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java
+	* src/org/eclipse/cdt/internal/ui/CElementImageProvider.java
+
 2004-03-18 Alain Magloire
 	Change in the hierarchy of the core Model:
 	ICModel
diff --git a/core/org.eclipse.cdt.ui/icons/full/obj16/cfolder_obj.gif b/core/org.eclipse.cdt.ui/icons/full/obj16/cfolder_obj.gif
index f0ca8bca73fba9de30efc09ffabda6bd2ec2022e..b6fedd4bb49925ae607524930070c0f654ad8569 100644
GIT binary patch
delta 138
zcmZ3>xQtQA-P6s&GEsm*fMGKOgSk&fRsTc@)qDmpQ2fcl$iTqOpabH8lrXRa7o7B5
zz4bxZf$C{a8XgV_v*tJPa4eeUIEiKEhI<_1^XDA+xAqdx)(wo229j$zR4nEPGzmHy
mM6AEo+~j#QY3qV@=DS%1`CgRl($Uno_hCnx-*R^b25SJc)-F*1

delta 145
zcmZ3+xRz1E-P6s&GEsm*fMGKOgSk&fc;1q#{=JJfPZUxuQ2fcl$iTqMpu+$JASDbe
zQ5#Nru3qZQV)*Wg(+*!3Pm{yj)<hlGXkBFRQ0N{b<NL0vb_S=M6)XOlSS2Z{M%-jz
xet6DdZ4|F(E91epMZ!I8C9mH$sah3D7P?6beW<Xpu{3!1V^8||=k5#))&Q{oHEsX^

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java
index dc247264522..82fe8eb7165 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java
@@ -280,7 +280,9 @@ public class BaseCElementContentProvider implements ITreeContentProvider {
 		}
 		try {
 			ILibraryReference[] refs = cproject.getLibraryReferences();
-			objects = concatenate(objects, refs);
+			if (refs != null && refs.length > 0) {
+				objects = concatenate(objects, refs);
+			}
 		} catch (CModelException e) {
 		}
 		return objects;
@@ -293,7 +295,7 @@ public class BaseCElementContentProvider implements ITreeContentProvider {
 			objects = container.getNonCResources();
 		} catch (CModelException e) {
 		}
-		if (objects == null) {
+		if (objects == null || objects.length == 0) {
 			return children;
 		}
 		return concatenate(children, objects);
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java
index 33a85570a49..dacae9f4501 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java
@@ -14,11 +14,13 @@ import org.eclipse.cdt.core.model.IDeclaration;
 import org.eclipse.cdt.core.model.IField;
 import org.eclipse.cdt.core.model.ILibraryReference;
 import org.eclipse.cdt.core.model.IMethodDeclaration;
+import org.eclipse.cdt.core.model.ISourceRoot;
 import org.eclipse.cdt.core.model.ITemplate;
 import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility;
 import org.eclipse.cdt.internal.ui.util.ImageDescriptorRegistry;
 import org.eclipse.cdt.ui.CElementImageDescriptor;
 import org.eclipse.cdt.ui.CUIPlugin;
+import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.jface.resource.ImageDescriptor;
@@ -99,6 +101,15 @@ public class CElementImageProvider {
 		ImageDescriptor descriptor= null;
 		if (element instanceof ICElement) {
 			descriptor= getCImageDescriptor((ICElement) element, flags);
+		} else if (element instanceof IFile) {
+			// Check for Non Translation Unit.
+			IFile file = (IFile)element;
+			CoreModel model = CoreModel.getDefault();
+			if (model.isTranslationUnit(file)) {
+				descriptor = CPluginImages.DESC_OBJS_TUNIT_RESOURCE;
+				Point size= useSmallSize(flags) ? SMALL_SIZE : BIG_SIZE;
+				descriptor = new CElementImageDescriptor(descriptor, 0, size);
+			}
 		}
 		if (descriptor == null && element instanceof IAdaptable) {
 			descriptor= getWorkbenchImageDescriptor((IAdaptable) element, flags);
@@ -278,6 +289,9 @@ public class CElementImageProvider {
 				return CPluginImages.DESC_OBJS_TUNIT;
 				
 			case ICElement.C_CCONTAINER:
+				if (celement instanceof ISourceRoot) {
+					return CPluginImages.DESC_OBJS_SOURCE_ROOT;
+				}
 				return DESC_OBJ_FOLDER;
 			
 			case ICElement.C_PROJECT: