diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index 4194f2d183f..6ce37057d24 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,10 @@ +2004-06-08 Alain Magloire + + Fix for PR 66186. + Remove the log() print not necessary + and users thinks something went wrong. + * src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java + 2004-06-07 Tanya Wolff Fix for Bug 66053 - externalized string in cview 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 50877594cad..62dcf17cb52 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 @@ -125,42 +125,42 @@ public class BaseCElementContentProvider implements ITreeContentProvider { return NO_CHILDREN; try { - if (element instanceof ICModel) { - return getCProjects((ICModel)element); - } else if (element instanceof ICProject ) { - 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) { - // if we want to use the working copy of it - if(fProvideWorkingCopy){ - // if it is not already a working copy - if(!(element instanceof IWorkingCopy)){ - // if it has a valid working copy - ITranslationUnit tu = (ITranslationUnit)element; - IWorkingCopy copy = tu.findSharedWorkingCopy(CUIPlugin.getDefault().getBufferFactory()); - if(copy != null) { - return ((IParent)copy).getChildren(); + if (element instanceof ICModel) { + return getCProjects((ICModel)element); + } else if (element instanceof ICProject ) { + 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) { + // if we want to use the working copy of it + if(fProvideWorkingCopy){ + // if it is not already a working copy + if(!(element instanceof IWorkingCopy)){ + // if it has a valid working copy + ITranslationUnit tu = (ITranslationUnit)element; + IWorkingCopy copy = tu.findSharedWorkingCopy(CUIPlugin.getDefault().getBufferFactory()); + if(copy != null) { + return ((IParent)copy).getChildren(); + } } } + return ((IParent)element).getChildren(); } + } else if (element instanceof IParent) { return ((IParent)element).getChildren(); + } else if (element instanceof IProject) { + return getResources((IProject)element); + } else if (element instanceof IFolder) { + return getResources((IFolder)element); } - } else if (element instanceof IParent) { - return ((IParent)element).getChildren(); - } else if (element instanceof IProject) { - return getResources((IProject)element); - } else if (element instanceof IFolder) { - return getResources((IFolder)element); - } } catch (CModelException e) { - CUIPlugin.getDefault().log(e); + //CUIPlugin.getDefault().log(e); return NO_CHILDREN; } return NO_CHILDREN;