X-Git-Url: http://secure.phpeclipse.com
diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 27b9950..a872078 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
<plugin
id="net.sourceforge.phpeclipse"
name="%pluginName"
- version="1.0.7"
+ version="1.1.0"
provider-name="%providerName"
class="net.sourceforge.phpeclipse.PHPeclipsePlugin">
@@ -12,41 +13,83 @@
</library>
</runtime>
<requires>
- <import plugin="org.eclipse.core.resources"/>
+ <import plugin="org.eclipse.core.runtime.compatibility"/>
<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.debug.core"/>
+ <import plugin="org.eclipse.debug.ui"/>
+ <import plugin="org.eclipse.compare"/>
+ <import plugin="org.eclipse.core.filebuffers"/>
+ <import plugin="org.eclipse.jface.text"/>
+ <import plugin="org.eclipse.ui.workbench.texteditor"/>
+ <import plugin="org.eclipse.ui.ide"/>
+ <import plugin="org.eclipse.ui.views"/>
+ <import plugin="org.eclipse.ui.editors"/>
<import plugin="org.eclipse.ui.externaltools"/>
<import plugin="org.eclipse.help"/>
<import plugin="org.eclipse.swt"/>
- <import plugin="org.eclipse.debug.core"/>
- <import plugin="org.eclipse.debug.ui"/>
- <import plugin="org.apache.xerces"/>
+ <import plugin="org.eclipse.search"/>
<import plugin="org.eclipse.update.ui"/>
+ <import plugin="net.sourceforge.phpeclipse.quantum.sql"/>
</requires>
-
<extension
id="phpnature"
name="%naturePHP.name"
point="org.eclipse.core.resources.natures">
<runtime>
<run
- class="net.sourceforge.phpeclipse.resourcesview.PHPProject">
+ class="net.sourceforge.phpdt.internal.core.JavaProject">
</run>
</runtime>
- <builder
- id="net.sourceforge.phpeclipse.parserbuilder">
- </builder>
</extension>
+
<extension
id="parserbuilder"
- name="Parser Builder"
+ name="PHP Builder"
point="org.eclipse.core.resources.builders">
- <builder hasNature="true">
- <run
- class="net.sourceforge.phpeclipse.builder.ParserBuilder">
+ <builder>
+ <run
+ class="net.sourceforge.phpdt.internal.core.builder.PHPBuilder">
</run>
</builder>
</extension>
+ <!-- =================================================================================== -->
+<!-- Extension: Java Markers -->
+<!-- =================================================================================== -->
+
+<!-- Java problems -->
+
+<extension id="problem" point="org.eclipse.core.resources.markers" name="%phpProblemName">
+ <super type="org.eclipse.core.resources.problemmarker"/>
+ <super type="org.eclipse.core.resources.textmarker"/>
+ <persistent value="true"/>
+ <attribute name="id"/>
+ <attribute name="flags"/>
+ <attribute name="arguments"/>
+</extension>
+
+<!-- Java transient problems -->
+
+<extension id="transient_problem" point="org.eclipse.core.resources.markers" name="%transientPHPProblemName">
+ <super type="org.eclipse.core.resources.textmarker"/>
+ <persistent value="false"/>
+ <attribute name="id"/>
+ <attribute name="flags"/>
+ <attribute name="arguments"/>
+</extension>
+
+<!-- PHP tasks -->
+
+<extension id="task" name="%phpTaskName" point="org.eclipse.core.resources.markers">
+ <super type="org.eclipse.core.resources.taskmarker"/>
+ <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="org.eclipse.team.core.fileTypes">
<fileTypes
@@ -81,7 +124,41 @@
type="text"
extension="xml">
</fileTypes>
+ <fileTypes
+ type="text"
+ extension="tpl">
+ </fileTypes>
+ </extension>
+
+ <extension
+ point="net.sourceforge.phpeclipse.phpEditorTextHovers">
+ <hover
+ class="net.sourceforge.phpdt.internal.ui.text.java.hover.BestMatchHover"
+ id="net.sourceforge.phpdt.ui.BestMatchHover"
+ label="%sequentialHover"
+ description="%sequentialHoverDescription">
+ </hover>
+</extension>
+
+<extension
+ point="net.sourceforge.phpeclipse.phpEditorTextHovers">
+ <hover
+ class="net.sourceforge.phpdt.internal.ui.text.java.hover.JavaSourceHover"
+ id="net.sourceforge.phpdt.ui.JavaSourceHover"
+ label="%sourceHover"
+ description="%sourceHoverDescription">
+ </hover>
+</extension>
+ <extension
+ point="net.sourceforge.phpeclipse.phpEditorTextHovers">
+ <hover
+ class="net.sourceforge.phpdt.internal.ui.text.java.hover.AnnotationHover"
+ id="net.sourceforge.phpdt.ui.AnnotationHover"
+ label="%annotationHover"
+ description="%annotationHoverDescription">
+ </hover>
</extension>
+
<extension
point="org.eclipse.ui.perspectives">
<perspective
@@ -97,9 +174,6 @@
name="%newWizardCategory.name"
id="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP">
</category>
-<!--
-Temporarily replaced until errors can be ironed out...
--->
<wizard
name="%newWizardPHPProject.name"
icon="icons/obj16/php.gif"
@@ -111,6 +185,15 @@ Temporarily replaced until errors can be ironed out...
Create a new PHP project.
</description>
</wizard>
+<!-- <wizard
+ id="net.sourceforge.phpdt.internal.ui.wizards.NewClassCreationWizard"
+ name="%NewPHPClass.label"
+ class="net.sourceforge.phpdt.internal.ui.wizards.NewClassCreationWizard"
+ category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
+ icon="icons/ctool16/newclass_wiz.gif">
+ <description>%NewPHPClass.description</description>
+ </wizard>
+ -->
<!--
<this wizard replaces it as it works - maybe not as pretty but still>
@@ -135,21 +218,18 @@ Temporarily replaced until errors can be ironed out...
Create a basic PHP file.
</description>
</wizard>
-<!-- choochter's stuff -->
- <wizard
- name="Xaraya Module"
- icon="icons/obj16/php.gif"
- category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
- class="com.xaraya.wizard.NewXarayaResourceWizard"
- project="true"
- id="net.sourceforge.phpeclipse.wizards.NewXarayaModuleWizard">
- <description>
- Create a Xaraya module.
- </description>
- </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"
+ id="net.sourceforge.phpeclipse.obfuscator.export.ObfuscatorExportWizard">
+ <description>%ExportWizards.ObfuscatorDescription</description>
+ <selection class="org.eclipse.core.resources.IResource" />
+ </wizard>
+ </extension>
<extension
- point="org.eclipse.ui.projectNatureImages">
+ point="org.eclipse.ui.ide.projectNatureImages">
<image
icon="icons/obj16/php.gif"
natureId="net.sourceforge.phpeclipse.phpnature"
@@ -170,14 +250,60 @@ Temporarily replaced until errors can be ironed out...
</page> -->
<page
objectClass="org.eclipse.core.resources.IProject"
- name="PHP Obfuscator"
- class="net.sourceforge.phpeclipse.preferences.PHPObfuscatorPropertyPage"
- id="net.sourceforge.phpeclipse.preferences.PHPObfuscatorPropertyPage">
+ name="PHP Project Settings"
+ class="net.sourceforge.phpeclipse.preferences.PHPMiscProjectPreferences"
+ id="net.sourceforge.phpeclipse.preferences.project.PHPMiscProjectPreferences">
+ <filter
+ name="nature"
+ value="net.sourceforge.phpeclipse.phpnature">
+ </filter>
+ </page>
+ <page
+ objectClass="org.eclipse.core.resources.IProject"
+ name="%todoPageName"
+ class="net.sourceforge.phpdt.internal.ui.preferences.TodoTaskPropertyPage"
+ id="net.sourceforge.phpdt.ui.propertyPages.TodoTaskPropertyPage">
<filter
name="nature"
value="net.sourceforge.phpeclipse.phpnature">
</filter>
</page>
+ <page
+ objectClass="net.sourceforge.phpdt.core.IJavaProject"
+ name="%todoPageName"
+ class="net.sourceforge.phpdt.internal.ui.preferences.TodoTaskPropertyPage"
+ id="net.sourceforge.phpdt.ui.propertyPages.TodoTaskPropertyPage">
+ <filter
+ name="nature"
+ value="net.sourceforge.phpeclipse.phpnature">
+ </filter>
+ </page>
+ <page
+ objectClass="org.eclipse.core.resources.IProject"
+ name="%compilerPageName"
+ class="net.sourceforge.phpdt.internal.ui.preferences.CompilerPropertyPage"
+ id="net.sourceforge.phpdt.ui.propertyPages.CompilerPropertyPage">
+ <filter
+ name="nature"
+ value="net.sourceforge.phpeclipse.phpnature">
+ </filter>
+ </page>
+ <page
+ objectClass="net.sourceforge.phpdt.core.IJavaProject"
+ name="%compilerPageName"
+ class="net.sourceforge.phpdt.internal.ui.preferences.CompilerPropertyPage"
+ id="net.sourceforge.phpdt.ui.propertyPages.CompilerPropertyPage">
+ <filter
+ name="nature"
+ value="net.sourceforge.phpeclipse.phpnature">
+ </filter>
+ </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>
</extension>
<!-- <extension
point="org.eclipse.ui.views">
@@ -195,8 +321,9 @@ Temporarily replaced until errors can be ironed out...
default="true"
icon="icons/obj16/phpedit.gif"
extensions="php"
- contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
+ 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
@@ -204,8 +331,9 @@ Temporarily replaced until errors can be ironed out...
default="true"
icon="icons/obj16/phpedit.gif"
extensions="php3"
- contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
+ 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
@@ -213,8 +341,9 @@ Temporarily replaced until errors can be ironed out...
default="true"
icon="icons/obj16/phpedit.gif"
extensions="php4"
- contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
+ 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
@@ -222,8 +351,9 @@ Temporarily replaced until errors can be ironed out...
default="true"
icon="icons/obj16/phpedit.gif"
extensions="inc"
- contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
+ 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
@@ -231,17 +361,19 @@ Temporarily replaced until errors can be ironed out...
default="true"
icon="icons/obj16/phpedit.gif"
extensions="phtml"
- contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
+ 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"
- contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
+ extensions="htm"
+ 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
@@ -249,8 +381,9 @@ Temporarily replaced until errors can be ironed out...
default="true"
icon="icons/obj16/htmledit.gif"
extensions="html"
- contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
+ 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
@@ -258,11 +391,99 @@ Temporarily replaced until errors can be ironed out...
default="true"
icon="icons/obj16/xmledit.gif"
extensions="xml"
- contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
+ 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="tpl"
+ 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>
</extension>
+ <extension
+ point="org.eclipse.ui.fontDefinitions">
+ <fontDefinition
+ label="%phpEditorFontDefiniton.label"
+ defaultsTo="org.eclipse.jface.textfont"
+ id="net.sourceforge.phpdt.ui.editors.textfont">
+ <description>
+ %phpEditorFontDefintion.description
+ </description>
+ </fontDefinition>
+ </extension>
+ <extension
+ point="org.eclipse.ui.editors.annotationTypes">
+ <type
+ name="net.sourceforge.phpdt.ui.error"
+ super="org.eclipse.ui.workbench.texteditor.error"
+ markerType="net.sourceforge.phpeclipse.problem"
+ markerSeverity="2">
+ </type>
+ <type
+ name="net.sourceforge.phpdt.ui.warning"
+ super="org.eclipse.ui.workbench.texteditor.warning"
+ markerType="net.sourceforge.phpeclipse.problem"
+ markerSeverity="1">
+ </type>
+ <type
+ name="net.sourceforge.phpdt.ui.info"
+ super="org.eclipse.ui.workbench.texteditor.info"
+ markerType="net.sourceforge.phpeclipse.problem"
+ markerSeverity="0">
+ </type>
+ <type
+ name="net.sourceforge.phpdt.ui.occurrences">
+ </type>
+ </extension>
+ <extension
+ point="org.eclipse.ui.editors.markerAnnotationSpecification">
+ <specification
+ annotationType="net.sourceforge.phpdt.ui.error"
+ annotationImageProvider="net.sourceforge.phpeclipse.phpeditor.JavaAnnotationImageProvider">
+ </specification>
+ <specification
+ annotationType="net.sourceforge.phpdt.ui.warning"
+ annotationImageProvider="net.sourceforge.phpeclipse.phpeditor.JavaAnnotationImageProvider">
+ </specification>
+ <specification
+ annotationType="net.sourceforge.phpdt.ui.info"
+ annotationImageProvider="net.sourceforge.phpeclipse.phpeditor.JavaAnnotationImageProvider">
+ </specification>
+ <specification
+ annotationType="org.eclipse.debug.core.breakpoint"
+ icon="icons/full/obj16/brkp_obj.gif"
+ annotationImageProvider="net.sourceforge.phpeclipse.phpeditor.BreakpointImageProvider">
+ </specification>
+ <specification
+ annotationType="net.sourceforge.phpdt.ui.occurrences"
+ label="%OccurrenceAnnotation.label"
+ icon="icons/full/obj16/searchm_obj.gif"
+ textPreferenceKey="occurrenceIndication"
+ textPreferenceValue="false"
+ highlightPreferenceKey="occurrenceHighlighting"
+ highlightPreferenceValue="true"
+ overviewRulerPreferenceKey="occurrenceIndicationInOverviewRuler"
+ overviewRulerPreferenceValue="true"
+ verticalRulerPreferenceKey="occurrenceIndicationInVerticalRuler"
+ verticalRulerPreferenceValue="false"
+ colorPreferenceKey="occurrenceIndicationColor"
+ colorPreferenceValue="180,207,205"
+ presentationLayer="3"
+ showInNextPrevDropdownToolbarActionKey="showOccurrenceInNextPrevDropdownToolbarAction"
+ showInNextPrevDropdownToolbarAction="true"
+ isGoToNextNavigationTargetKey="isOccurrenceGoToNextNavigationTarget"
+ isGoToNextNavigationTarget="false"
+ isGoToPreviousNavigationTargetKey="isOccurrenceGoToPreviousNavigationTarget"
+ isGoToPreviousNavigationTarget="false">
+ </specification>
+ </extension>
<extension
point="org.eclipse.ui.actionSets">
<actionSet
@@ -315,6 +536,7 @@ Temporarily replaced until errors can be ironed out...
</actionSet>
<actionSet
label="%CodingActionSet.label"
+ description="%CodingActionSet.description"
visible="false"
id="net.sourceforge.phpeclipse.ui.CodingActionSet">
<!-- =========================================================================== -->
@@ -324,7 +546,12 @@ Temporarily replaced until errors can be ironed out...
label="%SourceMenu.label"
path="edit"
id="net.sourceforge.phpeclipse.ui.source.menu">
- <separator name="editGroup" />
+ <separator
+ name="editGroup">
+ </separator>
+ <separator
+ name="convertGroup">
+ </separator>
</menu>
<action
definitionId="net.sourceforge.phpeclipse.phpeditor.format"
@@ -346,6 +573,27 @@ Temporarily replaced until errors can be ironed out...
id="net.sourceforge.phpeclipse.phpeditor.ShiftRight">
</action>
<action
+ definitionId="net.sourceforge.phpeclipse.remove.block.comment"
+ label="%RemoveBlockCommentAction.label"
+ retarget="true"
+ menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+ id="net.sourceforge.phpeclipse.ui.actions.RemoveBlockComment">
+ </action>
+ <action
+ definitionId="net.sourceforge.phpeclipse.add.block.comment"
+ label="%AddBlockCommentAction.label"
+ retarget="true"
+ menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+ id="net.sourceforge.phpeclipse.ui.actions.AddBlockComment">
+ </action>
+ <action
+ definitionId="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
+ label="%ToggleCommentAction.label"
+ retarget="true"
+ menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+ id="net.sourceforge.phpeclipse.ui.actions.ToggleComment">
+ </action>
+ <action
definitionId="net.sourceforge.phpeclipse.phpeditor.uncomment"
label="%UncommentAction.label"
retarget="true"
@@ -359,6 +607,36 @@ Temporarily replaced until errors can be ironed out...
menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
id="net.sourceforge.phpeclipse.phpeditor.Comment">
</action>
+<!-- convert group -->
+ <menu
+ label="%ConvertLineDelimitersActions.label"
+ path="net.sourceforge.phpeclipse.ui.source.menu/convertGroup"
+ id="convertSubMenu">
+ <separator
+ name="group1">
+ </separator>
+ </menu>
+ <action
+ label="%ConvertLineDelimitersToMacAction.label"
+ retarget="true"
+ menubarPath="net.sourceforge.phpeclipse.ui.source.menu/convertSubMenu/group1"
+ allowLabelUpdate="true"
+ id="net.sourceforge.phpeclipse.ui.actions.ConvertLineDelimitersToMac">
+ </action>
+ <action
+ label="%ConvertLineDelimitersToUNIXAction.label"
+ retarget="true"
+ menubarPath="net.sourceforge.phpeclipse.ui.source.menu/convertSubMenu/group1"
+ allowLabelUpdate="true"
+ id="net.sourceforge.phpeclipse.ui.actions.ConvertLineDelimitersToUNIX">
+ </action>
+ <action
+ label="%ConvertLineDelimitersToWindowsAction.label"
+ retarget="true"
+ menubarPath="net.sourceforge.phpeclipse.ui.source.menu/convertSubMenu/group1"
+ allowLabelUpdate="true"
+ id="net.sourceforge.phpeclipse.ui.actions.ConvertLineDelimitersToWindows">
+ </action>
</actionSet>
</extension>
<extension
@@ -371,13 +649,13 @@ Temporarily replaced until errors can be ironed out...
<!-- =========================================================================== -->
<!-- PHP Editor Action Definition IDs -->
<!-- =========================================================================== -->
- <extension
+<!-- <extension
point="org.eclipse.ui.actionDefinitions">
-<!-- edit -->
+
<actionDefinition
id="net.sourceforge.phpeclipse.phpeditor.ContentAssistProposal">
</actionDefinition>
-<!-- source -->
+
<actionDefinition
id="net.sourceforge.phpeclipse.phpeditor.Comment">
</actionDefinition>
@@ -399,7 +677,7 @@ Temporarily replaced until errors can be ironed out...
<actionDefinition
id="net.sourceforge.phpeclipse.ui.edit.text.php.show.previous.problem">
</actionDefinition>
- </extension>
+ </extension> -->
<!-- <extension
point="org.eclipse.ui.acceleratorSets">
<acceleratorSet
@@ -418,14 +696,14 @@ Temporarily replaced until errors can be ironed out...
<extension
point="org.eclipse.ui.popupMenus">
- <objectContribution
- objectClass="org.eclipse.core.resources.IResource"
- id="net.sourceforge.phpeclipse.actions.obfuscator">
+ <objectContribution
+ objectClass="org.eclipse.core.resources.IProject"
+ id="net.sourceforge.phpeclipse.actions.PHPDocumentorAction">
<action
- label="PHP Obfuscator"
- class="net.sourceforge.phpeclipse.actions.PHPObfuscatorAction"
+ label="Run PHPDocumentor"
+ class="net.sourceforge.phpeclipse.actions.PHPDocumentorAction"
menubarPath="additions"
- id="net.sourceforge.phpeclipse.actions.obfuscatorAction">
+ id="net.sourceforge.phpeclipse.actions.PHPDocumentorAction">
</action>
</objectContribution>
<objectContribution
@@ -571,7 +849,18 @@ Temporarily replaced until errors can be ironed out...
id="net.sourceforge.phpeclipse.actions.showAction">
</action>
</objectContribution>
-
+
+ <viewerContribution
+ targetID="#PHPEditorContext"
+ id="net.sourceforge.phpeclipse.actions.popupOpenDeclaration">
+ <action
+ label="Open PHP Declaration"
+ class="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorActon"
+ menubarPath="additions"
+ id="net.sourceforge.phpeclipse.actions.opendeclaration">
+ </action>
+ </viewerContribution>
+
<viewerContribution
targetID="#PHPRulerContext"
id="net.sourceforge.phpdt.ui.PHPEditorPopupActions">
@@ -591,19 +880,295 @@ Temporarily replaced until errors can be ironed out...
</action>
</viewerContribution>
</extension>
+
<extension
point="org.eclipse.ui.editorActions">
<editorContribution
- targetID="net.sourceforge.phpeclipse.PHPEditor"
- id="org.eclipse.ui.texteditor.ruler.actions">
+ id="org.eclipse.ui.texteditor.ruler.actions"
+ targetID="net.sourceforge.phpeclipse.PHPUnitEditor">
+
+ <action
+ id="org.eclipse.ui.texteditor.BookmarkRulerAction"
+ actionID="RulerDoubleClick"
+ label="%Dummy.label"
+ helpContextId="org.eclipse.ui.bookmark_action_context"
+ class="org.eclipse.ui.texteditor.BookmarkRulerAction">
+ </action>
+ <action
+ label="%Dummy.label"
+ class="net.sourceforge.phpeclipse.phpeditor.JavaSelectRulerAction"
+ actionID="RulerClick"
+ id="net.sourceforge.phpeclipse.phpeditor.JavaSelectRulerAction">
+ </action>
+ </editorContribution>
+ </extension>
+ <extension
+ point="org.eclipse.ui.popupMenus">
+ <viewerContribution
+ targetID="#CompilationUnitRulerContext"
+ id="net.sourceforge.phpeclipse.phpeditor.QuickFixRulerMenuAction">
<action
label="%Dummy.label"
+ helpContextId="org.eclipse.jdt.ui.quick_fix_action"
+ class="net.sourceforge.phpeclipse.phpeditor.JavaSelectRulerAction"
+ menubarPath="additions"
+ id="net.sourceforge.phpeclipse.phpeditor.JavaSelectRulerMenuAction">
+ </action>
+ </viewerContribution>
+ </extension>
+ <extension
+ point="org.eclipse.ui.popupMenus">
+ <viewerContribution
+ targetID="#CompilationUnitRulerContext"
+ id="net.sourceforge.phpdt.ui.CompilationUnitEditorPopupActions">
+ <action
+ label="%AddTask.label"
+ helpContextId="org.eclipse.ui.AddTask_action_context"
+ tooltip="%AddTask.tooltip"
+ class="org.eclipse.ui.texteditor.TaskRulerAction"
+ menubarPath="add"
+ id="org.eclipse.ui.texteditor.TaskRulerAction">
+ </action>
+ <action
+ label="%AddBookmark.label"
helpContextId="org.eclipse.ui.bookmark_action_context"
+ tooltip="%AddBookmark.tooltip"
class="org.eclipse.ui.texteditor.BookmarkRulerAction"
+ menubarPath="add"
id="org.eclipse.ui.texteditor.BookmarkRulerAction">
</action>
- </editorContribution>
+ <menu
+ id="projection"
+ label="%Folding.label"
+ path="rest">
+ </menu>
+ <action
+ label="%Dummy.label"
+ tooltip="%Dummy.label"
+ class="net.sourceforge.phpdt.internal.ui.actions.FoldingExpandAllRulerAction"
+ menubarPath="projection/additions"
+ definitionId="org.eclipse.ui.edit.text.folding.expand_all"
+ id="net.sourceforge.phpdt.ui.folding.expandAll">
+ </action>
+ <action
+ label="%Dummy.label"
+ tooltip="%Dummy.label"
+ class="net.sourceforge.phpdt.internal.ui.actions.FoldingToggleRulerAction"
+ menubarPath="projection/additions"
+ definitionId="org.eclipse.ui.edit.text.folding.toggle"
+ id="net.sourceforge.phpdt.ui.folding.toggle">
+ </action>
+ </viewerContribution>
</extension>
+ <!-- =========================================================================== -->
+<!-- JDT/UI command definitions -->
+<!-- =========================================================================== -->
+ <extension
+ point="org.eclipse.ui.commands">
+ <category
+ name="%category.source.name"
+ 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
+ name="%ActionDefinition.comment.name"
+ description="%ActionDefinition.comment.description"
+ category="net.sourceforge.phpeclipse.ui.category.source"
+ id="net.sourceforge.phpeclipse.phpeditor.comment">
+ </command>
+ <command
+ name="%ActionDefinition.uncomment.name"
+ description="%ActionDefinition.uncomment.description"
+ category="net.sourceforge.phpeclipse.ui.category.source"
+ id="net.sourceforge.phpeclipse.phpeditor.uncomment">
+ </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"
+ 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"
+ command=""
+ configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+ </keyBinding>
+ <keyBinding
+ platform="carbon"
+ string="Command+Shift+C"
+ 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"
+ command=""
+ configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+ </keyBinding>
+ <keyBinding
+ platform="gtk"
+ string="Esc Ctrl+C"
+ scope="net.sourceforge.phpdt.ui.phpEditorScope"
+ command="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
+ configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+ </keyBinding>
+ <command
+ name="%ActionDefinition.addBlockComment.name"
+ description="%ActionDefinition.addBlockComment.description"
+ category="net.sourceforge.phpeclipse.ui.category.source"
+ id="net.sourceforge.phpeclipse.phpeditor.add.block.comment">
+ </command>
+ <keyBinding
+ string="Ctrl+Shift+/"
+ scope="net.sourceforge.phpdt.ui.phpEditorScope"
+ command="net.sourceforge.phpeclipse.phpeditor.add.block.comment"
+ configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+ </keyBinding>
+ <keyBinding
+ platform="carbon"
+ string="Ctrl+Shift+/"
+ scope="net.sourceforge.phpdt.ui.phpEditorScope"
+ command=""
+ configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+ </keyBinding>
+ <keyBinding
+ platform="carbon"
+ string="Command+Shift+/"
+ scope="net.sourceforge.phpdt.ui.phpEditorScope"
+ command="net.sourceforge.phpeclipse.phpeditor.add.block.comment"
+ configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+ </keyBinding>
+ <command
+ name="%ActionDefinition.removeBlockComment.name"
+ description="%ActionDefinition.removeBlockComment.description"
+ category="net.sourceforge.phpeclipse.ui.category.source"
+ id="net.sourceforge.phpeclipse.phpeditor.remove.block.comment">
+ </command>
+ <keyBinding
+ string="Ctrl+Shift+\"
+ scope="net.sourceforge.phpdt.ui.phpEditorScope"
+ command="net.sourceforge.phpeclipse.phpeditor.remove.block.comment"
+ configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+ </keyBinding>
+ <keyBinding
+ platform="carbon"
+ string="Ctrl+Shift+\"
+ scope="net.sourceforge.phpdt.ui.phpEditorScope"
+ command=""
+ configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+ </keyBinding>
+ <keyBinding
+ platform="carbon"
+ string="Command+Shift+\"
+ scope="net.sourceforge.phpdt.ui.phpEditorScope"
+ command="net.sourceforge.phpeclipse.phpeditor.remove.block.comment"
+ configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+ </keyBinding>
+ <command
+ name="%ActionDefinition.indent.name"
+ description="%ActionDefinition.indent.description"
+ category="net.sourceforge.phpeclipse.ui.category.source"
+ id="net.sourceforge.phpeclipse.phpeditor.indent">
+ </command>
+ <keyBinding
+ string="Ctrl+I"
+ scope="net.sourceforge.phpdt.ui.phpEditorScope"
+ command="net.sourceforge.phpeclipse.phpeditor.indent"
+ configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+ </keyBinding>
+
+ <command
+ name="%ActionDefinition.format.name"
+ description="%ActionDefinition.format.description"
+ category="net.sourceforge.phpeclipse.ui.category.source"
+ id="net.sourceforge.phpeclipse.phpeditor.format">
+ </command>
+ <keyBinding
+ string="Ctrl+Shift+F"
+ scope="net.sourceforge.phpdt.ui.phpEditorScope"
+ command="net.sourceforge.phpeclipse.phpeditor.format"
+ configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+ </keyBinding>
+ <keyBinding
+ platform="carbon"
+ string="Ctrl+Shift+F"
+ scope="net.sourceforge.phpdt.ui.phpEditorScope"
+ command=""
+ configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+ </keyBinding>
+ <keyBinding
+ platform="carbon"
+ string="Command+Shift+F"
+ scope="net.sourceforge.phpdt.ui.phpEditorScope"
+ command="net.sourceforge.phpeclipse.phpeditor.format"
+ configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+ </keyBinding>
+ <keyBinding
+ platform="gtk"
+ string="Ctrl+Shift+F"
+ scope="net.sourceforge.phpdt.ui.phpEditorScope"
+ command=""
+ configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+ </keyBinding>
+ <keyBinding
+ platform="gtk"
+ string="Esc Ctrl+F"
+ scope="net.sourceforge.phpdt.ui.phpEditorScope"
+ command="net.sourceforge.phpeclipse.phpeditor.format"
+ 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"
+ class="net.sourceforge.phpeclipse.phpeditor.JavaDocumentSetupParticipant">
+ </participant>
+ <participant
+ extensions="html,xml"
+ class="net.sourceforge.phpeclipse.phpeditor.HTMLDocumentSetupParticipant">
+ </participant>
+ <participant
+ extensions="tpl"
+ class="net.sourceforge.phpeclipse.phpeditor.SmartyDocumentSetupParticipant">
+ </participant>
+ </extension>
+ <extension
+ id="net.sourceforge.phpeclipse.JavaDocumentFactory"
+ name="%javaDocumentFactory"
+ point="org.eclipse.core.filebuffers.documentCreation">
+ <factory
+ extensions="php"
+ class="net.sourceforge.phpeclipse.phpeditor.JavaDocumentFactory">
+ </factory>
+ </extension>
+
<extension
point="org.eclipse.ui.preferencePages">
<page
@@ -624,13 +1189,31 @@ Temporarily replaced until errors can be ironed out...
id="net.sourceforge.phpeclipse.preference.PHPSyntaxEditorPreferencePage">
</page> -->
<page
- name="Outline"
category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
- class="net.sourceforge.phpeclipse.PHPOutlinePreferencePage"
- id="net.sourceforge.phpeclipse.preference.PHPOutlinePreferencePage">
+ name="PHP Project Defaults"
+ class="net.sourceforge.phpeclipse.preferences.PHPMiscProjectPreferences"
+ id="net.sourceforge.phpeclipse.preferences.PHPMiscProjectPreferences">
+ </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
- name="Templates"
+ name="%compilerOptionsPrefName"
+ category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+ class="net.sourceforge.phpdt.internal.ui.preferences.CompilerPreferencePage"
+ id="net.sourceforge.phpeclipse.preference.CompilerPreferencePage">
+ </page>
+ <page
+ name="%todoTaskPrefName"
+ category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+ class="net.sourceforge.phpdt.internal.ui.preferences.TodoTaskPreferencePage"
+ 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">
@@ -641,21 +1224,27 @@ Temporarily replaced until errors can be ironed out...
class="net.sourceforge.phpdt.internal.ui.preferences.CodeFormatterPreferencePage"
id="net.sourceforge.phpeclipse.preference.CodeFormatterPreferencePage">
</page>
- <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> -->
<page
+ name="Editor 2"
+ 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="Language Settings"
category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
class="net.sourceforge.phpeclipse.PHPLanguagePreferencePage"
id="net.sourceforge.phpeclipse.preference.PHPLanguagePreferencePage">
- </page>
+ </page> -->
</extension>
<extension
- point="org.eclipse.ui.documentProviders">
+ point="org.eclipse.ui.editors.documentProviders">
<provider
extensions="%phpFileExtension"
class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
@@ -663,7 +1252,7 @@ Temporarily replaced until errors can be ironed out...
</provider>
</extension>
<extension
- point="org.eclipse.ui.documentProviders">
+ point="org.eclipse.ui.editors.documentProviders">
<provider
extensions="%php3FileExtension"
class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
@@ -671,7 +1260,7 @@ Temporarily replaced until errors can be ironed out...
</provider>
</extension>
<extension
- point="org.eclipse.ui.documentProviders">
+ point="org.eclipse.ui.editors.documentProviders">
<provider
extensions="%php4FileExtension"
class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
@@ -679,7 +1268,7 @@ Temporarily replaced until errors can be ironed out...
</provider>
</extension>
<extension
- point="org.eclipse.ui.documentProviders">
+ point="org.eclipse.ui.editors.documentProviders">
<provider
extensions="%incFileExtension"
class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
@@ -687,7 +1276,7 @@ Temporarily replaced until errors can be ironed out...
</provider>
</extension>
<extension
- point="org.eclipse.ui.documentProviders">
+ point="org.eclipse.ui.editors.documentProviders">
<provider
extensions="%phtmlFileExtension"
class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
@@ -695,7 +1284,7 @@ Temporarily replaced until errors can be ironed out...
</provider>
</extension>
<extension
- point="org.eclipse.ui.documentProviders">
+ point="org.eclipse.ui.editors.documentProviders">
<provider
extensions="%htmlFileExtension"
class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
@@ -703,7 +1292,7 @@ Temporarily replaced until errors can be ironed out...
</provider>
</extension>
<extension
- point="org.eclipse.ui.documentProviders">
+ point="org.eclipse.ui.editors.documentProviders">
<provider
extensions="%htmFileExtension"
class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
@@ -711,7 +1300,7 @@ Temporarily replaced until errors can be ironed out...
</provider>
</extension>
<extension
- point="org.eclipse.ui.documentProviders">
+ point="org.eclipse.ui.editors.documentProviders">
<provider
extensions="%xmlFileExtension"
class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
@@ -719,120 +1308,37 @@ Temporarily replaced until errors can be ironed out...
</provider>
</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
point="org.eclipse.ui.views">
+ <category
+ name="%viewCategoryName"
+ id="net.sourceforge.phpeclipse.views.category">
+ </category>
<view
name="%phpConsoleView"
icon="icons/obj16/php.gif"
+ category="net.sourceforge.phpeclipse.views.category"
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 command definitions -->
-<!-- =========================================================================== -->
-<!--
-<extension point="org.eclipse.ui.commands">
- <category
- name="%category.source.name"
- description="%category.source.description"
- id="net.sourceforge.phpeclipse.ui.category.source">
- </category>
-
-
- <scope
- name="%scope.javaEditor.name"
- parent="org.eclipse.ui.textEditorScope"
- description="%scope.javaEditor.description"
- id="net.sourceforge.phpeclipse.ui.textEditorScope">
- </scope>
-
-
- <command
- category="org.eclipse.ui.category.edit"
- id="org.eclipse.jdt.ui.edit.text.java.correction.assist.proposals"
- name= "%ActionDefinition.correctionAssistProposals.name"
- description="%ActionDefinition.correctionAssistProposals.description">
- </command>
- <keyBinding
- string="Ctrl+1"
- scope="net.sourceforge.phpeclipse.ui.textEditorScope"
- command="org.eclipse.jdt.ui.edit.text.java.correction.assist.proposals"
- configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
- <keyBinding
- platform="carbon"
- string="Command+1"
- scope="net.sourceforge.phpeclipse.ui.textEditorScope"
- command="org.eclipse.jdt.ui.edit.text.java.correction.assist.proposals"
- configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
-
-
- <command
- category="net.sourceforge.phpeclipse.ui.category.source"
- id="net.sourceforge.phpeclipse.phpeditor.comment"
- name= "%ActionDefinition.comment.name"
- description= "%ActionDefinition.comment.description">
- </command>
- <keyBinding
- string="Ctrl+/"
- scope="net.sourceforge.phpeclipse.ui.textEditorScope"
- command="net.sourceforge.phpeclipse.phpeditor.comment"
- configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
- <keyBinding
- platform="carbon"
- string="Command+/"
- scope="net.sourceforge.phpeclipse.ui.textEditorScope"
- command="net.sourceforge.phpeclipse.phpeditor.comment"
- configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
-
- <command
- category="net.sourceforge.phpeclipse.ui.category.source"
- id="net.sourceforge.phpeclipse.phpeditor.uncomment"
- name= "%ActionDefinition.uncomment.name"
- description= "%ActionDefinition.uncomment.description">
- </command>
- <keyBinding
- string="Ctrl+\"
- scope="net.sourceforge.phpeclipse.ui.textEditorScope"
- command="net.sourceforge.phpeclipse.phpeditor.uncomment"
- configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
- <keyBinding
- platform="carbon"
- string="Command+\"
- scope="net.sourceforge.phpeclipse.ui.textEditorScope"
- command="net.sourceforge.phpeclipse.phpeditor.uncomment"
- configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
-
- <command
- category="net.sourceforge.phpeclipse.ui.category.source"
- id="org.eclipse.jdt.ui.edit.text.java.format"
- name= "%ActionDefinition.format.name"
- description= "%ActionDefinition.format.description">
- </command>
- <keyBinding
- string="Ctrl+Shift+F"
- scope="net.sourceforge.phpeclipse.ui.textEditorScope"
- command="org.eclipse.jdt.ui.edit.text.java.format"
- configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
- <keyBinding
- platform="carbon"
- string="Command+Shift+F"
- scope="net.sourceforge.phpeclipse.ui.textEditorScope"
- command="org.eclipse.jdt.ui.edit.text.java.format"
- configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
-
-</extension>
--->
-<!-- =========================================================================== -->
-<!-- PHP Editor Key Bindings -->
+<!-- PHPDT/UI Editor Key Bindings -->
<!-- =========================================================================== -->
<extension
point="org.eclipse.ui.acceleratorSets">
@@ -846,7 +1352,7 @@ Temporarily replaced until errors can be ironed out...
</accelerator>
<accelerator
key="Ctrl+1"
- id="net.sourceforge.phpeclipse.ui.edit.text.php.content.assist.proposals">
+ id="org.eclipse.ui.edit.text.contentAssist.proposals">
</accelerator>
<!-- source -->
<accelerator
@@ -880,8 +1386,8 @@ Temporarily replaced until errors can be ironed out...
</accelerator>
<accelerator
key="Ctrl+Space"
- id="net.sourceforge.phpeclipse.ui.edit.text.php.content.assist.proposals">
- </accelerator>
+ id="org.eclipse.ui.edit.text.contentAssist.proposals">
+ </accelerator>
<!-- source -->
<accelerator
key="Ctrl+/"
@@ -916,7 +1422,7 @@ Temporarily replaced until errors can be ironed out...
<accelerator
platform="carbon"
key="Command+1"
- id="net.sourceforge.phpeclipse.ui.edit.text.php.content.assist.proposals">
+ id="org.eclipse.ui.edit.text.contentAssist.proposals">
</accelerator>
<!-- source -->
<accelerator
@@ -961,7 +1467,7 @@ Temporarily replaced until errors can be ironed out...
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"
@@ -972,7 +1478,7 @@ Temporarily replaced until errors can be ironed out...
tooltip="%Action.externalToolsTip"
pulldown="true"
class="net.sourceforge.phpdt.externaltools.internal.menu.ExternalToolMenuDelegate">
- </action>
+ </action> -->
</actionSet>
</extension>
@@ -1148,4 +1654,13 @@ Temporarily replaced until errors can be ironed out...
expanderClass="net.sourceforge.phpdt.externaltools.variable.WorkingSetExpander">
</variable>
</extension>
+ <extension
+ point= "net.sourceforge.phpeclipse.foldingStructureProviders">
+ <provider
+ id="net.sourceforge.phpdt.ui.text.defaultFoldingProvider"
+ name= "%defaultFoldingStructureProviderName"
+ class="net.sourceforge.phpdt.internal.ui.text.folding.DefaultJavaFoldingStructureProvider"
+ preferencesClass="net.sourceforge.phpdt.internal.ui.text.folding.DefaultJavaFoldingPreferenceBlock">
+ </provider>
+ </extension>
</plugin>