From ff806b07d1ad3e9ad6a893da3b566581610e8ead Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Mon, 5 Apr 2004 20:35:33 +0000 Subject: [PATCH] Small bug fix of the CView. --- .../eclipse/cdt/internal/ui/BaseCElementContentProvider.java | 4 ++++ .../eclipse/cdt/internal/ui/cview/CViewContentProvider.java | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) 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 b110efb7083..fc079c6413e 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 @@ -130,6 +130,10 @@ public class BaseCElementContentProvider implements ITreeContentProvider { return getSourceRoots((ICProject)element); } else if (element instanceof ICContainer) { return getCResources((ICContainer)element); + } else if (element instanceof IBinaryContainer) { + return NO_CHILDREN; // we deal with this in the CVIewContentProvider + } else if (element instanceof IArchiveContainer) { + return NO_CHILDREN; // we deal with this in the CViewContentProvider } else if (element instanceof ITranslationUnit) { // if we want to get the chidren of a translation unit if (fProvideMembers) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewContentProvider.java index 1fc30bcf5d2..1fdaf5b004a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewContentProvider.java @@ -48,9 +48,9 @@ public class CViewContentProvider extends CElementContentProvider { if (element instanceof ICProject) { extras = getProjectChildren((ICProject)element); } else if (element instanceof IBinaryContainer) { - extras = ((IBinaryContainer)element).getBinaries(); + extras = getExecutables((IBinaryContainer)element); } else if (element instanceof IArchiveContainer) { - extras =((IArchiveContainer)element).getArchives(); + extras = getArchives((IArchiveContainer)element); } else if (element instanceof LibraryRefContainer) { extras = ((LibraryRefContainer)element).getChildren(element); } else if (element instanceof IncludeRefContainer) {