diff options
author | Doug Schaefer | 2007-06-25 16:08:19 +0000 |
---|---|---|
committer | Doug Schaefer | 2007-06-25 16:08:19 +0000 |
commit | b13904bb5034c408de3ee3e17189cfdf38ad5e87 (patch) | |
tree | c9d12c29d36771cccc5bd02501f0c54f40891c40 | |
parent | 7dbd86677cd698f7b1a0ed5b2ec12c3fc62cb7b4 (diff) | |
download | org.eclipse.cdt-b13904bb5034c408de3ee3e17189cfdf38ad5e87.tar.gz org.eclipse.cdt-b13904bb5034c408de3ee3e17189cfdf38ad5e87.tar.xz org.eclipse.cdt-b13904bb5034c408de3ee3e17189cfdf38ad5e87.zip |
Bug 193843 - fix missing non C resources in non Source Root containers.
-rw-r--r-- | core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CContainerInfo.java | 4 |
1 files changed, 1 insertions, 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; } |