From b13904bb5034c408de3ee3e17189cfdf38ad5e87 Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Mon, 25 Jun 2007 16:08:19 +0000 Subject: [PATCH] Bug 193843 - fix missing non C resources in non Source Root containers. --- .../org/eclipse/cdt/internal/core/model/CContainerInfo.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CContainerInfo.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CContainerInfo.java index c2dba75999a..6f28c8d222c 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CContainerInfo.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CContainerInfo.java @@ -57,8 +57,6 @@ public class CContainerInfo extends OpenableInfo { ISourceRoot root = null; if (celement instanceof ISourceRoot) { root = (ISourceRoot)celement; - } else { - return new Object[0]; // should not be. assert } try { @@ -92,7 +90,7 @@ public class CContainerInfo extends OpenableInfo { } case IResource.FILE: { String filename = member.getName(); - if (CoreModel.isValidTranslationUnitName(cproject.getProject(), filename) + if (root != null && CoreModel.isValidTranslationUnitName(cproject.getProject(), filename) && root.isOnSourceEntry(member)) { continue; }