X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml index ebe915d..419b36c 100644 --- a/net.sourceforge.phpeclipse/plugin.xml +++ b/net.sourceforge.phpeclipse/plugin.xml @@ -102,15 +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="html" /> - <fileTypes type="text" extension="htm" /> + <fileTypes type="text" extension="ctp" /> </extension> <!-- declares a content type for PHP Source files --> @@ -119,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,html,htm"/> + file-extensions="php,phpc,php3,php4,php5,phtml,inc,module,phpt,ctp"/> </extension> <extension @@ -155,16 +155,6 @@ </extension> <extension - point="org.eclipse.ui.perspectives"> - <perspective - name="%perspectivePHP.name" - icon="icons/obj16/php.png" - class="net.sourceforge.phpeclipse.PHPPerspectiveFactory" - id="net.sourceforge.phpeclipse.PHPPerspective"> - </perspective> - </extension> - - <extension point="org.eclipse.ui.perspectiveExtensions"> <perspectiveExtension targetID="net.sourceforge.phpeclipse.PHPPerspective"> @@ -455,34 +445,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" @@ -490,10 +460,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" @@ -536,7 +508,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" @@ -545,17 +517,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" @@ -568,6 +529,7 @@ </action> </objectContribution> + <!-- Viewers --> <viewerContribution targetID="#PHPEditorContext" id="net.sourceforge.phpeclipse.actions.popupHTMLWizard"> @@ -875,7 +837,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"