added php5 file type

diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPLaunchShortcut.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPLaunchShortcut.java
index ec84fd5..5a3cafb 100644 (file)
--- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPLaunchShortcut.java
+++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPLaunchShortcut.java
@@ -34,7 +34,8 @@ public class PHPLaunchShortcut implements ILaunchShortcut {
                                if (
              ((IFile) firstSelection).getFileExtension().equals("php") ||
              ((IFile) firstSelection).getFileExtension().equals("php3") ||
-             ((IFile) firstSelection).getFileExtension().equals("php4")
+             ((IFile) firstSelection).getFileExtension().equals("php4") ||
+             ((IFile) firstSelection).getFileExtension().equals("php5")
             ) {
                                        ILaunchConfiguration config = findLaunchConfiguration((IFile)firstSelection, mode);
                                        try {

diff --git a/net.sourceforge.phpeclipse/plugin.properties b/net.sourceforge.phpeclipse/plugin.properties
index 94cefe9..5f13f45 100644 (file)
--- a/net.sourceforge.phpeclipse/plugin.properties
+++ b/net.sourceforge.phpeclipse/plugin.properties
@@ -43,6 +43,7 @@ phpBrowserView=PHP Browser
 phpFileExtension=php
 php3FileExtension=php3
 php4FileExtension=php4
+php5FileExtension=php5
 incFileExtension=inc
 phtmlFileExtension=phtml
 htmlFileExtension=html

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index c5e37f4..9fea8e5 100644 (file)
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -151,6 +151,10 @@
       </fileTypes>
       <fileTypes
             type="text"
+            extension="php5">
+      </fileTypes>
+      <fileTypes
+            type="text"
             extension="inc">
       </fileTypes>
       <fileTypes
@@ -397,6 +401,16 @@
             name="%phpEditorName"
             default="true"
             icon="icons/obj16/phpedit.gif"
+            extensions="php5"
+            contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
+            symbolicFontName="net.sourceforge.phpdt.ui.editors.textfont"
+            id="net.sourceforge.phpeclipse.PHPUnitEditor">
+      </editor>
+      <editor
+            name="%phpEditorName"
+            default="true"
+            icon="icons/obj16/phpedit.gif"
             extensions="inc"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
@@ -845,6 +859,17 @@
       </objectContribution>
       <objectContribution
             objectClass="org.eclipse.core.resources.IFile"
+            nameFilter="*.php5"
+            id="net.sourceforge.phpeclipse.actions.popupShowAction">
+         <action
+               label="Open PHP Browser"
+               class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
+               menubarPath="additions"
+               id="net.sourceforge.phpeclipse.actions.showAction">
+         </action>
+      </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IFile"
             nameFilter="*.inc"
             id="net.sourceforge.phpeclipse.actions.popupShowAction">
          <action
@@ -1417,6 +1442,14 @@
    <extension
          point="org.eclipse.ui.editors.documentProviders">
       <provider
+            extensions="%php5FileExtension"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
+            id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
+      </provider>
+   </extension>
+   <extension
+         point="org.eclipse.ui.editors.documentProviders">
+      <provider
             extensions="%incFileExtension"
             class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
             id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">

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 (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
@@ -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);
        }
 }

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java
index 940d68b..ee74a43 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java
@@ -39,7 +39,7 @@ import org.eclipse.ui.texteditor.TextEditorAction;
 public class PHPParserAction extends TextEditorAction {
 
   private static PHPParserAction instance = new PHPParserAction();
-  private static String[] EXTENSIONS = { ".php", ".php3", ".php4", ".inc", ".phtml" };
+  private static String[] EXTENSIONS = { ".php", ".php3", ".php4", ".php5", ".inc", ".phtml" };
 
   protected IFile fileToParse;
   protected List fVariables = new ArrayList(100);