Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Inglis2006-12-11 10:16:23 -0500
committerDavid Inglis2006-12-11 10:16:23 -0500
commit35913375ff63da91a841b3a12df77b9f62e3491a (patch)
treef874af27c733c926cf886743840fc1a776e036d8
parentff4f573e0f50cf2fdb6fe44ae598c736502229f6 (diff)
downloadorg.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
-rw-r--r--core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CContainerInfo.java2
-rw-r--r--core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProjectInfo.java3
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;
}
}

Back to the top