X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml index 18d2b57..42ac482 100644 --- a/net.sourceforge.phpeclipse/plugin.xml +++ b/net.sourceforge.phpeclipse/plugin.xml @@ -3,14 +3,15 @@ <plugin id="net.sourceforge.phpeclipse" name="%pluginName" - version="1.1.3" + version="1.1.7" provider-name="%providerName" class="net.sourceforge.phpeclipse.PHPeclipsePlugin"> - + <runtime> <library name="phpeclipse.jar"> <export name="*"/> </library> + <!-- <library name="lib/hsqldb.jar"/> --> <!-- <library name="lib/xstream-1.0.2.jar" /> --> </runtime> <requires> @@ -18,7 +19,7 @@ <import plugin="org.eclipse.ui"/> <import plugin="org.eclipse.ui.console"/> <import plugin="org.eclipse.core.resources"/> - <import plugin="org.eclipse.search"/> + <import plugin="org.eclipse.search"/> <import plugin="org.eclipse.debug.core"/> <import plugin="org.eclipse.debug.ui"/> <import plugin="org.eclipse.compare"/> @@ -34,8 +35,10 @@ <import plugin="org.eclipse.swt"/> <import plugin="org.eclipse.search"/> <import plugin="org.eclipse.update.ui"/> - <import plugin="net.sourceforge.phpeclipse.quantum.sql"/> + <!-- <import plugin="net.sourceforge.phpeclipse.quantum.sql"/> --> + <!-- <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"/> @@ -52,13 +55,13 @@ </run> </runtime> </extension> - + <extension id="parserbuilder" name="PHP Builder" point="org.eclipse.core.resources.builders"> <builder> - <run + <run class="net.sourceforge.phpdt.internal.core.builder.PHPBuilder"> </run> </builder> @@ -76,7 +79,7 @@ <attribute name="id"/> <attribute name="flags"/> <attribute name="arguments"/> -</extension> +</extension> <!-- Java transient problems --> @@ -91,20 +94,19 @@ <!-- PHP tasks --> <extension id="task" name="%phpTaskName" point="org.eclipse.core.resources.markers"> - <super type="org.eclipse.core.resources.taskmarker"/> + <super type="org.eclipse.core.resources.taskmarker"/> <persistent value="true"/> </extension> <extension-point id="phpElementFilters" name="%elementFiltersName" schema="schema/phpElementFilters.exsd"/> -<extension-point id="phpEditorTextHovers" name="%phpEditorTextHoversName" schema="schema/phpEditorTextHovers.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"> - <!-- <decorator label="%ProblemsLabelDecorator.label" - state="false" + state="true" lightweight="true" location="BOTTOM_LEFT" class="net.sourceforge.phpdt.ui.ProblemsLabelDecorator" @@ -116,18 +118,17 @@ <or> <objectClass name="org.eclipse.core.resources.IResource"> - </objectClass> + </objectClass> <objectClass name="net.sourceforge.phpdt.core.IJavaElement"> </objectClass> - </or> + </or> </enablement> </decorator> - --> <decorator label="%OverrideIndicatorLabelDecorator.label" lightweight="true" - location="BOTTOM_RIGHT" + location="BOTTOM_RIGHT" state="true" class="net.sourceforge.phpdt.ui.OverrideIndicatorLabelDecorator" id="net.sourceforge.phpdt.ui.override.decorator"> @@ -139,57 +140,29 @@ name="net.sourceforge.phpdt.core.IMethod"> </objectClass> </enablement> - </decorator> -</extension> - + </decorator> + </extension> + <extension point="org.eclipse.team.core.fileTypes"> - <fileTypes - type="text" - extension="php"> - </fileTypes> - <fileTypes - type="text" - extension="php3"> - </fileTypes> - <fileTypes - type="text" - extension="php4"> - </fileTypes> - <fileTypes - type="text" - extension="php5"> - </fileTypes> - <fileTypes - type="text" - extension="module"> - </fileTypes> - <fileTypes - type="text" - extension="inc"> - </fileTypes> - <fileTypes - type="text" - extension="phtml"> - </fileTypes> - <fileTypes - type="text" - extension="html"> - </fileTypes> - <fileTypes - type="text" - extension="htm"> - </fileTypes> - <fileTypes - type="text" - extension="xhtml"> - </fileTypes> - <!-- <fileTypes - type="text" - extension="tpl"> - </fileTypes> --> + <fileTypes type="text" extension="php" /> + <fileTypes type="text" extension="php3" /> + <fileTypes type="text" extension="php4" /> + <fileTypes type="text" extension="php5" /> + <fileTypes type="text" extension="module" /> + <fileTypes type="text" extension="inc" /> + <fileTypes type="text" extension="phtml" /> + </extension> + +<!-- declares a content type for PHP Source files --> + + <extension point="org.eclipse.core.runtime.contentTypes"> + <content-type id="phpSource" name="%phpSourceName" + base-type="org.eclipse.core.runtime.text" + priority="high" + file-extensions="php,php3,php4,php5,phtml,inc,module"/> </extension> - + <extension point="net.sourceforge.phpeclipse.phpEditorTextHovers"> <hover @@ -198,7 +171,7 @@ label="%sequentialHover" description="%sequentialHoverDescription"> </hover> -</extension> + </extension> <extension point="net.sourceforge.phpeclipse.phpEditorTextHovers"> @@ -217,7 +190,7 @@ <hover class="net.sourceforge.phpdt.internal.ui.text.java.hover.AnnotationHover" id="net.sourceforge.phpdt.ui.AnnotationHover" - label="%annotationHover" + label="%annotationHover" description="%annotationHoverDescription"> </hover> </extension> @@ -231,6 +204,16 @@ id="net.sourceforge.phpeclipse.PHPPerspective"> </perspective> </extension> + + <extension + point="org.eclipse.ui.perspectiveExtensions"> + <perspectiveExtension + targetID="net.sourceforge.phpeclipse.PHPPerspective"> + <showInPart id="net.sourceforge.phpeclipse.webbrowser.view" /> + <showInPart id="org.eclipse.ui.views.ResourceNavigator" /> + </perspectiveExtension> + </extension> + <extension point="org.eclipse.ui.newWizards"> <category @@ -292,12 +275,12 @@ </wizard> </extension> <extension point="org.eclipse.ui.exportWizards"> - <wizard name="%ExportWizards.Obfuscator" - icon="icons/ctool16/exportdir_wiz.gif" - class="net.sourceforge.phpeclipse.obfuscator.export.ObfuscatorExportWizard" + <wizard name="%ExportWizards.Obfuscator" + icon="icons/ctool16/exportdir_wiz.gif" + class="net.sourceforge.phpeclipse.obfuscator.export.ObfuscatorExportWizard" id="net.sourceforge.phpeclipse.obfuscator.export.ObfuscatorExportWizard"> - <description>%ExportWizards.ObfuscatorDescription</description> - <selection class="org.eclipse.core.resources.IResource" /> + <description>%ExportWizards.ObfuscatorDescription</description> + <selection class="org.eclipse.core.resources.IResource" /> </wizard> </extension> <extension @@ -319,7 +302,7 @@ name="nature" value="net.sourceforge.phpeclipse.phpnature"> </filter> - </page> + </page> <page objectClass="org.eclipse.core.resources.IProject" name="PHP Project Settings" @@ -392,97 +375,19 @@ name="%phpEditorName" default="true" icon="icons/obj16/phpedit.gif" - 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"> + <contentTypeBinding + contentTypeId="net.sourceforge.phpeclipse.phpSource" + /> </editor> <!-- <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" + extensions="htm,html,xhtml" contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor" class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor" symbolicFontName="net.sourceforge.phpdt.ui.editors.textfont" @@ -548,7 +453,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"> @@ -576,62 +481,14 @@ isGoToPreviousNavigationTarget="false"> </specification> </extension> + <extension point="org.eclipse.ui.actionSets"> <actionSet - label="PHP/Apache" - visible="true" - 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> - </actionSet> - - <actionSet label="%CodingActionSet.label" description="%CodingActionSet.description" visible="false" - id="net.sourceforge.phpeclipse.ui.CodingActionSet"> + id="net.sourceforge.phpeclipse.ui.CodingActionSet"> <!-- =========================================================================== --> <!-- Source Menu --> <!-- =========================================================================== --> @@ -639,7 +496,7 @@ label="%SourceMenu.label" path="edit/editEnd" id="net.sourceforge.phpeclipse.ui.source.menu"> - <separator + <separator name="editGroup"> </separator> <separator @@ -678,7 +535,7 @@ retarget="true" menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup" id="net.sourceforge.phpeclipse.ui.actions.AddBlockComment"> - </action> + </action> <action definitionId="net.sourceforge.phpeclipse.phpeditor.toggle.comment" label="%ToggleCommentAction.label" @@ -739,17 +596,17 @@ <part id="net.sourceforge.phpeclipse.PHPUnitEditor" /> </actionSetPartAssociation> </extension> - + <!-- =========================================================================== --> <!-- PHP Editor Action Definition IDs --> <!-- =========================================================================== --> <!-- <extension point="org.eclipse.ui.actionDefinitions"> - + <actionDefinition id="net.sourceforge.phpeclipse.phpeditor.ContentAssistProposal"> </actionDefinition> - + <actionDefinition id="net.sourceforge.phpeclipse.phpeditor.Comment"> </actionDefinition> @@ -787,96 +644,9 @@ </accelerator> </acceleratorSet> </extension> --> - + <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" @@ -987,8 +757,8 @@ id="net.sourceforge.phpeclipse.actions.showAction"> </action> </objectContribution> - - <viewerContribution + + <!-- <viewerContribution targetID="#PHPEditorContext" id="net.sourceforge.phpeclipse.actions.popupOpenSQLTable"> <action @@ -997,7 +767,7 @@ menubarPath="additions" id="net.sourceforge.phpeclipse.actions.opensqltable"> </action> - </viewerContribution> + </viewerContribution> --> <viewerContribution targetID="#PHPEditorContext" id="net.sourceforge.phpeclipse.actions.popupHTMLWizard"> @@ -1060,12 +830,12 @@ label="%OpenDeclaration" tooltip="%OpenDeclaration" retarget="true" - menubarPath="navigate/open.ext" + menubarPath="navigate/open.ext" allowLabelUpdate="true" id="net.sourceforge.phpeclipse.ui.actions.Open"> </action> </actionSet> - </extension> + </extension> <extension point="org.eclipse.ui.editorActions"> <editorContribution @@ -1086,19 +856,19 @@ </action> </editorContribution> <editorContribution - id="net.sourceforge.phpdt.editor.actions" + id="net.sourceforge.phpdt.editor.actions" targetID="net.sourceforge.phpeclipse.PHPUnitEditor"> - <action + <action definitionId="net.sourceforge.phpeclipse.actions.opendeclaration" label="%OpenDeclaration" class="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction" id="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction"> </action> - </editorContribution> + </editorContribution> </extension> <extension point="org.eclipse.ui.popupMenus"> - <viewerContribution + <viewerContribution targetID="#CompilationUnitRulerContext" id="net.sourceforge.phpeclipse.phpeditor.QuickFixRulerMenuAction"> <action @@ -1158,10 +928,10 @@ <!-- 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" /> + <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"> @@ -1170,7 +940,7 @@ description="%category.source.description" id="net.sourceforge.phpeclipse.ui.category.source"> </category> - + <!-- source --> <command name="%ActionDefinition.comment.name" @@ -1184,13 +954,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" @@ -1329,7 +1099,7 @@ command="net.sourceforge.phpeclipse.phpeditor.indent" configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> </keyBinding> - + <command name="%ActionDefinition.format.name" description="%ActionDefinition.format.description" @@ -1370,7 +1140,7 @@ command="net.sourceforge.phpeclipse.phpeditor.format" configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> </keyBinding> - + <!-- navigate --> <command name="%ActionDefinition.gotoNextMember.name" @@ -1424,12 +1194,12 @@ command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.previous.member" configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> </keyBinding> - <keyBinding + <!-- <keyBinding string="" scope="net.sourceforge.phpdt.ui.phpEditorScope" - command="org.eclipse.jdt.ui.edit.text.java.show.next.problem" + command="net.sourceforge.phpdt.ui.edit.text.java.show.next.problem" configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> - </keyBinding> + </keyBinding> --> <command name="%ActionDefinition.gotoMatchingBracket.name" description="%ActionDefinition.gotoMatchingBracket.description" @@ -1457,7 +1227,7 @@ configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> </keyBinding> <command - name="%OpenDeclaration" + name="%OpenDeclaration" description="%OpenDeclaration" category="net.sourceforge.phpeclipse.ui.category.source" id="net.sourceforge.phpeclipse.actions.opendeclaration"> @@ -1467,14 +1237,14 @@ scope="net.sourceforge.phpdt.ui.phpEditorScope" command="net.sourceforge.phpeclipse.actions.opendeclaration" configuration="org.eclipse.ui.defaultAcceleratorConfiguration"> - </keyBinding> - </extension> + </keyBinding> + </extension> <extension id="net.sourceforge.phpeclipse.JavaDocumentSetupParticipant" name="%javaDocumentSetupParticipant" - point="org.eclipse.core.filebuffers.documentSetup"> + point="org.eclipse.core.filebuffers.documentSetup"> <participant - extensions="php,php3,php4,php5,module,inc,phtml,html,htm,xhtml" + contentTypeId="net.sourceforge.phpeclipse.phpSource" class="net.sourceforge.phpeclipse.phpeditor.JavaDocumentSetupParticipant"> </participant> <!-- <participant @@ -1491,117 +1261,124 @@ name="%javaDocumentFactory" point="org.eclipse.core.filebuffers.documentCreation"> <factory - extensions="php" + contentTypeId="net.sourceforge.phpeclipse.phpSource" 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> <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> <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" + name="%compilerOptionsPrefName" + 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" + name="%todoTaskPrefName" + 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 + <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> + </page> + <page + name="%editorMarkOccurrencesPage" + category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage" + class="net.sourceforge.phpdt.internal.ui.preferences.MarkOccurrencesPreferencePage" + id="net.sourceforge.phpdt.internal.ui.preferences.MarkOccurrencesPreferencePage"> + <!-- <keywordReference id="org.eclipse.jdt.ui.markoccurrences"/> --> + </page> </extension> - <extension + <!-- <extension point="org.eclipse.ui.editors.documentProviders"> <provider - extensions="php,php3,php4,php5,phtml,inc,module,html,htm,xhtml" + extensions="php,php3,php4,php5,phtml,inc,module" 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" @@ -1680,7 +1457,7 @@ class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider" id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"> </provider> - </extension> --> + </extension> <extension point="org.eclipse.ui.views"> <category @@ -1693,30 +1470,29 @@ category="net.sourceforge.phpeclipse.views.category" class="net.sourceforge.phpeclipse.views.PHPConsole" id="net.sourceforge.phpeclipse.views.phpconsoleview"> - </view> - </extension> + </view> + </extension> --> <!-- external tools --> - <!-- extension point definitions --> <extension-point id="configurationDuplicationMaps" name="%ExtPoint.configurationDuplicationMaps"/> <extension-point id="argumentVariables" name="%ExtPoint.argumentVariables"/> <extension-point id="directoryVariables" name="%ExtPoint.directoryVariables"/> <extension-point id="fileVariables" name="%ExtPoint.fileVariables"/> <extension-point id="refreshVariables" name="%ExtPoint.refreshVariables"/> - + <!-- Extensions --> - <extension point="org.eclipse.ui.actionSets"> + <!--<extension point="org.eclipse.ui.actionSets"> <actionSet id="net.sourceforge.phpdt.externaltools.ExternalToolsSet" label="%ActionSet.externalTools" visible="true"> - <menu id="org.eclipse.ui.run" - label="%Menu.run" - path="additions"> - <separator name="ExternalToolsGroup"/> - </menu> - <!-- <action + <menu id="org.eclipse.ui.run" + label="%Menu.run" + path="additions"> + <separator name="ExternalToolsGroup"/> + </menu> + <action id="net.sourceforge.phpdt.externaltools.ExternalToolMenuDelegateMenu" label="%Action.externalTools" menubarPath="org.eclipse.ui.run/ExternalToolsGroup" @@ -1725,7 +1501,7 @@ hoverIcon="icons/externaltools/full/ctool16/external_tools.gif" pulldown="true" class="net.sourceforge.phpdt.externaltools.internal.menu.ExternalToolMenuDelegate"> - </action> + </action> <action id="net.sourceforge.phpdt.externaltools.ExternalToolMenuDelegateToolbar" label="%Action.externalTools" @@ -1736,183 +1512,11 @@ tooltip="%Action.externalToolsTip" pulldown="true" class="net.sourceforge.phpdt.externaltools.internal.menu.ExternalToolMenuDelegate"> - </action> --> + </action> </actionSet> - </extension> - - <!-- Launch Configuration Extensions --> - <extension point="org.eclipse.debug.core.launchConfigurationTypes"> - <launchConfigurationType - id = "net.sourceforge.phpdt.externaltools.ProgramLaunchConfigurationType" - name = "%Program.externalTools" - delegate = "net.sourceforge.phpdt.externaltools.internal.program.launchConfigurations.ProgramLaunchDelegate" - modes = "run" - category = "org.eclipse.ui.externaltools"> - </launchConfigurationType> - <launchConfigurationType - id = "net.sourceforge.phpdt.externaltools.ProgramBuilderLaunchConfigurationType" - name = "%Program.externalTools" - delegate = "net.sourceforge.phpdt.externaltools.internal.program.launchConfigurations.ProgramLaunchDelegate" - modes = "run" - category = "org.eclipse.ui.externaltools.builder"> - </launchConfigurationType> - </extension> - - <extension point = "net.sourceforge.phpeclipse.configurationDuplicationMaps"> - <configurationMap - sourceType="net.sourceforge.phpdt.externaltools.ProgramLaunchConfigurationType" - builderType="net.sourceforge.phpdt.externaltools.ProgramBuilderLaunchConfigurationType"> - </configurationMap> - </extension> - - <extension point = "org.eclipse.debug.ui.launchConfigurationTabGroups"> - <launchConfigurationTabGroup - id="net.sourceforge.phpdt.externaltools.launchConfigurationTabGroup.program" - type ="net.sourceforge.phpdt.externaltools.ProgramLaunchConfigurationType" - class="net.sourceforge.phpdt.externaltools.internal.program.launchConfigurations.ProgramTabGroup"> - </launchConfigurationTabGroup> - <launchConfigurationTabGroup - id="net.sourceforge.phpdt.externaltools.launchConfigurationTabGroup.program.builder" - type ="net.sourceforge.phpdt.externaltools.ProgramBuilderLaunchConfigurationType" - class="net.sourceforge.phpdt.externaltools.internal.program.launchConfigurations.ProgramBuilderTabGroup"> - </launchConfigurationTabGroup> - </extension> - - <extension point="org.eclipse.debug.ui.launchConfigurationTypeImages"> - <launchConfigurationTypeImage - id="net.sourceforge.phpdt.externaltools.launchConfigurationTypeImage.program" - configTypeID="net.sourceforge.phpdt.externaltools.ProgramLaunchConfigurationType" - icon="icons/externaltools/full/obj16/external_tools.gif"> - </launchConfigurationTypeImage> - <launchConfigurationTypeImage - id="net.sourceforge.phpdt.externaltools.launchConfigurationTypeImage.program.builder" - configTypeID="net.sourceforge.phpdt.externaltools.ProgramBuilderLaunchConfigurationType" - icon="icons/externaltools/full/obj16/external_tools.gif"> - </launchConfigurationTypeImage> - </extension> - - <!-- Variable Extensions --> - <extension point="net.sourceforge.phpeclipse.fileVariables"> - <variable - tag="workspace_loc" - description="Expands to the workspace root's absolute file system path." - expanderClass="net.sourceforge.phpdt.externaltools.variable.WorkspaceExpander"> - </variable> - <variable - tag="resource_loc" - description="Expands to the resource's absolute file system path." - componentClass="net.sourceforge.phpdt.externaltools.variable.SpecificFileResourceComponent" - expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceExpander"> - </variable> - </extension> - - <extension point="net.sourceforge.phpeclipse.argumentVariables"> - <variable - tag="workspace_loc" - description="Expands to the workspace root's absolute file system path." - expanderClass="net.sourceforge.phpdt.externaltools.variable.WorkspaceExpander"> - </variable> - <variable - tag="file_loc" - description="Expands to the full file name" - expanderClass="net.sourceforge.phpdt.externaltools.variable.FileExpander"> - </variable> - <variable - tag="file_url" - description="Expands to an URL with the localhost preference settings" - expanderClass="net.sourceforge.phpdt.externaltools.variable.UrlExpander"> - </variable> - <variable - tag="localhost_url" - description="Expands to the localhost preference settings." - expanderClass="net.sourceforge.phpdt.externaltools.variable.LocalhostExpander"> - </variable> - <variable - tag="project_loc" - description="Expands to the selected resource's project absolute file system path." - expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceProjectExpander"> - </variable> - <variable - tag="project_path" - description="Expands to the full path, relative to the workspace root, of the selected project" - expanderClass="net.sourceforge.phpdt.externaltools.variable.ProjectExpander"> - </variable> - <variable - tag="project_name" - description="Expands to the name of the selected project" - expanderClass="net.sourceforge.phpdt.externaltools.variable.ProjectNameExpander"> - </variable> - <variable - tag="resource_loc" - description="Expands to the resource's absolute file system path." - componentClass="net.sourceforge.phpdt.externaltools.variable.SpecificFileResourceComponent" - expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceExpander"> - </variable> - <variable - tag="container_loc" - description="Expands to the selected resource's containing folder absolute file system path." - expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceContainerExpander"> - </variable> - <variable - tag="build_type" - description="Expands to the type of build" - expanderClass="net.sourceforge.phpdt.externaltools.variable.BuildTypeExpander"> - </variable> - </extension> - - <extension point="net.sourceforge.phpeclipse.directoryVariables"> - <variable - tag="workspace_loc" - description="Expands to the workspace root's absolute file system path." - expanderClass="net.sourceforge.phpdt.externaltools.variable.WorkspaceExpander"> - </variable> - <variable - tag="project_loc" - description="Expands to the selected resource's project absolute file system path." - expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceProjectExpander"> - </variable> - <variable - tag="container_loc" - description="Expands to the selected resource's containing folder absolute file system path." - expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceContainerExpander"> - </variable> - <variable - tag="resource_loc" - description="Expands to a resource's absolute file system path." - componentClass="net.sourceforge.phpdt.externaltools.variable.SpecificFolderResourceComponent" - expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceExpander"> - </variable> - </extension> + </extension> --> - <extension point="net.sourceforge.phpeclipse.refreshVariables"> - <variable - tag="workspace" - description="Expands to the workspace root." - expanderClass="net.sourceforge.phpdt.externaltools.variable.WorkspaceExpander"> - </variable> - <variable - tag="project" - description="Expands to the project of the selected resource." - expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceProjectExpander"> - </variable> - <variable - tag="container" - description="Expands to the folder containing the selected resource." - expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceContainerExpander"> - </variable> - <variable - tag="resource" - description="Expands to a resource." - componentClass="net.sourceforge.phpdt.externaltools.variable.ResourceComponent" - expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceExpander"> - </variable> - <variable - tag="working_set" - description="Expands to the group of resources in a working set." - expanderClass="net.sourceforge.phpdt.externaltools.variable.WorkingSetExpander"> - </variable> - </extension> - <extension + <extension point= "net.sourceforge.phpeclipse.foldingStructureProviders"> <provider id="net.sourceforge.phpdt.ui.text.defaultFoldingProvider" @@ -1921,7 +1525,7 @@ preferencesClass="net.sourceforge.phpdt.internal.ui.text.folding.DefaultJavaFoldingPreferenceBlock"> </provider> </extension> - + <!-- =========================================================================== --> <!-- Filter Support --> <!-- =========================================================================== --> @@ -1937,7 +1541,7 @@ id="net.sourceforge.phpeclipse.JavaOutlinePage.ImportDeclarationFilter"> </filter> </extension> - + <!-- =========================================================================== --> <!-- Templates --> <!-- =========================================================================== -->