<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
<plugin
id="net.sourceforge.phpeclipse"
name="%pluginName"
- version="1.0.9"
+ version="1.0.10"
provider-name="%providerName"
class="net.sourceforge.phpeclipse.PHPeclipsePlugin">
</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.eclipse.search"/>
<import plugin="org.apache.xerces"/>
<import plugin="org.eclipse.update.ui"/>
</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>
+
+<!-- Java 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 name="%phpEditorTextHoversName" id="phpEditorTextHovers" schema="schema/phpEditorTextHovers.exsd"/>
+
<extension
point="org.eclipse.team.core.fileTypes">
<fileTypes
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
</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"
</editor>
</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="org.eclipse.jdt.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
label="PHP/Apache"
<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"
</action>
</viewerContribution>
</extension>
+
<extension
point="org.eclipse.ui.editorActions">
<editorContribution
- targetID="net.sourceforge.phpeclipse.PHPEditor"
- id="org.eclipse.ui.texteditor.ruler.actions">
- <action
- label="%Dummy.label"
- helpContextId="org.eclipse.ui.bookmark_action_context"
- class="org.eclipse.ui.texteditor.BookmarkRulerAction"
- id="org.eclipse.ui.texteditor.BookmarkRulerAction">
- </action>
+ 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>
</editorContribution>
</extension>
+
<extension
point="org.eclipse.ui.preferencePages">
<page
class="net.sourceforge.phpdt.internal.ui.preferences.PHPEditorPreferencePage"
id="net.sourceforge.phpeclipse.preference.PHPEditorPreferencePage">
</page>
- <page
+ <!-- <page
name="Language Settings"
category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
class="net.sourceforge.phpeclipse.PHPLanguagePreferencePage"
id="net.sourceforge.phpeclipse.preference.PHPLanguagePreferencePage">
- </page>
+ </page> -->
</extension>
<extension
- point="org.eclipse.ui.documentProviders">
+ point="org.eclipse.ui.editors.documentProviders">
<provider
extensions="%phpFileExtension"
class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
</provider>
</extension>
<extension
- point="org.eclipse.ui.documentProviders">
+ point="org.eclipse.ui.editors.documentProviders">
<provider
extensions="%php3FileExtension"
class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
</provider>
</extension>
<extension
- point="org.eclipse.ui.documentProviders">
+ point="org.eclipse.ui.editors.documentProviders">
<provider
extensions="%php4FileExtension"
class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
</provider>
</extension>
<extension
- point="org.eclipse.ui.documentProviders">
+ point="org.eclipse.ui.editors.documentProviders">
<provider
extensions="%incFileExtension"
class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
</provider>
</extension>
<extension
- point="org.eclipse.ui.documentProviders">
+ point="org.eclipse.ui.editors.documentProviders">
<provider
extensions="%phtmlFileExtension"
class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
</provider>
</extension>
<extension
- point="org.eclipse.ui.documentProviders">
+ point="org.eclipse.ui.editors.documentProviders">
<provider
extensions="%htmlFileExtension"
class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
</provider>
</extension>
<extension
- point="org.eclipse.ui.documentProviders">
+ point="org.eclipse.ui.editors.documentProviders">
<provider
extensions="%htmFileExtension"
class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
</provider>
</extension>
<extension
- point="org.eclipse.ui.documentProviders">
+ point="org.eclipse.ui.editors.documentProviders">
<provider
extensions="%xmlFileExtension"
class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
</provider>
</extension>
<extension
- point="org.eclipse.ui.documentProviders">
+ point="org.eclipse.ui.editors.documentProviders">
<provider
extensions="%tplFileExtension"
class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
</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">
</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
</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+/"
<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
git://secure.phpeclipse.com / phpeclipse.git / blobdiff