X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml index 27b9950..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.7" + version="1.0.10" provider-name="%providerName" class="net.sourceforge.phpeclipse.PHPeclipsePlugin"> @@ -19,6 +19,7 @@ <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.eclipse.update.ui"/> </requires> @@ -81,6 +82,10 @@ type="text" extension="xml"> </fileTypes> + <fileTypes + type="text" + extension="tpl"> + </fileTypes> </extension> <extension point="org.eclipse.ui.perspectives"> @@ -97,9 +102,6 @@ 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" @@ -111,6 +113,15 @@ 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> @@ -148,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 @@ -262,6 +282,15 @@ Temporarily replaced until errors can be ironed out... 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"> @@ -419,16 +448,6 @@ Temporarily replaced until errors can be ironed out... <extension point="org.eclipse.ui.popupMenus"> <objectContribution - objectClass="org.eclipse.core.resources.IResource" - id="net.sourceforge.phpeclipse.actions.obfuscator"> - <action - label="PHP Obfuscator" - class="net.sourceforge.phpeclipse.actions.PHPObfuscatorAction" - menubarPath="additions" - id="net.sourceforge.phpeclipse.actions.obfuscatorAction"> - </action> - </objectContribution> - <objectContribution objectClass="org.eclipse.core.resources.IFile" nameFilter="*.php" id="net.sourceforge.phpeclipse.actions.externalParserAction"> @@ -571,7 +590,18 @@ Temporarily replaced until errors can be ironed out... 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"> @@ -591,19 +621,23 @@ Temporarily replaced until errors can be ironed out... </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" - 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 @@ -647,12 +681,12 @@ Temporarily replaced until errors can be ironed out... class="net.sourceforge.phpdt.internal.ui.preferences.PHPEditorPreferencePage" id="net.sourceforge.phpeclipse.preference.PHPEditorPreferencePage"> </page> - <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"> @@ -719,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" @@ -729,110 +771,7 @@ Temporarily replaced until errors can be ironed out... </extension> <!-- =========================================================================== --> -<!-- PHPDT/UI command definitions --> -<!-- =========================================================================== --> -<!-- -<extension point="org.eclipse.ui.commands"> - <category - name="%category.source.name" - description="%category.source.description" - id="net.sourceforge.phpeclipse.ui.category.source"> - </category> - - - <scope - name="%scope.javaEditor.name" - parent="org.eclipse.ui.textEditorScope" - description="%scope.javaEditor.description" - id="net.sourceforge.phpeclipse.ui.textEditorScope"> - </scope> - - - <command - category="org.eclipse.ui.category.edit" - id="org.eclipse.jdt.ui.edit.text.java.correction.assist.proposals" - name= "%ActionDefinition.correctionAssistProposals.name" - description="%ActionDefinition.correctionAssistProposals.description"> - </command> - <keyBinding - string="Ctrl+1" - scope="net.sourceforge.phpeclipse.ui.textEditorScope" - command="org.eclipse.jdt.ui.edit.text.java.correction.assist.proposals" - configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> - </keyBinding> - <keyBinding - platform="carbon" - string="Command+1" - scope="net.sourceforge.phpeclipse.ui.textEditorScope" - command="org.eclipse.jdt.ui.edit.text.java.correction.assist.proposals" - configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> - </keyBinding> - - - <command - category="net.sourceforge.phpeclipse.ui.category.source" - id="net.sourceforge.phpeclipse.phpeditor.comment" - name= "%ActionDefinition.comment.name" - description= "%ActionDefinition.comment.description"> - </command> - <keyBinding - string="Ctrl+/" - scope="net.sourceforge.phpeclipse.ui.textEditorScope" - command="net.sourceforge.phpeclipse.phpeditor.comment" - configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> - </keyBinding> - <keyBinding - platform="carbon" - string="Command+/" - scope="net.sourceforge.phpeclipse.ui.textEditorScope" - command="net.sourceforge.phpeclipse.phpeditor.comment" - configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> - </keyBinding> - - <command - category="net.sourceforge.phpeclipse.ui.category.source" - id="net.sourceforge.phpeclipse.phpeditor.uncomment" - name= "%ActionDefinition.uncomment.name" - description= "%ActionDefinition.uncomment.description"> - </command> - <keyBinding - string="Ctrl+\" - scope="net.sourceforge.phpeclipse.ui.textEditorScope" - command="net.sourceforge.phpeclipse.phpeditor.uncomment" - configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> - </keyBinding> - <keyBinding - platform="carbon" - string="Command+\" - scope="net.sourceforge.phpeclipse.ui.textEditorScope" - command="net.sourceforge.phpeclipse.phpeditor.uncomment" - configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> - </keyBinding> - - <command - category="net.sourceforge.phpeclipse.ui.category.source" - id="org.eclipse.jdt.ui.edit.text.java.format" - name= "%ActionDefinition.format.name" - description= "%ActionDefinition.format.description"> - </command> - <keyBinding - string="Ctrl+Shift+F" - scope="net.sourceforge.phpeclipse.ui.textEditorScope" - command="org.eclipse.jdt.ui.edit.text.java.format" - configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> - </keyBinding> - <keyBinding - platform="carbon" - string="Command+Shift+F" - scope="net.sourceforge.phpeclipse.ui.textEditorScope" - command="org.eclipse.jdt.ui.edit.text.java.format" - configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> - </keyBinding> - -</extension> ---> -<!-- =========================================================================== --> -<!-- PHP Editor Key Bindings --> +<!-- PHPDT/UI Editor Key Bindings --> <!-- =========================================================================== --> <extension point="org.eclipse.ui.acceleratorSets"> @@ -846,7 +785,7 @@ Temporarily replaced until errors can be ironed out... </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 @@ -880,8 +819,8 @@ Temporarily replaced until errors can be ironed out... </accelerator> <accelerator key="Ctrl+Space" - id="net.sourceforge.phpeclipse.ui.edit.text.php.content.assist.proposals"> - </accelerator> + id="org.eclipse.ui.edit.text.contentAssist.proposals"> + </accelerator> <!-- source --> <accelerator key="Ctrl+/" @@ -916,7 +855,7 @@ Temporarily replaced until errors can be ironed out... <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 @@ -961,7 +900,7 @@ Temporarily replaced until errors can be ironed out... hoverIcon="icons/externaltools/full/ctool16/external_tools.gif" pulldown="true" class="net.sourceforge.phpdt.externaltools.internal.menu.ExternalToolMenuDelegate"> - </action> --> + </action> <action id="net.sourceforge.phpdt.externaltools.ExternalToolMenuDelegateToolbar" label="%Action.externalTools" @@ -972,7 +911,7 @@ Temporarily replaced until errors can be ironed out... tooltip="%Action.externalToolsTip" pulldown="true" class="net.sourceforge.phpdt.externaltools.internal.menu.ExternalToolMenuDelegate"> - </action> + </action> --> </actionSet> </extension>