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 b205146..261673f 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
@@ -1,6 +1,6 @@
 /*
  * Created on 09.08.2003
- *  
+ *
  */
 package net.sourceforge.phpdt.internal.ui.util;
 
@@ -18,44 +18,58 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.ui.IEditorDescriptor;
+import org.eclipse.ui.IEditorRegistry;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.PlatformUI;
 
 public class PHPFileUtil {
-  private static String[] PHP_EXTENSIONS = null;
+//  private static String[] PHP_EXTENSIONS = null;
 
   public final static String[] SMARTY_EXTENSIONS = { "tpl" };
 
   public static boolean isPHPFile(IFile file) {
-    String extension = file.getFileExtension();
+//    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);
-  }
+//  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) {
-    String extension = getFileExtension(name);
-    if (extension == null) {
-      return false;
-    }
-    extension = extension.toLowerCase();
-    PHP_EXTENSIONS = getExtensions();
-    if (PHP_EXTENSIONS == null) {
-      return false;
-    }
-    for (int i = 0; i < PHP_EXTENSIONS.length; i++) {
-      if (extension.equals(PHP_EXTENSIONS[i])) {
+
+  	IWorkbench workbench = PlatformUI.getWorkbench();
+  	IEditorRegistry registry = workbench.getEditorRegistry();
+  	IEditorDescriptor[] descriptors = registry.getEditors(name);
+
+  	for (int i = 0; i < descriptors.length; i++) {
+			if (descriptors[i].getId().equals(PHPeclipsePlugin.EDITOR_ID)) {
         return true;
-      }
-    }
+			}
+		}
+//    String extension = getFileExtension(name);
+//    if (extension == null) {
+//      return false;
+//    }
+//    extension = extension.toLowerCase();
+//    PHP_EXTENSIONS = getExtensions();
+//    if (PHP_EXTENSIONS == null) {
+//      return false;
+//    }
+//    for (int i = 0; i < PHP_EXTENSIONS.length; i++) {
+//      if (extension.equals(PHP_EXTENSIONS[i])) {
+//        return true;
+//      }
+//    }
     return false;
   }
 
@@ -69,43 +83,43 @@ public class PHPFileUtil {
   /**
    * @return Returns the PHP extensions.
    */
-  public static String[] getExtensions() {
-    if (PHP_EXTENSIONS == null) {
-      ArrayList list = new ArrayList();
-      final IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore();
-      String extensions = store.getString(PHPeclipsePlugin.PHP_EXTENSION_PREFS);
-      extensions = extensions.trim();
-      if (extensions.length() != 0) {
-        StringTokenizer tokenizer = new StringTokenizer(extensions, " ,;:/-|");
-        String token;
-        while (tokenizer.hasMoreTokens()) {
-          token = tokenizer.nextToken();
-          if (token != null && token.length() >= 1) {
-            list.add(token);
-          }
-        }
-        if (list.size() != 0) {
-          PHP_EXTENSIONS = new String[list.size()];
-          for (int i = 0; i < list.size(); i++) {
-            PHP_EXTENSIONS[i] = (String) list.get(i);
-          }
-        }
-      }
-    }
-    return PHP_EXTENSIONS;
-  }
+//  public static String[] getExtensions() {
+//    if (PHP_EXTENSIONS == null) {
+//      ArrayList list = new ArrayList();
+//      final IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore();
+//      String extensions = store.getString(PHPeclipsePlugin.PHP_EXTENSION_PREFS);
+//      extensions = extensions.trim();
+//      if (extensions.length() != 0) {
+//        StringTokenizer tokenizer = new StringTokenizer(extensions, " ,;:/-|");
+//        String token;
+//        while (tokenizer.hasMoreTokens()) {
+//          token = tokenizer.nextToken();
+//          if (token != null && token.length() >= 1) {
+//            list.add(token);
+//          }
+//        }
+//        if (list.size() != 0) {
+//          PHP_EXTENSIONS = new String[list.size()];
+//          for (int i = 0; i < list.size(); i++) {
+//            PHP_EXTENSIONS[i] = (String) list.get(i);
+//          }
+//        }
+//      }
+//    }
+//    return PHP_EXTENSIONS;
+//  }
 
   /**
    * @param php_extensions
    *          The PHP extensions to set.
    */
-  public static void setExtensions(String[] php_extensions) {
-    PHP_EXTENSIONS = php_extensions;
-  }
+//  public static void setExtensions(String[] php_extensions) {
+//    PHP_EXTENSIONS = php_extensions;
+//  }
 
   /**
    * Creata the file for the given absolute file path
-   * 
+   *
    * @param absoluteFilePath
    * @param project
    * @return the file for the given absolute file path or <code>null</code> if no existing file can be found
@@ -123,7 +137,7 @@ public class PHPFileUtil {
 
   /**
    * Determine the path of an include name string
-   * 
+   *
    * @param includeNameString
    * @param resource
    * @param project