X-Git-Url: http://secure.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 8680c34..a433151 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">
@@ -874,7 +847,12 @@
 			class="net.sourceforge.phpdt.internal.ui.preferences.CodeAssistPreferencePage"
 			id="net.sourceforge.phpdt.internal.ui.preferences.CodeAssistPreferencePage">
 	  </page>
-			<page
+      <page name="%editorPageName"
+            category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
+            class="net.sourceforge.phpdt.internal.ui.preferences.EditorPreferencePage"
+            id="net.sourceforge.phpdt.internal.ui.preferences.EditorPreferencePage">
+      </page>
+      <page
 			name="%templatePageName"
 			category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
 			class="net.sourceforge.phpdt.internal.ui.preferences.JavaTemplatePreferencePage"