X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml index 01d8353..5d25fbb 100644 --- a/net.sourceforge.phpeclipse/plugin.xml +++ b/net.sourceforge.phpeclipse/plugin.xml @@ -2,20 +2,176 @@ <plugin id="net.sourceforge.phpeclipse" name="%pluginName" - version="1.0.2" + version="1.0.6" provider-name="%providerName" class="net.sourceforge.phpeclipse.PHPeclipsePlugin"> <runtime> - <library name="phpeclipse.jar"/> + <library name="phpeclipse.jar"> + <export name="*"/> + </library> </runtime> <requires> <import plugin="org.eclipse.core.resources"/> <import plugin="org.eclipse.ui"/> <import plugin="org.eclipse.help"/> <import plugin="org.eclipse.swt"/> + <import plugin="org.eclipse.debug.ui"/> + <import plugin="org.apache.xerces"/> + <import plugin="org.junit"/> + <import plugin="org.eclipse.update.ui"/> </requires> + + <extension + id="phpnature" + name="%naturePHP.name" + point="org.eclipse.core.resources.natures"> + <runtime> + <run + class="net.sourceforge.phpeclipse.resourcesview.PHPProject"> + </run> + </runtime> + </extension> + <extension + point="org.eclipse.team.core.fileTypes"> + <fileTypes + type="text" + extension="php"> + </fileTypes> + <fileTypes + type="text" + extension="php3"> + </fileTypes> + <fileTypes + type="text" + extension="php4"> + </fileTypes> + <fileTypes + type="text" + extension="inc"> + </fileTypes> + <fileTypes + type="text" + extension="phtml"> + </fileTypes> + <fileTypes + type="text" + extension="html"> + </fileTypes> + <fileTypes + type="text" + extension="htm"> + </fileTypes> + <fileTypes + type="text" + extension="xml"> + </fileTypes> + </extension> + <extension + point="org.eclipse.ui.perspectives"> + <perspective + name="%perspectivePHP.name" + icon="icons/obj16/php.gif" + class="net.sourceforge.phpeclipse.PHPPerspectiveFactory" + id="net.sourceforge.phpeclipse.PHPPerspective"> + </perspective> + </extension> + <extension + point="org.eclipse.ui.newWizards"> + <category + name="%newWizardCategory.name" + id="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"> + </category> +<!-- +Temporarily replaced until errors can be ironed out... + <wizard + name="%newWizardPHPProject.name" + icon="icons/obj16/php.gif" + category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP" + class="net.sourceforge.phpeclipse.wizards.NewProjectCreationWizard" + project="true" + id="net.sourceforge.phpeclipse.wizards.NewWizardProjectCreation"> + <description> + Create a new PHP project. + </description> + </wizard> +<this wizard replaces it as it works - maybe not as pretty but still> +--> + <wizard + name="%newWizardPHPProject.name" + icon="icons/obj16/php.gif" + category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP" + class="net.sourceforge.phpeclipse.wizards.TempnewPHPProject" + project="true" + id="net.sourceforge.phpeclipse.wizards.NewWizardProjectCreation"> + <description> + Create a new PHP project. + </description> + </wizard> + <wizard + name="%newWizardPHPFile.name" + icon="icons/obj16/phpedit.gif" + category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP" + class="net.sourceforge.phpeclipse.wizards.PHPFileWizard" + id="net.sourceforge.phpeclipse.wizards.PHPFileWizard"> + <description> + Create a basic PHP file. + </description> + </wizard> +<!-- choochter's stuff --> + <wizard + name="Xaraya Module" + icon="icons/obj16/php.gif" + category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP" + class=" com.xaraya.wizard.NewXarayaResourceWizard" + project="true" + id="net.sourceforge.phpeclipse.wizards.NewXarayaModuleWizard"> + <description> + Create a Xaraya module. + </description> + </wizard> + </extension> + <extension + point="org.eclipse.ui.projectNatureImages"> + <image + icon="icons/obj16/php.gif" + natureId="net.sourceforge.phpeclipse.phpnature" + id="net.sourceforge.phpeclipse.ProjectNatureImagePHP"> + </image> + </extension> + <extension + point="org.eclipse.ui.propertyPages"> + <page + objectClass="org.eclipse.core.resources.IProject" + name="%propertyPagePHPProject.name" + class="net.sourceforge.phpeclipse.preferences.PHPProjectPropertyPage" + id="net.sourceforge.phpeclipse.preferences.PropertyPagePHPProject"> + <filter + name="nature" + value="net.sourceforge.phpeclipse.phpnature"> + </filter> + </page> + <page + objectClass="net.sourceforge.phpeclipse.PHPProject" + name="%propertyPagePHPProject.name" + class="net.sourceforge.phpeclipse.preferences.PHPProjectPropertyPage" + id="net.sourceforge.phpeclipse.preferences.PropertyPagePHPProject"> + <filter + name="nature" + value="net.sourceforge.phpeclipse.phpnature"> + </filter> + </page> + </extension> +<!-- <extension + point="org.eclipse.ui.views"> + <view + name="%viewPHPResources.name" + icon="icons/obj16/php.gif" + class="net.sourceforge.phpeclipse.resourcesview.PHPResourcesView" + id="net.sourceforge.phpeclipse.resourcesview.ViewPHPResources"> + </view> + </extension> --> <extension point="org.eclipse.ui.actionSets"> <actionSet @@ -32,7 +188,7 @@ </menu> <action label="Restart Apache" - icon="icons/obj16/apache.gif" + icon="icons/obj16/apache_restart.gif" tooltip="Restart Apache" class="net.sourceforge.phpeclipse.actions.PHPRestartApacheAction" menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse" @@ -42,7 +198,7 @@ </action> <action label="Stop Apache" - icon="icons/obj16/apache.gif" + icon="icons/obj16/apache_stop.gif" tooltip="Stop Apache" class="net.sourceforge.phpeclipse.actions.PHPStopApacheAction" menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse" @@ -62,7 +218,7 @@ </action> <action label="Start MySQL" - icon="icons/obj16/apache.gif" + icon="icons/obj16/sql.gif" tooltip="Start MySQL" class="net.sourceforge.phpeclipse.actions.PHPStartMySQLAction" menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse" @@ -71,12 +227,81 @@ id="net.sourceforge.phpeclipse.actions.PHPStartMySQLAction"> </action> </actionSet> + <actionSet + label="%CodingActionSet.label" + description="%CodingActionSet.description" + visible="false" + id="net.sourceforge.phpeclipse.ui.CodingActionSet"> +<!-- =========================================================================== --> +<!-- Source Menu --> +<!-- =========================================================================== --> + <menu + label="%SourceMenu.label" + path="edit" + id="net.sourceforge.phpeclipse.ui.source.menu"> + <separator + name="editGroup"> + </separator> + </menu> + <action + definitionId="net.sourceforge.phpeclipse.phpeditor.uncomment" + label="%UncommentAction.label" + retarget="true" + menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup" + id="net.sourceforge.phpeclipse.phpeditor.Uncomment"> + </action> + <action + definitionId="net.sourceforge.phpeclipse.phpeditor.comment" + label="%CommentAction.label" + retarget="true" + menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup" + id="net.sourceforge.phpeclipse.phpeditor.Comment"> + </action> + </actionSet> + </extension> +<!-- =========================================================================== --> +<!-- PHP Editor Action Definition IDs --> +<!-- =========================================================================== --> + <extension + point="org.eclipse.ui.actionDefinitions"> +<!-- edit --> + <actionDefinition + name="%ActionDefinition.contentAssistProposals.name" + description="%ActionDefinition.contentAssistProposals.description" + id="net.sourceforge.phpeclipse.phpeditor.ContentAssistProposal"> + </actionDefinition> +<!-- source --> + <actionDefinition + name="%ActionDefinition.comment.name" + description="%ActionDefinition.comment.description" + id="net.sourceforge.phpeclipse.phpeditor.Comment"> + </actionDefinition> + <actionDefinition + name="%ActionDefinition.uncomment.name" + description="%ActionDefinition.uncomment.description" + id="net.sourceforge.phpeclipse.phpeditor.Uncomment"> + </actionDefinition> </extension> +<!-- <extension + point="org.eclipse.ui.acceleratorSets"> + <acceleratorSet + scopeId="org.eclipse.ui.textEditorScope" + configurationId="org.eclipse.ui.defaultAcceleratorConfiguration"> + <accelerator + key="Ctrl+/" + id="net.sourceforge.phpdt.ui.actions.comment"> + </accelerator> + <accelerator + key="Ctrl+\\" + id="net.sourceforge.phpdt.ui.actions.uncomment"> + </accelerator> + </acceleratorSet> + </extension> --> <extension point="org.eclipse.ui.editors"> <editor name="%phpEditorName" - icon="icons/obj16/java.gif" + icon="icons/obj16/phpedit.gif" extensions="php" contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor" class="net.sourceforge.phpeclipse.phpeditor.PHPEditor" @@ -84,7 +309,7 @@ </editor> <editor name="%phpEditorName" - icon="icons/obj16/java.gif" + icon="icons/obj16/phpedit.gif" extensions="php3" contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor" class="net.sourceforge.phpeclipse.phpeditor.PHPEditor" @@ -92,7 +317,7 @@ </editor> <editor name="%phpEditorName" - icon="icons/obj16/java.gif" + icon="icons/obj16/phpedit.gif" extensions="php4" contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor" class="net.sourceforge.phpeclipse.phpeditor.PHPEditor" @@ -100,32 +325,47 @@ </editor> <editor name="%phpEditorName" - icon="icons/obj16/java.gif" + icon="icons/obj16/phpedit.gif" extensions="inc" contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor" class="net.sourceforge.phpeclipse.phpeditor.PHPEditor" id="net.sourceforge.phpeclipse.PHPEditor"> - </editor> + </editor> + <editor + name="%phpEditorName" + icon="icons/obj16/phpedit.gif" + extensions="phtml" + contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor" + class="net.sourceforge.phpeclipse.phpeditor.PHPEditor" + id="net.sourceforge.phpeclipse.PHPEditor"> + </editor> <editor name="%phpEditorName" - icon="icons/obj16/java.gif" + icon="icons/obj16/htmledit.gif" extensions="htm" contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor" class="net.sourceforge.phpeclipse.phpeditor.PHPEditor" id="net.sourceforge.phpeclipse.PHPEditor"> - </editor> + </editor> <editor name="%phpEditorName" - icon="icons/obj16/java.gif" + icon="icons/obj16/htmledit.gif" extensions="html" contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor" class="net.sourceforge.phpeclipse.phpeditor.PHPEditor" id="net.sourceforge.phpeclipse.PHPEditor"> - </editor> + </editor> + <editor + name="%phpEditorName" + icon="icons/obj16/xmledit.gif" + extensions="xml" + contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor" + class="net.sourceforge.phpeclipse.phpeditor.PHPEditor" + id="net.sourceforge.phpeclipse.PHPEditor"> + </editor> </extension> <extension point="org.eclipse.ui.popupMenus"> - <objectContribution objectClass="org.eclipse.core.resources.IFile" nameFilter="*.php" @@ -159,7 +399,28 @@ id="net.sourceforge.phpeclipse.actions.externalParserAction"> </action> </objectContribution> - + <objectContribution + objectClass="org.eclipse.core.resources.IFile" + nameFilter="*.inc" + id="net.sourceforge.phpeclipse.actions.externalParserAction"> + <action + label="Run External PHP Parser" + class="net.sourceforge.phpeclipse.actions.PHPExternalParserAction" + menubarPath="additions" + id="net.sourceforge.phpeclipse.actions.externalParserAction"> + </action> + </objectContribution> + <objectContribution + objectClass="org.eclipse.core.resources.IFile" + nameFilter="*.phtml" + id="net.sourceforge.phpeclipse.actions.externalParserAction"> + <action + label="Run External PHP Parser" + class="net.sourceforge.phpeclipse.actions.PHPExternalParserAction" + menubarPath="additions" + id="net.sourceforge.phpeclipse.actions.externalParserAction"> + </action> + </objectContribution> <objectContribution objectClass="org.eclipse.core.resources.IFile" nameFilter="*.php" @@ -193,25 +454,94 @@ id="net.sourceforge.phpeclipse.actions.showAction"> </action> </objectContribution> - - <viewerContribution - targetID="#PHPEditorContext" - id="net.sourceforge.phpeclipse.actions.popup.editor"> + <objectContribution + objectClass="org.eclipse.core.resources.IFile" + nameFilter="*.inc" + id="net.sourceforge.phpeclipse.actions.popupShowAction"> <action - label="PHP Help" - class="net.sourceforge.phpeclipse.actions.PHPEclipseShowContextHelp" + label="Open PHP Browser" + class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction" menubarPath="additions" - id="net.sourceforge.phpeclipse.actions.editor.contexthelp"> + id="net.sourceforge.phpeclipse.actions.showAction"> + </action> + </objectContribution> + <objectContribution + objectClass="org.eclipse.core.resources.IFile" + nameFilter="*.phtml" + 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> + <viewerContribution + targetID="#PHPRulerContext" + id="net.sourceforge.phpdt.ui.PHPEditorPopupActions"> + <action + label="%AddTask.label" + helpContextId="org.eclipse.ui.AddTask_action_context" + tooltip="%AddTask.tooltip" + class="org.eclipse.ui.texteditor.TaskRulerAction" + menubarPath="add" + id="org.eclipse.ui.texteditor.TaskRulerAction"> + </action> + <action + label="%AddBookmark.label" + helpContextId="org.eclipse.ui.bookmark_action_context" + tooltip="%AddBookmark.tooltip" + class="org.eclipse.ui.texteditor.BookmarkRulerAction" + menubarPath="add" + id="org.eclipse.ui.texteditor.BookmarkRulerAction"> </action> </viewerContribution> </extension> <extension + point="org.eclipse.ui.editorActions"> + <editorContribution + targetID="net.sourceforge.phpeclipse.PHPEditor" + id="org.eclipse.ui.texteditor.ruler.actions"> + <action + label="%Dummy.label" + helpContextId="org.eclipse.ui.bookmark_action_context" + class="org.eclipse.ui.texteditor.BookmarkRulerAction" + actionID="RulerDoubleClick" + id="org.eclipse.ui.texteditor.BookmarkRulerAction"> + </action> + </editorContribution> + </extension> + <extension point="org.eclipse.ui.preferencePages"> <page name="PHP" - class="net.sourceforge.phpeclipse.PHPEclipsePreferencePage" + class="net.sourceforge.phpeclipse.PHPEclipseBasePreferencePage" id="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"> </page> + <page + name="Editor" + category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage" + class="net.sourceforge.phpeclipse.PHPSyntaxEditorPreferencePage" + id="net.sourceforge.phpeclipse.preference.PHPSyntaxEditorPreferencePage"> + </page> + <page + name="Outline" + category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage" + class="net.sourceforge.phpeclipse.PHPOutlinePreferencePage" + id="net.sourceforge.phpeclipse.preference.PHPOutlinePreferencePage"> + </page> + <page + name="Templates" + category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage" + class="net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage" + id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage"> + </page> + <page + name="Language Settings" + category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage" + class="net.sourceforge.phpeclipse.PHPLanguagePreferencePage" + id="net.sourceforge.phpeclipse.preference.PHPLanguagePreferencePage"> + </page> </extension> <extension point="org.eclipse.ui.documentProviders"> @@ -238,34 +568,116 @@ </provider> </extension> <extension + point="org.eclipse.ui.documentProviders"> + <provider + extensions="%incFileExtension" + class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider" + id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"> + </provider> + </extension> + <extension + point="org.eclipse.ui.documentProviders"> + <provider + extensions="%phtmlFileExtension" + class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider" + id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"> + </provider> + </extension> + <extension + point="org.eclipse.ui.documentProviders"> + <provider + extensions="%htmlFileExtension" + class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider" + id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"> + </provider> + </extension> + <extension + point="org.eclipse.ui.documentProviders"> + <provider + extensions="%htmFileExtension" + class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider" + id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"> + </provider> + </extension> + <extension + point="org.eclipse.ui.documentProviders"> + <provider + extensions="%xmlFileExtension" + class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider" + id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"> + </provider> + </extension> + <extension point="org.eclipse.ui.views"> <view name="%phpConsoleView" - icon="icons/obj16/java.gif" + icon="icons/obj16/php.gif" class="net.sourceforge.phpeclipse.views.PHPConsole" id="net.sourceforge.phpeclipse.views.phpconsoleview"> </view> </extension> +<!-- =========================================================================== --> +<!-- Java Editor Key Bindings --> +<!-- =========================================================================== --> <extension - point="org.eclipse.ui.newWizards"> - <category - name="PHP" - id="net.sourceforge.phpeclipse.wizardCategory"> - </category> - <wizard - name="PHP File" - icon="icons/obj16/java.gif" - category="net.sourceforge.phpeclipse.wizardCategory" - class="net.sourceforge.phpeclipse.wizards.PHPFileWizard" - id="net.sourceforge.phpeclipse.wizards.PHPFileWizard"> - </wizard> - </extension> - <extension - point="org.eclipse.help.toc"> - <toc - file="phphelp.xml" - primary="true"> - </toc> + point="org.eclipse.ui.acceleratorSets"> + <acceleratorSet + scopeId="org.eclipse.ui.textEditorScope" + configurationId="org.eclipse.ui.emacsAcceleratorConfiguration"> +<!-- edit --> + <accelerator + key="Ctrl+1" + id="net.sourceforge.phpeclipse.ui.edit.text.php.content.assist.proposals"> + </accelerator> +<!-- source --> + <accelerator + key="Ctrl+/" + id="net.sourceforge.phpeclipse.phpeditor.comment"> + </accelerator> + <accelerator + key="Ctrl+\" + id="net.sourceforge.phpeclipse.phpeditor.uncomment"> + </accelerator> + </acceleratorSet> + <acceleratorSet + scopeId="org.eclipse.ui.textEditorScope" + configurationId="org.eclipse.ui.defaultAcceleratorConfiguration"> +<!-- edit --> + <accelerator + key="Ctrl+Space" + id="net.sourceforge.phpeclipse.ui.edit.text.php.content.assist.proposals"> + </accelerator> +<!-- source --> + <accelerator + key="Ctrl+/" + id="net.sourceforge.phpeclipse.phpeditor.comment"> + </accelerator> + <accelerator + key="Ctrl+\" + id="net.sourceforge.phpeclipse.phpeditor.uncomment"> + </accelerator> + </acceleratorSet> + <acceleratorSet + scopeId="org.eclipse.ui.textEditorScope" + configurationId="org.eclipse.ui.defaultAcceleratorConfiguration"> +<!-- edit --> + <accelerator + platform="carbon" + key="Command+1" + id="net.sourceforge.phpeclipse.ui.edit.text.php.content.assist.proposals"> + </accelerator> +<!-- source --> + <accelerator + platform="carbon" + key="Command+/" + id="net.sourceforge.phpeclipse.phpeditor.comment"> + </accelerator> + <accelerator + platform="carbon" + key="Command+\" + id="net.sourceforge.phpeclipse.phpeditor.uncomment"> + </accelerator> + </acceleratorSet> </extension> </plugin>