mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 14:42:11 +02:00
Code Issues Wiki Activity

Undo accidental change

Browse source
This commit is contained in:
Anton Leherbauer 2007-03-21 15:51:28 +00:00
parent f0cccf7f71
commit b0a57ff9ae
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java
View file

@ -43,7 +43,6 @@ import org.eclipse.swt.widgets.MessageBox;
import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.IInclude;
import org.eclipse.cdt.core.parser.ExtendedScannerInfo; import org.eclipse.cdt.core.parser.ExtendedScannerInfo;
import org.eclipse.cdt.core.parser.IExtendedScannerInfo; import org.eclipse.cdt.core.parser.IExtendedScannerInfo;
import org.eclipse.cdt.core.parser.IScannerInfo; import org.eclipse.cdt.core.parser.IScannerInfo;
@ -97,22 +96,17 @@ public class OpenIncludeAction extends Action {
if (info == null) { if (info == null) {
info = provider.getScannerInformation(proj); info = provider.getScannerInformation(proj);
} }
if (info != null) {
boolean isSystemInclude = include instanceof IInclude // search in system includes
&& ((IInclude) include).isStandard(); String[] includePaths = info.getIncludePaths();
findFile(includePaths, includeName, filesFound);
// search in user includes
if (!isSystemInclude && info != null) {
IExtendedScannerInfo scanInfo = new ExtendedScannerInfo(info);
String[] localIncludePaths = scanInfo.getLocalIncludePath();
findFile(localIncludePaths, includeName, filesFound);
} }
if (filesFound.size() == 0) { if (filesFound.size() == 0) {
// search in local includes
if (info != null) { if (info != null) {
// search in system includes IExtendedScannerInfo scanInfo = new ExtendedScannerInfo(info);
String[] includePaths = info.getIncludePaths(); String[] localIncludePaths = scanInfo.getLocalIncludePath();
findFile(includePaths, includeName, filesFound); findFile(localIncludePaths, includeName, filesFound);
} }
if (filesFound.size() == 0) { if (filesFound.size() == 0) {