X-Git-Url: http://git.phpeclipse.com
diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 5f7ce85..1a46707 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.3"
+ version="1.1.5"
provider-name="%providerName"
class="net.sourceforge.phpeclipse.PHPeclipsePlugin">
@@ -36,8 +36,9 @@
<import plugin="org.eclipse.search"/>
<import plugin="org.eclipse.update.ui"/>
<!-- <import plugin="net.sourceforge.phpeclipse.quantum.sql"/> -->
- <import plugin="com.quantum.Quantum"/>
+ <!-- <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"/>
@@ -142,7 +143,7 @@
</objectClass>
</enablement>
</decorator>
-</extension>
+ </extension>
<extension
point="org.eclipse.team.core.fileTypes">
@@ -192,6 +193,14 @@
</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
point="net.sourceforge.phpeclipse.phpEditorTextHovers">
<hover
@@ -233,15 +242,7 @@
id="net.sourceforge.phpeclipse.PHPPerspective">
</perspective>
</extension>
- <extension
- point="org.eclipse.ui.perspectiveExtensions">
- <perspectiveExtension
- targetID="net.sourceforge.phpeclipse.PHPPerspective">
- <actionSet
- id="net.sourceforge.phpeclipse.PHPActionSet">
- </actionSet>
- </perspectiveExtension>
- </extension>
+
<extension
point="org.eclipse.ui.newWizards">
<category
@@ -403,7 +404,7 @@
name="%phpEditorName"
default="true"
icon="icons/obj16/phpedit.gif"
- extensions="php,php3,php4,php5,phtml,inc,module"
+ 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"
@@ -412,92 +413,12 @@
<!-- <editor
name="%phpEditorName"
default="true"
- icon="icons/obj16/phpedit.gif"
- extensions="php3"
- 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="php4"
- contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor"
- class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
- symbolicFontName="net.sourceforge.phpdt.ui.editors.textfont"
- id="net.sourceforge.phpeclipse.PHPUnitEditor">
- </editor>
- <editor
- name="%phpEditorName"
- default="true"
- icon="icons/obj16/phpedit.gif"
- extensions="module"
- contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor"
- class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
- symbolicFontName="net.sourceforge.phpdt.ui.editors.textfont"
- id="net.sourceforge.phpeclipse.PHPUnitEditor">
- </editor>
- <editor
- name="%phpEditorName"
- default="true"
- icon="icons/obj16/phpedit.gif"
- extensions="php5"
- contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor"
- class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
- symbolicFontName="net.sourceforge.phpdt.ui.editors.textfont"
- id="net.sourceforge.phpeclipse.PHPUnitEditor">
- </editor>
- <editor
- name="%phpEditorName"
- default="true"
- icon="icons/obj16/phpedit.gif"
- extensions="inc"
- 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="phtml"
- 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/htmledit.gif"
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/htmledit.gif"
- extensions="html"
- 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/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
name="%phpEditorName"
@@ -591,73 +512,6 @@
<extension
point="org.eclipse.ui.actionSets">
<actionSet
- label="PHP/Apache"
- visible="false"
- 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>
- <action
- label="Stop XAMPP"
- icon="icons/obj16/xampp_stop.gif"
- tooltip="Stop XAMPP"
- class="net.sourceforge.phpeclipse.actions.PHPStopXAMPPAction"
- menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
- toolbarPath="Normal"
- id="net.sourceforge.phpeclipse.actions.PHPStopXAMPPAction">
- </action>
- <action
- label="Start XAMPP"
- icon="icons/obj16/xampp_start.gif"
- tooltip="Start XAMPP"
- class="net.sourceforge.phpeclipse.actions.PHPStartXAMPPAction"
- menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
- toolbarPath="Normal"
- id="net.sourceforge.phpeclipse.actions.PHPStartXAMPPAction">
- </action>
- </actionSet>
-
- <actionSet
label="%CodingActionSet.label"
description="%CodingActionSet.description"
visible="false"
@@ -820,93 +674,6 @@
<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">
- <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="*.php3"
- 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="*.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="*.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
- 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"
@@ -1018,7 +785,7 @@
</action>
</objectContribution>
- <viewerContribution
+ <!-- <viewerContribution
targetID="#PHPEditorContext"
id="net.sourceforge.phpeclipse.actions.popupOpenSQLTable">
<action
@@ -1027,7 +794,7 @@
menubarPath="additions"
id="net.sourceforge.phpeclipse.actions.opensqltable">
</action>
- </viewerContribution>
+ </viewerContribution> -->
<viewerContribution
targetID="#PHPEditorContext"
id="net.sourceforge.phpeclipse.actions.popupHTMLWizard">
@@ -1521,109 +1288,109 @@
name="%javaDocumentFactory"
point="org.eclipse.core.filebuffers.documentCreation">
<factory
- extensions="php"
+ 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="Code Templates"
- category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
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"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
class="net.sourceforge.phpdt.internal.ui.preferences.MembersOrderPreferencePage"
id="net.sourceforge.phpeclipse.preference.MembersOrderPreferencePage">
- </page> -->
+ </page>
<page
name="PHP External Parser Command"
- category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
class="net.sourceforge.phpeclipse.preferences.PHPEclipseParserPreferencePage"
id="net.sourceforge.phpeclipse.preferences.PHPEclipseParserPreferencePage">
</page>
-<!-- <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
- 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
- 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
name="%compilerOptionsPrefName"
- category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
class="net.sourceforge.phpdt.internal.ui.preferences.CompilerPreferencePage"
id="net.sourceforge.phpeclipse.preference.CompilerPreferencePage">
</page>
<page
name="%todoTaskPrefName"
- category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+ 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.JavaEditorPreferencePage"
- id="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage">
- </page>
<page name="%codeAssistPageName"
- category="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
+ 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.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
+ category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
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"
+ 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.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
+ 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="php,php3,php4,php5,phtml,inc,module,html,htm,xhtml"
@@ -1631,7 +1398,7 @@
id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
</provider>
</extension>
-<!-- <extension
+ <extension
point="org.eclipse.ui.editors.documentProviders">
<provider
extensions="%php3FileExtension"
@@ -1942,6 +1709,7 @@
expanderClass="net.sourceforge.phpdt.externaltools.variable.WorkingSetExpander">
</variable>
</extension>
+
<extension
point= "net.sourceforge.phpeclipse.foldingStructureProviders">
<provider