X-Git-Url: http://secure.phpeclipse.com
diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index fccf33e..57699a0 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"/>
@@ -36,6 +38,7 @@
<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>
@@ -92,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">
@@ -137,8 +141,7 @@
</enablement>
</decorator>
</extension>
-
-
+
<extension
point="org.eclipse.team.core.fileTypes">
<fileTypes
@@ -155,7 +158,7 @@
</fileTypes>
<fileTypes
type="text"
- extension="php5">
+ extension="php5">
</fileTypes>
<fileTypes
type="text"
@@ -169,7 +172,7 @@
type="text"
extension="phtml">
</fileTypes>
- <!-- <fileTypes
+ <fileTypes
type="text"
extension="html">
</fileTypes>
@@ -179,9 +182,9 @@
</fileTypes>
<fileTypes
type="text"
- extension="xml">
+ extension="xhtml">
</fileTypes>
- <fileTypes
+ <!-- <fileTypes
type="text"
extension="tpl">
</fileTypes> -->
@@ -277,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"
@@ -379,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"
@@ -444,18 +457,18 @@
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="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"
@@ -468,14 +481,14 @@
<editor
name="%phpEditorName"
default="true"
- icon="icons/obj16/xmledit.gif"
- extensions="xml"
+ 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"
@@ -777,7 +790,7 @@
<extension
point="org.eclipse.ui.popupMenus">
- <objectContribution
+ <!-- <objectContribution
objectClass="org.eclipse.core.resources.IProject"
id="net.sourceforge.phpeclipse.actions.PHPDocumentorAction">
<action
@@ -786,7 +799,7 @@
menubarPath="additions"
id="net.sourceforge.phpeclipse.actions.PHPDocumentorAction">
</action>
- </objectContribution>
+ </objectContribution> -->
<objectContribution
objectClass="org.eclipse.core.resources.IFile"
nameFilter="*.php"
@@ -963,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">
@@ -977,45 +990,46 @@
<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">
@@ -1041,7 +1055,6 @@
<editorContribution
id="org.eclipse.ui.texteditor.ruler.actions"
targetID="net.sourceforge.phpeclipse.PHPUnitEditor">
-
<action
id="org.eclipse.ui.texteditor.BookmarkRulerAction"
actionID="RulerDoubleClick"
@@ -1056,6 +1069,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">
@@ -1064,7 +1087,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">
@@ -1151,6 +1174,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"
@@ -1358,13 +1382,26 @@
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"
+ extensions="php,php3,php4,php5,module,inc,phtml,html,htm,xhtml"
class="net.sourceforge.phpeclipse.phpeditor.JavaDocumentSetupParticipant">
</participant>
<!-- <participant
@@ -1395,6 +1432,18 @@
id="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
</page>
<page
+ name="Code Templates"
+ category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+ 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"
@@ -1436,12 +1485,6 @@
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"
category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
class="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
@@ -1452,34 +1495,40 @@
class="net.sourceforge.phpdt.internal.ui.preferences.CodeAssistPreferencePage"
id="net.sourceforge.phpdt.internal.ui.preferences.CodeAssistPreferencePage">
</page>
- <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> -->
<page
name="%spellingPrefName"
- category= "net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+ 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> -->
+ </page>
</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>
</extension>
- <extension
+<!-- <extension
point="org.eclipse.ui.editors.documentProviders">
<provider
extensions="%php3FileExtension"
@@ -1527,7 +1576,7 @@
id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
</provider>
</extension>
-<!-- <extension
+ <extension
point="org.eclipse.ui.editors.documentProviders">
<provider
extensions="%htmlFileExtension"
@@ -1546,12 +1595,12 @@
<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"
@@ -1799,4 +1848,50 @@
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>