X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml index d28e95c..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,10 +14,12 @@ <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.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,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" @@ -97,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> @@ -134,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 @@ -144,7 +178,7 @@ 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" @@ -153,7 +187,7 @@ Temporarily replaced until errors can be ironed out... name="nature" value="net.sourceforge.phpeclipse.phpnature"> </filter> - </page> + </page> --> <page objectClass="org.eclipse.core.resources.IProject" name="PHP Obfuscator" @@ -164,16 +198,6 @@ Temporarily replaced until errors can be ironed out... value="net.sourceforge.phpeclipse.phpnature"> </filter> </page> - <!-- <page - objectClass="net.sourceforge.phpeclipse.resourcesview.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"> @@ -185,6 +209,90 @@ 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" @@ -245,9 +353,7 @@ 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" @@ -260,13 +366,13 @@ Temporarily replaced until errors can be ironed out... label="%ShiftLeftAction.label" retarget="true" menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup" - id="net.sourceforge.phpeclipse.ui.actions.ShiftLeft"> + 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.ui.actions.ShiftRight"> + id="net.sourceforge.phpeclipse.phpeditor.ShiftRight"> </action> <action definitionId="net.sourceforge.phpeclipse.phpeditor.uncomment" @@ -288,9 +394,7 @@ Temporarily replaced until errors can be ironed out... point="org.eclipse.ui.actionSetPartAssociations"> <actionSetPartAssociation targetID="net.sourceforge.phpeclipse.ui.CodingActionSet"> - <part - id="net.sourceforge.phpeclipse.PHPUnitEditor"> - </part> + <part id="net.sourceforge.phpeclipse.PHPUnitEditor" /> </actionSetPartAssociation> </extension> <!-- =========================================================================== --> @@ -340,94 +444,10 @@ Temporarily replaced until errors can be ironed out... </accelerator> </acceleratorSet> </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> - </extension> + <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"> @@ -570,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"> @@ -590,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 @@ -610,6 +645,12 @@ Temporarily replaced until errors can be ironed out... class="net.sourceforge.phpeclipse.PHPEclipseBasePreferencePage" id="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"> </page> + <page + 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" @@ -640,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"> @@ -712,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" @@ -720,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"> @@ -735,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 @@ -745,7 +795,7 @@ Temporarily replaced until errors can be ironed out... <accelerator key="Ctrl+\" id="net.sourceforge.phpeclipse.phpeditor.uncomment"> - </accelerator> + </accelerator> <accelerator key="Ctrl+Shift+F" id="net.sourceforge.phpeclipse.phpeditor.format"> @@ -769,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+/" @@ -805,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 @@ -817,7 +867,7 @@ Temporarily replaced until errors can be ironed out... platform="carbon" key="Command+\" id="net.sourceforge.phpeclipse.phpeditor.uncomment"> - </accelerator> + </accelerator> </acceleratorSet> </extension> @@ -841,7 +891,7 @@ Temporarily replaced until errors can be ironed out... path="additions"> <separator name="ExternalToolsGroup"/> </menu> - <action + <!-- <action id="net.sourceforge.phpdt.externaltools.ExternalToolMenuDelegateMenu" label="%Action.externalTools" menubarPath="org.eclipse.ui.run/ExternalToolsGroup" @@ -850,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" @@ -861,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>