From aa87b0aa44fde197cd7d22f914e345c8a13604c8 Mon Sep 17 00:00:00 2001 From: Anton Leherbauer Date: Fri, 25 May 2007 08:41:24 +0000 Subject: [PATCH] Fix for 185719: [UI] [CView/Explorer] Proposed new icons for binary and includes --- core/org.eclipse.cdt.ui/icons/obj16/ar_obj.gif | Bin 601 -> 1045 bytes .../icons/obj16/archives_obj.gif | Bin 0 -> 600 bytes .../icons/obj16/binaries_obj.gif | Bin 0 -> 605 bytes .../icons/obj16/exec_dbg_obj.gif | Bin 348 -> 347 bytes .../icons/obj16/exec_obj.gif | Bin 125 -> 378 bytes .../icons/obj16/includes_container.gif | Bin 589 -> 614 bytes .../icons/obj16/shlib_obj.gif | Bin 161 -> 337 bytes .../icons/obj16/sroot_obj.gif | Bin 171 -> 230 bytes .../icons/obj16/wsp_includefolder.gif | Bin 0 -> 598 bytes .../eclipse/cdt/internal/ui/CPluginImages.java | 10 ++++++++-- .../internal/ui/cview/CViewLabelProvider.java | 3 ++- .../dialogs/cpaths/CPElementLabelProvider.java | 14 ++++++++++++-- .../ui/viewsupport/CElementImageProvider.java | 7 +++++++ 13 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 core/org.eclipse.cdt.ui/icons/obj16/archives_obj.gif create mode 100644 core/org.eclipse.cdt.ui/icons/obj16/binaries_obj.gif create mode 100644 core/org.eclipse.cdt.ui/icons/obj16/wsp_includefolder.gif diff --git a/core/org.eclipse.cdt.ui/icons/obj16/ar_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/ar_obj.gif index d1a56087c66ee71fe5e16ccb9e5d1f4dafa72b5f..10d652cc04d04df9b6472cf7e22c224e92700086 100644 GIT binary patch delta 814 zcmV+}1JV511eFMXM@dFFIbje05CHc80M^slX=!Tx{r>#?{rmg;`uh9$`1xmQc{N(HWzr@f}YMoeaqN}{&vAorP%GU7B*zwro{n6X;zQ^0m z*6QEr{K?VcxxmlU+Udl})WXNo!N$?Q#Lvjh*w544%g@;0L8*~QcF$=31J;rO?~)wI6S!pz{i#Ma^J{k+4`$Ijf~=k?0a+~(}~ z$IRB>?BeC?=jrYA_4izLq_Mx)w!_=B!PvRQ+qc8m z(cbpE$K1Zk-@eJ-YjJ$U&*Qzv+Q!l3*5UQpiW>w=gH9BzQoVG z!p+6Y*22is(bnI}&)D(y|LgGiv%%TT*5$p$($d=J!N}C& z>GkC6_V4od=b%*5UEh-t5QC*5>T>_4oSk@$}>C_VDxf-RSo4_WkPc z_U-WV`TG0h>+#>@==}cw`2GLr@bUfs|NQ;^bZc0Aaa@UOJbG$Rnr$tbZZDB*G?8mH zi)%a>f@(*GZcCbLEtqR9nrtp^X=4BX|Nj2|k?x<80a||{`2+y~0IdKl000005C9MW z00{B`TM29>#l{s@0~01>6{AXxHxxK1OxQ@#s#O`_(2;=y%fvZ3E>dx_O2dQ@FfbGl zxCu}a2?l6Pxu}D|hCDL_5^^)?)G1J)LZt$Q>eMPc0+m3}GzyBO1raJC$RtXDoK}>I zRJi16QImfr4?qaAM9M;(RyR}-X;JEqqYp?}C;(u}g_Txi0@?ZV2@)GM9Z(oL(#a2j z1Yqja!NkeK8Z<+`m?+ePNvk$tB4Jvh3elMqCxisilO;;4M`^T}Ars)x3Kb=QkoYk| sz`y}dj5Kg?V9XvLJa&j!HIdPaEnE^k65!>+#Dofi`ta!@W?(=7JN#o0^#A|> literal 601 zcmd6kzfTiU0LR}|V?_)c4p5D$7)!KD5EW{HR*%{r9EV#OHMlY3+JS^NX{C_na__yX zhN_`UJE1XM+Chv4M;8+}DBuMwoY2DEdv}*q_%HkppXoDvl5d0$dxu`IfCUNw5F$b? zotPOZmywoIQZX&%)w)qXHV=;sjabyM2sKl%n34(^nA@(AgCjEy^XohMR*huflCn>g zeX{$PHZ-$-Y$Rc!`iE@qooI$mEsdD#yZY81QBPA zAkwIrMT=27e|N@U?;9>$u@Cistcot|X?5J2x~l?aI7#4lp{YQ^|e*XtQ=MzWIyL$px+?N9t z_ox_jIy=@noKIR>oI&w{%XKSk{~2=G?O`!ejSP%$D&m;qwxi#nj){kNyE?o08=W_K zfgj}W4Wdu)e!M?3+r|a~E3;n$w)S&T2M0FidfL76Mt^rM61)_M%TpW6Yqqwl1HYy| J{uVhf@(-8@=wtu@ diff --git a/core/org.eclipse.cdt.ui/icons/obj16/archives_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/archives_obj.gif new file mode 100644 index 0000000000000000000000000000000000000000..c052e662cfae11aab5a9b7ae917cedbfaf445bf8 GIT binary patch literal 600 zcmZ?wbhEHb6krfwc*ej`SXlJs>#r|gf4+YI^V64~*#*@p1sy2`?bjZB$u6jR`uh9Z zk3gyKAHV!cDeOouXuS6D%ZqnEU%vaET-cso*m(ZVr%U(0TmdRBtiJL1>)mHxKYji6 z@ypNicRyWu2o$Wk@ffHcXvp`k-+#US`18}(pO+qdy7Bbu)3@JmJpFR#1(5Oer3ac)PFD=aMDE4hH@@*^%t0{_~UTig?*rlV$udy&}X^HNV zV%_=0#`8;z=M@{zD>0s4Y(1gKWqpat>Jp7r#TrYCb^rhW&oJnL;!hSv1_nf5_PcnaC zZe;WD=_Cs&Eh%HEw-%E==qpGnn5au?ns}NRniv>*#>6x*Ffy>P$T6_EbT}k3@vz#7 nczh6W7UB`}iO^tJudKu+YZX%QVB_LOW_B4Ljgv;63Jlf&bVAHA literal 0 HcmV?d00001 diff --git a/core/org.eclipse.cdt.ui/icons/obj16/binaries_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/binaries_obj.gif new file mode 100644 index 0000000000000000000000000000000000000000..5a08512dcb19e3c6002e363e7cfd030f1bf859f3 GIT binary patch literal 605 zcmZ?wbhEHb6krfwc*el+@8AEmYu6n;_2lE{U)v8oK6vKIwgcBsU3_r!@%OvWf4}?u zw{7;ps}H~3div|$vo9fOjU5XP9XfmO(v|BW8BLQ{o_PQ1+v8`i9Kwqn!wL@G_;U2t zm)5?S%T}#_@Z@D|*<@++5MB2qpX93Wytd%XhOCYTak z`1xzM9=$w&?asv;_gspmCHJn)nz+s}JR`cOrF-qMt~E!eZabgVI4QJ#c67^voC&L% zr!8K*are>g!oa?(A*ZRiIXGCdB_}I8BPTOED<{}J*hz|mD<`8T zrzd-oo11H}7w4=w^Ckra1_T5JFYjF$92ycDY{ffERXImZdSY;Ru%{FcUlW@!vzU2P zTSv2nj+TRf0;`64XEVE5YJ{b?9KVlUr;@BlSaMplE{nB)r@e~2V|rw4jHwXg#BQmL zo(~^&i|Hq1BvgFNoP0olJE4QqIgOQFo!3(FVc^529!bNhB}ED>wxi L?r^X&F<1itU`rGx literal 0 HcmV?d00001 diff --git a/core/org.eclipse.cdt.ui/icons/obj16/exec_dbg_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/exec_dbg_obj.gif index d90a29fead84c0ca79773c63e69c2f8c46daf706..fe21f448b8c851bb574958f7399ba13167c8f5d4 100644 GIT binary patch literal 347 zcmZ?wbhEHb6krfwxXQqA;r{konHloKqs?RZIf>Z27=eS8O@sr&Wr$&{o zESq?A%KFEX*FBoH@#(CsFX!!iyY#@9RY!lWKK5((rT=>`|37%`|G9hruRr+@1Pl}a z#h)yU3=G-~Iv_JZeqvy&I54%qLq|&f*pdx~EgG#0SUgU6SV?iWxG`J#OjYPTu;uC+ zwlR80nyj*-C^MI9oQSH5 qvW%Qau#Yphf{?J1qP(<_Td5PX;3h$TC)T2^&Kx_P*LylLSOWm_n{8+S literal 348 zcmZ?wbhEHb6krfwxXQpFm0T{B0z_ppsb#Wh+mRt9F_KB}J9`r#g`PUial&Z=(aTAtPl_67=023r2s zI@$6TwHkr_Rud1`7Oo7Na-@9f(eimG>*t+pSbDnc`M29^FHBf>VZxRxGqzuybNk)t z+iy>A1+ixzy}$O@{dGt0tv&T<^VL@ekKJ2)?B2SoFAr|mu;Ksz{|u-=@h1x-1A`TV z4oDc}CkD1khq(bBl2ZMLPY5)bJTtLWT$b7Cq1ErMC!G7Li2sW2?+d7K36Q@l~$Ly1U#YBsooW6^-@PxqPKL3{A|Gv{X5SW!+=g4YV~CR9FMOoP{je iSk%>&<(WN7oP-&e7#ZT6WeT^tiSBe;w`ad2gEavB?SN4L diff --git a/core/org.eclipse.cdt.ui/icons/obj16/exec_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/exec_obj.gif index 8174dade2bb6b271e20a37b618face058cd00d17..d5f502a974619d3a2002286e71cefb9992833470 100644 GIT binary patch literal 378 zcmZ?wbhEHb6krfwxXQqgP`)I-Y;j!a!ql3TX|=0Ts+VWfuSu_4o!PK9yJ>w^EZu^jxA+g8>5t zK=CIFBLjmrgAT|Hke?XXrXQGE;GrYtDe0=P;KYQU)n^`lW?X7FEzR)pgPIU|kyDQg zQ`(jsUZxz>X#L^bL&>Qzdb!`9*V(Vrz@^f6XLB?VHV=_fnbO6vrKy^LA6u!K98B31%im2a}wr VjZ+?8u`pY4=;*oWxhf0{)&P08E6e}@ diff --git a/core/org.eclipse.cdt.ui/icons/obj16/includes_container.gif b/core/org.eclipse.cdt.ui/icons/obj16/includes_container.gif index 8505f9d3c6330234d3e58d66a287e62818c66296..c8926a25c00c8be15f633f4ac86f1f244bb5e19b 100644 GIT binary patch delta 563 zcmV-30?hr*1m*;PM@dFFIbje05CG-?0O8@|_W1np^!x4d`t(ZJ2!zslIi(%!4GyYTh<^7i{F zNNYo1eotwKP-=)!YKKv4h>)VU?eqHd`26+w`}q3&_xbyO=I!(J`1|?${PXeYl6yFs zf<2gjJfMd_n}kN1gh-WvNv4ohsFPZ?q;aK$G@ybtoPRc!d^f9)MW~EKwwO%IsaT$c zMA5EWq>fa;r)IRAV7;Ylx}+QN+B$C2dEpVhKy;K!1!axb}uPQ#dIk?}u&A^8LW003(MEC2ui z01yBW000NWfNO$-goTEJU|~dJMn^M;f?+6=C}n3@g<4x#RzE;8BuiyvT!dRBBq=3H zUQYq9L2FY~JyAM2DZABS>9WO(p^^3IauI zI|UyL1?2@a4#b+7?D>MsNY89^3DPFBpyh^Wht$x{Bql$G#mFrBa zH(Jzfv8dZ@S-07uc7sjhR@=sH4lO(E8#g<*?{aD1?b5!>y=$*~_g?Sb{eBY;`As+& zH2Lu6bB{NkdARk$(=F$pY&rL6_mvkC84F~x7Rh8UQp#JZl($5)c%?zb8uQxqc1@di zTzkN3mqSBO!)C&#*YUJzP&mB=kv`UH#&Y?sQ3XC zywI?x)#z}y*_L{v=NH#6%~4rfq`jx!=y0pq+8mX6Y3gf>^zR*6J}+LjKS=UF7%&W0 zp!k!8k%7U7K?meOP@FKZuWImVYEo`(ZE0(6VPaxtZQ|w=RPORoWny7vZ{igYQkkm8 z%*MglG*3jm+0H?Om4l1BNk~jwqsi5Km$ygPR!L1C7d<@_b1iNj1|d-iNhy9GTm35r z!jra$OG?XV`#2juG*Xn4Rgh=Y(N$9Pu{Zl*;r{u{S05+qpYEoA{{As`pTTl+;$x13 p&FqX^UW*=c^tTJhYl$p*($Uu~q3`*?AQPQ{{R30A^8LW000gEEC2ui01yBW000C|(8)<_O^IUb(qMp;2%zPa z9T{GO!eBvzPT0^Wg3!oFCJw-zaF<&p3XGwU!CW~E1f3G(6iJ6Onk>m|asYtC2V6Cc PIhREi?Etgiln4Mj?0Z9V diff --git a/core/org.eclipse.cdt.ui/icons/obj16/sroot_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/sroot_obj.gif index 57ba1fbf15915848cafbdabdea2b998da639ba66..bacc22a65d2a7cfb95c556d292fde7b2bea2e072 100644 GIT binary patch literal 230 zcmZ?wbhEHb6krfwIKsfN<z-#f&HM3U#*Yste!ST5;zGxV8xwv!nDOJmf*&_J zeq5+{aG>G`P~<|xjSU5RT8$2On{BB#TAHJ>wn%$Vz0u)Tv$Z)Y^U~DU7U|E6m+cRd z{0{~UV4(Pug^__lmO%%^1KG*Inw+5Cmy$UzLvu~GDdi>(| a?+PVpN$%FR)<$KC?w(%F{t0S|4AuZfjc3~c literal 171 zcmV;c095}+Nk%w1VGsZi0J8u9w8G(#uIFolp7`v%_~Dx9(1`ZfkoeGe_|$~Vs&(YO zgrIOds)1LykZAw^|NsC0A^8LW000jFEC2ui01yBW000D7@X1N5y_kxC}1SBa; zjH5cr2&lmMBm`j;N*g$(oD9I=h-Z@gfGsdK~P=LNGghC!cK7R#-`{`!UU}{3%Bw$CUi-1};on~`=l%b9==_O|(`(HqRa^9x zTmFB&c}1J?(iW2?%_a+)Oy@V5&Z!3?vuQQv4^H&|f4bz#sSTUD4AyrTu4y+~*=l@c zQ^u7|ng4Hf-r8I9|NgZ97fb(Nt-ZP_^TL|S|Ns9p3@A|i$->CM5Xztfas?<(7}z&A zgf@kGw6?W2cZPaO_4fICbTxSyPMzi-Jh98xVD3Cue;@D85PL~Ud39a+HS%^%j0|Ru zYFk%rRg-pT;x{*Ul0B%dr>?Fl>)ga-V`Hg&{;2X1WtS#)H#aL4o!k0y`Z{v%O`HJ% z))FkNubJ7HSvgok`TYDWxJ`fl`o$G06ci+NVTNLJTTe5qB*!iR)+R1d&9D^_jY&tl gIGQy=9vpCV;Sf-CDcQ0hqv_;i4b_z)k{k@y0GZ6?fB*mh literal 0 HcmV?d00001 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 c8366e9a115..e32ba30e1ec 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 @@ -96,11 +96,14 @@ public class CPluginImages { public static final String IMG_OBJS_CEXEC_DEBUG= NAME_PREFIX + "exec_dbg_obj.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_CORE= NAME_PREFIX + "core_obj.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_CONTAINER= NAME_PREFIX + "container_obj.gif"; //$NON-NLS-1$ + public static final String IMG_OBJS_ARCHIVES_CONTAINER= NAME_PREFIX + "archives_obj.gif"; //$NON-NLS-1$ + public static final String IMG_OBJS_BINARIES_CONTAINER= NAME_PREFIX + "binaries_obj.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_OUTPUT_FOLDER= NAME_PREFIX + "output_folder_obj.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_LIBRARY= NAME_PREFIX + "lib_obj.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_INCLUDES_CONTAINER = NAME_PREFIX + "includes_container.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_INCLUDES_FOLDER = NAME_PREFIX + "hfolder_obj.gif"; //$NON-NLS-1$ - public static final String IMG_OBJS_QUOTE_INCLUDES_FOLDER = NAME_PREFIX + "hfolder_quote_obj.gif"; //$NON-NLS-1$ + public static final String IMG_OBJS_QUOTE_INCLUDES_FOLDER = NAME_PREFIX + "hfolder_quote_obj.gif"; //$NON-NLS-1$ + public static final String IMG_OBJS_INCLUDES_FOLDER_WORKSPACE = NAME_PREFIX + "wsp_includefolder.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_ORDER= NAME_PREFIX + "cp_order_obj.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_EXCLUDSION_FILTER_ATTRIB= NAME_PREFIX + "exclusion_filter_attrib.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_SOURCE_ATTACH_ATTRIB = NAME_PREFIX + "source_attach_attrib.gif"; //$NON-NLS-1$ @@ -174,11 +177,14 @@ public class CPluginImages { public static final ImageDescriptor DESC_OBJS_CEXEC_DEBUG= createManaged(T_OBJ, IMG_OBJS_CEXEC_DEBUG); public static final ImageDescriptor DESC_OBJS_CORE= createManaged(T_OBJ, IMG_OBJS_CORE); public static final ImageDescriptor DESC_OBJS_CONTAINER= createManaged(T_OBJ, IMG_OBJS_CONTAINER); + public static final ImageDescriptor DESC_OBJS_ARCHIVES_CONTAINER= createManaged(T_OBJ, IMG_OBJS_ARCHIVES_CONTAINER); + public static final ImageDescriptor DESC_OBJS_BINARIES_CONTAINER= createManaged(T_OBJ, IMG_OBJS_BINARIES_CONTAINER); public static final ImageDescriptor DESC_OBJS_OUTPUT_FOLDER= createManaged(T_OBJ, IMG_OBJS_OUTPUT_FOLDER); public static final ImageDescriptor DESC_OBJS_LIBRARY= createManaged(T_OBJ, IMG_OBJS_LIBRARY); public static final ImageDescriptor DESC_OBJS_INCLUDES_CONTAINER= createManaged(T_OBJ, IMG_OBJS_INCLUDES_CONTAINER); public static final ImageDescriptor DESC_OBJS_INCLUDES_FOLDER= createManaged(T_OBJ, IMG_OBJS_INCLUDES_FOLDER); - public static final ImageDescriptor DESC_OBJS_QUOTE_INCLUDES_FOLDER= createManaged(T_OBJ, IMG_OBJS_QUOTE_INCLUDES_FOLDER); + public static final ImageDescriptor DESC_OBJS_QUOTE_INCLUDES_FOLDER= createManaged(T_OBJ, IMG_OBJS_QUOTE_INCLUDES_FOLDER); + public static final ImageDescriptor DESC_OBJS_INCLUDES_FOLDER_WORKSPACE= createManaged(T_OBJ, IMG_OBJS_INCLUDES_FOLDER_WORKSPACE); public static final ImageDescriptor DESC_OBJS_ORDER= createManaged(T_OBJ, IMG_OBJS_ORDER); public static final ImageDescriptor DESC_OBJS_EXCLUSION_FILTER_ATTRIB = createManaged(T_OBJ, IMG_OBJS_EXCLUDSION_FILTER_ATTRIB); public static final ImageDescriptor DESC_OBJS_SOURCE_ATTACH_ATTRIB= createManaged(T_OBJ, IMG_OBJS_SOURCE_ATTACH_ATTRIB); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java index 42c00c0ad50..a3ff26b623b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java @@ -22,6 +22,7 @@ import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.ui.CElementImageDescriptor; import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.internal.ui.CPluginImages; import org.eclipse.cdt.internal.ui.viewsupport.AppearanceAwareLabelProvider; import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; @@ -82,7 +83,7 @@ public class CViewLabelProvider extends AppearanceAwareLabelProvider { IPath path = reference.getPath(); IContainer container = reference.getCModel().getWorkspace().getRoot().getContainerForLocation(path); if (container != null && container.isAccessible()) { - ImageDescriptor desc = CElementImageProvider.getImageDescriptor(ICElement.C_PROJECT); + ImageDescriptor desc = CPluginImages.DESC_OBJS_INCLUDES_FOLDER_WORKSPACE; desc = new CElementImageDescriptor(desc, 0, CElementImageProvider.SMALL_SIZE); return CUIPlugin.getImageDescriptorRegistry().get(desc); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementLabelProvider.java index 5f7c4297e1e..55578a68b65 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2005 QNX Software Systems and others. + * Copyright (c) 2004, 2007 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * QNX Software Systems - initial API and implementation + * Anton Leherbauer (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.internal.ui.dialogs.cpaths; @@ -34,7 +35,7 @@ import org.eclipse.ui.model.IWorkbenchAdapter; class CPElementLabelProvider extends LabelProvider implements IColorProvider { - private final Color inDirect = new Color(Display.getDefault(), new RGB(170, 170, 170)); + private Color inDirect = new Color(Display.getDefault(), new RGB(170, 170, 170)); private String fNewLabel, fCreateLabel; private ImageDescriptor fIncludeIcon, fMacroIcon, fLibWSrcIcon, fLibIcon; @@ -71,6 +72,15 @@ class CPElementLabelProvider extends LabelProvider implements IColorProvider { bShowParentInfo = showParentInfo; } + /* + * @see org.eclipse.jface.viewers.BaseLabelProvider#dispose() + */ + public void dispose() { + inDirect.dispose(); + inDirect= null; + super.dispose(); + } + public String getText(Object element) { if (element instanceof CPElement) { return getCPElementText((CPElement)element); 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 246b4d5bf86..297f7c82991 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 @@ -9,6 +9,7 @@ * IBM Corporation - initial API and implementation * QNX Software System * Markus Schorn (Wind River Systems) + * Anton Leherbauer (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.internal.ui.viewsupport; @@ -24,7 +25,9 @@ import org.eclipse.ui.model.IWorkbenchAdapter; import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.IArchiveContainer; import org.eclipse.cdt.core.model.IBinary; +import org.eclipse.cdt.core.model.IBinaryContainer; import org.eclipse.cdt.core.model.IBinaryModule; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; @@ -288,6 +291,10 @@ public class CElementImageProvider { return CPluginImages.DESC_OBJS_UNKNOWN; } else if (celement instanceof IIncludeReference) { return CPluginImages.DESC_OBJS_INCLUDES_FOLDER; + } else if (celement instanceof IArchiveContainer) { + return CPluginImages.DESC_OBJS_ARCHIVES_CONTAINER; + } else if (celement instanceof IBinaryContainer) { + return CPluginImages.DESC_OBJS_BINARIES_CONTAINER; } return CPluginImages.DESC_OBJS_CONTAINER;