Parser detects wrong include files now

[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 91e330b..dd1c59c 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
@@ -4,36 +4,24 @@
  */
 package net.sourceforge.phpdt.internal.ui.util;
 
+import java.io.File;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.StringTokenizer;
 
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
+import net.sourceforge.phpeclipse.ui.overlaypages.ProjectPrefUtil;
 
 import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
 import org.eclipse.jface.preference.IPreferenceStore;
 
-/**
- * @author khartlage
- *  
- */
 public class PHPFileUtil {
   private static String[] PHP_EXTENSIONS = null;
 
-  //  {
-  //      "php",
-  //      "php3",
-  //      "php4",
-  //      "php5",
-  //      "phtml",
-  //      "module", // drupal
-  //      "inc",
-  //      "class"
-  //  };
-  //  public final static String[] HTML_EXTENSIONS = {
-  //      "html",
-  //      "htm",
-  //      "xhtml"
-  //  };
   public final static String[] SMARTY_EXTENSIONS = { "tpl" };
 
   public static boolean isPHPFile(IFile file) {
@@ -70,47 +58,12 @@ public class PHPFileUtil {
     }
     return false;
   }
-
-  /**
-   * Returns true iff str.toLowerCase().endsWith(".html") implementation is not creating extra strings.
-   */
-  //  public final static boolean isHTML_FileName(String name) {
-  //    String extension = getFileExtension(name);
-  //    if (extension==null) {
-  //      return false;
-  //    }
-  //  extension = extension.toLowerCase();
-  //    for (int i=0;i<HTML_EXTENSIONS.length;i++) {
-  //      if (extension.equals(HTML_EXTENSIONS[i])) {
-  //        return true;
-  //      }
-  //    }
-  //    return false;
-  //  }
-  /**
-   * Returns true iff str.toLowerCase().endsWith(".tpl") implementation is not creating extra strings.
-   */
-  //  public final static boolean isTPL_FileName(String name) {
-  //    String extension = getFileExtension(name);
-  //    if (extension==null) {
-  //      return false;
-  //    }
-  //  extension = extension.toLowerCase();
-  //    for (int i=0;i<SMARTY_EXTENSIONS.length;i++) {
-  //      if (extension.equals(SMARTY_EXTENSIONS[i])) {
-  //        return true;
-  //      }
-  //    }
-  //    return false;
-  //  }
+  
   /**
    * 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);
-    //         ||
-    //                PHPFileUtil.isHTML_FileName(filename) ||
-    //                    PHPFileUtil.isTPL_FileName(filename);
   }
 
   /**
@@ -149,4 +102,46 @@ public class PHPFileUtil {
   public static void setExtensins(String[] php_extensions) {
     PHP_EXTENSIONS = php_extensions;
   }
+
+  /**
+   * Determine the path of an include name string
+   * @param includeNameString
+   * @param resource
+   * @param project
+   */
+  public static IPath determineFilePath(String includeNameString, IResource resource, IProject project) {
+    IPath documentRootPath = ProjectPrefUtil.getDocumentRoot(project);
+    IPath resourcePath = resource.getProjectRelativePath();
+  
+    File file = null;
+    IPath path = null;
+    path = documentRootPath.append(includeNameString);
+    file = path.toFile();
+    if (file.exists()) {
+      return path;
+    }
+  
+    int index = includeNameString.indexOf('/');
+    if (index < 0) {
+      // includeNameString contains no path separator
+      path = project.getLocation().append(resourcePath.removeLastSegments(1));
+      path = path.append(includeNameString);
+      file = path.toFile();
+      if (file.exists()) {
+        return path;
+      }
+    }
+  
+    List includePaths = ProjectPrefUtil.getIncludePaths(project);
+    if (includePaths.size() > 0) {
+      for (int i = 0; i < includePaths.size(); i++) {
+        path = new Path(includePaths.get(i).toString()).append(includeNameString);
+        file = path.toFile();
+        if (file.exists()) {
+          return path;
+        }
+      }
+    }
+    return null;
+  }
 }
\ No newline at end of file