X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml index 5725887..fae4bbd 100644 --- a/net.sourceforge.phpeclipse/plugin.xml +++ b/net.sourceforge.phpeclipse/plugin.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> <plugin id="net.sourceforge.phpeclipse" name="%pluginName" - version="1.0.4" + version="1.0.10" provider-name="%providerName" class="net.sourceforge.phpeclipse.PHPeclipsePlugin"> @@ -12,25 +13,83 @@ </library> </runtime> <requires> - <import plugin="org.eclipse.core.resources"/> + <import plugin="org.eclipse.core.runtime.compatibility"/> <import plugin="org.eclipse.ui"/> + <import plugin="org.eclipse.ui.console"/> + <import plugin="org.eclipse.core.resources"/> + <import plugin="org.eclipse.search"/> + <import plugin="org.eclipse.debug.core"/> + <import plugin="org.eclipse.debug.ui"/> + <import plugin="org.eclipse.compare"/> + <import plugin="org.eclipse.core.filebuffers"/> + <import plugin="org.eclipse.jface.text"/> + <import plugin="org.eclipse.ui.workbench.texteditor"/> + <import plugin="org.eclipse.ui.ide"/> + <import plugin="org.eclipse.ui.views"/> + <import plugin="org.eclipse.ui.editors"/> + <import plugin="org.eclipse.ui.externaltools"/> <import plugin="org.eclipse.help"/> <import plugin="org.eclipse.swt"/> - <import plugin="org.eclipse.debug.ui"/> + <import plugin="org.eclipse.search"/> <import plugin="org.apache.xerces"/> + <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.PHPProject"> + class="net.sourceforge.phpdt.internal.core.JavaProject"> </run> </runtime> </extension> + + <extension + id="parserbuilder" + name="PHP Builder" + point="org.eclipse.core.resources.builders"> + <builder> + <run + class="net.sourceforge.phpdt.internal.core.builder.PHPBuilder"> + </run> + </builder> + </extension> + <!-- =================================================================================== --> +<!-- Extension: Java Markers --> +<!-- =================================================================================== --> + +<!-- Java problems --> + +<extension id="problem" point="org.eclipse.core.resources.markers" name="%phpProblemName"> + <super type="org.eclipse.core.resources.problemmarker"/> + <super type="org.eclipse.core.resources.textmarker"/> + <persistent value="true"/> + <attribute name="id"/> + <attribute name="flags"/> + <attribute name="arguments"/> +</extension> + +<!-- Java transient problems --> + +<extension id="transient_problem" point="org.eclipse.core.resources.markers" name="%transientPHPProblemName"> + <super type="org.eclipse.core.resources.textmarker"/> + <persistent value="false"/> + <attribute name="id"/> + <attribute name="flags"/> + <attribute name="arguments"/> +</extension> + +<!-- Java tasks --> + +<extension id="task" name="%phpTaskName" point="org.eclipse.core.resources.markers"> + <super type="org.eclipse.core.resources.taskmarker"/> + <persistent value="true"/> +</extension> + + <extension-point name="%phpEditorTextHoversName" id="phpEditorTextHovers" schema="schema/phpEditorTextHovers.exsd"/> + <extension point="org.eclipse.team.core.fileTypes"> <fileTypes @@ -65,7 +124,41 @@ type="text" extension="xml"> </fileTypes> + <fileTypes + type="text" + extension="tpl"> + </fileTypes> + </extension> + + <extension + point="net.sourceforge.phpeclipse.phpEditorTextHovers"> + <hover + class="net.sourceforge.phpdt.internal.ui.text.java.hover.BestMatchHover" + id="net.sourceforge.phpdt.ui.BestMatchHover" + label="%sequentialHover" + description="%sequentialHoverDescription"> + </hover> +</extension> + +<extension + point="net.sourceforge.phpeclipse.phpEditorTextHovers"> + <hover + class="net.sourceforge.phpdt.internal.ui.text.java.hover.JavaSourceHover" + id="net.sourceforge.phpdt.ui.JavaSourceHover" + label="%sourceHover" + description="%sourceHoverDescription"> + </hover> +</extension> + <extension + point="net.sourceforge.phpeclipse.phpEditorTextHovers"> + <hover + class="net.sourceforge.phpdt.internal.ui.text.java.hover.AnnotationHover" + id="net.sourceforge.phpdt.ui.AnnotationHover" + label="%annotationHover" + description="%annotationHoverDescription"> + </hover> </extension> + <extension point="org.eclipse.ui.perspectives"> <perspective @@ -92,61 +185,86 @@ Create a new PHP project. </description> </wizard> -<!-- choochter's stuff --> - <wizard - name="Xaraya Module" +<!-- <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" category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP" - class="net.sourceforge.phpeclipse.wizards.NewXarayaModuleWizard" + class="net.sourceforge.phpeclipse.wizards.TempnewPHPProject" project="true" - id="net.sourceforge.phpeclipse.wizards.NewXarayaModuleWizard"> + id="net.sourceforge.phpeclipse.wizards.NewWizardProjectCreation"> <description> - Create a Xaraya module. + Create a new PHP project. </description> - </wizard> - </extension> -<!-- <extension - point="org.eclipse.ui.newWizards"> - <category - name="%newWizardCategory.name" - id="net.sourceforge.phpeclipse.wizardCategory"> - </category> + </wizard> --> <wizard name="%newWizardPHPFile.name" icon="icons/obj16/phpedit.gif" - category="net.sourceforge.phpeclipse.wizardCategory" + 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> - </extension> --> +<!-- 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.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"> + point="org.eclipse.ui.ide.projectNatureImages"> <image icon="icons/obj16/php.gif" natureId="net.sourceforge.phpeclipse.phpnature" - id="net.sourceforge.phpeclipse..ProjectNatureImagePHP"> + id="net.sourceforge.phpeclipse.ProjectNatureImagePHP"> </image> </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 - objectClass="net.sourceforge.phpeclipse.PHPProject" - name="%propertyPagePHPProject.name" - class="net.sourceforge.phpeclipse.preferences.PHPProjectPropertyPage" - id="net.sourceforge.phpeclipse.preferences.PropertyPagePHPProject"> + </page> --> + <page + 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"> @@ -163,10 +281,159 @@ </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.editors.annotationTypes"> + <type + name="net.sourceforge.phpdt.ui.error" + super="org.eclipse.ui.workbench.texteditor.error" + markerType="net.sourceforge.phpeclipse.problem" + markerSeverity="2"> + </type> + <type + name="net.sourceforge.phpdt.ui.warning" + super="org.eclipse.ui.workbench.texteditor.warning" + markerType="net.sourceforge.phpeclipse.problem" + markerSeverity="1"> + </type> + <type + name="net.sourceforge.phpdt.ui.info" + super="org.eclipse.ui.workbench.texteditor.info" + markerType="net.sourceforge.phpeclipse.problem" + markerSeverity="0"> + </type> + <type + name="org.eclipse.jdt.ui.occurrences"> + </type> + </extension> + <extension + point="org.eclipse.ui.editors.markerAnnotationSpecification"> + <specification + annotationType="net.sourceforge.phpdt.ui.error" + annotationImageProvider="net.sourceforge.phpeclipse.phpeditor.JavaAnnotationImageProvider"> + </specification> + <specification + annotationType="net.sourceforge.phpdt.ui.warning" + annotationImageProvider="net.sourceforge.phpeclipse.phpeditor.JavaAnnotationImageProvider"> + </specification> + <specification + annotationType="net.sourceforge.phpdt.ui.info" + annotationImageProvider="net.sourceforge.phpeclipse.phpeditor.JavaAnnotationImageProvider"> + </specification> + <specification + annotationType="org.eclipse.debug.core.breakpoint" + icon="icons/full/obj16/brkp_obj.gif" + annotationImageProvider="net.sourceforge.phpeclipse.phpeditor.BreakpointImageProvider"> + </specification> + <specification + annotationType="net.sourceforge.phpdt.ui.occurrences" + label="%OccurrenceAnnotation.label" + icon="icons/full/obj16/searchm_obj.gif" + textPreferenceKey="occurrenceIndication" + textPreferenceValue="false" + highlightPreferenceKey="occurrenceHighlighting" + highlightPreferenceValue="true" + overviewRulerPreferenceKey="occurrenceIndicationInOverviewRuler" + overviewRulerPreferenceValue="true" + verticalRulerPreferenceKey="occurrenceIndicationInVerticalRuler" + verticalRulerPreferenceValue="false" + colorPreferenceKey="occurrenceIndicationColor" + colorPreferenceValue="180,207,205" + presentationLayer="3" + showInNextPrevDropdownToolbarActionKey="showOccurrenceInNextPrevDropdownToolbarAction" + showInNextPrevDropdownToolbarAction="true" + isGoToNextNavigationTargetKey="isOccurrenceGoToNextNavigationTarget" + isGoToNextNavigationTarget="false" + isGoToPreviousNavigationTargetKey="isOccurrenceGoToPreviousNavigationTarget" + isGoToPreviousNavigationTarget="false"> + </specification> + </extension> + <extension point="org.eclipse.ui.actionSets"> <actionSet label="PHP/Apache" - description="Starting MySQL and Apache." visible="true" id="net.sourceforge.phpeclipse.PHPActionSet"> <menu @@ -183,7 +450,6 @@ class="net.sourceforge.phpeclipse.actions.PHPRestartApacheAction" menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse" toolbarPath="Normal" - start="true" id="net.sourceforge.phpeclipse.actions.PHPRestartApacheAction"> </action> <action @@ -193,7 +459,6 @@ class="net.sourceforge.phpeclipse.actions.PHPStopApacheAction" menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse" toolbarPath="Normal" - start="true" id="net.sourceforge.phpeclipse.actions.PHPStopApacheAction"> </action> <action @@ -203,7 +468,6 @@ class="net.sourceforge.phpeclipse.actions.PHPStartApacheAction" menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse" toolbarPath="Normal" - start="true" id="net.sourceforge.phpeclipse.actions.PHPStartApacheAction"> </action> <action @@ -213,125 +477,124 @@ 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 - id="net.sourceforge.phpeclipse.ui.CodingActionSet" - label="%phpActionSet.label" - visible="false" - description="%CodingActionSet.description"> - <menu - id="net.sourceforge.phpeclipse.ui.source.menu" - label="%php.menu.label" - path="edit"> - <separator name="editGroup"/> - </menu> - <action id="net.sourceforge.phpeclipse.ui.actions.Uncomment" - menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup" - label="%phpUncommentAction.label" - retarget="true" /> - - <action id="net.sourceforge.phpeclipse.ui.actions.Comment" - menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup" - label="%phpCommentAction.label" - retarget="true" /> - </actionSet> --> + <actionSet + label="%CodingActionSet.label" + 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" /> + </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" + 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> - <!-- <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 --> +<!-- =========================================================================== --> + <extension point="org.eclipse.ui.actionDefinitions"> +<!-- edit --> <actionDefinition - id="net.sourceforge.phpeclipse.phpeditor.comment"> + id="net.sourceforge.phpeclipse.phpeditor.ContentAssistProposal"> </actionDefinition> +<!-- source --> <actionDefinition - id="net.sourceforge.phpeclipse.phpeditor.uncomment"> + id="net.sourceforge.phpeclipse.phpeditor.Comment"> </actionDefinition> - </extension> - <extension + <actionDefinition + 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"> <acceleratorSet scopeId="org.eclipse.ui.textEditorScope" configurationId="org.eclipse.ui.defaultAcceleratorConfiguration"> <accelerator key="Ctrl+/" - id="net.sourceforge.phpeclipse.phpeditor.comment"> + id="net.sourceforge.phpdt.ui.actions.comment"> </accelerator> <accelerator key="Ctrl+\\" - id="net.sourceforge.phpeclipse.phpeditor.uncomment"> + id="net.sourceforge.phpdt.ui.actions.uncomment"> </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 + objectClass="org.eclipse.core.resources.IProject" + id="net.sourceforge.phpeclipse.actions.PHPDocumentorAction"> + <action + label="Run PHPDocumentor" + class="net.sourceforge.phpeclipse.actions.PHPDocumentorAction" + menubarPath="additions" + id="net.sourceforge.phpeclipse.actions.PHPDocumentorAction"> + </action> + </objectContribution> <objectContribution objectClass="org.eclipse.core.resources.IFile" nameFilter="*.php" @@ -442,41 +705,139 @@ 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" + 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" + class="org.eclipse.ui.texteditor.BookmarkRulerAction" + menubarPath="add" + id="org.eclipse.ui.texteditor.BookmarkRulerAction"> + </action> + </viewerContribution> + </extension> + + <extension + point="org.eclipse.ui.editorActions"> + <editorContribution + 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 + <page name="PHP" class="net.sourceforge.phpeclipse.PHPEclipseBasePreferencePage" 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" class="net.sourceforge.phpeclipse.PHPOutlinePreferencePage" id="net.sourceforge.phpeclipse.preference.PHPOutlinePreferencePage"> </page> - <page + <page name="Templates" - category= "net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage" - class="net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage" - id = "net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage"> - </page> + category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage" + class="net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage" + 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"> + point="org.eclipse.ui.editors.documentProviders"> <provider extensions="%phpFileExtension" class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider" @@ -484,7 +845,7 @@ </provider> </extension> <extension - point="org.eclipse.ui.documentProviders"> + point="org.eclipse.ui.editors.documentProviders"> <provider extensions="%php3FileExtension" class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider" @@ -492,7 +853,7 @@ </provider> </extension> <extension - point="org.eclipse.ui.documentProviders"> + point="org.eclipse.ui.editors.documentProviders"> <provider extensions="%php4FileExtension" class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider" @@ -500,7 +861,7 @@ </provider> </extension> <extension - point="org.eclipse.ui.documentProviders"> + point="org.eclipse.ui.editors.documentProviders"> <provider extensions="%incFileExtension" class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider" @@ -508,7 +869,7 @@ </provider> </extension> <extension - point="org.eclipse.ui.documentProviders"> + point="org.eclipse.ui.editors.documentProviders"> <provider extensions="%phtmlFileExtension" class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider" @@ -516,13 +877,374 @@ </provider> </extension> <extension + point="org.eclipse.ui.editors.documentProviders"> + <provider + extensions="%htmlFileExtension" + class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider" + id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"> + </provider> + </extension> + <extension + point="org.eclipse.ui.editors.documentProviders"> + <provider + extensions="%htmFileExtension" + class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider" + id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"> + </provider> + </extension> + <extension + point="org.eclipse.ui.editors.documentProviders"> + <provider + extensions="%xmlFileExtension" + class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider" + id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"> + </provider> + </extension> + <extension + point="org.eclipse.ui.editors.documentProviders"> + <provider + extensions="%tplFileExtension" + class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider" + id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"> + </provider> + </extension> + <extension point="org.eclipse.ui.views"> + <category + name="%viewCategoryName" + id="net.sourceforge.phpeclipse.views.category"> + </category> <view name="%phpConsoleView" icon="icons/obj16/php.gif" + category="net.sourceforge.phpeclipse.views.category" class="net.sourceforge.phpeclipse.views.PHPConsole" id="net.sourceforge.phpeclipse.views.phpconsoleview"> + </view> + <view + name="%phpBrowserView" + icon="icons/obj16/php.gif" + category="net.sourceforge.phpeclipse.views.category" + class="net.sourceforge.phpeclipse.views.browser.BrowserView" + id="net.sourceforge.phpeclipse.views.browser"> </view> </extension> +<!-- =========================================================================== --> +<!-- PHPDT/UI Editor Key Bindings --> +<!-- =========================================================================== --> + <extension + point="org.eclipse.ui.acceleratorSets"> + <acceleratorSet + scopeId="org.eclipse.ui.textEditorScope" + 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="org.eclipse.ui.edit.text.contentAssist.proposals"> + </accelerator> +<!-- source --> + <accelerator + key="Ctrl+/" + id="net.sourceforge.phpeclipse.phpeditor.comment"> + </accelerator> + <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 + scopeId="org.eclipse.ui.textEditorScope" + configurationId="org.eclipse.ui.defaultAcceleratorConfiguration"> +<!-- edit --> + <accelerator + 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+/" + id="net.sourceforge.phpeclipse.phpeditor.comment"> + </accelerator> + <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+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" + configurationId="org.eclipse.ui.defaultAcceleratorConfiguration"> +<!-- 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="org.eclipse.ui.edit.text.contentAssist.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> + +<!-- 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>