Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Leherbauer2008-03-05 09:36:02 +0000
committerAnton Leherbauer2008-03-05 09:36:02 +0000
commitc1570a8a019fa4971122cd0893b70917cab034d2 (patch)
tree19321f7e84be3c302df6c1565272f4b71f2a801b /core/org.eclipse.cdt.core/model/org
parent2f0d70899e71bf8429b6935b0e8e01e1e47f81f9 (diff)
downloadorg.eclipse.cdt-c1570a8a019fa4971122cd0893b70917cab034d2.tar.gz
org.eclipse.cdt-c1570a8a019fa4971122cd0893b70917cab034d2.tar.xz
org.eclipse.cdt-c1570a8a019fa4971122cd0893b70917cab034d2.zip
Fix for 199369: [Outline View] empty for headers in project on include path outside of src folder
Diffstat (limited to 'core/org.eclipse.cdt.core/model/org')
-rw-r--r--core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/IncludeReference.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/IncludeReference.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/IncludeReference.java
index 76288574484..a98dd587c3a 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/IncludeReference.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/IncludeReference.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 QNX Software Systems and others.
+ * Copyright (c) 2000, 2008 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
* Contributors:
* QNX Software Systems - Initial API and implementation
* Ed Swartz (Nokia)
+ * Anton Leherbauer (Wind River Systems)
*******************************************************************************/
package org.eclipse.cdt.internal.core.model;
@@ -92,7 +93,7 @@ public class IncludeReference extends Openable implements IIncludeReference {
* @see org.eclipse.cdt.internal.core.model.CContainer#computeChildren(org.eclipse.cdt.internal.core.model.OpenableInfo, org.eclipse.core.resources.IResource)
*/
protected boolean computeChildren(OpenableInfo info, IResource res) throws CModelException {
- ArrayList vChildren = new ArrayList();
+ ArrayList<ICElement> vChildren = new ArrayList<ICElement>();
File file = null;
if (fPath != null) {
file = fPath.toFile();
@@ -131,7 +132,7 @@ public class IncludeReference extends Openable implements IIncludeReference {
* @see org.eclipse.cdt.core.model.IIncludeReference#isOnIncludeEntry(org.eclipse.core.runtime.IPath)
*/
public boolean isOnIncludeEntry(IPath path) {
- if (fIncludeEntry.getIncludePath().isPrefixOf(path)
+ if (fIncludeEntry.getFullIncludePath().isPrefixOf(path)
&& !CoreModelUtil.isExcluded(path, fIncludeEntry.fullExclusionPatternChars())) {
return true;
}

Back to the top