X-Git-Url: http://git.phpeclipse.com
diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index d546f9a..a433151 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -102,13 +102,15 @@
<extension
point="org.eclipse.team.core.fileTypes">
<fileTypes type="text" extension="php" />
+ <fileTypes type="text" extension="phpc" />
<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 -->
@@ -117,7 +119,7 @@
<content-type id="phpSource" name="%phpSourceName"
base-type="org.eclipse.core.runtime.text"
priority="high"
- file-extensions="php,php3,php4,php5,phtml,inc,module,phpt"/>
+ file-extensions="php,phpc,php3,php4,php5,phtml,inc,module,phpt,ctp"/>
</extension>
<extension
@@ -453,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">
- <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">
- <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">
+ nameFilter="*.php*"
+ id="net.sourceforge.phpeclipse.actions.popupShowAction.phpS">
<action
label="Open PHP Browser"
class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -488,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">
+ nameFilter="*.ctp"
+ id="net.sourceforge.phpeclipse.actions.popupShowAction.ctp">
<action
label="Open PHP Browser"
class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -502,7 +486,7 @@
<objectContribution
objectClass="org.eclipse.core.resources.IFile"
nameFilter="*.module"
- id="net.sourceforge.phpeclipse.actions.popupShowAction">
+ id="net.sourceforge.phpeclipse.actions.popupShowAction.module">
<action
label="Open PHP Browser"
class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -513,7 +497,7 @@
<objectContribution
objectClass="org.eclipse.core.resources.IFile"
nameFilter="*.inc"
- id="net.sourceforge.phpeclipse.actions.popupShowAction">
+ id="net.sourceforge.phpeclipse.actions.popupShowAction.inc">
<action
label="Open PHP Browser"
class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -524,7 +508,7 @@
<objectContribution
objectClass="org.eclipse.core.resources.IFile"
nameFilter="*.phtml"
- id="net.sourceforge.phpeclipse.actions.popupShowAction">
+ id="net.sourceforge.phpeclipse.actions.popupShowAction.phtml">
<action
label="Open PHP Browser"
class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -534,19 +518,8 @@
</objectContribution>
<objectContribution
objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.html"
- 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="*.htm"
- id="net.sourceforge.phpeclipse.actions.popupShowAction">
+ nameFilter="*.htm*"
+ id="net.sourceforge.phpeclipse.actions.popupShowAction.html">
<action
label="Open PHP Browser"
class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -557,7 +530,7 @@
<objectContribution
objectClass="org.eclipse.core.resources.IFile"
nameFilter="*.xml"
- id="net.sourceforge.phpeclipse.actions.popupShowAction">
+ id="net.sourceforge.phpeclipse.actions.popupShowAction.xml">
<action
label="Open PHP Browser"
class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -566,6 +539,7 @@
</action>
</objectContribution>
+ <!-- Viewers -->
<viewerContribution
targetID="#PHPEditorContext"
id="net.sourceforge.phpeclipse.actions.popupHTMLWizard">
@@ -873,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"