1) Moved net.sourceforge.phpeclipse.ui\src\net\sourceforge\phpdt back to net.sourcefo...

[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..b571a1c 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
@@ -2,6 +2,8 @@
  * Created on 09.08.2003
  *
  */
+
+/*duplicated incastrix*/
 package net.sourceforge.phpdt.internal.ui.util;
 
 import java.io.File;
@@ -82,9 +84,9 @@ public class PHPFileUtil {
         * Returns true iff the file extension is a valid PHP Unit name
         * implementation is not creating extra strings.
         */
-       public final static boolean isValidPHPUnitName(String filename) {
-               return PHPFileUtil.isPHPFileName(filename);
-       }
+//     public final static boolean isValidPHPUnitName(String filename) {
+//             return PHPFileUtil.isPHPFileName(filename);
+//     }
 
        /**
         * @return Returns the PHP extensions.
@@ -131,17 +133,17 @@ public class PHPFileUtil {
         * @return the file for the given absolute file path or <code>null</code>
         *         if no existing file can be found
         */
-       public static IFile createFile(IPath absoluteFilePath, IProject project) {
-               if (absoluteFilePath == null || project == null) {
-                       return null;
-               }
-
-               String projectPath = project.getLocation().toString();
-               String filePath = absoluteFilePath.toString().substring(
-                               projectPath.length() + 1);
-               return project.getFile(filePath);
-
-       }
+//     public static IFile createFile(IPath absoluteFilePath, IProject project) {
+//             if (absoluteFilePath == null || project == null) {
+//                     return null;
+//             }
+//
+//             String projectPath = project.getFullPath().toString();
+//             String filePath = absoluteFilePath.toString().substring(
+//                             projectPath.length() + 1);
+//             return project.getFile(filePath);
+//
+//     }
 
        /**
         * Determine the path of an include name string
@@ -157,22 +159,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 +202,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;