From 775e82edd0da53048ad58cfef68f0e9d40682460 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Wed, 24 Mar 2004 01:15:13 +0000 Subject: [PATCH] Check for Reorder IPathEntry and do a refresh --- core/org.eclipse.cdt.ui/ChangeLog | 8 ++++++++ .../cdt/internal/ui/BaseCElementContentProvider.java | 12 +++++++++++- .../org/eclipse/cdt/ui/CElementContentProvider.java | 1 + 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index bbfd9cd6164..6f14c0985d5 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,11 @@ +2004-03-23 Alain Magloire + + Show the objects on the IOuputEntry path should + be save in the BinaryContainer. + + * src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java + * src/org/eclpse/cdt/ui/CElementContentProvider.java + 2004-03-23 Hoda Amer Fix for bug#51303 Content Assist: Completion list remains open after a space is added to a prefix Fix for bug#53066 Content Assist: Information displayed after completion on Macro function is not legible. 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 4908bd87c43..0758e85d58d 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 @@ -129,6 +129,10 @@ public class BaseCElementContentProvider implements ITreeContentProvider { return getCProjects((ICModel)element); } else if (element instanceof ICProject ) { return getSourceRoots((ICProject)element); + } else if (element instanceof IBinaryContainer) { + return ((IBinaryContainer)element).getBinaries(); + } else if (element instanceof IArchiveContainer) { + return ((IArchiveContainer)element).getArchives(); } else if (element instanceof ICContainer) { return getCResources((ICContainer)element); } else if (element instanceof ITranslationUnit) { @@ -182,7 +186,13 @@ public class BaseCElementContentProvider implements ITreeContentProvider { return true; } } - + + if (element instanceof IBinaryContainer) { + IBinaryContainer cont = (IBinaryContainer)element; + IBinary[] bin = cont.getBinaries(); + return (bin != null) && bin.length > 0; + } + if (element instanceof IParent) { // when we have C children return true, else we fetch all the children if (((IParent)element).hasChildren()) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementContentProvider.java index 1e9a3d2cd5d..1a169586632 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementContentProvider.java @@ -109,6 +109,7 @@ public class CElementContentProvider extends BaseCElementContentProvider impleme (flags & ICElementDelta.F_ADDED_PATHENTRY_LIBRARY) != 0 || (flags & ICElementDelta.F_ADDED_PATHENTRY_SOURCE) != 0 || (flags & ICElementDelta.F_REMOVED_PATHENTRY_LIBRARY) != 0 || + (flags & ICElementDelta.F_PATHENTRY_REORDER) != 0 || (flags & ICElementDelta.F_REMOVED_PATHENTRY_SOURCE) != 0)); }