From: axelcl Date: Wed, 2 Feb 2005 22:39:22 +0000 (+0000) Subject: fixed bug for detecting IFile "include files" outside of the workspace X-Git-Url: http://secure.phpeclipse.com fixed bug for detecting IFile "include files" outside of the workspace --- diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java index ad67bec..d77f3fc 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java @@ -3428,7 +3428,11 @@ public class Parser //extends PHPParserSuperclass problemReporter.phpIncludeNotExistWarning(args, literal.sourceStart, literal.sourceEnd, referenceContext, compilationUnit.compilationResult); } else { - impt.setFile( PHPFileUtil.createFile(path, project) ); + try { + impt.setFile( PHPFileUtil.createFile(path, project) ); + } catch (Exception e) { + // the file is outside of the workspace + } } } } diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/util/PHPFileUtil.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/util/PHPFileUtil.java index 432359c..7d0e19f 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/util/PHPFileUtil.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/util/PHPFileUtil.java @@ -104,7 +104,7 @@ public class PHPFileUtil { } /** - * Creata the file for the given absolute file path + * Creata the file for the given absolute file path * * @param absoluteFilePath * @param project @@ -114,13 +114,15 @@ public class PHPFileUtil { if (absoluteFilePath == null || project == null) { return null; } + String projectPath = project.getLocation().toString(); String filePath = absoluteFilePath.toString().substring(projectPath.length() + 1); return project.getFile(filePath); + } /** - * Determine the path of an include name string + * Determine the path of an include name string * * @param includeNameString * @param resource