From f3878f3175a36eafed953f0c338d852e10a069f7 Mon Sep 17 00:00:00 2001 From: David Inglis Date: Mon, 11 Dec 2006 15:31:11 +0000 Subject: [PATCH] [merged from 3_1_1] fixed binary handling on non output paths bug#167431 --- .../org/eclipse/cdt/internal/core/model/CContainerInfo.java | 2 +- .../org/eclipse/cdt/internal/core/model/CProjectInfo.java | 3 +-- 2 files changed, 2 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 dcd18c93181..0f0b031c006 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 @@ -85,7 +85,7 @@ public class CContainerInfo extends OpenableInfo { continue; } if (root.isOnSourceEntry(member)) { - if (CModelManager.getDefault().createBinaryFile((IFile)member) != null) { + if (cproject.isOnOutputEntry(member) && CModelManager.getDefault().createBinaryFile((IFile)member) != null) { continue; } } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProjectInfo.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProjectInfo.java index 5eba9bc3bfe..d5c3703d2ed 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProjectInfo.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProjectInfo.java @@ -116,8 +116,7 @@ class CProjectInfo extends OpenableInfo { && !CoreModelUtil.isExcluded(member, exclusionPatterns)) { continue; } else if (!CoreModelUtil.isExcluded(member, exclusionPatterns)) { - Object o = CModelManager.getDefault().createBinaryFile((IFile)member); - if (o != null) { + if (cproject.isOnOutputEntry(member) && CModelManager.getDefault().createBinaryFile((IFile)member) != null) { continue; } }