Committing more fixes for bug #1839622 RSE Path error. This will clean up php files...

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/CompilationUnitScope.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/CompilationUnitScope.java
index 0e03ef2..0de4b0a 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/CompilationUnitScope.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/CompilationUnitScope.java
@@ -387,7 +387,7 @@ public class CompilationUnitScope extends Scope {
                                }
                                typeBinding.compoundName = compoundName; // compoundName;
                                // this.fPackage = fPackage;
-                               typeBinding.fileName = file.getLocation().toString()
+                               typeBinding.fileName = file.getFullPath().toString()
                                                .toCharArray();
                                // typeBinding.modifiers = scope.referenceContext.modifiers;
                                // typeBinding.sourceName = scope.referenceContext.name;

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 c31b8fa..e6c6133 100644 (file)
--- 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
@@ -4170,7 +4170,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers,
                                        if (path == null) {
                                                // SyntaxError: "File: << >> doesn't exist in project."
                                                String[] args = { expression.toStringExpression(),
-                                                               project.getLocation().toString() };
+                                                               project.getFullPath().toString() };
                                                problemReporter.phpIncludeNotExistWarning(args,
                                                                literal.sourceStart, literal.sourceEnd,
                                                                referenceContext,

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 (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
@@ -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;
                                }