X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml index 5d25fbb..a94138f 100644 --- a/net.sourceforge.phpeclipse/plugin.xml +++ b/net.sourceforge.phpeclipse/plugin.xml @@ -2,7 +2,7 @@ <plugin id="net.sourceforge.phpeclipse" name="%pluginName" - version="1.0.6" + version="1.0.10" provider-name="%providerName" class="net.sourceforge.phpeclipse.PHPeclipsePlugin"> @@ -14,11 +14,13 @@ <requires> <import plugin="org.eclipse.core.resources"/> <import plugin="org.eclipse.ui"/> + <import plugin="org.eclipse.ui.externaltools"/> <import plugin="org.eclipse.help"/> <import plugin="org.eclipse.swt"/> + <import plugin="org.eclipse.debug.core"/> <import plugin="org.eclipse.debug.ui"/> + <import plugin="org.eclipse.search"/> <import plugin="org.apache.xerces"/> - <import plugin="org.junit"/> <import plugin="org.eclipse.update.ui"/> </requires> @@ -29,9 +31,22 @@ point="org.eclipse.core.resources.natures"> <runtime> <run - class="net.sourceforge.phpeclipse.resourcesview.PHPProject"> + class="net.sourceforge.phpeclipse.resourcesview.PHPProject"> </run> </runtime> + <builder + id="net.sourceforge.phpeclipse.parserbuilder"> + </builder> + </extension> + <extension + id="parserbuilder" + name="Parser Builder" + point="org.eclipse.core.resources.builders"> + <builder hasNature="true"> + <run + class="net.sourceforge.phpeclipse.builder.ParserBuilder"> + </run> + </builder> </extension> <extension point="org.eclipse.team.core.fileTypes"> @@ -67,6 +82,10 @@ type="text" extension="xml"> </fileTypes> + <fileTypes + type="text" + extension="tpl"> + </fileTypes> </extension> <extension point="org.eclipse.ui.perspectives"> @@ -83,9 +102,7 @@ name="%newWizardCategory.name" id="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"> </category> -<!-- -Temporarily replaced until errors can be ironed out... - <wizard + <wizard name="%newWizardPHPProject.name" icon="icons/obj16/php.gif" category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP" @@ -96,8 +113,18 @@ Temporarily replaced until errors can be ironed out... Create a new PHP project. </description> </wizard> +<!-- <wizard + id="net.sourceforge.phpdt.internal.ui.wizards.NewClassCreationWizard" + name="%NewPHPClass.label" + class="net.sourceforge.phpdt.internal.ui.wizards.NewClassCreationWizard" + category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP" + icon="icons/ctool16/newclass_wiz.gif"> + <description>%NewPHPClass.description</description> + </wizard> + --> +<!-- <this wizard replaces it as it works - maybe not as pretty but still> ---> + <wizard name="%newWizardPHPProject.name" icon="icons/obj16/php.gif" @@ -108,7 +135,7 @@ Temporarily replaced until errors can be ironed out... <description> Create a new PHP project. </description> - </wizard> + </wizard> --> <wizard name="%newWizardPHPFile.name" icon="icons/obj16/phpedit.gif" @@ -124,7 +151,7 @@ Temporarily replaced until errors can be ironed out... name="Xaraya Module" icon="icons/obj16/php.gif" category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP" - class=" com.xaraya.wizard.NewXarayaResourceWizard" + class="com.xaraya.wizard.NewXarayaResourceWizard" project="true" id="net.sourceforge.phpeclipse.wizards.NewXarayaModuleWizard"> <description> @@ -132,6 +159,15 @@ Temporarily replaced until errors can be ironed out... </description> </wizard> </extension> + <extension point="org.eclipse.ui.exportWizards"> + <wizard name="%ExportWizards.Obfuscator" + icon="icons/ctool16/exportdir_wiz.gif" + class="net.sourceforge.phpeclipse.obfuscator.export.ObfuscatorExportWizard" + id="net.sourceforge.phpeclipse.obfuscator.export.ObfuscatorExportWizard"> + <description>%ExportWizards.ObfuscatorDescription</description> + <selection class="org.eclipse.core.resources.IResource" /> + </wizard> + </extension> <extension point="org.eclipse.ui.projectNatureImages"> <image @@ -142,21 +178,21 @@ Temporarily replaced until errors can be ironed out... </extension> <extension point="org.eclipse.ui.propertyPages"> - <page +<!-- <page objectClass="org.eclipse.core.resources.IProject" name="%propertyPagePHPProject.name" class="net.sourceforge.phpeclipse.preferences.PHPProjectPropertyPage" - id="net.sourceforge.phpeclipse.preferences.PropertyPagePHPProject"> + id="net.sourceforge.phpeclipse.preferences.PHPProjectPropertyPage"> <filter name="nature" value="net.sourceforge.phpeclipse.phpnature"> </filter> - </page> + </page> --> <page - objectClass="net.sourceforge.phpeclipse.PHPProject" - name="%propertyPagePHPProject.name" - class="net.sourceforge.phpeclipse.preferences.PHPProjectPropertyPage" - id="net.sourceforge.phpeclipse.preferences.PropertyPagePHPProject"> + objectClass="org.eclipse.core.resources.IProject" + name="PHP Obfuscator" + class="net.sourceforge.phpeclipse.preferences.PHPObfuscatorPropertyPage" + id="net.sourceforge.phpeclipse.preferences.PHPObfuscatorPropertyPage"> <filter name="nature" value="net.sourceforge.phpeclipse.phpnature"> @@ -173,10 +209,93 @@ Temporarily replaced until errors can be ironed out... </view> </extension> --> <extension + point="org.eclipse.ui.editors"> + <editor + name="%phpEditorName" + default="true" + icon="icons/obj16/phpedit.gif" + extensions="php" + contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor" + class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor" + id="net.sourceforge.phpeclipse.PHPUnitEditor"> + </editor> + <editor + name="%phpEditorName" + default="true" + icon="icons/obj16/phpedit.gif" + extensions="php3" + contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor" + class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor" + id="net.sourceforge.phpeclipse.PHPUnitEditor"> + </editor> + <editor + name="%phpEditorName" + default="true" + icon="icons/obj16/phpedit.gif" + extensions="php4" + contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor" + class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor" + id="net.sourceforge.phpeclipse.PHPUnitEditor"> + </editor> + <editor + name="%phpEditorName" + default="true" + icon="icons/obj16/phpedit.gif" + extensions="inc" + contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor" + class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor" + id="net.sourceforge.phpeclipse.PHPUnitEditor"> + </editor> + <editor + name="%phpEditorName" + default="true" + icon="icons/obj16/phpedit.gif" + extensions="phtml" + contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor" + class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor" + id="net.sourceforge.phpeclipse.PHPUnitEditor"> + </editor> + <editor + name="%phpEditorName" + default="true" + icon="icons/obj16/htmledit.gif" + extensions="htm" + contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor" + class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor" + id="net.sourceforge.phpeclipse.PHPUnitEditor"> + </editor> + <editor + name="%phpEditorName" + default="true" + icon="icons/obj16/htmledit.gif" + extensions="html" + contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor" + class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor" + id="net.sourceforge.phpeclipse.PHPUnitEditor"> + </editor> + <editor + name="%phpEditorName" + default="true" + icon="icons/obj16/xmledit.gif" + extensions="xml" + contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor" + class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor" + id="net.sourceforge.phpeclipse.PHPUnitEditor"> + </editor> + <editor + name="%phpEditorName" + default="true" + icon="icons/obj16/htmledit.gif" + extensions="tpl" + contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor" + class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor" + id="net.sourceforge.phpeclipse.PHPUnitEditor"> + </editor> + </extension> + <extension point="org.eclipse.ui.actionSets"> <actionSet label="PHP/Apache" - description="Starting MySQL and Apache." visible="true" id="net.sourceforge.phpeclipse.PHPActionSet"> <menu @@ -193,7 +312,6 @@ Temporarily replaced until errors can be ironed out... class="net.sourceforge.phpeclipse.actions.PHPRestartApacheAction" menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse" toolbarPath="Normal" - start="true" id="net.sourceforge.phpeclipse.actions.PHPRestartApacheAction"> </action> <action @@ -203,7 +321,6 @@ Temporarily replaced until errors can be ironed out... class="net.sourceforge.phpeclipse.actions.PHPStopApacheAction" menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse" toolbarPath="Normal" - start="true" id="net.sourceforge.phpeclipse.actions.PHPStopApacheAction"> </action> <action @@ -213,7 +330,6 @@ Temporarily replaced until errors can be ironed out... class="net.sourceforge.phpeclipse.actions.PHPStartApacheAction" menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse" toolbarPath="Normal" - start="true" id="net.sourceforge.phpeclipse.actions.PHPStartApacheAction"> </action> <action @@ -223,13 +339,11 @@ Temporarily replaced until errors can be ironed out... class="net.sourceforge.phpeclipse.actions.PHPStartMySQLAction" menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse" toolbarPath="Normal" - start="true" id="net.sourceforge.phpeclipse.actions.PHPStartMySQLAction"> </action> </actionSet> <actionSet label="%CodingActionSet.label" - description="%CodingActionSet.description" visible="false" id="net.sourceforge.phpeclipse.ui.CodingActionSet"> <!-- =========================================================================== --> @@ -239,11 +353,28 @@ Temporarily replaced until errors can be ironed out... label="%SourceMenu.label" path="edit" id="net.sourceforge.phpeclipse.ui.source.menu"> - <separator - name="editGroup"> - </separator> + <separator name="editGroup" /> </menu> <action + definitionId="net.sourceforge.phpeclipse.phpeditor.format" + label="%FormatAction.label" + retarget="true" + menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup" + id="net.sourceforge.phpeclipse.phpeditor.Format"> + </action> + <action + label="%ShiftLeftAction.label" + retarget="true" + menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup" + id="net.sourceforge.phpeclipse.phpeditor.ShiftLeft"> + </action> + <action + label="%ShiftRightAction.label" + retarget="true" + menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup" + id="net.sourceforge.phpeclipse.phpeditor.ShiftRight"> + </action> + <action definitionId="net.sourceforge.phpeclipse.phpeditor.uncomment" label="%UncommentAction.label" retarget="true" @@ -259,6 +390,13 @@ Temporarily replaced until errors can be ironed out... </action> </actionSet> </extension> + <extension + point="org.eclipse.ui.actionSetPartAssociations"> + <actionSetPartAssociation + targetID="net.sourceforge.phpeclipse.ui.CodingActionSet"> + <part id="net.sourceforge.phpeclipse.PHPUnitEditor" /> + </actionSetPartAssociation> + </extension> <!-- =========================================================================== --> <!-- PHP Editor Action Definition IDs --> <!-- =========================================================================== --> @@ -266,21 +404,30 @@ Temporarily replaced until errors can be ironed out... 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> + <actionDefinition + id="net.sourceforge.phpeclipse.phpeditor.Format"> + </actionDefinition> + <actionDefinition + id="net.sourceforge.phpeclipse.ui.edit.text.php.show.outline"> + </actionDefinition> + <actionDefinition + id="net.sourceforge.phpeclipse.ui.navigate.php.open.structure"> + </actionDefinition> + <actionDefinition + id="net.sourceforge.phpeclipse.ui.edit.text.php.show.next.problem"> + </actionDefinition> + <actionDefinition + id="net.sourceforge.phpeclipse.ui.edit.text.php.show.previous.problem"> + </actionDefinition> </extension> <!-- <extension point="org.eclipse.ui.acceleratorSets"> @@ -297,73 +444,7 @@ Temporarily replaced until errors can be ironed out... </accelerator> </acceleratorSet> </extension> --> - <extension - point="org.eclipse.ui.editors"> - <editor - name="%phpEditorName" - icon="icons/obj16/phpedit.gif" - extensions="php" - contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor" - class="net.sourceforge.phpeclipse.phpeditor.PHPEditor" - id="net.sourceforge.phpeclipse.PHPEditor"> - </editor> - <editor - name="%phpEditorName" - icon="icons/obj16/phpedit.gif" - extensions="php3" - contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor" - class="net.sourceforge.phpeclipse.phpeditor.PHPEditor" - id="net.sourceforge.phpeclipse.PHPEditor"> - </editor> - <editor - name="%phpEditorName" - icon="icons/obj16/phpedit.gif" - extensions="php4" - contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor" - class="net.sourceforge.phpeclipse.phpeditor.PHPEditor" - id="net.sourceforge.phpeclipse.PHPEditor"> - </editor> - <editor - name="%phpEditorName" - 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 - 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/htmledit.gif" - extensions="htm" - contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor" - class="net.sourceforge.phpeclipse.phpeditor.PHPEditor" - id="net.sourceforge.phpeclipse.PHPEditor"> - </editor> - <editor - name="%phpEditorName" - 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 - 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 @@ -476,13 +557,57 @@ Temporarily replaced until errors can be ironed out... id="net.sourceforge.phpeclipse.actions.showAction"> </action> </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"> + <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" + 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="#PHPEditorContext" + id="net.sourceforge.phpeclipse.actions.popupOpenDeclaration"> + <action + label="Open PHP Declaration" + class="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorActon" + menubarPath="additions" + id="net.sourceforge.phpeclipse.actions.opendeclaration"> + </action> + </viewerContribution> + <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"> @@ -490,27 +615,29 @@ Temporarily replaced until errors can be ironed out... <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> + id="org.eclipse.ui.texteditor.ruler.actions" + targetID="net.sourceforge.phpeclipse.PHPUnitEditor"> + + <action + id="org.eclipse.ui.texteditor.BookmarkRulerAction" + actionID="RulerDoubleClick" + label="%Dummy.label" + helpContextId="org.eclipse.ui.bookmark_action_context" + class="org.eclipse.ui.texteditor.BookmarkRulerAction"> + </action> </editorContribution> </extension> + <extension point="org.eclipse.ui.preferencePages"> <page @@ -519,11 +646,17 @@ Temporarily replaced until errors can be ironed out... id="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"> </page> <page - name="Editor" + name="PHP Parser" + category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage" + class="net.sourceforge.phpeclipse.PHPEclipseParserPreferencePage" + id="net.sourceforge.phpeclipse.preference.PHPEclipseParserPreferencePage"> + </page> +<!-- <page + name="Editor2" category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage" class="net.sourceforge.phpeclipse.PHPSyntaxEditorPreferencePage" id="net.sourceforge.phpeclipse.preference.PHPSyntaxEditorPreferencePage"> - </page> + </page> --> <page name="Outline" category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage" @@ -537,11 +670,23 @@ Temporarily replaced until errors can be ironed out... id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage"> </page> <page + name="Formatter" + category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage" + class="net.sourceforge.phpdt.internal.ui.preferences.CodeFormatterPreferencePage" + id="net.sourceforge.phpeclipse.preference.CodeFormatterPreferencePage"> + </page> + <page + name="Editor" + category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage" + class="net.sourceforge.phpdt.internal.ui.preferences.PHPEditorPreferencePage" + id="net.sourceforge.phpeclipse.preference.PHPEditorPreferencePage"> + </page> + <!-- <page name="Language Settings" category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage" class="net.sourceforge.phpeclipse.PHPLanguagePreferencePage" id="net.sourceforge.phpeclipse.preference.PHPLanguagePreferencePage"> - </page> + </page> --> </extension> <extension point="org.eclipse.ui.documentProviders"> @@ -608,6 +753,14 @@ Temporarily replaced until errors can be ironed out... </provider> </extension> <extension + point="org.eclipse.ui.documentProviders"> + <provider + extensions="%tplFileExtension" + class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider" + id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"> + </provider> + </extension> + <extension point="org.eclipse.ui.views"> <view name="%phpConsoleView" @@ -616,8 +769,9 @@ Temporarily replaced until errors can be ironed out... id="net.sourceforge.phpeclipse.views.phpconsoleview"> </view> </extension> + <!-- =========================================================================== --> -<!-- Java Editor Key Bindings --> +<!-- PHPDT/UI Editor Key Bindings --> <!-- =========================================================================== --> <extension point="org.eclipse.ui.acceleratorSets"> @@ -626,8 +780,12 @@ Temporarily replaced until errors can be ironed out... configurationId="org.eclipse.ui.emacsAcceleratorConfiguration"> <!-- edit --> <accelerator + key="Ctrl+Shift+P" + id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket"> + </accelerator> + <accelerator key="Ctrl+1" - id="net.sourceforge.phpeclipse.ui.edit.text.php.content.assist.proposals"> + id="org.eclipse.ui.edit.text.contentAssist.proposals"> </accelerator> <!-- source --> <accelerator @@ -637,6 +795,18 @@ Temporarily replaced until errors can be ironed out... <accelerator key="Ctrl+\" id="net.sourceforge.phpeclipse.phpeditor.uncomment"> + </accelerator> + <accelerator + key="Ctrl+Shift+F" + id="net.sourceforge.phpeclipse.phpeditor.format"> + </accelerator> + <accelerator + key="Ctrl+O" + id="net.sourceforge.phpeclipse.ui.edit.text.php.show.outline"> + </accelerator> + <accelerator + key="Ctrl+F3" + id="net.sourceforge.phpeclipse.ui.navigate.php.open.structure"> </accelerator> </acceleratorSet> <acceleratorSet @@ -644,9 +814,13 @@ Temporarily replaced until errors can be ironed out... configurationId="org.eclipse.ui.defaultAcceleratorConfiguration"> <!-- edit --> <accelerator - key="Ctrl+Space" - id="net.sourceforge.phpeclipse.ui.edit.text.php.content.assist.proposals"> + key="Ctrl+Shift+P" + id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket"> </accelerator> + <accelerator + key="Ctrl+Space" + id="org.eclipse.ui.edit.text.contentAssist.proposals"> + </accelerator> <!-- source --> <accelerator key="Ctrl+/" @@ -656,6 +830,18 @@ Temporarily replaced until errors can be ironed out... key="Ctrl+\" id="net.sourceforge.phpeclipse.phpeditor.uncomment"> </accelerator> + <accelerator + key="Ctrl+Shift+F" + id="net.sourceforge.phpeclipse.phpeditor.format"> + </accelerator> + <accelerator + key="Ctrl+F3" + id="net.sourceforge.phpeclipse.ui.navigate.php.open.structure"> + </accelerator> + <accelerator + key="Ctrl+O" + id="net.sourceforge.phpeclipse.ui.edit.text.php.show.outline"> + </accelerator> </acceleratorSet> <acceleratorSet scopeId="org.eclipse.ui.textEditorScope" @@ -663,8 +849,13 @@ Temporarily replaced until errors can be ironed out... <!-- edit --> <accelerator platform="carbon" + key="Command+Shift+P" + id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket"> + </accelerator> + <accelerator + platform="carbon" key="Command+1" - id="net.sourceforge.phpeclipse.ui.edit.text.php.content.assist.proposals"> + id="org.eclipse.ui.edit.text.contentAssist.proposals"> </accelerator> <!-- source --> <accelerator @@ -676,8 +867,224 @@ Temporarily replaced until errors can be ironed out... platform="carbon" key="Command+\" id="net.sourceforge.phpeclipse.phpeditor.uncomment"> - </accelerator> + </accelerator> </acceleratorSet> </extension> +<!-- external tools --> + +<!-- extension point definitions --> + <extension-point id="configurationDuplicationMaps" name="%ExtPoint.configurationDuplicationMaps"/> + <extension-point id="argumentVariables" name="%ExtPoint.argumentVariables"/> + <extension-point id="directoryVariables" name="%ExtPoint.directoryVariables"/> + <extension-point id="fileVariables" name="%ExtPoint.fileVariables"/> + <extension-point id="refreshVariables" name="%ExtPoint.refreshVariables"/> + +<!-- Extensions --> + <extension point="org.eclipse.ui.actionSets"> + <actionSet + id="net.sourceforge.phpdt.externaltools.ExternalToolsSet" + label="%ActionSet.externalTools" + visible="true"> + <menu id="org.eclipse.ui.run" + label="%Menu.run" + path="additions"> + <separator name="ExternalToolsGroup"/> + </menu> + <!-- <action + id="net.sourceforge.phpdt.externaltools.ExternalToolMenuDelegateMenu" + label="%Action.externalTools" + menubarPath="org.eclipse.ui.run/ExternalToolsGroup" + disabledIcon="icons/externaltools/full/dtool16/external_tools.gif" + icon="icons/externaltools/full/etool16/external_tools.gif" + hoverIcon="icons/externaltools/full/ctool16/external_tools.gif" + pulldown="true" + class="net.sourceforge.phpdt.externaltools.internal.menu.ExternalToolMenuDelegate"> + </action> + <action + id="net.sourceforge.phpdt.externaltools.ExternalToolMenuDelegateToolbar" + label="%Action.externalTools" + toolbarPath="Normal/additions" + disabledIcon="icons/externaltools/full/dtool16/external_tools.gif" + icon="icons/externaltools/full/etool16/external_tools.gif" + hoverIcon="icons/externaltools/full/ctool16/external_tools.gif" + tooltip="%Action.externalToolsTip" + pulldown="true" + class="net.sourceforge.phpdt.externaltools.internal.menu.ExternalToolMenuDelegate"> + </action> --> + </actionSet> + </extension> + + <!-- Launch Configuration Extensions --> + <extension point="org.eclipse.debug.core.launchConfigurationTypes"> + <launchConfigurationType + id = "net.sourceforge.phpdt.externaltools.ProgramLaunchConfigurationType" + name = "%Program.externalTools" + delegate = "net.sourceforge.phpdt.externaltools.internal.program.launchConfigurations.ProgramLaunchDelegate" + modes = "run" + category = "org.eclipse.ui.externaltools"> + </launchConfigurationType> + <launchConfigurationType + id = "net.sourceforge.phpdt.externaltools.ProgramBuilderLaunchConfigurationType" + name = "%Program.externalTools" + delegate = "net.sourceforge.phpdt.externaltools.internal.program.launchConfigurations.ProgramLaunchDelegate" + modes = "run" + category = "org.eclipse.ui.externaltools.builder"> + </launchConfigurationType> + </extension> + + <extension point = "net.sourceforge.phpeclipse.configurationDuplicationMaps"> + <configurationMap + sourceType="net.sourceforge.phpdt.externaltools.ProgramLaunchConfigurationType" + builderType="net.sourceforge.phpdt.externaltools.ProgramBuilderLaunchConfigurationType"> + </configurationMap> + </extension> + + <extension point = "org.eclipse.debug.ui.launchConfigurationTabGroups"> + <launchConfigurationTabGroup + id="net.sourceforge.phpdt.externaltools.launchConfigurationTabGroup.program" + type ="net.sourceforge.phpdt.externaltools.ProgramLaunchConfigurationType" + class="net.sourceforge.phpdt.externaltools.internal.program.launchConfigurations.ProgramTabGroup"> + </launchConfigurationTabGroup> + <launchConfigurationTabGroup + id="net.sourceforge.phpdt.externaltools.launchConfigurationTabGroup.program.builder" + type ="net.sourceforge.phpdt.externaltools.ProgramBuilderLaunchConfigurationType" + class="net.sourceforge.phpdt.externaltools.internal.program.launchConfigurations.ProgramBuilderTabGroup"> + </launchConfigurationTabGroup> + </extension> + + <extension point="org.eclipse.debug.ui.launchConfigurationTypeImages"> + <launchConfigurationTypeImage + id="net.sourceforge.phpdt.externaltools.launchConfigurationTypeImage.program" + configTypeID="net.sourceforge.phpdt.externaltools.ProgramLaunchConfigurationType" + icon="icons/externaltools/full/obj16/external_tools.gif"> + </launchConfigurationTypeImage> + <launchConfigurationTypeImage + id="net.sourceforge.phpdt.externaltools.launchConfigurationTypeImage.program.builder" + configTypeID="net.sourceforge.phpdt.externaltools.ProgramBuilderLaunchConfigurationType" + icon="icons/externaltools/full/obj16/external_tools.gif"> + </launchConfigurationTypeImage> + </extension> + + <!-- Variable Extensions --> + <extension point="net.sourceforge.phpeclipse.fileVariables"> + <variable + tag="workspace_loc" + description="Expands to the workspace root's absolute file system path." + expanderClass="net.sourceforge.phpdt.externaltools.variable.WorkspaceExpander"> + </variable> + <variable + tag="resource_loc" + description="Expands to the resource's absolute file system path." + componentClass="net.sourceforge.phpdt.externaltools.variable.SpecificFileResourceComponent" + expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceExpander"> + </variable> + </extension> + + <extension point="net.sourceforge.phpeclipse.argumentVariables"> + <variable + tag="workspace_loc" + description="Expands to the workspace root's absolute file system path." + expanderClass="net.sourceforge.phpdt.externaltools.variable.WorkspaceExpander"> + </variable> + <variable + tag="file_loc" + description="Expands to the full file name" + expanderClass="net.sourceforge.phpdt.externaltools.variable.FileExpander"> + </variable> + <variable + tag="file_url" + description="Expands to an URL with the localhost preference settings" + expanderClass="net.sourceforge.phpdt.externaltools.variable.UrlExpander"> + </variable> + <variable + tag="localhost_url" + description="Expands to the localhost preference settings." + expanderClass="net.sourceforge.phpdt.externaltools.variable.LocalhostExpander"> + </variable> + <variable + tag="project_loc" + description="Expands to the selected resource's project absolute file system path." + expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceProjectExpander"> + </variable> + <variable + tag="project_path" + description="Expands to the full path, relative to the workspace root, of the selected project" + expanderClass="net.sourceforge.phpdt.externaltools.variable.ProjectExpander"> + </variable> + <variable + tag="project_name" + description="Expands to the name of the selected project" + expanderClass="net.sourceforge.phpdt.externaltools.variable.ProjectNameExpander"> + </variable> + <variable + tag="resource_loc" + description="Expands to the resource's absolute file system path." + componentClass="net.sourceforge.phpdt.externaltools.variable.SpecificFileResourceComponent" + expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceExpander"> + </variable> + <variable + tag="container_loc" + description="Expands to the selected resource's containing folder absolute file system path." + expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceContainerExpander"> + </variable> + <variable + tag="build_type" + description="Expands to the type of build" + expanderClass="net.sourceforge.phpdt.externaltools.variable.BuildTypeExpander"> + </variable> + </extension> + + <extension point="net.sourceforge.phpeclipse.directoryVariables"> + <variable + tag="workspace_loc" + description="Expands to the workspace root's absolute file system path." + expanderClass="net.sourceforge.phpdt.externaltools.variable.WorkspaceExpander"> + </variable> + <variable + tag="project_loc" + description="Expands to the selected resource's project absolute file system path." + expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceProjectExpander"> + </variable> + <variable + tag="container_loc" + description="Expands to the selected resource's containing folder absolute file system path." + expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceContainerExpander"> + </variable> + <variable + tag="resource_loc" + description="Expands to a resource's absolute file system path." + componentClass="net.sourceforge.phpdt.externaltools.variable.SpecificFolderResourceComponent" + expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceExpander"> + </variable> + </extension> + + <extension point="net.sourceforge.phpeclipse.refreshVariables"> + <variable + tag="workspace" + description="Expands to the workspace root." + expanderClass="net.sourceforge.phpdt.externaltools.variable.WorkspaceExpander"> + </variable> + <variable + tag="project" + description="Expands to the project of the selected resource." + expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceProjectExpander"> + </variable> + <variable + tag="container" + description="Expands to the folder containing the selected resource." + expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceContainerExpander"> + </variable> + <variable + tag="resource" + description="Expands to a resource." + componentClass="net.sourceforge.phpdt.externaltools.variable.ResourceComponent" + expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceExpander"> + </variable> + <variable + tag="working_set" + description="Expands to the group of resources in a working set." + expanderClass="net.sourceforge.phpdt.externaltools.variable.WorkingSetExpander"> + </variable> + </extension> </plugin>