From fdfc59936cfcfc376cb3bb7ec2bff1a917ed8d50 Mon Sep 17 00:00:00 2001
From: Alain Magloire <alain@qnx.com>
Date: Tue, 22 Jun 2004 19:16:51 +0000
Subject: [PATCH] 2004-06-21 Alain Magloire

	It is too late to change the icons, but still
	make a difference in a CFolder(CContainer) and
	a normal folder.
	* icons/full/obj16/sroo_obj.gif
	* src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java
	* src/org/eclipse/cdt/internal/ui/CElementImageProvider.java
	* src/org/eclipse/cdt/internal/ui/CPluginImages.java
---
 core/org.eclipse.cdt.ui/ChangeLog               |  13 +++++++++++--
 .../icons/full/obj16/cfolder_obj.gif            | Bin 171 -> 152 bytes
 .../icons/full/obj16/sroot_obj.gif              | Bin 0 -> 171 bytes
 .../ui/BaseCElementContentProvider.java         |   3 +--
 .../cdt/internal/ui/CElementImageProvider.java  |  10 ++++++----
 .../eclipse/cdt/internal/ui/CPluginImages.java  |   4 +++-
 .../eclipse/cdt/ui/CElementLabelProvider.java   |   3 +--
 7 files changed, 22 insertions(+), 11 deletions(-)
 create mode 100644 core/org.eclipse.cdt.ui/icons/full/obj16/sroot_obj.gif

diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 85c10eff688..38002b0c006 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,11 +1,20 @@
+2004-06-21 Alain Magloire
+
+	It is too late to change the icons, but still
+	make a difference in a CFolder(CContainer) and
+	a normal folder.
+	* icons/full/obj16/sroo_obj.gif
+	* src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java
+	* src/org/eclipse/cdt/internal/ui/CElementImageProvider.java
+	* src/org/eclipse/cdt/internal/ui/CPluginImages.java
+
 2004-06-22 Tanya Wolff
 	Fix for Bug 49883:  duplicate mnemonics on editor preferences page.
 	Also flipped label/checkbox presentation for "bold" so the mnemonic would work. 
 	Removed unneeded keys.
 	
 	* src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java
-	* src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties
-		
+	* src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties		
 
 2004-06-22 Bogdan Gheorghe
 	Fix for 68028: Open Declaration into closed project causes PartInitException
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 57ba1fbf15915848cafbdabdea2b998da639ba66..a9c777343c0fad5216001cd2e0c7c1309aabed4e 100644
GIT binary patch
literal 152
zcmZ?wbhEHb6krfw*v!Dt(7-T%zWx9I^W)>~=g+Udzu$g8kb57<jsO4uKLZ9({K>+|
zz`)6%1Cjxm!NB5baME-2UW@PpjeaK-W!NV%CRLTh7%(Q!Ikv3j)Q?}MoZtU%zMUAL
mA=S+$oKs<=mU~8R(=-Mio*OySW+^D_d+;IM$Ipd<!5RP_+BC!f

literal 171
zcmV;c095}+Nk%w1VGsZi0J8u9w8G(#uIFolp7`v%_~Dx9(1`ZfkoeGe_|$~Vs&(YO
zgrIOds)1LykZAw^|NsC0A^8LW000jFEC2ui01yBW000D7@X1N5y_kx<Yx>C}1SBa;
zjH5cr2&lmMBm`j;N*g$(oD9I=h-Z@gf<PC{SF1Ii(CDLKs5Y8dLZR_sAP|kOSiF@i
Z4&gDGYi=Cg@OPQQsN3(Ey#5ja06T~NQ*{6U

diff --git a/core/org.eclipse.cdt.ui/icons/full/obj16/sroot_obj.gif b/core/org.eclipse.cdt.ui/icons/full/obj16/sroot_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..57ba1fbf15915848cafbdabdea2b998da639ba66
GIT binary patch
literal 171
zcmV;c095}+Nk%w1VGsZi0J8u9w8G(#uIFolp7`v%_~Dx9(1`ZfkoeGe_|$~Vs&(YO
zgrIOds)1LykZAw^|NsC0A^8LW000jFEC2ui01yBW000D7@X1N5y_kx<Yx>C}1SBa;
zjH5cr2&lmMBm`j;N*g$(oD9I=h-Z@gf<PC{SF1Ii(CDLKs5Y8dLZR_sAP|kOSiF@i
Z4&gDGYi=Cg@OPQQsN3(Ey#5ja06T~NQ*{6U

literal 0
HcmV?d00001

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 62dcf17cb52..4b2aa701689 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
@@ -188,9 +188,8 @@ public class BaseCElementContentProvider implements ITreeContentProvider {
 			ICProject cp= (ICProject)element;
 			if (!cp.getProject().isOpen()) {
 				return false;
-			} else {
-				return true;	
 			}
+			return true;	
 		}
 
 		if (element instanceof IBinaryContainer) {
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 b41538867c6..7456b8e78f0 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
@@ -79,12 +79,12 @@ public class CElementImageProvider {
 
 	private static ImageDescriptor DESC_OBJ_PROJECT_CLOSED;	
 	private static ImageDescriptor DESC_OBJ_PROJECT;	
-	private static ImageDescriptor DESC_OBJ_FOLDER;
+	//private static ImageDescriptor DESC_OBJ_FOLDER;
 	{
 		ISharedImages images= CUIPlugin.getDefault().getWorkbench().getSharedImages(); 
 		DESC_OBJ_PROJECT_CLOSED= images.getImageDescriptor(IDE.SharedImages.IMG_OBJ_PROJECT_CLOSED);
 		DESC_OBJ_PROJECT= 		 images.getImageDescriptor(IDE.SharedImages.IMG_OBJ_PROJECT);
-		DESC_OBJ_FOLDER= 		 images.getImageDescriptor(ISharedImages.IMG_OBJ_FOLDER);
+		//DESC_OBJ_FOLDER= 		 images.getImageDescriptor(ISharedImages.IMG_OBJ_FOLDER);
 	}
 	
 	public CElementImageProvider() {
@@ -138,7 +138,8 @@ public class CElementImageProvider {
 				return CPluginImages.DESC_OBJS_TUNIT;
 				
 			case ICElement.C_CCONTAINER:
-				return DESC_OBJ_FOLDER;
+				//return DESC_OBJ_FOLDER;
+				return CPluginImages.DESC_OBJS_CFOLDER;
 			
 			case ICElement.C_PROJECT:
 				return DESC_OBJ_PROJECT;
@@ -292,7 +293,8 @@ public class CElementImageProvider {
 				if (celement instanceof ISourceRoot) {
 					return CPluginImages.DESC_OBJS_SOURCE_ROOT;
 				}
-				return DESC_OBJ_FOLDER;
+				//return DESC_OBJ_FOLDER;
+				return CPluginImages.DESC_OBJS_CFOLDER;
 			
 			case ICElement.C_PROJECT:
 				ICProject cp= (ICProject)celement;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java
index 21a4a5b9502..4dbc7e9dafd 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java
@@ -72,7 +72,8 @@ public class CPluginImages {
 	public static final String IMG_OBJS_TUNIT_HEADER= NAME_PREFIX + "h_file_obj.gif"; //$NON-NLS-1$
 	public static final String IMG_OBJS_TUNIT_ASM= NAME_PREFIX + "s_file_obj.gif"; //$NON-NLS-1$
 	public static final String IMG_OBJS_TUNIT_RESOURCE= NAME_PREFIX + "c_resource_obj.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJS_SOURCE_ROOT=  NAME_PREFIX + "cfolder_obj.gif"; // $NON-NLS-1$  //$NON-NLS-1$
+	public static final String IMG_OBJS_SOURCE_ROOT=  NAME_PREFIX + "sroot_obj.gif"; // $NON-NLS-1$  //$NON-NLS-1$
+	public static final String IMG_OBJS_CFOLDER=  NAME_PREFIX + "cfolder_obj.gif"; // $NON-NLS-1$  //$NON-NLS-1$
 	public static final String IMG_OBJS_ARCHIVE= NAME_PREFIX + "ar_obj.gif"; //$NON-NLS-1$
 	public static final String IMG_OBJS_BINARY= NAME_PREFIX + "bin_obj.gif"; //$NON-NLS-1$
 	public static final String IMG_OBJS_SHLIB= NAME_PREFIX + "shlib_obj.gif"; //$NON-NLS-1$
@@ -135,6 +136,7 @@ public class CPluginImages {
 	public static final ImageDescriptor DESC_OBJS_TUNIT_ASM= createManaged(T_OBJ, IMG_OBJS_TUNIT_ASM);
 	public static final ImageDescriptor DESC_OBJS_TUNIT_RESOURCE= createManaged(T_OBJ, IMG_OBJS_TUNIT_RESOURCE);
 	public static final ImageDescriptor DESC_OBJS_SOURCE_ROOT= createManaged(T_OBJ, IMG_OBJS_SOURCE_ROOT);
+	public static final ImageDescriptor DESC_OBJS_CFOLDER= createManaged(T_OBJ, IMG_OBJS_CFOLDER);
 	public static final ImageDescriptor DESC_OBJS_ARCHIVE= createManaged(T_OBJ, IMG_OBJS_ARCHIVE);
 	public static final ImageDescriptor DESC_OBJS_ARCHIVE_WSRC= createManaged(T_OBJ, IMG_OBJS_ARCHIVE);
 	public static final ImageDescriptor DESC_OBJS_BINARY= createManaged(T_OBJ, IMG_OBJS_BINARY);
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementLabelProvider.java
index b3a4ed240de..6338230ea85 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementLabelProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementLabelProvider.java
@@ -285,9 +285,8 @@ public class CElementLabelProvider extends LabelProvider {
 		if (errortick) {
 			if (extra == null) {
 				return new IAdornmentProvider[] { new ErrorTickAdornmentProvider() };
-			} else {
-				return new IAdornmentProvider[] { new ErrorTickAdornmentProvider(), extra };
 			}
+			return new IAdornmentProvider[] { new ErrorTickAdornmentProvider(), extra };
 		}
 		if (extra != null) {
 			return new IAdornmentProvider[] { extra };