X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml index d28e95c..6405e84 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.7" provider-name="%providerName" class="net.sourceforge.phpeclipse.PHPeclipsePlugin"> @@ -14,6 +14,7 @@ <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"/> @@ -29,9 +30,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"> @@ -144,7 +158,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 +167,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 +178,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 +189,81 @@ 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> + </extension> + <extension point="org.eclipse.ui.actionSets"> <actionSet label="PHP/Apache" @@ -245,9 +324,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 +337,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 +365,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,81 +415,7 @@ 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 @@ -570,7 +571,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"> @@ -610,6 +622,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" @@ -720,8 +738,112 @@ Temporarily replaced until errors can be ironed out... id="net.sourceforge.phpeclipse.views.phpconsoleview"> </view> </extension> + <!-- =========================================================================== --> -<!-- Java Editor Key Bindings --> +<!-- 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 --> <!-- =========================================================================== --> <extension point="org.eclipse.ui.acceleratorSets"> @@ -745,7 +867,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"> @@ -817,7 +939,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 +963,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 +972,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 +983,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>