From b0a57ff9ae49f3db88a0f39caff7c5e7ead353a0 Mon Sep 17 00:00:00 2001 From: Anton Leherbauer Date: Wed, 21 Mar 2007 15:51:28 +0000 Subject: [PATCH] Undo accidental change --- .../internal/ui/editor/OpenIncludeAction.java | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java index 33b1967d1dc..6c29a551764 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java @@ -43,7 +43,6 @@ import org.eclipse.swt.widgets.MessageBox; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.model.CModelException; 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.IExtendedScannerInfo; import org.eclipse.cdt.core.parser.IScannerInfo; @@ -97,22 +96,17 @@ public class OpenIncludeAction extends Action { if (info == null) { info = provider.getScannerInformation(proj); } - - boolean isSystemInclude = include instanceof IInclude - && ((IInclude) include).isStandard(); - - // search in user includes - if (!isSystemInclude && info != null) { - IExtendedScannerInfo scanInfo = new ExtendedScannerInfo(info); - String[] localIncludePaths = scanInfo.getLocalIncludePath(); - findFile(localIncludePaths, includeName, filesFound); + if (info != null) { + // search in system includes + String[] includePaths = info.getIncludePaths(); + findFile(includePaths, includeName, filesFound); } - if (filesFound.size() == 0) { + // search in local includes if (info != null) { - // search in system includes - String[] includePaths = info.getIncludePaths(); - findFile(includePaths, includeName, filesFound); + IExtendedScannerInfo scanInfo = new ExtendedScannerInfo(info); + String[] localIncludePaths = scanInfo.getLocalIncludePath(); + findFile(localIncludePaths, includeName, filesFound); } if (filesFound.size() == 0) {