X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml index 2508d8a..72dcc0d 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.1" provider-name="%providerName" class="net.sourceforge.phpeclipse.PHPeclipsePlugin"> @@ -33,6 +33,11 @@ <import plugin="org.eclipse.search"/> <import plugin="org.eclipse.update.ui"/> <import plugin="net.sourceforge.phpeclipse.quantum.sql"/> + <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> <extension @@ -133,8 +138,7 @@ </enablement> </decorator> </extension> - - + <extension point="org.eclipse.team.core.fileTypes"> <fileTypes @@ -151,6 +155,14 @@ </fileTypes> <fileTypes type="text" + extension="php5"> + </fileTypes> + <fileTypes + type="text" + extension="module"> + </fileTypes> + <fileTypes + type="text" extension="inc"> </fileTypes> <fileTypes @@ -167,12 +179,12 @@ </fileTypes> <fileTypes type="text" - extension="xml"> - </fileTypes> - <fileTypes + extension="xhtml"> + </fileTypes> + <!-- <fileTypes type="text" extension="tpl"> - </fileTypes> + </fileTypes> --> </extension> <extension @@ -193,9 +205,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" @@ -262,6 +277,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" @@ -291,7 +316,7 @@ name="nature" value="net.sourceforge.phpeclipse.phpnature"> </filter> - </page> --> + </page> <page objectClass="org.eclipse.core.resources.IProject" name="PHP Project Settings" @@ -301,7 +326,7 @@ name="nature" value="net.sourceforge.phpeclipse.phpnature"> </filter> - </page> + </page> --> <page objectClass="org.eclipse.core.resources.IProject" name="%todoPageName" @@ -342,12 +367,12 @@ value="net.sourceforge.phpeclipse.phpnature"> </filter> </page> - <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"> @@ -364,13 +389,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" @@ -394,6 +419,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" @@ -409,18 +454,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" @@ -433,14 +478,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" @@ -449,7 +494,7 @@ 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"> @@ -742,7 +787,7 @@ <extension point="org.eclipse.ui.popupMenus"> - <objectContribution + <!-- <objectContribution objectClass="org.eclipse.core.resources.IProject" id="net.sourceforge.phpeclipse.actions.PHPDocumentorAction"> <action @@ -751,7 +796,7 @@ menubarPath="additions" id="net.sourceforge.phpeclipse.actions.PHPDocumentorAction"> </action> - </objectContribution> + </objectContribution> --> <objectContribution objectClass="org.eclipse.core.resources.IFile" nameFilter="*.php" @@ -787,6 +832,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 @@ -842,6 +909,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 @@ -884,7 +973,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"> @@ -936,6 +1025,16 @@ 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.phpdt.phphelp.actions.contexthelp"> + </action> + </viewerContribution> <viewerContribution targetID="#PHPRulerContext" @@ -980,7 +1079,7 @@ </extension> <extension point="org.eclipse.ui.popupMenus"> - <viewerContribution + <viewerContribution targetID="#CompilationUnitRulerContext" id="net.sourceforge.phpeclipse.phpeditor.QuickFixRulerMenuAction"> <action @@ -1037,8 +1136,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 @@ -1046,18 +1151,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 @@ -1072,12 +1165,13 @@ 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.phpeditor.toggle.comment"> </command> + <keyBinding string="Ctrl+Shift+C" scope="net.sourceforge.phpdt.ui.phpEditorScope" @@ -1085,6 +1179,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" @@ -1099,6 +1205,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" @@ -1108,7 +1242,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> @@ -1217,23 +1351,51 @@ 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,html,htm,xhtml" class="net.sourceforge.phpeclipse.phpeditor.JavaDocumentSetupParticipant"> </participant> - <participant + <!-- <participant extensions="html,xml" class="net.sourceforge.phpeclipse.phpeditor.HTMLDocumentSetupParticipant"> </participant> <participant extensions="tpl" class="net.sourceforge.phpeclipse.phpeditor.SmartyDocumentSetupParticipant"> - </participant> + </participant> --> </extension> <extension id="net.sourceforge.phpeclipse.JavaDocumentFactory" @@ -1249,33 +1411,46 @@ point="org.eclipse.ui.preferencePages"> <page name="PHP" + category="net.sourceforge.phpeclipse.ui.preferencePage" class="net.sourceforge.phpeclipse.PHPEclipseBasePreferencePage" id="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"> </page> <page - name="PHP Parser" + 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.PHPEclipseParserPreferencePage" - id="net.sourceforge.phpeclipse.preference.PHPEclipseParserPreferencePage"> + class="net.sourceforge.phpeclipse.preferences.PHPEclipseParserPreferencePage" + id="net.sourceforge.phpeclipse.preferences.PHPEclipseParserPreferencePage"> </page> <!-- <page name="Editor2" category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage" class="net.sourceforge.phpeclipse.PHPSyntaxEditorPreferencePage" id="net.sourceforge.phpeclipse.preference.PHPSyntaxEditorPreferencePage"> - </page> --> + </page> <page category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage" 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" name="PHP Browser Preview" class="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences" id="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences"> - </page> + </page> --> <page name="%compilerOptionsPrefName" category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage" @@ -1289,30 +1464,34 @@ 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" 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" + <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 + <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.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 name="Language Settings" category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage" class="net.sourceforge.phpeclipse.PHPLanguagePreferencePage" @@ -1320,20 +1499,20 @@ </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" @@ -1352,6 +1531,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"> @@ -1365,7 +1560,7 @@ id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"> </provider> </extension> - <extension + <extension point="org.eclipse.ui.editors.documentProviders"> <provider extensions="%htmlFileExtension" @@ -1384,19 +1579,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 @@ -1410,114 +1605,6 @@ 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> <!-- external tools --> @@ -1745,4 +1832,34 @@ preferencesClass="net.sourceforge.phpdt.internal.ui.text.folding.DefaultJavaFoldingPreferenceBlock"> </provider> </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>