X-Git-Url: http://secure.phpeclipse.com
diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 5e67157..663efab 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -3,7 +3,7 @@
<plugin
id="net.sourceforge.phpeclipse"
name="%pluginName"
- version="1.1.0"
+ version="1.1.2"
provider-name="%providerName"
class="net.sourceforge.phpeclipse.PHPeclipsePlugin">
@@ -11,6 +11,7 @@
<library name="phpeclipse.jar">
<export name="*"/>
</library>
+ <!-- <library name="lib/xstream-1.0.2.jar" /> -->
</runtime>
<requires>
<import plugin="org.eclipse.core.runtime.compatibility"/>
@@ -29,6 +30,7 @@
<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.eclipse.update.ui"/>
@@ -93,8 +95,9 @@
<persistent value="true"/>
</extension>
- <extension-point id="phpEditorTextHovers" name="%phpEditorTextHoversName" schema="schema/phpEditorTextHovers.exsd"/>
- <extension-point id="foldingStructureProviders" name="%foldingStructureProvidersExtensionPoint" schema="schema/foldingStructureProviders.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">
@@ -138,8 +141,7 @@
</enablement>
</decorator>
</extension>
-
-
+
<extension
point="org.eclipse.team.core.fileTypes">
<fileTypes
@@ -278,6 +280,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"
@@ -380,13 +392,13 @@
name="%phpEditorName"
default="true"
icon="icons/obj16/phpedit.gif"
- extensions="php"
+ 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"
@@ -445,18 +457,18 @@
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"
+ 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"
@@ -475,7 +487,7 @@
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"
@@ -654,14 +666,14 @@
id="net.sourceforge.phpeclipse.phpeditor.ShiftRight">
</action>
<action
- definitionId="net.sourceforge.phpeclipse.remove.block.comment"
+ 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.add.block.comment"
+ definitionId="net.sourceforge.phpeclipse.phpeditor.add.block.comment"
label="%AddBlockCommentAction.label"
retarget="true"
menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
@@ -778,7 +790,7 @@
<extension
point="org.eclipse.ui.popupMenus">
- <objectContribution
+ <!-- <objectContribution
objectClass="org.eclipse.core.resources.IProject"
id="net.sourceforge.phpeclipse.actions.PHPDocumentorAction">
<action
@@ -787,7 +799,7 @@
menubarPath="additions"
id="net.sourceforge.phpeclipse.actions.PHPDocumentorAction">
</action>
- </objectContribution>
+ </objectContribution> -->
<objectContribution
objectClass="org.eclipse.core.resources.IFile"
nameFilter="*.php"
@@ -978,45 +990,45 @@
<viewerContribution
targetID="#PHPEditorContext"
- id="net.sourceforge.phpeclipse.actions.popupOpenDeclaration">
+ id="net.sourceforge.phpeclipse.actions.popupOpenSQLTable">
<action
- label="Open PHP Declaration"
- class="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction"
+ label="Open Quantum SQL Table View"
+ class="net.sourceforge.phpeclipse.actions.PHPOpenSQLTableEditorAction"
menubarPath="additions"
- id="net.sourceforge.phpeclipse.actions.opendeclaration">
+ id="net.sourceforge.phpeclipse.actions.opensqltable">
</action>
</viewerContribution>
<viewerContribution
targetID="#PHPEditorContext"
- id="net.sourceforge.phpeclipse.actions.popupOpenAllIncludes">
+ id="net.sourceforge.phpeclipse.actions.popupHTMLWizard">
<action
- label="Open Included Files List"
- class="net.sourceforge.phpeclipse.actions.PHPOpenAllIncludesEditorAction"
+ label="Insert HTML (dl,ul,ol,table)"
+ class="net.sourceforge.phpeclipse.wizards.html.InsertHTMLElementAction"
menubarPath="additions"
- id="net.sourceforge.phpeclipse.actions.openallincludes">
+ id="net.sourceforge.phpeclipse.actions.wizards.html">
</action>
</viewerContribution>
<viewerContribution
targetID="#PHPEditorContext"
- id="net.sourceforge.phpeclipse.actions.popupOpenInclude">
+ id="net.sourceforge.phpeclipse.actions.popupOpenAllIncludes">
<action
- label="Open Include File"
- class="net.sourceforge.phpeclipse.actions.PHPOpenIncludeEditorAction"
+ label="Open Included Files List"
+ class="net.sourceforge.phpeclipse.actions.PHPOpenAllIncludesEditorAction"
menubarPath="additions"
- id="net.sourceforge.phpeclipse.actions.openinclude">
+ id="net.sourceforge.phpeclipse.actions.openallincludes">
</action>
</viewerContribution>
<viewerContribution
targetID="#PHPEditorContext"
- id="net.sourceforge.phpeclipse.actions.popupOpenSQLTable">
+ id="net.sourceforge.phpeclipse.actions.popupOpenDeclaration">
<action
- label="Open Quantum SQL Table View"
- class="net.sourceforge.phpeclipse.actions.PHPOpenSQLTableEditorAction"
+ label="%OpenDeclaration"
+ class="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction"
menubarPath="additions"
- id="net.sourceforge.phpeclipse.actions.opensqltable">
+ definitionId="net.sourceforge.phpeclipse.actions.opendeclaration"
+ id="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction">
</action>
</viewerContribution>
-
<viewerContribution
targetID="#PHPRulerContext"
id="net.sourceforge.phpdt.ui.PHPEditorPopupActions">
@@ -1036,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"
@@ -1057,6 +1085,16 @@
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">
@@ -1065,7 +1103,7 @@
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">
@@ -1152,6 +1190,7 @@
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"
@@ -1188,7 +1227,7 @@
platform="carbon"
string="Ctrl+/"
scope="net.sourceforge.phpdt.ui.phpEditorScope"
- command=""
+ command="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
</keyBinding>
<keyBinding
@@ -1334,6 +1373,64 @@
<!-- 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"
@@ -1359,7 +1456,19 @@
command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket"
configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
</keyBinding>
- </extension>
+ <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"
@@ -1487,12 +1596,12 @@
<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>
</extension>
- <extension
+<!-- <extension
point="org.eclipse.ui.editors.documentProviders">
<provider
extensions="%php3FileExtension"
@@ -1563,7 +1672,7 @@
class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
</provider>
- </extension>
+ </extension> -->
<!-- <extension
point="org.eclipse.ui.editors.documentProviders">
<provider
@@ -1814,6 +1923,22 @@
</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