mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-05 00:36:16 +02:00
Code Issues Wiki Activity

2004-06-28 Alain Magloire

Browse source 
Fix for PR 68820.
	* src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java
	* src/org/eclipse/cdt/internal/ui/CElementImageProvider.java
This commit is contained in:
Alain Magloire 2004-06-28 21:10:17 +00:00
parent b98a43f436
commit eea167e5c3
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/org.eclipse.cdt.ui/ChangeLog
View file

@ -1,3 +1,9 @@
2004-06-28 Alain Magloire
Fix for PR 68820.
* src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java
* src/org/eclipse/cdt/internal/ui/CElementImageProvider.java
2004-06-27 Bogdan Gheorghe
Fix for Bug 67987: [Search] C Search results do no show up as editor annotations

10
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java
View file

@ -336,8 +336,14 @@ public class BaseCElementContentProvider implements ITreeContentProvider {
}
private Object[] filterNonCResources(Object[] objects, ICProject cproject) throws CModelException {
ICElement[] binaries = getBinaries(cproject);
ICElement[] archives = getArchives(cproject);
ICElement[] binaries = null;
ICElement[] archives = null;
try {
binaries = getBinaries(cproject);
archives = getArchives(cproject);
} catch (CModelException e) {
archives = binaries = new ICElement[0];
}
ISourceRoot[] roots = null;
try {
roots = cproject.getSourceRoots();

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java
View file

@ -103,7 +103,7 @@ public class CElementImageProvider {
} else if (element instanceof IFile) {
// Check for Non Translation Unit.
IFile file = (IFile)element;
if (CoreModel.isTranslationUnit(file)) {
if (CoreModel.isValidTranslationUnitName(file.getProject(), file.getName())) {
descriptor = CPluginImages.DESC_OBJS_TUNIT_RESOURCE;
Point size= useSmallSize(flags) ? SMALL_SIZE : BIG_SIZE;
descriptor = new CElementImageDescriptor(descriptor, 0, size);