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 dd4a36f..177438d 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
@@ -4,6 +4,9 @@
  */
 package net.sourceforge.phpdt.internal.ui.util;
 
+import net.sourceforge.phpeclipse.ui.IPreferenceConstants;
+import net.sourceforge.phpeclipse.ui.overlaypages.Util;
+
 import org.eclipse.core.resources.IFile;
 
 /**
@@ -11,155 +14,98 @@ import org.eclipse.core.resources.IFile;
  *
  */
 public class PHPFileUtil {
-  public final static char[] SUFFIX_php = ".php".toCharArray(); //$NON-NLS-1$
-  public final static char[] SUFFIX_PHP = ".PHP".toCharArray(); //$NON-NLS-1$
-  public final static char[] SUFFIX_php3 = ".php3".toCharArray(); //$NON-NLS-1$
-  public final static char[] SUFFIX_PHP3 = ".PHP3".toCharArray(); //$NON-NLS-1$
-  public final static char[] SUFFIX_php4 = ".php4".toCharArray(); //$NON-NLS-1$
-  public final static char[] SUFFIX_PHP4 = ".PHP4".toCharArray(); //$NON-NLS-1$
-  public final static char[] SUFFIX_inc = ".inc".toCharArray(); //$NON-NLS-1$
-  public final static char[] SUFFIX_INC = ".INC".toCharArray(); //$NON-NLS-1$
-  public final static char[] SUFFIX_html = ".html".toCharArray(); //$NON-NLS-1$
-  public final static char[] SUFFIX_HTML = ".HTML".toCharArray(); //$NON-NLS-1$
-  public final static char[] SUFFIX_tpl = ".tpl".toCharArray(); //$NON-NLS-1$
-  public final static char[] SUFFIX_TPL = ".TPL".toCharArray(); //$NON-NLS-1$
-
+  public final static String[] PHP_EXTENSIONS = {
+      "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) {
     String extension = file.getFileExtension();
     return isPHPFileName(file.getLocation().toString());
   }
 
+  public final static String getFileExtension(String name) {
+	int index = name.lastIndexOf('.');
+	if (index == -1)
+		return null;
+	if (index == (name.length() - 1))
+		return null; //$NON-NLS-1$
+	return name.substring(index + 1);
+}
+  
   /**
    * Returns true iff str.toLowerCase().endsWith(".php")
    * implementation is not creating extra strings.
    */
   public final static boolean isPHPFileName(String name) {
-    return isPHP_FileName(name) || isPHP3_FileName(name) || isPHP4_FileName(name) || isINC_FileName(name);
-  }
-  //  static public boolean isPHPFile(String extension) {
-  //    if ("php".equalsIgnoreCase(extension)
-  //      || "php3".equalsIgnoreCase(extension)
-  //      || "php4".equalsIgnoreCase(extension)
-  //      || "inc".equalsIgnoreCase(extension)) {
-  //      return true;
-  //    }
-  //    return false;
-  //  }
-
-  /**
-   * Returns true iff str.toLowerCase().endsWith(".php")
-   * implementation is not creating extra strings.
-   */
-  private final static boolean isPHP_FileName(String name) {
-    int nameLength = name == null ? 0 : name.length();
-    int suffixLength = SUFFIX_PHP.length;
-    if (nameLength < suffixLength)
+    String extension = getFileExtension(name).toLowerCase();
+    if (extension==null) {
       return false;
-
-    for (int i = 0, offset = nameLength - suffixLength; i < suffixLength; i++) {
-      char c = name.charAt(offset + i);
-      if (c != SUFFIX_php[i] && c != SUFFIX_PHP[i])
-        return false;
     }
-    return true;
-  }
-
-  /**
-   * Returns true iff str.toLowerCase().endsWith(".php3")
-   * implementation is not creating extra strings.
-   */
-  private final static boolean isPHP3_FileName(String name) {
-    int nameLength = name == null ? 0 : name.length();
-    int suffixLength = SUFFIX_PHP3.length;
-    if (nameLength < suffixLength)
-      return false;
-
-    for (int i = 0, offset = nameLength - suffixLength; i < suffixLength; i++) {
-      char c = name.charAt(offset + i);
-      if (c != SUFFIX_php3[i] && c != SUFFIX_PHP3[i])
-        return false;
+    for (int i=0;i<PHP_EXTENSIONS.length;i++) {
+      if (extension.equals(PHP_EXTENSIONS[i])) {
+        return true;
+      }
     }
-    return true;
+    return false;
   }
-
-  /**
-   * Returns true iff str.toLowerCase().endsWith(".php4")
-   * implementation is not creating extra strings.
-   */
-  private final static boolean isPHP4_FileName(String name) {
-    int nameLength = name == null ? 0 : name.length();
-    int suffixLength = SUFFIX_PHP4.length;
-    if (nameLength < suffixLength)
-      return false;
-
-    for (int i = 0, offset = nameLength - suffixLength; i < suffixLength; i++) {
-      char c = name.charAt(offset + i);
-      if (c != SUFFIX_php4[i] && c != SUFFIX_PHP4[i])
-        return false;
-    }
-    return true;
-  }
-
-  /**
-   * Returns true iff str.toLowerCase().endsWith(".inc")
-   * implementation is not creating extra strings.
-   */
-  private final static boolean isINC_FileName(String name) {
-    int nameLength = name == null ? 0 : name.length();
-    int suffixLength = SUFFIX_INC.length;
-    if (nameLength < suffixLength)
-      return false;
-
-    for (int i = 0, offset = nameLength - suffixLength; i < suffixLength; i++) {
-      char c = name.charAt(offset + i);
-      if (c != SUFFIX_inc[i] && c != SUFFIX_INC[i])
-        return false;
-    }
-    return true;
-  }
-  
+    
   /**
    * Returns true iff str.toLowerCase().endsWith(".html")
    * implementation is not creating extra strings.
    */
-  public final static boolean isHTML_FileName(String name) {
-    int nameLength = name == null ? 0 : name.length();
-    int suffixLength = SUFFIX_HTML.length;
-    if (nameLength < suffixLength)
-      return false;
-
-    for (int i = 0, offset = nameLength - suffixLength; i < suffixLength; i++) {
-      char c = name.charAt(offset + i);
-      if (c != SUFFIX_html[i] && c != SUFFIX_HTML[i])
-        return false;
-    }
-    return true;
-  }
+//  public final static boolean isHTML_FileName(String name) {
+//    String extension = getFileExtension(name).toLowerCase();
+//    if (extension==null) {
+//      return false;
+//    }
+//    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) {
-    int nameLength = name == null ? 0 : name.length();
-    int suffixLength = SUFFIX_TPL.length;
-    if (nameLength < suffixLength)
-      return false;
-
-    for (int i = 0, offset = nameLength - suffixLength; i < suffixLength; i++) {
-      char c = name.charAt(offset + i);
-      if (c != SUFFIX_tpl[i] && c != SUFFIX_TPL[i])
-        return false;
-    }
-    return true;
-  }
+//  public final static boolean isTPL_FileName(String name) {
+//    String extension = getFileExtension(name).toLowerCase();
+//    if (extension==null) {
+//      return false;
+//    }
+//    for (int i=0;i<SMARTY_EXTENSIONS.length;i++) {
+//      if (extension.equals(SMARTY_EXTENSIONS[i])) {
+//        return true;
+//      }
+//    }
+//    return false;
+//  }
   
   /**
-	 * Returns true iff str.toLowerCase().endsWith(".java")
+	 * Returns true iff the file extension is a valid PHP Unit name
 	 * implementation is not creating extra strings.
 	 */
-	public final static boolean isValidPHPUnitName(String name) {
-		return PHPFileUtil.isPHPFileName(name) ||
-		       PHPFileUtil.isHTML_FileName(name) ||
-			   PHPFileUtil.isTPL_FileName(name);
+	public final static boolean isValidPHPUnitName(String filename) {
+		return PHPFileUtil.isPHPFileName(filename);
+//		||
+//		       PHPFileUtil.isHTML_FileName(filename) ||
+//			   PHPFileUtil.isTPL_FileName(filename);
 	}
 }