From c25a3eff3f3e3293500097ad8d9318763bd66206 Mon Sep 17 00:00:00 2001
From: pombredanne <pombredanne>
Date: Mon, 24 Sep 2007 20:26:12 +0000
Subject: [PATCH 1/1] Cleaning up the supported files extensions, need more fixing. Adding ctp extensions support (Cake PHP templates)

---
 .../plugin.xml                                     |   25 +++------
 net.sourceforge.phpeclipse.launching/plugin.xml    |   40 ++++----------
 net.sourceforge.phpeclipse/plugin.xml              |   55 +++++---------------
 3 files changed, 34 insertions(+), 86 deletions(-)

diff --git a/net.sourceforge.phpeclipse.externaltools/plugin.xml b/net.sourceforge.phpeclipse.externaltools/plugin.xml
index 03fe24c..a7c61f2 100644
--- a/net.sourceforge.phpeclipse.externaltools/plugin.xml
+++ b/net.sourceforge.phpeclipse.externaltools/plugin.xml
@@ -289,12 +289,14 @@
 	  </actionSet>
 	</extension>
 
+	<!-- FIXME: there is too much duplication of contributions pointing to the same action. we should find a better way-->
+	  <!-- php, phpc,php3,php4,php5,phpt-->
 	<extension
 		 point="org.eclipse.ui.popupMenus">
 	  <objectContribution
 			objectClass="org.eclipse.core.resources.IFile"
-			nameFilter="*.php"
-			id="net.sourceforge.phpdt.externaltools.actions.externalParserAction.php">
+			nameFilter="*.php*"
+			id="net.sourceforge.phpdt.externaltools.actions.externalParserAction.phpS">
 		 <action
 			   label="Run External PHP Parser"
 			   class="net.sourceforge.phpdt.externaltools.actions.PHPExternalParserAction"
@@ -304,8 +306,8 @@
 	  </objectContribution>
 	  <objectContribution
 			objectClass="org.eclipse.core.resources.IFile"
-			nameFilter="*.php3"
-			id="net.sourceforge.phpdt.externaltools.actions.externalParserAction.php3">
+			nameFilter="*.ctp"
+			id="net.sourceforge.phpdt.externaltools.actions.externalParserAction.ctp">
 		 <action
 			   label="Run External PHP Parser"
 			   class="net.sourceforge.phpdt.externaltools.actions.PHPExternalParserAction"
@@ -315,19 +317,8 @@
 	  </objectContribution>
 	  <objectContribution
 			objectClass="org.eclipse.core.resources.IFile"
-			nameFilter="*.php4"
-			id="net.sourceforge.phpdt.externaltools.actions.externalParserAction.php4">
-		 <action
-			   label="Run External PHP Parser"
-			   class="net.sourceforge.phpdt.externaltools.actions.PHPExternalParserAction"
-			   menubarPath="additions"
-			   id="net.sourceforge.phpdt.externaltools.actions.externalParserAction">
-		 </action>
-	  </objectContribution>
-	  <objectContribution
-			objectClass="org.eclipse.core.resources.IFile"
-			nameFilter="*.php5"
-			id="net.sourceforge.phpdt.externaltools.actions.externalParserAction.php5">
+			nameFilter="*.phtml"
+			id="net.sourceforge.phpdt.externaltools.actions.externalParserAction.phtml">
 		 <action
 			   label="Run External PHP Parser"
 			   class="net.sourceforge.phpdt.externaltools.actions.PHPExternalParserAction"
diff --git a/net.sourceforge.phpeclipse.launching/plugin.xml b/net.sourceforge.phpeclipse.launching/plugin.xml
index 91a3bca..ef5d455 100644
--- a/net.sourceforge.phpeclipse.launching/plugin.xml
+++ b/net.sourceforge.phpeclipse.launching/plugin.xml
@@ -8,34 +8,18 @@
 			delegate="net.sourceforge.phpdt.internal.launching.PHPLaunchConfigurationDelegate"
 			modes="run,debug"
 			id="net.sourceforge.phpdt.launching.LaunchConfigurationTypePHPApplication">
-		 <fileExtension
-			   default="true"
-			   extension="php">
-		 </fileExtension>
-		 <fileExtension
-			   default="true"
-			   extension="phpc">
-		 </fileExtension>
-		 <fileExtension
-			   default="true"
-			   extension="php3">
-		 </fileExtension>
-		 <fileExtension
-			   default="true"
-			   extension="php4">
-		 </fileExtension>
-		 <fileExtension
-			   default="true"
-			   extension="php5">
-		 </fileExtension>
-		 <fileExtension
-			   default="true"
-			   extension="htm">
-		 </fileExtension>
-		 <fileExtension
-			   default="true"
-			   extension="html">
-		 </fileExtension>
+		 <fileExtension default="true" extension="php"></fileExtension>
+		 <fileExtension default="true" extension="phpc"></fileExtension>
+		 <fileExtension default="true" extension="php3"></fileExtension>
+		 <fileExtension default="true" extension="php4"></fileExtension>
+		 <fileExtension default="true" extension="php5"></fileExtension>
+		 <fileExtension default="true" extension="phtml"></fileExtension>
+		 <fileExtension default="true" extension="phpt"></fileExtension>
+		 <fileExtension default="true" extension="htm"></fileExtension>
+		 <fileExtension default="true" extension="html"></fileExtension>
+		 <fileExtension default="true" extension="inc"></fileExtension>
+		 <fileExtension default="true" extension="ctp"></fileExtension>
+		 <fileExtension default="true" extension="module"></fileExtension>
 	  </launchConfigurationType>
    </extension>
 
diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 8680c34..1a3aee8 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -106,10 +106,11 @@
 	  <fileTypes type="text" extension="php3" />
 	  <fileTypes type="text" extension="php4" />
 	  <fileTypes type="text" extension="php5" />
-	  <fileTypes type="text" extension="module" />
-	  <fileTypes type="text" extension="inc" />
 	  <fileTypes type="text" extension="phtml" />
+	  <fileTypes type="text" extension="inc" />
+	  <fileTypes type="text" extension="module" />
 	  <fileTypes type="text" extension="phpt" />
+	  <fileTypes type="text" extension="ctp" />
    </extension>
 
 <!-- declares a content type for PHP Source files -->
@@ -118,7 +119,7 @@
 	<content-type id="phpSource" name="%phpSourceName"
 		base-type="org.eclipse.core.runtime.text"
 		priority="high"
-		file-extensions="php,phpc,php3,php4,php5,phtml,inc,module,phpt"/>
+		file-extensions="php,phpc,php3,php4,php5,phtml,inc,module,phpt,ctp"/>
    </extension>
 
    <extension
@@ -454,34 +455,14 @@
 <!-- PHP Editor Action Definition IDs -->
 <!-- =========================================================================== -->
 
+	<!-- FIXME: there is too much duplication of contributions pointing to the same action. we should find a better way-->
    <extension
 		 point="org.eclipse.ui.popupMenus">
+	  <!-- php, phpc,php3,php4,php5,phpt-->
 	  <objectContribution
 			objectClass="org.eclipse.core.resources.IFile"
-			nameFilter="*.php"
-			id="net.sourceforge.phpeclipse.actions.popupShowAction.php">
-		 <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="*.php3"
-			id="net.sourceforge.phpeclipse.actions.popupShowAction.php3">
-		 <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="*.php4"
-			id="net.sourceforge.phpeclipse.actions.popupShowAction.php4">
+			nameFilter="*.php*"
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.phpS">
 		 <action
 			   label="Open PHP Browser"
 			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -489,10 +470,12 @@
 			   id="net.sourceforge.phpeclipse.actions.showAction">
 		 </action>
 	  </objectContribution>
+
+	  <!-- cake PHP support -->
 	  <objectContribution
 			objectClass="org.eclipse.core.resources.IFile"
-			nameFilter="*.php5"
-			id="net.sourceforge.phpeclipse.actions.popupShowAction.php5">
+			nameFilter="*.ctp"
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.ctp">
 		 <action
 			   label="Open PHP Browser"
 			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -535,7 +518,7 @@
 	  </objectContribution>
 	  <objectContribution
 			objectClass="org.eclipse.core.resources.IFile"
-			nameFilter="*.html"
+			nameFilter="*.htm*"
 			id="net.sourceforge.phpeclipse.actions.popupShowAction.html">
 		 <action
 			   label="Open PHP Browser"
@@ -544,17 +527,6 @@
 			   id="net.sourceforge.phpeclipse.actions.showAction">
 		 </action>
 	  </objectContribution>
-			<objectContribution
-			objectClass="org.eclipse.core.resources.IFile"
-			nameFilter="*.htm"
-			id="net.sourceforge.phpeclipse.actions.popupShowAction.htm">
-		 <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="*.xml"
@@ -567,6 +539,7 @@
 		 </action>
 	  </objectContribution>
 
+	  <!-- Viewers -->
 	  <viewerContribution
 			targetID="#PHPEditorContext"
 			id="net.sourceforge.phpeclipse.actions.popupHTMLWizard">
-- 
1.7.1