X-Git-Url: http://git.phpeclipse.com 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 e8ffe5d..5f9facc 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 @@ -157,22 +157,21 @@ public class PHPFileUtil { IPath documentRootPath = ProjectPrefUtil.getDocumentRoot(project); IPath resourcePath = resource.getProjectRelativePath(); - File file = null; IPath path = null; - + // script location based - path = project.getLocation().append(resourcePath.removeLastSegments(1)) + path = project.getFullPath().append(resourcePath.removeLastSegments(1)) .append(includeNameString); + //path = if (fileExists(path, false)) { return path; } - // project root based - path = project.getLocation().append(includeNameString); + path = project.getFullPath().append(includeNameString); if (fileExists(path, false)) { return path; } - + // DocumentRoot (absolute path) based path = documentRootPath.append(includeNameString); if (fileExists(path, true)) { @@ -201,7 +200,7 @@ public class PHPFileUtil { if (!absolute) { IFile ifile = FileBuffers.getWorkspaceFileAtLocation(path); if (ifile != null) { - file = ifile.getLocation().toFile(); + file = ifile.getFullPath().toFile(); if (file.exists()) { return true; }