X-Git-Url: http://secure.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..4b9f279 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
@@ -17,6 +17,11 @@ public class PHPFileUtil {
   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_php5 = ".php5".toCharArray(); //$NON-NLS-1$
+  public final static char[] SUFFIX_PHP5 = ".PHP5".toCharArray(); //$NON-NLS-1$
+  public final static char[] SUFFIX_phtml = ".phtml".toCharArray(); //$NON-NLS-1$
+  public final static char[] SUFFIX_PHTML = ".PHTML".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$
@@ -34,7 +39,12 @@ public class PHPFileUtil {
    * 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);
+    return isPHP_FileName(name) || 
+           isPHP3_FileName(name) || 
+           isPHP4_FileName(name) || 
+           isPHP5_FileName(name) || 
+           isPHTML_FileName(name) || 
+           isINC_FileName(name);
   }
   //  static public boolean isPHPFile(String extension) {
   //    if ("php".equalsIgnoreCase(extension)
@@ -101,6 +111,42 @@ public class PHPFileUtil {
   }
 
   /**
+   * Returns true iff str.toLowerCase().endsWith(".php4")
+   * implementation is not creating extra strings.
+   */
+  private final static boolean isPHP5_FileName(String name) {
+    int nameLength = name == null ? 0 : name.length();
+    int suffixLength = SUFFIX_PHP5.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_php5[i] && c != SUFFIX_PHP5[i])
+        return false;
+    }
+    return true;
+  }
+  
+ /**
+  * Returns true iff str.toLowerCase().endsWith(".php4")
+  * implementation is not creating extra strings.
+  */
+ private final static boolean isPHTML_FileName(String name) {
+   int nameLength = name == null ? 0 : name.length();
+   int suffixLength = SUFFIX_PHTML.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_phtml[i] && c != SUFFIX_PHTML[i])
+       return false;
+   }
+   return true;
+ }
+  
+  /**
    * Returns true iff str.toLowerCase().endsWith(".inc")
    * implementation is not creating extra strings.
    */
@@ -154,12 +200,12 @@ public class PHPFileUtil {
   }
   
   /**
-	 * 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);
 	}
 }