From 14939e4ab605da5de185999111cd0d21ae9e45bd Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Mon, 26 Sep 2011 12:15:42 -0400 Subject: [PATCH] bug 355601: Make Targets Not Found In Nested Folders --- .../cdt/make/ui/views/FilterEmtpyFoldersAction.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/FilterEmtpyFoldersAction.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/FilterEmtpyFoldersAction.java index 661c724468e..d6fc6d5d847 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/FilterEmtpyFoldersAction.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/FilterEmtpyFoldersAction.java @@ -75,17 +75,12 @@ public class FilterEmtpyFoldersAction extends Action { if(haveTargets[0]) { return false; //We found what we were looking for } + if(proxy.getType() != IResource.FOLDER) { return true; //We only look at folders for content } - IContainer folder = (IContainer) proxy.requestResource(); - if (CCorePlugin.showSourceRootsAtTopOfProject() && !(folder instanceof IProject)) { - boolean isSourceEntry = MakeContentProvider.isSourceEntry(folder); - if (isSourceEntry) - return false; - } - + IContainer folder = (IContainer) proxy.requestResource(); IMakeTarget [] targets = MakeCorePlugin.getDefault().getTargetManager().getTargets(folder); if(targets != null && targets.length > 0) { haveTargets[0] = true;