Commiting more changes to fix RSE issues with PHP projects.

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / ui / util / PHPFileUtil.java

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..702184a 100644 (file)
--- 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
@@ -136,7 +136,7 @@ public class PHPFileUtil {
                        return null;
                }
 
-               String projectPath = project.getLocation().toString();
+               String projectPath = project.getFullPath().toString();
                String filePath = absoluteFilePath.toString().substring(
                                projectPath.length() + 1);
                return project.getFile(filePath);
@@ -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,10 +200,10 @@ public class PHPFileUtil {
                if (!absolute) {
                        IFile ifile = FileBuffers.getWorkspaceFileAtLocation(path);
                        if (ifile != null) {
-                               file = ifile.getLocation().toFile();
-                               if (file.exists()) {
-                                       return true;
-                               }
+                           IResource resource = ifile;
+                if (resource.exists()) {
+                    return true;
+                }
                        }
                }
                return false;