diff options
| author | David Inglis | 2006-12-11 15:16:23 +0000 |
|---|---|---|
| committer | David Inglis | 2006-12-11 15:16:23 +0000 |
| commit | 35913375ff63da91a841b3a12df77b9f62e3491a (patch) | |
| tree | f874af27c733c926cf886743840fc1a776e036d8 /core | |
| parent | ff4f573e0f50cf2fdb6fe44ae598c736502229f6 (diff) | |
| download | org.eclipse.cdt-35913375ff63da91a841b3a12df77b9f62e3491a.tar.gz org.eclipse.cdt-35913375ff63da91a841b3a12df77b9f62e3491a.tar.xz org.eclipse.cdt-35913375ff63da91a841b3a12df77b9f62e3491a.zip | |
fixed binary handleing on non output paths
bug#167431
Diffstat (limited to 'core')
| -rw-r--r-- | core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CContainerInfo.java | 2 | ||||
| -rw-r--r-- | core/org.eclipse.cdt.core/model/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 3a3a4961c52..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 && cproject.isOnOutputEntry(member)) { + 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 4cc62000a18..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 && cproject.isOnOutputEntry(member)) { + if (cproject.isOnOutputEntry(member) && CModelManager.getDefault().createBinaryFile((IFile)member) != null) { continue; } } |