diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index 8ff609c451c..9a2ae2ffd29 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,9 @@ +2004-08-11 Alain Magloire + + Duplication in the CView. + * src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java + * src/org/eclipse/cdt/internal/ui/cview/CViewContentProvider.java + 2004-08-10 Alain Magloire * src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java 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 9ba55f9d7b1..172b4617daf 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 @@ -20,6 +20,7 @@ import org.eclipse.cdt.core.model.ICModel; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.IInclude; import org.eclipse.cdt.core.model.IParent; +import org.eclipse.cdt.core.model.ISourceReference; import org.eclipse.cdt.core.model.ISourceRoot; import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.model.IWorkingCopy; @@ -170,7 +171,7 @@ public class BaseCElementContentProvider implements ITreeContentProvider { } return getTranslationUnitChildren(tu); } - } else if (element instanceof IParent) { + } else if (element instanceof ISourceReference && element instanceof IParent) { return ((IParent)element).getChildren(); } else if (element instanceof IProject) { return getResources((IProject)element); 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 51e6cb7150f..78b5451d8ff 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 @@ -54,10 +54,6 @@ public class CViewContentProvider extends CElementContentProvider { extras = getBinaries((IBinaryContainer)element); } else if (element instanceof IArchiveContainer) { extras = getArchives((IArchiveContainer)element); - } else if (element instanceof LibraryRefContainer) { - extras = ((LibraryRefContainer)element).getChildren(element); - } else if (element instanceof IncludeRefContainer) { - extras = ((IncludeRefContainer)element).getChildren(element); } } catch (CModelException e) { extras = null;