X-Git-Url: http://secure.phpeclipse.com
diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 0eb9dd0..dc3e02e 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.0"?>
-
<plugin
id="net.sourceforge.phpeclipse"
name="%pluginName"
@@ -34,6 +33,7 @@
<import plugin="org.eclipse.search"/>
<import plugin="org.eclipse.update.ui"/>
<import plugin="net.sourceforge.phpeclipse.quantum.sql"/>
+ <import plugin="net.sourceforge.phpeclipse.webbrowser"/>
</requires>
<extension
@@ -91,6 +91,51 @@
<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
@@ -107,6 +152,14 @@
</fileTypes>
<fileTypes
type="text"
+ extension="php5">
+ </fileTypes>
+ <fileTypes
+ type="text"
+ extension="module">
+ </fileTypes>
+ <fileTypes
+ type="text"
extension="inc">
</fileTypes>
<fileTypes
@@ -149,9 +202,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"
@@ -186,14 +242,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>
@@ -350,6 +406,26 @@
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
+ name="%phpEditorName"
+ default="true"
+ icon="icons/obj16/phpedit.gif"
extensions="inc"
contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor"
class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
@@ -456,7 +532,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">
@@ -534,11 +610,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 -->
<!-- =========================================================================== -->
@@ -646,6 +723,7 @@
<part id="net.sourceforge.phpeclipse.PHPUnitEditor" />
</actionSetPartAssociation>
</extension>
+
<!-- =========================================================================== -->
<!-- PHP Editor Action Definition IDs -->
<!-- =========================================================================== -->
@@ -741,6 +819,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
@@ -796,6 +896,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
@@ -862,6 +984,16 @@
</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.popupOpenInclude">
<action
label="Open Include File"
@@ -924,7 +1056,7 @@
</extension>
<extension
point="org.eclipse.ui.popupMenus">
- <viewerContribution
+ <viewerContribution
targetID="#CompilationUnitRulerContext"
id="net.sourceforge.phpeclipse.phpeditor.QuickFixRulerMenuAction">
<action
@@ -981,8 +1113,14 @@
</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
@@ -990,18 +1128,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
@@ -1016,7 +1142,7 @@
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"
@@ -1029,6 +1155,18 @@
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"
@@ -1043,6 +1181,34 @@
configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
</keyBinding>
<keyBinding
+ platform="carbon"
+ string="Ctrl+/"
+ scope="net.sourceforge.phpdt.ui.phpEditorScope"
+ command=""
+ 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"
@@ -1052,7 +1218,7 @@
<keyBinding
platform="gtk"
string="Esc Ctrl+C"
- scope="net.sourceforge.phpdt.ui.phpEditorScope"
+ scope="net.sourceforge.phpdt.ui.phpEditorScope"
command="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
</keyBinding>
@@ -1161,13 +1327,41 @@
command="net.sourceforge.phpeclipse.phpeditor.format"
configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
</keyBinding>
+
+ <!-- navigate -->
+ <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>
</extension>
<extension
id="net.sourceforge.phpeclipse.JavaDocumentSetupParticipant"
name="%javaDocumentSetupParticipant"
point="org.eclipse.core.filebuffers.documentSetup">
<participant
- extensions="php,php3,php4,inc"
+ extensions="php,php3,php4,php5,module,inc,phtml"
class="net.sourceforge.phpeclipse.phpeditor.JavaDocumentSetupParticipant">
</participant>
<participant
@@ -1197,10 +1391,10 @@
id="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
</page>
<page
- name="PHP Parser"
+ name="PHP External Parser Command"
category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
- class="net.sourceforge.phpeclipse.PHPEclipseParserPreferencePage"
- id="net.sourceforge.phpeclipse.preference.PHPEclipseParserPreferencePage">
+ class="net.sourceforge.phpeclipse.preferences.PHPEclipseParserPreferencePage"
+ id="net.sourceforge.phpeclipse.preferences.PHPEclipseParserPreferencePage">
</page>
<!-- <page
name="Editor2"
@@ -1233,12 +1427,6 @@
id="net.sourceforge.phpeclipse.preference.TodoTaskPreferencePage">
</page>
<page
- name="%templatePageName"
- category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
- class="net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage"
- id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage">
- </page>
- <page
name="Formatter"
category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
class="net.sourceforge.phpdt.internal.ui.preferences.CodeFormatterPreferencePage"
@@ -1250,18 +1438,34 @@
class="net.sourceforge.phpdt.internal.ui.preferences.PHPEditorPreferencePage"
id="net.sourceforge.phpeclipse.preference.PHPEditorPreferencePage">
</page> -->
- <page
- name="Editor 2"
+ <page name="Editor"
category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
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.TemplatePreferencePage"
+ id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage">
+ </page>
<!-- <page
name="Language Settings"
category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
class="net.sourceforge.phpeclipse.PHPLanguagePreferencePage"
id="net.sourceforge.phpeclipse.preference.PHPLanguagePreferencePage">
- </page> -->
+ </page>
+ <page
+ name="%spellingPrefName"
+ category= "net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+ class="net.sourceforge.phpdt.internal.ui.preferences.SpellingPreferencePage"
+ id = "net.sourceforge.phpdt.internal.ui.preferences.SpellingPreferencePage">
+ </page> -->
</extension>
<extension
point="org.eclipse.ui.editors.documentProviders">
@@ -1290,6 +1494,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">
@@ -1357,107 +1577,6 @@
</view>
</extension>
-<!-- =========================================================================== -->
-<!-- PHPDT/UI Editor Key Bindings -->
-<!-- =========================================================================== -->
- <extension
- point="org.eclipse.ui.acceleratorSets">
- <acceleratorSet
- scopeId="org.eclipse.ui.textEditorScope"
- configurationId="org.eclipse.ui.emacsAcceleratorConfiguration">
-<!-- edit -->
- <accelerator
- key="Ctrl+Shift+P"
- id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket">
- </accelerator>
- <accelerator
- key="Ctrl+1"
- id="org.eclipse.ui.edit.text.contentAssist.proposals">
- </accelerator>
-<!-- source -->
- <accelerator
- key="Ctrl+/"
- id="net.sourceforge.phpeclipse.phpeditor.comment">
- </accelerator>
- <accelerator
- key="Ctrl+\"
- id="net.sourceforge.phpeclipse.phpeditor.uncomment">
- </accelerator>
- <accelerator
- key="Ctrl+Shift+F"
- id="net.sourceforge.phpeclipse.phpeditor.format">
- </accelerator>
- <accelerator
- key="Ctrl+O"
- id="net.sourceforge.phpeclipse.ui.edit.text.php.show.outline">
- </accelerator>
- <accelerator
- key="Ctrl+F3"
- id="net.sourceforge.phpeclipse.ui.navigate.php.open.structure">
- </accelerator>
- </acceleratorSet>
- <acceleratorSet
- scopeId="org.eclipse.ui.textEditorScope"
- configurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
-<!-- edit -->
- <accelerator
- key="Ctrl+Shift+P"
- id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket">
- </accelerator>
- <accelerator
- key="Ctrl+Space"
- id="org.eclipse.ui.edit.text.contentAssist.proposals">
- </accelerator>
-<!-- source -->
- <accelerator
- key="Ctrl+/"
- id="net.sourceforge.phpeclipse.phpeditor.comment">
- </accelerator>
- <accelerator
- key="Ctrl+\"
- id="net.sourceforge.phpeclipse.phpeditor.uncomment">
- </accelerator>
- <accelerator
- key="Ctrl+Shift+F"
- id="net.sourceforge.phpeclipse.phpeditor.format">
- </accelerator>
- <accelerator
- key="Ctrl+F3"
- id="net.sourceforge.phpeclipse.ui.navigate.php.open.structure">
- </accelerator>
- <accelerator
- key="Ctrl+O"
- id="net.sourceforge.phpeclipse.ui.edit.text.php.show.outline">
- </accelerator>
- </acceleratorSet>
- <acceleratorSet
- scopeId="org.eclipse.ui.textEditorScope"
- configurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
-<!-- edit -->
- <accelerator
- platform="carbon"
- key="Command+Shift+P"
- id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket">
- </accelerator>
- <accelerator
- platform="carbon"
- key="Command+1"
- id="org.eclipse.ui.edit.text.contentAssist.proposals">
- </accelerator>
-<!-- source -->
- <accelerator
- platform="carbon"
- key="Command+/"
- id="net.sourceforge.phpeclipse.phpeditor.comment">
- </accelerator>
- <accelerator
- platform="carbon"
- key="Command+\"
- id="net.sourceforge.phpeclipse.phpeditor.uncomment">
- </accelerator>
- </acceleratorSet>
- </extension>
-
<!-- external tools -->
<!-- extension point definitions -->