X-Git-Url: http://secure.phpeclipse.com
diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index ac91d55..af3af2f 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -3,14 +3,16 @@
<plugin
id="net.sourceforge.phpeclipse"
name="%pluginName"
- version="1.1.0"
+ version="1.1.6"
provider-name="%providerName"
class="net.sourceforge.phpeclipse.PHPeclipsePlugin">
-
+
<runtime>
<library name="phpeclipse.jar">
- <export name="*"/>
+ <export name="*"/>
</library>
+ <!-- <library name="lib/hsqldb.jar"/> -->
+ <!-- <library name="lib/xstream-1.0.2.jar" /> -->
</runtime>
<requires>
<import plugin="org.eclipse.core.runtime.compatibility"/>
@@ -29,11 +31,18 @@
<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.quantum.sql"/> -->
+ <!-- <import plugin="com.quantum.Quantum"/> -->
+ <import plugin="net.sourceforge.phpeclipse.webbrowser"/>
+ <import plugin="net.sourceforge.phpeclipse.externaltools"/>
+ <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
@@ -82,15 +91,58 @@
<attribute name="arguments"/>
</extension>
-<!-- Java tasks -->
+<!-- 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 name="%phpEditorTextHoversName" id="phpEditorTextHovers" schema="schema/phpEditorTextHovers.exsd"/>
-
+<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="true"
+ 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
@@ -107,6 +159,14 @@
</fileTypes>
<fileTypes
type="text"
+ extension="php5">
+ </fileTypes>
+ <fileTypes
+ type="text"
+ extension="module">
+ </fileTypes>
+ <fileTypes
+ type="text"
extension="inc">
</fileTypes>
<fileTypes
@@ -123,12 +183,20 @@
</fileTypes>
<fileTypes
type="text"
- extension="xml">
- </fileTypes>
- <fileTypes
+ extension="xhtml">
+ </fileTypes>
+ <!-- <fileTypes
type="text"
extension="tpl">
- </fileTypes>
+ </fileTypes> -->
+ </extension>
+
+ <extension point="org.eclipse.core.runtime.contentTypes">
+ <!-- declares a content type for PHP Source files -->
+ <content-type id="phpSource" name="%phpSourceName"
+ base-type="org.eclipse.core.runtime.text"
+ priority="high"
+ file-extensions="php,php3,php4,php5,phtml,inc,module,htm,html,xhtml"/>
</extension>
<extension
@@ -149,9 +217,12 @@
label="%sourceHover"
description="%sourceHoverDescription">
</hover>
-</extension>
- <extension
- point="net.sourceforge.phpeclipse.phpEditorTextHovers">
+ <hover
+ 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"
@@ -169,6 +240,7 @@
id="net.sourceforge.phpeclipse.PHPPerspective">
</perspective>
</extension>
+
<extension
point="org.eclipse.ui.newWizards">
<category
@@ -186,15 +258,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>
@@ -219,6 +290,16 @@
Create a basic PHP file.
</description>
</wizard>
+ <wizard
+ name="%newWizardHTMLFile.name"
+ icon="icons/obj16/htmledit.gif"
+ category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
+ class="net.sourceforge.phpeclipse.wizards.HTMLFileWizard"
+ id="net.sourceforge.phpeclipse.wizards.HTMLFileWizard">
+ <description>
+ Create a basic HTML file.
+ </description>
+ </wizard>
</extension>
<extension point="org.eclipse.ui.exportWizards">
<wizard name="%ExportWizards.Obfuscator"
@@ -248,7 +329,7 @@
name="nature"
value="net.sourceforge.phpeclipse.phpnature">
</filter>
- </page> -->
+ </page>
<page
objectClass="org.eclipse.core.resources.IProject"
name="PHP Project Settings"
@@ -258,13 +339,53 @@
name="nature"
value="net.sourceforge.phpeclipse.phpnature">
</filter>
+ </page> -->
+ <page
+ objectClass="org.eclipse.core.resources.IProject"
+ 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>
+ </page> -->
</extension>
<!-- <extension
point="org.eclipse.ui.views">
@@ -281,83 +402,43 @@
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,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
- 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
+ <!-- <editor
name="%phpEditorName"
default="true"
icon="icons/obj16/htmledit.gif"
- extensions="html"
- 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
- 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
+ </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">
@@ -397,7 +478,7 @@
annotationType="net.sourceforge.phpdt.ui.info"
annotationImageProvider="net.sourceforge.phpeclipse.phpeditor.JavaAnnotationImageProvider">
</specification>
- <specification
+ <specification
annotationType="org.eclipse.debug.core.breakpoint"
icon="icons/full/obj16/brkp_obj.gif"
annotationImageProvider="net.sourceforge.phpeclipse.phpeditor.BreakpointImageProvider">
@@ -425,67 +506,20 @@
isGoToPreviousNavigationTarget="false">
</specification>
</extension>
+
<extension
point="org.eclipse.ui.actionSets">
<actionSet
- label="PHP/Apache"
- visible="true"
- id="net.sourceforge.phpeclipse.PHPActionSet">
- <menu
- label="PHP/Apache"
- id="net.sourceforge.phpeclipse.PHPMenu">
- <separator
- name="phpeclipse">
- </separator>
- </menu>
- <action
- label="Restart Apache"
- icon="icons/obj16/apache_restart.gif"
- tooltip="Restart Apache"
- class="net.sourceforge.phpeclipse.actions.PHPRestartApacheAction"
- menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
- toolbarPath="Normal"
- id="net.sourceforge.phpeclipse.actions.PHPRestartApacheAction">
- </action>
- <action
- label="Stop Apache"
- icon="icons/obj16/apache_stop.gif"
- tooltip="Stop Apache"
- class="net.sourceforge.phpeclipse.actions.PHPStopApacheAction"
- menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
- toolbarPath="Normal"
- id="net.sourceforge.phpeclipse.actions.PHPStopApacheAction">
- </action>
- <action
- label="Start Apache"
- icon="icons/obj16/apache.gif"
- tooltip="Start Apache"
- class="net.sourceforge.phpeclipse.actions.PHPStartApacheAction"
- menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
- toolbarPath="Normal"
- id="net.sourceforge.phpeclipse.actions.PHPStartApacheAction">
- </action>
- <action
- label="Start MySQL"
- icon="icons/obj16/sql.gif"
- tooltip="Start MySQL"
- class="net.sourceforge.phpeclipse.actions.PHPStartMySQLAction"
- menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
- toolbarPath="Normal"
- 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 -->
<!-- =========================================================================== -->
<menu
label="%SourceMenu.label"
- path="edit"
+ path="edit/editEnd"
id="net.sourceforge.phpeclipse.ui.source.menu">
<separator
name="editGroup">
@@ -498,60 +532,60 @@
definitionId="net.sourceforge.phpeclipse.phpeditor.format"
label="%FormatAction.label"
retarget="true"
- menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+ menubarPath="edit/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"
+ menubarPath="edit/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"
+ menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
id="net.sourceforge.phpeclipse.phpeditor.ShiftRight">
</action>
- <action
- definitionId="net.sourceforge.phpeclipse.remove.block.comment"
+ <action
+ definitionId="net.sourceforge.phpeclipse.phpeditor.remove.block.comment"
label="%RemoveBlockCommentAction.label"
retarget="true"
- menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+ menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
id="net.sourceforge.phpeclipse.ui.actions.RemoveBlockComment">
</action>
<action
- definitionId="net.sourceforge.phpeclipse.add.block.comment"
+ definitionId="net.sourceforge.phpeclipse.phpeditor.add.block.comment"
label="%AddBlockCommentAction.label"
retarget="true"
- menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+ menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
id="net.sourceforge.phpeclipse.ui.actions.AddBlockComment">
- </action>
+ </action>
<action
- definitionId="net.sourceforge.phpeclipse.toggle.comment"
+ definitionId="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
label="%ToggleCommentAction.label"
retarget="true"
- menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+ menubarPath="edit/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"
- menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+ menubarPath="edit/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"
+ menubarPath="edit/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"
+ path="edit/net.sourceforge.phpeclipse.ui.source.menu/convertGroup"
id="convertSubMenu">
<separator
name="group1">
@@ -560,21 +594,21 @@
<action
label="%ConvertLineDelimitersToMacAction.label"
retarget="true"
- menubarPath="net.sourceforge.phpeclipse.ui.source.menu/convertSubMenu/group1"
+ menubarPath="edit/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"
+ menubarPath="edit/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"
+ menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/convertSubMenu/group1"
allowLabelUpdate="true"
id="net.sourceforge.phpeclipse.ui.actions.ConvertLineDelimitersToWindows">
</action>
@@ -587,16 +621,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>
@@ -618,7 +653,7 @@
<actionDefinition
id="net.sourceforge.phpeclipse.ui.edit.text.php.show.previous.problem">
</actionDefinition>
- </extension>
+ </extension> -->
<!-- <extension
point="org.eclipse.ui.acceleratorSets">
<acceleratorSet
@@ -637,74 +672,31 @@
<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"
- id="net.sourceforge.phpeclipse.actions.externalParserAction">
+ id="net.sourceforge.phpeclipse.actions.popupShowAction">
<action
- label="Run External PHP Parser"
- class="net.sourceforge.phpeclipse.actions.PHPExternalParserAction"
+ label="Open PHP Browser"
+ class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
menubarPath="additions"
- id="net.sourceforge.phpeclipse.actions.externalParserAction">
+ id="net.sourceforge.phpeclipse.actions.showAction">
</action>
</objectContribution>
<objectContribution
objectClass="org.eclipse.core.resources.IFile"
nameFilter="*.php3"
- id="net.sourceforge.phpeclipse.actions.externalParserAction">
+ id="net.sourceforge.phpeclipse.actions.popupShowAction">
<action
- label="Run External PHP Parser"
- class="net.sourceforge.phpeclipse.actions.PHPExternalParserAction"
+ label="Open PHP Browser"
+ class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
menubarPath="additions"
- id="net.sourceforge.phpeclipse.actions.externalParserAction">
+ id="net.sourceforge.phpeclipse.actions.showAction">
</action>
</objectContribution>
<objectContribution
objectClass="org.eclipse.core.resources.IFile"
nameFilter="*.php4"
- 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
- 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="*.phtml"
- 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="*.php"
id="net.sourceforge.phpeclipse.actions.popupShowAction">
<action
label="Open PHP Browser"
@@ -715,7 +707,7 @@
</objectContribution>
<objectContribution
objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.php3"
+ nameFilter="*.php5"
id="net.sourceforge.phpeclipse.actions.popupShowAction">
<action
label="Open PHP Browser"
@@ -726,7 +718,7 @@
</objectContribution>
<objectContribution
objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.php4"
+ nameFilter="*.module"
id="net.sourceforge.phpeclipse.actions.popupShowAction">
<action
label="Open PHP Browser"
@@ -779,7 +771,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">
@@ -791,17 +783,47 @@
</action>
</objectContribution>
+ <!-- <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">
@@ -821,13 +843,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"
@@ -842,24 +880,84 @@
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
+ <viewerContribution
targetID="#CompilationUnitRulerContext"
id="net.sourceforge.phpeclipse.phpeditor.QuickFixRulerMenuAction">
<action
label="%Dummy.label"
- helpContextId="org.eclipse.jdt.ui.quick_fix_action"
+ 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>
<!-- =========================================================================== -->
-<!-- JDT/UI command definitions -->
+<!-- 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
@@ -867,18 +965,6 @@
description="%category.source.description"
id="net.sourceforge.phpeclipse.ui.category.source">
</category>
- <command
- name="%ActionDefinition.showJavadoc.name"
- description="%ActionDefinition.showJavadoc.description"
- category="org.eclipse.ui.category.edit"
- id="net.sourceforge.phpeclipse.show.javadoc">
- </command>
- <keyBinding
- string="F2"
- scope="net.sourceforge.phpdt.ui.phpEditorScope"
- command="net.sourceforge.phpeclipse.show.javadoc"
- configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
<!-- source -->
<command
@@ -893,16 +979,29 @@
category="net.sourceforge.phpeclipse.ui.category.source"
id="net.sourceforge.phpeclipse.phpeditor.uncomment">
</command>
- <command
+ <command
name="%ActionDefinition.toggleComment.name"
description="%ActionDefinition.toggleComment.description"
category="net.sourceforge.phpeclipse.ui.category.source"
- id="net.sourceforge.phpeclipse.toggle.comment">
+ id="net.sourceforge.phpeclipse.phpeditor.toggle.comment">
</command>
+
<keyBinding
string="Ctrl+Shift+C"
scope="net.sourceforge.phpdt.ui.phpEditorScope"
- command="net.sourceforge.phpeclipse.toggle.comment"
+ 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
@@ -916,7 +1015,35 @@
platform="carbon"
string="Command+Shift+C"
scope="net.sourceforge.phpdt.ui.phpEditorScope"
- command="net.sourceforge.phpeclipse.toggle.comment"
+ 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
@@ -930,10 +1057,75 @@
platform="gtk"
string="Esc Ctrl+C"
scope="net.sourceforge.phpdt.ui.phpEditorScope"
- command="net.sourceforge.phpeclipse.toggle.comment"
+ 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"
@@ -973,79 +1165,233 @@
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="net.sourceforge.phpdt.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,php3,php4,php5,phtml,inc,module,htm,html,xhtml"
+ class="net.sourceforge.phpeclipse.phpeditor.JavaDocumentFactory">
+ </factory>
</extension>
+
<extension
point="org.eclipse.ui.preferencePages">
- <page
+ <!-- <page
name="PHP"
+ category="net.sourceforge.phpeclipse.ui.preferencePage"
class="net.sourceforge.phpeclipse.PHPEclipseBasePreferencePage"
id="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
+ </page> -->
+ <page name="PHP"
+ category="net.sourceforge.phpeclipse.ui.preferencePage"
+ class="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
+ id="net.sourceforge.phpeclipse.preferences.PHPPreferencePage">
</page>
<page
- name="PHP Parser"
- category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
- class="net.sourceforge.phpeclipse.PHPEclipseParserPreferencePage"
- id="net.sourceforge.phpeclipse.preference.PHPEclipseParserPreferencePage">
+ name="Code Templates"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
+ class="net.sourceforge.phpdt.internal.ui.preferences.CodeTemplatePreferencePage"
+ id="net.sourceforge.phpeclipse.preference.CodeTemplatePreferencePage">
</page>
-<!-- <page
+ <!-- <page
+ name="Members Sort Order"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
+ 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.preferences.PHPPreferencePage"
+ class="net.sourceforge.phpeclipse.preferences.PHPEclipseParserPreferencePage"
+ id="net.sourceforge.phpeclipse.preferences.PHPEclipseParserPreferencePage">
+ </page>
+ <page
name="Editor2"
- category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
class="net.sourceforge.phpeclipse.PHPSyntaxEditorPreferencePage"
id="net.sourceforge.phpeclipse.preference.PHPSyntaxEditorPreferencePage">
- </page> -->
+ </page>
<page
- category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
name="PHP Project Defaults"
class="net.sourceforge.phpeclipse.preferences.PHPMiscProjectPreferences"
id="net.sourceforge.phpeclipse.preferences.PHPMiscProjectPreferences">
- </page>
+ </page>
<page
- category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
name="PHP Browser Preview"
class="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences"
id="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences">
- </page>
+ </page> -->
<page
- name="Outline"
- category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
- class="net.sourceforge.phpeclipse.PHPOutlinePreferencePage"
- id="net.sourceforge.phpeclipse.preference.PHPOutlinePreferencePage">
+ name="%compilerOptionsPrefName"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
+ class="net.sourceforge.phpdt.internal.ui.preferences.CompilerPreferencePage"
+ id="net.sourceforge.phpeclipse.preference.CompilerPreferencePage">
</page>
<page
- name="Templates"
- category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
- class="net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage"
- id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage">
+ name="%todoTaskPrefName"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
+ class="net.sourceforge.phpdt.internal.ui.preferences.TodoTaskPreferencePage"
+ id="net.sourceforge.phpeclipse.preference.TodoTaskPreferencePage">
</page>
<page
name="Formatter"
- category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
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="Editor 2"
- category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
- class="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
- id="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage">
+ <page name="%codeAssistPageName"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
+ class="net.sourceforge.phpdt.internal.ui.preferences.CodeAssistPreferencePage"
+ id="net.sourceforge.phpdt.internal.ui.preferences.CodeAssistPreferencePage">
+ </page>
+ <page
+ name="%templatePageName"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
+ class="net.sourceforge.phpdt.internal.ui.preferences.JavaTemplatePreferencePage"
+ id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage">
</page>
- <!-- <page
+ <!-- <page
+ name="%templatePageName"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
+ class="net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage"
+ id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage">
+ </page>
+ <page
name="Language Settings"
- category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
class="net.sourceforge.phpeclipse.PHPLanguagePreferencePage"
id="net.sourceforge.phpeclipse.preference.PHPLanguagePreferencePage">
</page> -->
+ <page
+ name="%spellingPrefName"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
+ class="net.sourceforge.phpdt.internal.ui.preferences.SpellingPreferencePage"
+ id = "net.sourceforge.phpdt.internal.ui.preferences.SpellingPreferencePage">
+ </page>
</extension>
- <extension
+ <!-- <extension
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>
@@ -1069,6 +1415,22 @@
<extension
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"
id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
@@ -1082,7 +1444,7 @@
id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
</provider>
</extension>
- <extension
+ <extension
point="org.eclipse.ui.editors.documentProviders">
<provider
extensions="%htmlFileExtension"
@@ -1101,19 +1463,19 @@
<extension
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
+ </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
@@ -1127,115 +1489,7 @@
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>
+ </extension> -->
<!-- external tools -->
@@ -1247,7 +1501,7 @@
<extension-point id="refreshVariables" name="%ExtPoint.refreshVariables"/>
<!-- Extensions -->
- <extension point="org.eclipse.ui.actionSets">
+ <!--<extension point="org.eclipse.ui.actionSets">
<actionSet
id="net.sourceforge.phpdt.externaltools.ExternalToolsSet"
label="%ActionSet.externalTools"
@@ -1257,7 +1511,7 @@
path="additions">
<separator name="ExternalToolsGroup"/>
</menu>
- <!-- <action
+ <action
id="net.sourceforge.phpdt.externaltools.ExternalToolMenuDelegateMenu"
label="%Action.externalTools"
menubarPath="org.eclipse.ui.run/ExternalToolsGroup"
@@ -1277,9 +1531,9 @@
tooltip="%Action.externalToolsTip"
pulldown="true"
class="net.sourceforge.phpdt.externaltools.internal.menu.ExternalToolMenuDelegate">
- </action> -->
+ </action>
</actionSet>
- </extension>
+ </extension> -->
<!-- Launch Configuration Extensions -->
<extension point="org.eclipse.debug.core.launchConfigurationTypes">
@@ -1453,4 +1707,60 @@
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>