X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml index cced16b..663efab 100644 --- a/net.sourceforge.phpeclipse/plugin.xml +++ b/net.sourceforge.phpeclipse/plugin.xml @@ -1,21 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> <plugin id="net.sourceforge.phpeclipse" name="%pluginName" - version="1.0.10" + version="1.1.2" provider-name="%providerName" class="net.sourceforge.phpeclipse.PHPeclipsePlugin"> - + <runtime> <library name="phpeclipse.jar"> - <export name="*"/> + <export name="*"/> </library> + <!-- <library name="lib/xstream-1.0.2.jar" /> --> </runtime> <requires> + <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.search"/> <import plugin="org.eclipse.debug.core"/> <import plugin="org.eclipse.debug.ui"/> <import plugin="org.eclipse.compare"/> @@ -27,10 +30,16 @@ <import plugin="org.eclipse.ui.editors"/> <import plugin="org.eclipse.ui.externaltools"/> <import plugin="org.eclipse.help"/> + <import plugin="org.eclipse.team.core"/> <import plugin="org.eclipse.swt"/> <import plugin="org.eclipse.search"/> - <import plugin="org.apache.xerces"/> <import plugin="org.eclipse.update.ui"/> + <import plugin="net.sourceforge.phpeclipse.quantum.sql"/> + <import plugin="net.sourceforge.phpeclipse.webbrowser"/> + <import plugin="net.sourceforge.phpeclipse.core"/> + <import plugin="net.sourceforge.phpeclipse.ui"/> + <import plugin="net.sourceforge.phpeclipse.xml.core"/> + <import plugin="net.sourceforge.phpeclipse.xml.ui"/> </requires> <extension @@ -54,23 +63,85 @@ </run> </builder> </extension> - - <extension-point name="%phpEditorTextHoversName" id="phpEditorTextHovers" schema="schema/phpEditorTextHovers.exsd"/> - <!-- =================================================================================== --> - <!-- Extension: PHP Markers --> <!-- =================================================================================== --> +<!-- Extension: Java Markers --> +<!-- =================================================================================== --> - <!-- Java problems --> +<!-- Java problems --> - <extension id="problem" point="org.eclipse.core.resources.markers" name="%phpProblemName"> +<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> +</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> + +<!-- PHP 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 id="phpElementFilters" name="%elementFiltersName" schema="schema/phpElementFilters.exsd"/> +<extension-point id="phpEditorTextHovers" name="%phpEditorTextHoversName" schema="schema/phpEditorTextHovers.exsd"/> +<extension-point id="foldingStructureProviders" name="%foldingStructureProvidersExtensionPoint" schema="schema/foldingStructureProviders.exsd"/> + + <extension + point="org.eclipse.ui.decorators"> + <!-- + <decorator + label="%ProblemsLabelDecorator.label" + state="false" + lightweight="true" + location="BOTTOM_LEFT" + class="net.sourceforge.phpdt.ui.ProblemsLabelDecorator" + id="net.sourceforge.phpdt.ui.problem.decorator"> + <description> + %ProblemsLabelDecorator.description + </description> + <enablement> + <or> + <objectClass + name="org.eclipse.core.resources.IResource"> + </objectClass> + <objectClass + name="net.sourceforge.phpdt.core.IJavaElement"> + </objectClass> + </or> + </enablement> + </decorator> + --> + <decorator + label="%OverrideIndicatorLabelDecorator.label" + lightweight="true" + location="BOTTOM_RIGHT" + state="true" + class="net.sourceforge.phpdt.ui.OverrideIndicatorLabelDecorator" + id="net.sourceforge.phpdt.ui.override.decorator"> + <description> + %OverrideIndicatorLabelDecorator.description + </description> + <enablement> + <objectClass + name="net.sourceforge.phpdt.core.IMethod"> + </objectClass> + </enablement> + </decorator> +</extension> + <extension point="org.eclipse.team.core.fileTypes"> <fileTypes @@ -87,6 +158,14 @@ </fileTypes> <fileTypes type="text" + extension="php5"> + </fileTypes> + <fileTypes + type="text" + extension="module"> + </fileTypes> + <fileTypes + type="text" extension="inc"> </fileTypes> <fileTypes @@ -103,12 +182,12 @@ </fileTypes> <fileTypes type="text" - extension="xml"> - </fileTypes> - <fileTypes + extension="xhtml"> + </fileTypes> + <!-- <fileTypes type="text" extension="tpl"> - </fileTypes> + </fileTypes> --> </extension> <extension @@ -129,16 +208,19 @@ label="%sourceHover" description="%sourceHoverDescription"> </hover> -</extension> - <extension - point="net.sourceforge.phpeclipse.phpEditorTextHovers"> <hover - class="net.sourceforge.phpdt.internal.ui.text.java.hover.JavaProblemHover" - id="net.sourceforge.phpdt.ui.ProblemHover" - label="%problemHover" - description="%problemHoverDescription"> + label="%problemHover" + description="%problemHoverDescription" + class="net.sourceforge.phpdt.internal.ui.text.java.hover.ProblemHover" + id="net.sourceforge.phpdt.ui.ProblemHover"> + </hover> + <hover + class="net.sourceforge.phpdt.internal.ui.text.java.hover.AnnotationHover" + id="net.sourceforge.phpdt.ui.AnnotationHover" + label="%annotationHover" + description="%annotationHoverDescription"> </hover> - </extension>r + </extension> <extension point="org.eclipse.ui.perspectives"> @@ -166,15 +248,14 @@ Create a new PHP project. </description> </wizard> -<!-- <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> - --> + </wizard> --> <!-- <this wizard replaces it as it works - maybe not as pretty but still> @@ -199,16 +280,14 @@ Create a basic PHP file. </description> </wizard> -<!-- choochter's stuff --> <wizard - name="Xaraya Module" - icon="icons/obj16/php.gif" + name="%newWizardHTMLFile.name" + icon="icons/obj16/htmledit.gif" category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP" - class="com.xaraya.wizard.NewXarayaResourceWizard" - project="true" - id="net.sourceforge.phpeclipse.wizards.NewXarayaModuleWizard"> + class="net.sourceforge.phpeclipse.wizards.HTMLFileWizard" + id="net.sourceforge.phpeclipse.wizards.HTMLFileWizard"> <description> - Create a Xaraya module. + Create a basic HTML file. </description> </wizard> </extension> @@ -222,7 +301,7 @@ </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" @@ -240,17 +319,63 @@ name="nature" value="net.sourceforge.phpeclipse.phpnature"> </filter> + </page> + <page + objectClass="org.eclipse.core.resources.IProject" + name="PHP Project Settings" + class="net.sourceforge.phpeclipse.preferences.PHPMiscProjectPreferences" + id="net.sourceforge.phpeclipse.preferences.project.PHPMiscProjectPreferences"> + <filter + name="nature" + value="net.sourceforge.phpeclipse.phpnature"> + </filter> </page> --> <page objectClass="org.eclipse.core.resources.IProject" - name="PHP Obfuscator" - class="net.sourceforge.phpeclipse.preferences.PHPObfuscatorPropertyPage" - id="net.sourceforge.phpeclipse.preferences.PHPObfuscatorPropertyPage"> + name="%todoPageName" + class="net.sourceforge.phpdt.internal.ui.preferences.TodoTaskPropertyPage" + id="net.sourceforge.phpdt.ui.propertyPages.TodoTaskPropertyPage"> + <filter + name="nature" + value="net.sourceforge.phpeclipse.phpnature"> + </filter> + </page> + <page + objectClass="net.sourceforge.phpdt.core.IJavaProject" + name="%todoPageName" + class="net.sourceforge.phpdt.internal.ui.preferences.TodoTaskPropertyPage" + id="net.sourceforge.phpdt.ui.propertyPages.TodoTaskPropertyPage"> + <filter + name="nature" + value="net.sourceforge.phpeclipse.phpnature"> + </filter> + </page> + <page + objectClass="org.eclipse.core.resources.IProject" + name="%compilerPageName" + class="net.sourceforge.phpdt.internal.ui.preferences.CompilerPropertyPage" + id="net.sourceforge.phpdt.ui.propertyPages.CompilerPropertyPage"> <filter name="nature" value="net.sourceforge.phpeclipse.phpnature"> </filter> </page> + <page + objectClass="net.sourceforge.phpdt.core.IJavaProject" + name="%compilerPageName" + class="net.sourceforge.phpdt.internal.ui.preferences.CompilerPropertyPage" + id="net.sourceforge.phpdt.ui.propertyPages.CompilerPropertyPage"> + <filter + name="nature" + value="net.sourceforge.phpeclipse.phpnature"> + </filter> + </page> + <!-- <page + objectClass="org.eclipse.core.resources.IFile" + name="PHP File Settings" + class="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences" + id="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences"> + </page> --> </extension> <!-- <extension point="org.eclipse.ui.views"> @@ -267,18 +392,20 @@ name="%phpEditorName" default="true" icon="icons/obj16/phpedit.gif" - extensions="php" - contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor" + extensions="php,php3,php4,php5,phtml,inc,module" + contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor" class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor" + symbolicFontName="net.sourceforge.phpdt.ui.editors.textfont" id="net.sourceforge.phpeclipse.PHPUnitEditor"> </editor> - <editor + <!-- <editor name="%phpEditorName" default="true" icon="icons/obj16/phpedit.gif" extensions="php3" - contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor" + contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor" class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor" + symbolicFontName="net.sourceforge.phpdt.ui.editors.textfont" id="net.sourceforge.phpeclipse.PHPUnitEditor"> </editor> <editor @@ -286,8 +413,29 @@ default="true" icon="icons/obj16/phpedit.gif" extensions="php4" - contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor" + contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor" + class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor" + symbolicFontName="net.sourceforge.phpdt.ui.editors.textfont" + id="net.sourceforge.phpeclipse.PHPUnitEditor"> + </editor> + <editor + name="%phpEditorName" + default="true" + icon="icons/obj16/phpedit.gif" + extensions="module" + contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor" + class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor" + symbolicFontName="net.sourceforge.phpdt.ui.editors.textfont" + id="net.sourceforge.phpeclipse.PHPUnitEditor"> + </editor> + <editor + name="%phpEditorName" + default="true" + icon="icons/obj16/phpedit.gif" + extensions="php5" + contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor" class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor" + symbolicFontName="net.sourceforge.phpdt.ui.editors.textfont" id="net.sourceforge.phpeclipse.PHPUnitEditor"> </editor> <editor @@ -295,8 +443,9 @@ default="true" icon="icons/obj16/phpedit.gif" extensions="inc" - contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor" + contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor" class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor" + symbolicFontName="net.sourceforge.phpdt.ui.editors.textfont" id="net.sourceforge.phpeclipse.PHPUnitEditor"> </editor> <editor @@ -304,48 +453,130 @@ default="true" icon="icons/obj16/phpedit.gif" extensions="phtml" - contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor" + contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor" class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor" + symbolicFontName="net.sourceforge.phpdt.ui.editors.textfont" id="net.sourceforge.phpeclipse.PHPUnitEditor"> - </editor> + </editor> --> <editor name="%phpEditorName" default="true" icon="icons/obj16/htmledit.gif" - extensions="htm" - contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor" + extensions="htm,html,xhtml" + contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor" class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor" + symbolicFontName="net.sourceforge.phpdt.ui.editors.textfont" id="net.sourceforge.phpeclipse.PHPUnitEditor"> </editor> - <editor + <!-- <editor name="%phpEditorName" default="true" icon="icons/obj16/htmledit.gif" extensions="html" - contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor" + contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor" class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor" + symbolicFontName="net.sourceforge.phpdt.ui.editors.textfont" id="net.sourceforge.phpeclipse.PHPUnitEditor"> </editor> <editor name="%phpEditorName" default="true" - icon="icons/obj16/xmledit.gif" - extensions="xml" - contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor" + icon="icons/obj16/htmledit.gif" + extensions="xhtml" + contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor" class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor" + symbolicFontName="net.sourceforge.phpdt.ui.editors.textfont" id="net.sourceforge.phpeclipse.PHPUnitEditor"> - </editor> - <editor + </editor> --> + <!-- <editor name="%phpEditorName" default="true" icon="icons/obj16/htmledit.gif" extensions="tpl" - contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor" + contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor" class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor" + symbolicFontName="net.sourceforge.phpdt.ui.editors.textfont" id="net.sourceforge.phpeclipse.PHPUnitEditor"> - </editor> + </editor> --> + </extension> + <extension + point="org.eclipse.ui.fontDefinitions"> + <fontDefinition + label="%phpEditorFontDefiniton.label" + defaultsTo="org.eclipse.jface.textfont" + id="net.sourceforge.phpdt.ui.editors.textfont"> + <description> + %phpEditorFontDefintion.description + </description> + </fontDefinition> </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="net.sourceforge.phpdt.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" @@ -395,10 +626,12 @@ id="net.sourceforge.phpeclipse.actions.PHPStartMySQLAction"> </action> </actionSet> + <actionSet label="%CodingActionSet.label" + description="%CodingActionSet.description" visible="false" - id="net.sourceforge.phpeclipse.ui.CodingActionSet"> + id="net.sourceforge.phpeclipse.ui.CodingActionSet"> <!-- =========================================================================== --> <!-- Source Menu --> <!-- =========================================================================== --> @@ -406,7 +639,12 @@ label="%SourceMenu.label" path="edit" id="net.sourceforge.phpeclipse.ui.source.menu"> - <separator name="editGroup" /> + <separator + name="editGroup"> + </separator> + <separator + name="convertGroup"> + </separator> </menu> <action definitionId="net.sourceforge.phpeclipse.phpeditor.format" @@ -428,6 +666,27 @@ id="net.sourceforge.phpeclipse.phpeditor.ShiftRight"> </action> <action + definitionId="net.sourceforge.phpeclipse.phpeditor.remove.block.comment" + label="%RemoveBlockCommentAction.label" + retarget="true" + menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup" + id="net.sourceforge.phpeclipse.ui.actions.RemoveBlockComment"> + </action> + <action + definitionId="net.sourceforge.phpeclipse.phpeditor.add.block.comment" + label="%AddBlockCommentAction.label" + retarget="true" + menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup" + id="net.sourceforge.phpeclipse.ui.actions.AddBlockComment"> + </action> + <action + definitionId="net.sourceforge.phpeclipse.phpeditor.toggle.comment" + label="%ToggleCommentAction.label" + retarget="true" + menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup" + id="net.sourceforge.phpeclipse.ui.actions.ToggleComment"> + </action> + <action definitionId="net.sourceforge.phpeclipse.phpeditor.uncomment" label="%UncommentAction.label" retarget="true" @@ -441,6 +700,36 @@ menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup" id="net.sourceforge.phpeclipse.phpeditor.Comment"> </action> +<!-- convert group --> + <menu + label="%ConvertLineDelimitersActions.label" + path="net.sourceforge.phpeclipse.ui.source.menu/convertGroup" + id="convertSubMenu"> + <separator + name="group1"> + </separator> + </menu> + <action + label="%ConvertLineDelimitersToMacAction.label" + retarget="true" + menubarPath="net.sourceforge.phpeclipse.ui.source.menu/convertSubMenu/group1" + allowLabelUpdate="true" + id="net.sourceforge.phpeclipse.ui.actions.ConvertLineDelimitersToMac"> + </action> + <action + label="%ConvertLineDelimitersToUNIXAction.label" + retarget="true" + menubarPath="net.sourceforge.phpeclipse.ui.source.menu/convertSubMenu/group1" + allowLabelUpdate="true" + id="net.sourceforge.phpeclipse.ui.actions.ConvertLineDelimitersToUNIX"> + </action> + <action + label="%ConvertLineDelimitersToWindowsAction.label" + retarget="true" + menubarPath="net.sourceforge.phpeclipse.ui.source.menu/convertSubMenu/group1" + allowLabelUpdate="true" + id="net.sourceforge.phpeclipse.ui.actions.ConvertLineDelimitersToWindows"> + </action> </actionSet> </extension> <extension @@ -450,16 +739,17 @@ <part id="net.sourceforge.phpeclipse.PHPUnitEditor" /> </actionSetPartAssociation> </extension> + <!-- =========================================================================== --> <!-- PHP Editor Action Definition IDs --> <!-- =========================================================================== --> - <extension +<!-- <extension point="org.eclipse.ui.actionDefinitions"> -<!-- edit --> + <actionDefinition id="net.sourceforge.phpeclipse.phpeditor.ContentAssistProposal"> </actionDefinition> -<!-- source --> + <actionDefinition id="net.sourceforge.phpeclipse.phpeditor.Comment"> </actionDefinition> @@ -481,7 +771,7 @@ <actionDefinition id="net.sourceforge.phpeclipse.ui.edit.text.php.show.previous.problem"> </actionDefinition> - </extension> + </extension> --> <!-- <extension point="org.eclipse.ui.acceleratorSets"> <acceleratorSet @@ -500,7 +790,7 @@ <extension point="org.eclipse.ui.popupMenus"> - <objectContribution + <!-- <objectContribution objectClass="org.eclipse.core.resources.IProject" id="net.sourceforge.phpeclipse.actions.PHPDocumentorAction"> <action @@ -509,7 +799,7 @@ menubarPath="additions" id="net.sourceforge.phpeclipse.actions.PHPDocumentorAction"> </action> - </objectContribution> + </objectContribution> --> <objectContribution objectClass="org.eclipse.core.resources.IFile" nameFilter="*.php" @@ -545,6 +835,28 @@ </objectContribution> <objectContribution objectClass="org.eclipse.core.resources.IFile" + nameFilter="*.php5" + id="net.sourceforge.phpeclipse.actions.externalParserAction"> + <action + label="Run External PHP Parser" + class="net.sourceforge.phpeclipse.actions.PHPExternalParserAction" + menubarPath="additions" + id="net.sourceforge.phpeclipse.actions.externalParserAction"> + </action> + </objectContribution> + <objectContribution + objectClass="org.eclipse.core.resources.IFile" + nameFilter="*.module" + id="net.sourceforge.phpeclipse.actions.externalParserAction"> + <action + label="Run External PHP Parser" + class="net.sourceforge.phpeclipse.actions.PHPExternalParserAction" + menubarPath="additions" + id="net.sourceforge.phpeclipse.actions.externalParserAction"> + </action> + </objectContribution> + <objectContribution + objectClass="org.eclipse.core.resources.IFile" nameFilter="*.inc" id="net.sourceforge.phpeclipse.actions.externalParserAction"> <action @@ -600,6 +912,28 @@ </objectContribution> <objectContribution objectClass="org.eclipse.core.resources.IFile" + nameFilter="*.php5" + 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="*.module" + 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="*.inc" id="net.sourceforge.phpeclipse.actions.popupShowAction"> <action @@ -642,7 +976,7 @@ id="net.sourceforge.phpeclipse.actions.showAction"> </action> </objectContribution> - <objectContribution + <objectContribution objectClass="org.eclipse.core.resources.IFile" nameFilter="*.xml" id="net.sourceforge.phpeclipse.actions.popupShowAction"> @@ -656,15 +990,45 @@ <viewerContribution targetID="#PHPEditorContext" + id="net.sourceforge.phpeclipse.actions.popupOpenSQLTable"> + <action + label="Open Quantum SQL Table View" + class="net.sourceforge.phpeclipse.actions.PHPOpenSQLTableEditorAction" + menubarPath="additions" + id="net.sourceforge.phpeclipse.actions.opensqltable"> + </action> + </viewerContribution> + <viewerContribution + targetID="#PHPEditorContext" + id="net.sourceforge.phpeclipse.actions.popupHTMLWizard"> + <action + label="Insert HTML (dl,ul,ol,table)" + class="net.sourceforge.phpeclipse.wizards.html.InsertHTMLElementAction" + menubarPath="additions" + id="net.sourceforge.phpeclipse.actions.wizards.html"> + </action> + </viewerContribution> + <viewerContribution + targetID="#PHPEditorContext" + id="net.sourceforge.phpeclipse.actions.popupOpenAllIncludes"> + <action + label="Open Included Files List" + class="net.sourceforge.phpeclipse.actions.PHPOpenAllIncludesEditorAction" + menubarPath="additions" + id="net.sourceforge.phpeclipse.actions.openallincludes"> + </action> + </viewerContribution> + <viewerContribution + targetID="#PHPEditorContext" id="net.sourceforge.phpeclipse.actions.popupOpenDeclaration"> <action - label="Open PHP Declaration" - class="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorActon" + label="%OpenDeclaration" + class="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction" menubarPath="additions" - id="net.sourceforge.phpeclipse.actions.opendeclaration"> + definitionId="net.sourceforge.phpeclipse.actions.opendeclaration" + id="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction"> </action> </viewerContribution> - <viewerContribution targetID="#PHPRulerContext" id="net.sourceforge.phpdt.ui.PHPEditorPopupActions"> @@ -684,13 +1048,29 @@ </action> </viewerContribution> </extension> - + <extension + point="org.eclipse.ui.actionSets"> + <actionSet + label="%OpenActionSet.label" + description="%OpenActionSet.description" + visible="false" + id="net.sourceforge.phpeclipse.ui.A_OpenActionSet"> + <action + definitionId="net.sourceforge.phpeclipse.ui.edit.text.java.open.editor" + label="%OpenDeclaration" + tooltip="%OpenDeclaration" + retarget="true" + menubarPath="navigate/open.ext" + allowLabelUpdate="true" + id="net.sourceforge.phpeclipse.ui.actions.Open"> + </action> + </actionSet> + </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" @@ -698,39 +1078,479 @@ helpContextId="org.eclipse.ui.bookmark_action_context" class="org.eclipse.ui.texteditor.BookmarkRulerAction"> </action> + <action + label="%Dummy.label" + class="net.sourceforge.phpeclipse.phpeditor.JavaSelectRulerAction" + actionID="RulerClick" + id="net.sourceforge.phpeclipse.phpeditor.JavaSelectRulerAction"> + </action> </editorContribution> + <editorContribution + id="net.sourceforge.phpdt.editor.actions" + targetID="net.sourceforge.phpeclipse.PHPUnitEditor"> + <action + definitionId="net.sourceforge.phpeclipse.actions.opendeclaration" + label="%OpenDeclaration" + class="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction" + id="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction"> + </action> + </editorContribution> + </extension> + <extension + point="org.eclipse.ui.popupMenus"> + <viewerContribution + targetID="#CompilationUnitRulerContext" + id="net.sourceforge.phpeclipse.phpeditor.QuickFixRulerMenuAction"> + <action + label="%Dummy.label" + helpContextId="net.sourceforge.phpeclipse.quick_fix_action" + class="net.sourceforge.phpeclipse.phpeditor.JavaSelectRulerAction" + menubarPath="additions" + id="net.sourceforge.phpeclipse.phpeditor.JavaSelectRulerMenuAction"> + </action> + </viewerContribution> + </extension> + <extension + point="org.eclipse.ui.popupMenus"> + <viewerContribution + targetID="#CompilationUnitRulerContext" + id="net.sourceforge.phpdt.ui.CompilationUnitEditorPopupActions"> + <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"> + </action> + <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> + <menu + id="projection" + label="%Folding.label" + path="rest"> + </menu> + <action + label="%Dummy.label" + tooltip="%Dummy.label" + class="net.sourceforge.phpdt.internal.ui.actions.FoldingExpandAllRulerAction" + menubarPath="projection/additions" + definitionId="org.eclipse.ui.edit.text.folding.expand_all" + id="net.sourceforge.phpdt.ui.folding.expandAll"> + </action> + <action + label="%Dummy.label" + tooltip="%Dummy.label" + class="net.sourceforge.phpdt.internal.ui.actions.FoldingToggleRulerAction" + menubarPath="projection/additions" + definitionId="org.eclipse.ui.edit.text.folding.toggle" + id="net.sourceforge.phpdt.ui.folding.toggle"> + </action> + </viewerContribution> + </extension> + <!-- =========================================================================== --> +<!-- PHPDT/UI command definitions --> +<!-- =========================================================================== --> + <extension point="org.eclipse.ui.contexts"> + <context name="%context.editingPHPSource.name" + description="%context.editingPHPSource.description" + parentId="org.eclipse.ui.textEditorScope" + id="net.sourceforge.phpdt.ui.phpEditorScope" /> + </extension> + <extension + point="org.eclipse.ui.commands"> + <category + name="%category.source.name" + description="%category.source.description" + id="net.sourceforge.phpeclipse.ui.category.source"> + </category> + + <!-- source --> + <command + name="%ActionDefinition.comment.name" + description="%ActionDefinition.comment.description" + category="net.sourceforge.phpeclipse.ui.category.source" + id="net.sourceforge.phpeclipse.phpeditor.comment"> + </command> + <command + name="%ActionDefinition.uncomment.name" + description="%ActionDefinition.uncomment.description" + category="net.sourceforge.phpeclipse.ui.category.source" + id="net.sourceforge.phpeclipse.phpeditor.uncomment"> + </command> + <command + name="%ActionDefinition.toggleComment.name" + description="%ActionDefinition.toggleComment.description" + category="net.sourceforge.phpeclipse.ui.category.source" + id="net.sourceforge.phpeclipse.phpeditor.toggle.comment"> + </command> + + <keyBinding + string="Ctrl+Shift+C" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="net.sourceforge.phpeclipse.phpeditor.toggle.comment" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <keyBinding + string="Ctrl+/" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="net.sourceforge.phpeclipse.phpeditor.toggle.comment" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <keyBinding + string="Ctrl+7" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="net.sourceforge.phpeclipse.phpeditor.toggle.comment" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <keyBinding + platform="carbon" + string="Ctrl+Shift+C" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <keyBinding + platform="carbon" + string="Command+Shift+C" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="net.sourceforge.phpeclipse.phpeditor.toggle.comment" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <keyBinding + platform="carbon" + string="Ctrl+/" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="net.sourceforge.phpeclipse.phpeditor.toggle.comment" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <keyBinding + platform="carbon" + string="Command+/" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="net.sourceforge.phpeclipse.phpeditor.toggle.comment" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <keyBinding + platform="carbon" + string="Ctrl+7" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <keyBinding + platform="carbon" + string="Command+7" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="net.sourceforge.phpeclipse.phpeditor.toggle.comment" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <keyBinding + platform="gtk" + string="Ctrl+Shift+C" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <keyBinding + platform="gtk" + string="Esc Ctrl+C" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="net.sourceforge.phpeclipse.phpeditor.toggle.comment" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <command + name="%ActionDefinition.addBlockComment.name" + description="%ActionDefinition.addBlockComment.description" + category="net.sourceforge.phpeclipse.ui.category.source" + id="net.sourceforge.phpeclipse.phpeditor.add.block.comment"> + </command> + <keyBinding + string="Ctrl+Shift+/" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="net.sourceforge.phpeclipse.phpeditor.add.block.comment" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <keyBinding + platform="carbon" + string="Ctrl+Shift+/" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <keyBinding + platform="carbon" + string="Command+Shift+/" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="net.sourceforge.phpeclipse.phpeditor.add.block.comment" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <command + name="%ActionDefinition.removeBlockComment.name" + description="%ActionDefinition.removeBlockComment.description" + category="net.sourceforge.phpeclipse.ui.category.source" + id="net.sourceforge.phpeclipse.phpeditor.remove.block.comment"> + </command> + <keyBinding + string="Ctrl+Shift+\" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="net.sourceforge.phpeclipse.phpeditor.remove.block.comment" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <keyBinding + platform="carbon" + string="Ctrl+Shift+\" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <keyBinding + platform="carbon" + string="Command+Shift+\" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="net.sourceforge.phpeclipse.phpeditor.remove.block.comment" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <command + name="%ActionDefinition.indent.name" + description="%ActionDefinition.indent.description" + category="net.sourceforge.phpeclipse.ui.category.source" + id="net.sourceforge.phpeclipse.phpeditor.indent"> + </command> + <keyBinding + string="Ctrl+I" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="net.sourceforge.phpeclipse.phpeditor.indent" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + + <command + name="%ActionDefinition.format.name" + description="%ActionDefinition.format.description" + category="net.sourceforge.phpeclipse.ui.category.source" + id="net.sourceforge.phpeclipse.phpeditor.format"> + </command> + <keyBinding + string="Ctrl+Shift+F" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="net.sourceforge.phpeclipse.phpeditor.format" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <keyBinding + platform="carbon" + string="Ctrl+Shift+F" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <keyBinding + platform="carbon" + string="Command+Shift+F" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="net.sourceforge.phpeclipse.phpeditor.format" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <keyBinding + platform="gtk" + string="Ctrl+Shift+F" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <keyBinding + platform="gtk" + string="Esc Ctrl+F" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="net.sourceforge.phpeclipse.phpeditor.format" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + + <!-- navigate --> + <command + name="%ActionDefinition.gotoNextMember.name" + description="%ActionDefinition.gotoNextMember.description" + category="org.eclipse.ui.category.navigate" + id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.next.member"> + </command> + <keyBinding + string="Ctrl+Shift+ARROW_DOWN" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.next.member" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <keyBinding + platform="carbon" + string="Ctrl+Shift+ARROW_DOWN" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <keyBinding + platform="carbon" + string="Command+Shift+ARROW_DOWN" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.next.member" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <command + name="%ActionDefinition.gotoPreviousMember.name" + description="%ActionDefinition.gotoPreviousMember.description" + category="org.eclipse.ui.category.navigate" + id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.previous.member"> + </command> + <keyBinding + string="Ctrl+Shift+ARROW_UP" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.previous.member" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <keyBinding + platform="carbon" + string="Ctrl+Shift+ARROW_UP" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <keyBinding + platform="carbon" + string="Command+Shift+ARROW_UP" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.previous.member" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <keyBinding + string="" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="org.eclipse.jdt.ui.edit.text.java.show.next.problem" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <command + name="%ActionDefinition.gotoMatchingBracket.name" + description="%ActionDefinition.gotoMatchingBracket.description" + category="org.eclipse.ui.category.navigate" + id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket"> + </command> + <keyBinding + string="Ctrl+Shift+P" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <keyBinding + platform="carbon" + string="Ctrl+Shift+P" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <keyBinding + platform="carbon" + string="Command+Shift+P" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + <command + name="%OpenDeclaration" + description="%OpenDeclaration" + category="net.sourceforge.phpeclipse.ui.category.source" + id="net.sourceforge.phpeclipse.actions.opendeclaration"> + </command> + <keyBinding + string="F3" + scope="net.sourceforge.phpdt.ui.phpEditorScope" + command="net.sourceforge.phpeclipse.actions.opendeclaration" + configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> + </keyBinding> + </extension> + <extension + id="net.sourceforge.phpeclipse.JavaDocumentSetupParticipant" + name="%javaDocumentSetupParticipant" + point="org.eclipse.core.filebuffers.documentSetup"> + <participant + extensions="php,php3,php4,php5,module,inc,phtml,html,htm,xhtml" + class="net.sourceforge.phpeclipse.phpeditor.JavaDocumentSetupParticipant"> + </participant> + <!-- <participant + extensions="html,xml" + class="net.sourceforge.phpeclipse.phpeditor.HTMLDocumentSetupParticipant"> + </participant> + <participant + extensions="tpl" + class="net.sourceforge.phpeclipse.phpeditor.SmartyDocumentSetupParticipant"> + </participant> --> + </extension> + <extension + id="net.sourceforge.phpeclipse.JavaDocumentFactory" + name="%javaDocumentFactory" + point="org.eclipse.core.filebuffers.documentCreation"> + <factory + extensions="php" + class="net.sourceforge.phpeclipse.phpeditor.JavaDocumentFactory"> + </factory> </extension> <extension point="org.eclipse.ui.preferencePages"> <page name="PHP" + category="net.sourceforge.phpeclipse.ui.preferencePage" class="net.sourceforge.phpeclipse.PHPEclipseBasePreferencePage" id="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"> </page> <page - name="PHP Parser" + name="Code Templates" category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage" - class="net.sourceforge.phpeclipse.PHPEclipseParserPreferencePage" - id="net.sourceforge.phpeclipse.preference.PHPEclipseParserPreferencePage"> + class="net.sourceforge.phpdt.internal.ui.preferences.CodeTemplatePreferencePage" + id="net.sourceforge.phpeclipse.preference.CodeTemplatePreferencePage"> + </page> + <!-- <page + name="Members Sort Order" + category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage" + class="net.sourceforge.phpdt.internal.ui.preferences.MembersOrderPreferencePage" + id="net.sourceforge.phpeclipse.preference.MembersOrderPreferencePage"> + </page> --> + <page + name="PHP External Parser Command" + category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage" + class="net.sourceforge.phpeclipse.preferences.PHPEclipseParserPreferencePage" + id="net.sourceforge.phpeclipse.preferences.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 + category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage" + name="PHP Project Defaults" + class="net.sourceforge.phpeclipse.preferences.PHPMiscProjectPreferences" + id="net.sourceforge.phpeclipse.preferences.PHPMiscProjectPreferences"> + </page> <page - name="Outline" category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage" - class="net.sourceforge.phpeclipse.PHPOutlinePreferencePage" - id="net.sourceforge.phpeclipse.preference.PHPOutlinePreferencePage"> + name="PHP Browser Preview" + class="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences" + id="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences"> + </page> --> + <page + name="%compilerOptionsPrefName" + category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage" + class="net.sourceforge.phpdt.internal.ui.preferences.CompilerPreferencePage" + id="net.sourceforge.phpeclipse.preference.CompilerPreferencePage"> </page> <page - name="Templates" + name="%todoTaskPrefName" category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage" - class="net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage" - id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage"> + class="net.sourceforge.phpdt.internal.ui.preferences.TodoTaskPreferencePage" + id="net.sourceforge.phpeclipse.preference.TodoTaskPreferencePage"> </page> <page name="Formatter" @@ -738,29 +1558,51 @@ class="net.sourceforge.phpdt.internal.ui.preferences.CodeFormatterPreferencePage" id="net.sourceforge.phpeclipse.preference.CodeFormatterPreferencePage"> </page> - <page - name="Editor" + <page name="Editor" category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage" - class="net.sourceforge.phpdt.internal.ui.preferences.PHPEditorPreferencePage" - id="net.sourceforge.phpeclipse.preference.PHPEditorPreferencePage"> + class="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage" + id="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"> + </page> + <page name="%codeAssistPageName" + category="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage" + class="net.sourceforge.phpdt.internal.ui.preferences.CodeAssistPreferencePage" + id="net.sourceforge.phpdt.internal.ui.preferences.CodeAssistPreferencePage"> + </page> + <page + name="%templatePageName" + category="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage" + class="net.sourceforge.phpdt.internal.ui.preferences.JavaTemplatePreferencePage" + id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage"> + </page> + <!-- <page + name="%templatePageName" + category="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage" + class="net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage" + id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage"> </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 + name="%spellingPrefName" + category="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage" + class="net.sourceforge.phpdt.internal.ui.preferences.SpellingPreferencePage" + id = "net.sourceforge.phpdt.internal.ui.preferences.SpellingPreferencePage"> + </page> </extension> <extension - point="org.eclipse.ui.documentProviders"> + point="org.eclipse.ui.editors.documentProviders"> <provider - extensions="%phpFileExtension" + extensions="php,php3,php4,php5,phtml,inc,module,html,htm,xhtml" class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider" id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"> </provider> </extension> - <extension - point="org.eclipse.ui.documentProviders"> +<!-- <extension + point="org.eclipse.ui.editors.documentProviders"> <provider extensions="%php3FileExtension" class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider" @@ -768,7 +1610,7 @@ </provider> </extension> <extension - point="org.eclipse.ui.documentProviders"> + point="org.eclipse.ui.editors.documentProviders"> <provider extensions="%php4FileExtension" class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider" @@ -776,7 +1618,23 @@ </provider> </extension> <extension - point="org.eclipse.ui.documentProviders"> + point="org.eclipse.ui.editors.documentProviders"> + <provider + extensions="%php5FileExtension" + class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider" + id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"> + </provider> + </extension> + <extension + point="org.eclipse.ui.editors.documentProviders"> + <provider + extensions="%moduleFileExtension" + class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider" + id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"> + </provider> + </extension> + <extension + point="org.eclipse.ui.editors.documentProviders"> <provider extensions="%incFileExtension" class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider" @@ -784,15 +1642,15 @@ </provider> </extension> <extension - point="org.eclipse.ui.documentProviders"> + point="org.eclipse.ui.editors.documentProviders"> <provider extensions="%phtmlFileExtension" class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider" id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"> </provider> </extension> - <extension - point="org.eclipse.ui.documentProviders"> + <extension + point="org.eclipse.ui.editors.documentProviders"> <provider extensions="%htmlFileExtension" class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider" @@ -800,7 +1658,7 @@ </provider> </extension> <extension - point="org.eclipse.ui.documentProviders"> + point="org.eclipse.ui.editors.documentProviders"> <provider extensions="%htmFileExtension" class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider" @@ -808,130 +1666,34 @@ </provider> </extension> <extension - point="org.eclipse.ui.documentProviders"> + point="org.eclipse.ui.editors.documentProviders"> <provider - extensions="%xmlFileExtension" + extensions="xhtml" class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider" id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"> </provider> - </extension> - <extension - point="org.eclipse.ui.documentProviders"> + </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> --> <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> - </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> + </view> </extension> <!-- external tools --> @@ -1150,4 +1912,59 @@ expanderClass="net.sourceforge.phpdt.externaltools.variable.WorkingSetExpander"> </variable> </extension> + <extension + point= "net.sourceforge.phpeclipse.foldingStructureProviders"> + <provider + id="net.sourceforge.phpdt.ui.text.defaultFoldingProvider" + name= "%defaultFoldingStructureProviderName" + class="net.sourceforge.phpdt.internal.ui.text.folding.DefaultJavaFoldingStructureProvider" + preferencesClass="net.sourceforge.phpdt.internal.ui.text.folding.DefaultJavaFoldingPreferenceBlock"> + </provider> + </extension> + +<!-- =========================================================================== --> +<!-- Filter Support --> +<!-- =========================================================================== --> + <extension + point="net.sourceforge.phpeclipse.phpElementFilters"> +<!-- Outline Page --> + <filter + targetId="net.sourceforge.phpeclipse.JavaOutlinePage" + name="%HideImportDeclaration.label" + enabled="false" + description="%HideImportDeclaration.description" + class="net.sourceforge.phpdt.internal.ui.filters.ImportDeclarationFilter" + id="net.sourceforge.phpeclipse.JavaOutlinePage.ImportDeclarationFilter"> + </filter> + </extension> + +<!-- =========================================================================== --> +<!-- Templates --> +<!-- =========================================================================== --> + <extension + point="org.eclipse.ui.editors.templates"> + <contextType + name="%templates.php.contextType.name" + class="net.sourceforge.phpdt.internal.corext.template.php.JavaContextType" + id="java"> + </contextType> + <contextType + name="%templates.phpdoc.contextType.name" + class="net.sourceforge.phpdt.internal.corext.template.php.JavaDocContextType" + id="javadoc"> + </contextType> + <contextType + name="%templates.html.contextType.name" + class="net.sourceforge.phpdt.internal.corext.template.php.HTMLContextType" + id="javadoc"> + </contextType> + <include + file="templates/default-templates.xml" + translations="templates/default-templates.properties"> + </include> + <include + file="templates/default-codetemplates.xml" + translations="templates/default-templates.properties"> + </include> + </extension> </plugin>