Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorymazor2007-07-19 07:38:31 -0400
committerymazor2007-07-19 07:38:31 -0400
commit5c335a44bb02024ee094b9d7e6b0642a5d339f9a (patch)
treeb13a61ae4caa6d8282ed438333340123dd35f657
parent8380ee209c1f3a60441124f47234f1db6c060d81 (diff)
downloadorg.eclipse.pdt-5c335a44bb02024ee094b9d7e6b0642a5d339f9a.tar.gz
org.eclipse.pdt-5c335a44bb02024ee094b9d7e6b0642a5d339f9a.tar.xz
org.eclipse.pdt-5c335a44bb02024ee094b9d7e6b0642a5d339f9a.zip
added support for Project model for PHP files opened from the RSE view.
This is also related to issue in bugzilla #175323
-rw-r--r--plugins/org.eclipse.php.ui/plugin.xml1306
-rw-r--r--plugins/org.eclipse.php.ui/src/org/eclipse/php/internal/ui/PHPUiConstants.java2
-rw-r--r--plugins/org.eclipse.php.ui/src/org/eclipse/php/internal/ui/editor/PHPStructuredEditor.java26
-rw-r--r--plugins/org.eclipse.php.ui/src/org/eclipse/php/internal/ui/filters/RSEProjectFilter.java33
4 files changed, 688 insertions, 679 deletions
diff --git a/plugins/org.eclipse.php.ui/plugin.xml b/plugins/org.eclipse.php.ui/plugin.xml
index 812bf51de..f6ef974f0 100644
--- a/plugins/org.eclipse.php.ui/plugin.xml
+++ b/plugins/org.eclipse.php.ui/plugin.xml
@@ -14,176 +14,159 @@
name="PHP Editor Text Hover"
schema="schema/phpEditorTextHovers.exsd" />
<extension-point
- id="phpTreeContentProvider"
+ id="phpTreeContentProviders"
name="PHP Tree Content Provider"
- schema="schema/phpTreeContentProvider.exsd" />
- <extension-point id="phpManualSites" name="PHP Manual URL" schema="schema/phpManualSites.exsd"/>
- <extension-point id="phpManualDirectors" name="PHP Manual Director" schema="schema/phpManualDirectors.exsd"/>
- <extension-point id="contentAssistProccesorForPHP" name="contentAssistProccesorForPHP" schema="schema/contentAssistProccesorForPHP.exsd"/>
- <extension-point id="hyperlinkDetectorForPHP" name="hyperlinkDetectorForPHP" schema="schema/hyperlinkDetectorForPHP.exsd"/>
- <extension-point id="phpOutlineElementComparer" name="phpOutlineElementComparer" schema="schema/phpOutlineElementComparer.exsd"/>
- <extension-point id="actionFilterDelegatorForPHPCodeData" name="actionFilterDelegatorForPHPCodeData" schema="schema/actionFilterDelegatorForPHPCodeData.exsd"/>
- <extension-point id="hoverMessageDecorators" name="Hover Message Decorators" schema="schema/hoverMessageDecorators.exsd"/>
-
- <!--extension point="org.eclipse.ui.editors.documentProviders">
- <provider
- extensions="php"
- class="org.eclipse.php.ui.editor.PhpDocumentProvider"
- id="org.eclipse.php.ui.PhpDocumentProvider">
- </provider>
- </extension-->
-
- <!-- =============================== -->
- <!-- PHP Perspective Definition -->
- <!-- =============================== -->
+ schema="schema/phpTreeContentProviders.exsd" />
+ <extension-point
+ id="phpManualSites"
+ name="PHP Manual URL"
+ schema="schema/phpManualSites.exsd" />
+ <extension-point
+ id="phpContentAssistProcessor"
+ name="PHP Content Assist Processor"
+ schema="schema/phpContentAssistProcessor.exsd" />
+ <extension-point
+ id="phpHyperlinkDetector"
+ name="PHP Hyperlink Detector"
+ schema="schema/phpHyperlinkDetector.exsd" />
+ <extension-point
+ id="phpTreeElementComparers"
+ name="PHP Tree Element Comparer"
+ schema="schema/phpTreeElementComparers.exsd" />
+ <extension-point
+ id="actionFilterContributors"
+ name="PHP Action Filter Contributor"
+ schema="schema/actionFilterContributors.exsd" />
+ <extension-point
+ id="phpWizardPages"
+ name="PHP Wizard Page"
+ schema="schema/phpWizardPages.exsd" />
+ <extension-point
+ id="phpPreferencePageBlocks"
+ name="PHP Preference Page Block"
+ schema="schema/phpPreferencePageBlocks.exsd" />
+ <extension-point
+ id="wizardAndCompositeFragments"
+ name="Wizard and Composite Fragments"
+ schema="schema/wizardAndCompositeFragments.exsd" />
+ <extension-point
+ id="phpContentAssistant"
+ name="phpContentAssistant"
+ schema="schema/phpContentAssistant.exsd" />
+ <extension-point
+ id="phpActionDelegator"
+ name="PHP Action Delegator"
+ schema="schema/phpActionDelegator.exsd" />
+ <extension-point id="phpFormatterProcessor" name="PHP Formatter Processor" schema="schema/phpFormatterProcessor.exsd"/>
+ <extension-point id="phpFormatterPrefBlock" name="PHP Formatter Preferences Block" schema="schema/phpFormatterPrefBlock.exsd"/>
+ <extension-point id="phpPerspectiveShortcut" name="PHP Perspective Shortcut" schema="schema/phpPerspectiveShortut.exsd"/>
+
+ <!--PHP Perspective Definition:-->
<extension point="org.eclipse.ui.perspectives">
<perspective
- class="org.eclipse.php.ui.PHPPerspectiveFactory"
- icon="icons/full/obj16/php_perspective.gif"
- id="org.eclipse.php.perspective"
- name="PHP">
- </perspective>
+ class="org.eclipse.php.internal.ui.PHPPerspectiveFactory"
+ icon="icons/full/obj16/php_perspective.gif"
+ id="org.eclipse.php.perspective"
+ name="PHP" />
</extension>
- <!-- =============================== -->
- <!-- PHP Perspective Extensions Definition -->
- <!-- =============================== -->
-
+ <!--PHP Perspective Extensions Definition:-->
<extension point="org.eclipse.ui.perspectiveExtensions">
<perspectiveExtension targetID="org.eclipse.php.perspective">
<actionSet id="org.eclipse.debug.ui.launchActionSet" />
<actionSet id="org.eclipse.ui.NavigateActionSet" />
<actionSet id="org.eclipse.php.ui.PHPActionSet" />
+ <actionSet id="org.eclipse.debug.ui.breakpointActionSet" />
+ <actionSet id="org.eclipse.wst.server.ui.internal.webbrowser.actionSet" />
+
<viewShortcut id="org.eclipse.ui.views.ContentOutline" />
- <viewShortcut id="org.eclipse.ui.views.PropertySheet" />
- <viewShortcut id="org.eclipse.ui.views.ResourceNavigator" />
<viewShortcut id="org.eclipse.ui.views.ProblemView" />
<viewShortcut id="org.eclipse.ui.views.TaskList" />
- <perspectiveShortcut
- id="org.eclipse.debug.ui.DebugPerspective" />
- <newWizardShortcut
- id="org.eclipse.php.project.ui.wizards.PHPProjectCreationWizard" />
- <newWizardShortcut
- id="org.eclipse.php.project.ui.wizards.PHPFileCreationWizard" />
- <newWizardShortcut id="org.eclipse.ui.wizards.new.folder"/>
- </perspectiveExtension>
- <perspectiveExtension
- targetID="org.eclipse.ui.resourcePerspective">
- <perspectiveShortcut id="org.eclipse.php.perspective" />
+
+ <!-- Add other Web document wizards shortcuts to the New menu:-->
+ <newWizardShortcut id="org.eclipse.php.ui.wizards.PHPProjectCreationWizard" />
+ <newWizardShortcut id="org.eclipse.php.ui.wizards.PHPFileCreationWizard" />
+ <newWizardShortcut id="org.eclipse.ui.wizards.new.folder" />
+ <newWizardShortcut id="org.eclipse.wst.css.ui.internal.wizard.NewCSSWizard" />
+ <newWizardShortcut id="org.eclipse.wst.html.ui.internal.wizard.NewHTMLWizard" />
+ <newWizardShortcut id="org.eclipse.wst.xml.ui.internal.wizards.NewXMLWizard" />
+
+ <showInPart id="org.eclipse.ui.views.ResourceNavigator" />
</perspectiveExtension>
- <perspectiveExtension
- targetID="org.eclipse.debug.ui.DebugPerspective">
+
+ <perspectiveExtension targetID="org.eclipse.ui.resourcePerspective">
<perspectiveShortcut id="org.eclipse.php.perspective" />
</perspectiveExtension>
- </extension>
- <!-- Add "New" wizards to the File->New menu
- <extension point="org.eclipse.ui.perspectiveExtensions">
- <perspectiveExtension targetID="org.eclipse.php.perspective">
- <newWizardShortcut id="org.eclipse.php.project.ui.wizards.PHPProjectCreationWizard" />
- <newWizardShortcut id="org.eclipse.php.project.ui.wizards.PHPFileCreationWizard" />
+ <perspectiveExtension targetID="org.eclipse.debug.ui.DebugPerspective">
+ <perspectiveShortcut id="org.eclipse.php.perspective" />
</perspectiveExtension>
- </extension>
- -->
-
- <!-- =============================== -->
- <!-- PHP Explorer View -->
- <!-- =============================== -->
-
- <extension point="org.eclipse.ui.views">
- <category
- name="PHP Tools"
- id="org.eclipse.php.ui.views">
- </category>
- <view
- category="org.eclipse.php.ui.views"
- class="org.eclipse.php.ui.explorer.ExplorerPart"
- icon="icons/full/obj16/php_explorer.gif"
- id="org.eclipse.php.ui.explorer"
- name="PHP Explorer">
- </view>
</extension>
- <!-- =============================== -->
- <!-- PHP Functions View -->
- <!-- =============================== -->
-
-
<extension point="org.eclipse.ui.views">
<category
name="PHP Tools"
- id="org.eclipse.php.ui.views">
- </category>
+ id="org.eclipse.php.ui.views" />
+ <view
+ name="PHP Explorer"
+ category="org.eclipse.php.ui.views"
+ class="org.eclipse.php.internal.ui.explorer.ExplorerPart"
+ icon="icons/full/obj16/php_explorer.gif"
+ id="org.eclipse.php.ui.explorer" />
<view
name="PHP Functions"
category="org.eclipse.php.ui.views"
- class="org.eclipse.php.ui.functions.PHPFunctionsPart"
- id="org.eclipse.php.ui.functions"
- icon="icons/full/obj16/phpfile.gif">
- </view>
- </extension>
-
- <extension point="org.eclipse.ui.views">
- <category
- name="PHP Tools"
- id="org.eclipse.php.ui.views">
- </category>
+ class="org.eclipse.php.internal.ui.functions.PHPFunctionsPart"
+ icon="icons/full/obj16/phpfile.gif"
+ id="org.eclipse.php.ui.functions" />
<view
name="PHP Project Outline"
category="org.eclipse.php.ui.views"
- class="org.eclipse.php.ui.projectOutline.ProjectOutlinePart"
+ class="org.eclipse.php.internal.ui.projectOutline.ProjectOutlinePart"
id="org.eclipse.php.ui.projectOutline"
- icon="icons/full/obj16/php_project_outline.gif">
- </view>
+ icon="icons/full/obj16/php_project_outline.gif" />
</extension>
-
- <!-- =============================== -->
- <!-- Wizards -->
- <!-- =============================== -->
-
- <!-- php project wizard -->
- <extension
- point="org.eclipse.wst.common.frameworks.ui.extendableWizard">
- <extendableWizard
- id="org.eclipse.php.project.ui.wizards.PHPProjectCreationWizard">
- </extendableWizard>
+ <!--Wizards:-->
+ <extension point="org.eclipse.wst.common.frameworks.ui.extendableWizard">
+ <extendableWizard id="org.eclipse.php.ui.wizards.PHPProjectCreationWizard" />
</extension>
<extension point="org.eclipse.ui.newWizards">
<category
name="PHP"
- id="org.eclipse.php.project.ui">
- </category>
+ id="org.eclipse.php.project.ui" />
+ <!--PHP Project wizard:-->
<wizard
- category="org.eclipse.php.project.ui"
- class="org.eclipse.php.project.ui.wizards.PHPProjectCreationWizard"
- finalPerspective="org.eclipse.php.perspective"
- icon="icons/full/obj16/add_php_project.gif"
- id="org.eclipse.php.project.ui.wizards.PHPProjectCreationWizard"
- name="%PHPProject.name"
- preferredPerspectives="org.eclipse.php.perspective"
- project="true">
+ id="org.eclipse.php.ui.wizards.PHPProjectCreationWizard"
+ category="org.eclipse.php.project.ui"
+ class="org.eclipse.php.internal.ui.wizards.PHPProjectCreationWizard"
+ name="%PHPProject.name"
+ icon="icons/full/obj16/add_php_project.gif"
+ finalPerspective="org.eclipse.php.perspective"
+ preferredPerspectives="org.eclipse.php.perspective"
+ project="true">
<description>%PHPProject.description</description>
- <selection class="org.eclipse.core.resources.IResource">
- </selection>
+ <selection class="org.eclipse.core.resources.IResource" />
</wizard>
- <primaryWizard id="org.eclipse.ui.wizards.new.folder"/>
-
- </extension>
-
- <extension
- id="newFileWizard"
- point="org.eclipse.ui.newWizards">
<wizard
- name="PHP File"
+ id="org.eclipse.php.ui.wizards.PHPFileCreationWizard"
category="org.eclipse.php.project.ui"
- class="org.eclipse.php.ui.wizards.PHPFileCreationWizard"
- id="org.eclipse.php.project.ui.wizards.PHPFileCreationWizard"
- icon="icons/full/obj16/add_php_file.gif">
- </wizard>
+ class="org.eclipse.php.internal.ui.wizards.PHPFileCreationWizard"
+ name="PHP File"
+ icon="icons/full/obj16/add_php_file.gif" />
+ <primaryWizard id="org.eclipse.ui.wizards.new.folder" />
+ <wizard
+ canFinishEarly="true"
+ category="org.eclipse.php.project.ui"
+ class="org.eclipse.php.internal.ui.wizards.UntitledPHPDocumentWizard"
+ hasPages="false"
+ icon="icons/full/obj16/add_php_file.gif"
+ id="org.eclipse.php.ui.wizards.UntitledPHPDocumentWizard"
+ name="Untitled PHP Document">
+ </wizard>
</extension>
<!-- the following are needed to add an image for SWPs into the "Add/Remove Project" dialog -->
@@ -193,39 +176,33 @@
name="%PHPModule.name" />
</extension>
- <!--
- <extension point="org.eclipse.wst.common.frameworks.ExtendableOperation"
- id="extendableOperation">
- <extendableOperation
- class="org.eclipse.php.core.project.operation.PHPModuleCreationOperation"
- id="org.eclipse.php.core.project.operation.PHPModuleCreationOperation">
- </extendableOperation>
- </extension>
- -->
- <!-- =============================== -->
- <!-- PHP Editor -->
- <!-- =============================== -->
-
+ <!--PHP Editor:-->
<extension point="org.eclipse.ui.editors">
<editor
- class="org.eclipse.php.ui.editor.PHPStructuredEditor"
- contributorClass="org.eclipse.php.ui.editor.PHPEditorActionBarContributor"
+ class="org.eclipse.php.internal.ui.editor.PHPStructuredEditor"
+ contributorClass="org.eclipse.php.internal.ui.editor.PHPEditorActionBarContributor"
default="true"
icon="icons/full/obj16/phpfile.gif"
id="org.eclipse.php.editor"
name="PHP Editor"
symbolicFontName="org.eclipse.wst.sse.ui.textfont">
- <contentTypeBinding
- contentTypeId="org.eclipse.php.core.phpsource" />
+ <contentTypeBinding contentTypeId="org.eclipse.php.core.phpsource" />
</editor>
+ <editor
+ class="org.eclipse.php.internal.ui.editor.UntitledPHPEditor"
+ icon="icons/full/obj16/phpfile.gif"
+ id="org.eclipse.php.untitledPhpEditor"
+ name="Untitiled PHP Document Editor"
+ symbolicFontName="org.eclipse.wst.sse.ui.textfont">
+ </editor>
</extension>
<extension point="org.eclipse.wst.sse.ui.editorConfiguration">
<sourceViewerConfiguration
- class="org.eclipse.php.ui.editor.configuration.PHPStructuredTextViewerConfiguration"
+ class="org.eclipse.php.internal.ui.editor.configuration.PHPStructuredTextViewerConfiguration"
target="org.eclipse.php.core.phpsource" />
<contentOutlineConfiguration
- class="org.eclipse.php.ui.outline.PHPContentOutlineConfiguration"
+ class="org.eclipse.php.internal.ui.outline.PHPContentOutlineConfiguration"
target="org.eclipse.php.core.phpsource" />
<propertySheetConfiguration
class="org.eclipse.wst.xml.ui.views.properties.XMLPropertySheetConfiguration"
@@ -236,7 +213,7 @@
target="org.eclipse.php.core.phpsource" />
<provisionalConfiguration
type="characterpairmatcher"
- class="org.eclipse.wst.html.ui.internal.text.HTMLDocumentRegionEdgeMatcher"
+ class="org.eclipse.php.internal.ui.text.PHPDocumentRegionEdgeMatcher"
target="org.eclipse.php.core.phpsource" />
<provisionalConfiguration
type="structuredtextfoldingprovider"
@@ -244,15 +221,13 @@
target="org.eclipse.php.core.phpsource" />
</extension>
- <extension
- point="org.eclipse.wst.sse.ui.adapterFactoryDescription">
- <adapterFactoryDescription
- class="org.eclipse.php.ui.editor.adapter.PHPAdapterFactoryProvider">
+ <extension point="org.eclipse.wst.sse.ui.adapterFactoryDescription">
+ <adapterFactoryDescription class="org.eclipse.php.internal.ui.editor.adapter.PHPAdapterFactoryProvider">
<contentType id="org.eclipse.php.core.phpsource" />
</adapterFactoryDescription>
</extension>
- <extension
- point="org.eclipse.core.filebuffers.annotationModelCreation">
+
+ <extension point="org.eclipse.core.filebuffers.annotationModelCreation">
<factory
contentTypeId="org.eclipse.php.core.phpsource"
class="org.eclipse.wst.sse.ui.internal.StructuredResourceMarkerAnnotationModelFactory" />
@@ -261,63 +236,47 @@
<extension point="org.eclipse.wst.sse.ui.sourcevalidation">
<validator
scope="total"
- class="org.eclipse.php.ui.editor.validation.PHPHTMLValidator"
+ class="org.eclipse.php.internal.ui.editor.validation.PHPHTMLValidator"
id="org.eclipse.php.ui.editor.phphtmlsourcevalidator">
- <contentTypeIdentifier
- id="org.eclipse.php.core.phpsource">
+ <contentTypeIdentifier id="org.eclipse.php.core.phpsource">
<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
<partitionType id="org.eclipse.php.PHP_DEFAULT" />
- <partitionType id="org.eclipse.php.PHP_QUOTED_STRING" />
- <partitionType id="org.eclipse.php.PHP_MULTI_LINE_COMMENT" />
- <partitionType id="org.eclipse.php.PHP_SINGLE_LINE_COMMENT" />
- <partitionType id="org.eclipse.php.PHP_DOC" />
</contentTypeIdentifier>
</validator>
</extension>
-
- <!-- initialize php ui preferences -->
-
- <!-- Templates -->
+ <!--Templates:-->
<extension point="org.eclipse.ui.editors.templates">
+
<contextType
name="%templates.php.contextType.name"
- class="org.eclipse.php.ui.editor.templates.PHPTemplateContextType"
- id="php">
- </contextType>
+ class="org.eclipse.php.internal.ui.editor.templates.PHPTemplateContextType"
+ id="php" />
<contextType
name="%templates.phpdoc.contextType.name"
- class="org.eclipse.php.ui.editor.templates.PHPTemplateContextType"
- id="phpdoc">
- </contextType>
+ class="org.eclipse.php.internal.ui.editor.templates.PHPTemplateContextType"
+ id="phpdoc" />
<contextType
name="%templates.newphp.contextType.name"
- class="org.eclipse.php.ui.editor.templates.PhpNewFileTemplateContextType"
- id="newPhp">
- </contextType>
+ class="org.eclipse.php.internal.ui.editor.templates.PhpNewFileTemplateContextType"
+ id="newPhp" />
+
<include
file="templates/phpdefault-templates.xml"
- translations="$nl$/templates/phpdefault-templates.properties">
- </include>
- </extension>
-
-
-
+ translations="$nl$/templates/phpdefault-templates.properties" />
- <!-- =============================== -->
- <!-- Property Pages -->
- <!-- =============================== -->
+ </extension>
+ <!--Property Pages:-->
<extension point="org.eclipse.ui.propertyPages">
<page
- class="org.eclipse.php.internal.ui.preferences.PHPInterpreterPreferencePage"
- id="org.eclipse.php.ui.propertyPages.PHPInterpreterPreferencePage"
+ class="org.eclipse.php.internal.ui.preferences.PHPInterpreterPreferencePage"
+ id="org.eclipse.php.ui.propertyPages.PHPInterpreterPreferencePage"
name="%phpInterpreterPreferenceName"
- objectClass="org.eclipse.core.resources.IProject">
+ objectClass="org.eclipse.core.resources.IProject">
<filter
name="nature"
- value="org.eclipse.php.core.PHPNature">
- </filter>
+ value="org.eclipse.php.core.PHPNature" />
</page>
<page
class="org.eclipse.php.internal.ui.preferences.TodoTaskPreferencePage"
@@ -329,85 +288,77 @@
value="org.eclipse.php.core.PHPNature" />
<keywordReference id="org.eclipse.php.ui.todo" />
</page>
- <page
- class="org.eclipse.php.internal.ui.preferences.PHPFormatterPreferencePage"
- id="org.eclipse.php.ui.propertyPages.PHPFormatterPreferencePage"
- name="%formatterPreferencePageName"
- objectClass="org.eclipse.core.resources.IProject"/>
- <!-- removed - had the same ID
- <page
- objectClass="org.eclipse.php.core.phpModel.parser.PHPBrowserModel"
- name="PHP Options"
- class="org.eclipse.php.ui.preferences.ui.ProjectPropertyPage"
- id="org.eclipse.php.ui.preferences.ui.ProjectPropertyPage">
- <filter
- name="nature"
- value="org.eclipse.php.core.PHPNature">
- </filter>
- </page>
- -->
- </extension>
-
- <extension point="org.eclipse.ui.propertyPages">
+ <page
+ class="org.eclipse.php.internal.ui.preferences.PHPFormatterPreferencePage"
+ id="org.eclipse.php.ui.propertyPages.PHPFormatterPreferencePage"
+ name="%formatterPreferencePageName"
+ objectClass="org.eclipse.core.resources.IProject" />
<page
objectClass="org.eclipse.core.resources.IProject"
name="PHP Include Path"
- class="org.eclipse.php.ui.preferences.includepath.IncludePathPropertyPage"
- id=" org.eclipse.php.ui.preferences.includepath.IncludePathPropertyPage">
+ class="org.eclipse.php.internal.ui.preferences.includepath.IncludePathPropertyPage"
+ id="org.eclipse.php.ui.propertyPages.IncludePathPropertyPage">
<filter
name="nature"
- value="org.eclipse.php.core.PHPNature">
- </filter>
+ value="org.eclipse.php.core.PHPNature" />
</page>
</extension>
-
- <!-- =============================== -->
- <!-- ADapters -->
- <!-- =============================== -->
-
-
+ <!--Adapters:-->
<extension point="org.eclipse.core.runtime.adapters">
<factory
class="org.eclipse.php.internal.ui.PHPElementAdapterFactory"
- adaptableType="org.eclipse.php.core.phpModel.phpElementData.PHPCodeData">
-
+ adaptableType="org.eclipse.php.internal.core.phpModel.phpElementData.PHPCodeData">
<adapter type="org.eclipse.core.resources.IResource" />
-
<adapter type="org.eclipse.ui.IContributorResourceAdapter" />
- <adapter
- type="org.eclipse.ui.ide.IContributorResourceAdapter2" />
+ <adapter type="org.eclipse.ui.ide.IContributorResourceAdapter2" />
<adapter type="org.eclipse.ui.IContainmentAdapter" />
-
-
<adapter type="org.eclipse.ui.model.IWorkbenchAdapter" />
- <adapter
- type="org.eclipse.ui.views.properties.IPropertySource" />
-
+ <adapter type="org.eclipse.ui.views.properties.IPropertySource" />
+ </factory>
+ <factory
+ adaptableType="org.eclipse.php.internal.core.documentModel.dom.ElementImplForPhp"
+ class="org.eclipse.php.internal.ui.PHPElementAdapterFactory">
+ <adapter type="org.eclipse.search.ui.ISearchPageScoreComputer" />
+ </factory>
+ <factory
+ adaptableType="org.eclipse.php.internal.core.documentModel.dom.TextImplForPhp"
+ class="org.eclipse.php.internal.ui.PHPElementAdapterFactory">
+ <adapter type="org.eclipse.search.ui.ISearchPageScoreComputer" />
</factory>
-
<factory
class="org.eclipse.php.internal.ui.PHPProjectAdapterFactory"
- adaptableType="org.eclipse.php.core.phpModel.parser.PHPBrowserModel">
+ adaptableType="org.eclipse.php.internal.core.phpModel.parser.PHPProjectModel">
<adapter type="org.eclipse.core.resources.IProject" />
</factory>
-
<factory
class="org.eclipse.core.internal.resources.mapping.ResourceAdapterFactory"
adaptableType="org.eclipse.core.resources.IResource">
- <adapter
- type="org.eclipse.php.core.phpModel.parser.PHPBrowserModel" />
+ <adapter type="org.eclipse.php.internal.core.phpModel.parser.PHPProjectModel" />
+ </factory>
+ <factory
+ adaptableType="org.eclipse.php.internal.core.phpModel.phpElementData.CodeData"
+ class="org.eclipse.php.internal.ui.CodeDataAdapterFactory">
+ <adapter type="org.eclipse.core.resources.IResource" />
+ </factory>
+ <factory
+ adaptableType="org.eclipse.php.internal.core.phpModel.phpElementData.PHPCodeData"
+ class="org.eclipse.php.internal.ui.phpCodeData.PhpCodeDataAdapterFactory">
+ <adapter type="org.eclipse.ui.IActionFilter" />
+ </factory>
+ <factory
+ adaptableType="org.eclipse.php.internal.core.documentModel.dom.TextImplForPhp"
+ class="org.eclipse.php.internal.ui.editor.adapter.PhpElementAdapterFactory">
+ <adapter type="org.eclipse.ui.IActionFilter" />
+ </factory>
+ <factory
+ adaptableType="org.eclipse.php.internal.core.documentModel.dom.ElementImplForPhp"
+ class="org.eclipse.php.internal.ui.editor.adapter.PhpElementAdapterFactory">
+ <adapter type="org.eclipse.ui.IActionFilter" />
</factory>
-
-
</extension>
-
-
- <!-- =============================== -->
- <!-- Actions -->
- <!-- =============================== -->
-
+ <!--Actions:-->
<extension point="org.eclipse.ui.actionSets">
<actionSet
label="%PHPActionSet.label"
@@ -415,26 +366,28 @@
visible="false"
id="org.eclipse.php.ui.PHPActionSet">
<action
- class="org.eclipse.php.internal.ui.actions.OpenTypeAction"
- definitionId="org.eclipse.php.ui.navigate.open.type"
- disabledIcon="icons/full/dtool16/opentype.gif"
- icon="icons/full/etool16/opentype.gif"
- id="openType"
- label="%OpenTypeAction.label"
- menubarPath="navigate/open.ext2"
- toolbarPath="org.eclipse.search.searchActionSet/Search"
- tooltip="%OpenTypeAction.tooltip"/>
-
+ class="org.eclipse.php.internal.ui.actions.OpenTypeAction"
+ definitionId="org.eclipse.php.ui.navigate.open.type"
+ disabledIcon="icons/full/dtool16/opentype.gif"
+ icon="icons/full/etool16/opentype.gif"
+ id="openType"
+ label="%OpenTypeAction.label"
+ menubarPath="navigate/open.ext2"
+ toolbarPath="org.eclipse.search.searchActionSet/Search"
+ tooltip="%OpenTypeAction.tooltip" />
+ <action
+ allowLabelUpdate="true"
+ definitionId="org.eclipse.php.ui.edit.text.OpenDeclaration"
+ id="org.eclipse.php.ui.actions.OpenDeclaration"
+ label="%OpenTypeAction.label"
+ menubarPath="navigate/open.ext2"
+ retarget="true" />
</actionSet>
- </extension>
-
- <extension point="org.eclipse.ui.actionSets">
<actionSet
label="%OpenActionSet.label"
description="%OpenActionSet.description"
visible="false"
id="org.eclipse.php.ui.A_OpenActionSet">
-
<action
definitionId="org.eclipse.php.ui.edit.text.open.editor"
label="%OpenAction.label"
@@ -442,182 +395,188 @@
retarget="true"
menubarPath="navigate/open.ext"
allowLabelUpdate="true"
- id="org.eclipse.php.ui.actions.Open">
- </action>
+ id="org.eclipse.php.ui.actions.Open" />
</actionSet>
- </extension>
-
- <extension point="org.eclipse.ui.actionSetPartAssociations">
- <actionSetPartAssociation
- targetID="org.eclipse.php.ui.A_OpenActionSet">
- <part id="org.eclipse.php.ui.explorer"></part>
- </actionSetPartAssociation>
- </extension>
-
-
-
- <extension point="org.eclipse.ui.actionSets">
<actionSet
label="%CodingActionSet.label"
description="%CodingActionSet.description"
visible="false"
id="org.eclipse.php.ui.CodingActionSet">
- <!-- =========================================================================== -->
- <!-- Refactoring Menu -->
- <!-- =========================================================================== -->
+ <!--Refactoring Menu:-->
<menu
label="%Refactoring.menu.label"
path="edit"
id="org.eclipse.php.ui.refactoring.menu">
<separator name="reorgGroup" />
<separator name="typeGroup" />
- <separator name="codingGroup" />
</menu>
-
- <!-- reorg group -->
+ <!--Reorganization group:-->
<action
definitionId="org.eclipse.php.ui.edit.text.move.element"
label="%Refactoring.moveAction.label"
retarget="true"
menubarPath="org.eclipse.php.ui.refactoring.menu/reorgGroup"
- id="org.eclipse.php.ui.actions.Move">
- </action>
+ id="org.eclipse.php.ui.actions.Move" />
<action
definitionId="org.eclipse.php.ui.edit.text.rename.element"
- label="%Refactoring.renameAction.label"
- retarget="true"
- menubarPath="org.eclipse.php.ui.refactoring.menu/reorgGroup"
- id="org.eclipse.php.ui.actions.Rename">
- </action>
- <!-- =========================================================================== -->
- <!-- Source Menu -->
- <!-- =========================================================================== -->
+ id="org.eclipse.php.ui.actions.Rename"
+ label="%Refactoring.renameAction.label"
+ menubarPath="org.eclipse.php.ui.refactoring.menu/reorgGroup"
+ retarget="true"/>
+ <!--Source Menu:-->
<menu
label="%SourceMenu.label"
path="edit"
id="org.eclipse.php.ui.source.menu">
- <separator name="editGroup"></separator>
- <separator name="importGroup"></separator>
- <separator name="generateGroup"></separator>
- <separator name="codeGroup"></separator>
- <separator name="convertGroup"></separator>
+ <separator name="editGroup" />
+ <separator name="importGroup" />
+ <separator name="generateGroup" />
+ <separator name="codeGroup" />
+ <separator name="convertGroup" />
+ <separator name="formatGroup" />
</menu>
<action
+ definitionId="org.eclipse.wst.sse.ui.format.active.elements"
+ id="FormatActiveElements"
+ label="Format Active Elements"
+ retarget="true"
+ menubarPath="org.eclipse.php.ui.source.menu/formatGroup" />
+ <action
+ definitionId="org.eclipse.wst.sse.ui.format.document"
+ id="FormatDocument"
+ label="Format Document"
+ retarget="true"
+ menubarPath="org.eclipse.php.ui.source.menu/formatGroup" />
+ <action
definitionId="org.eclipse.php.ui.edit.text.remove.block.comment"
label="%RemoveBlockCommentAction.label"
retarget="true"
menubarPath="org.eclipse.php.ui.source.menu/editGroup"
- id="org.eclipse.php.ui.actions.RemoveBlockComment">
- </action>
+ id="org.eclipse.php.ui.actions.RemoveBlockComment" />
<action
definitionId="org.eclipse.php.ui.edit.text.add.block.comment"
label="%AddBlockCommentAction.label"
retarget="true"
menubarPath="org.eclipse.php.ui.source.menu/editGroup"
- id="org.eclipse.php.ui.actions.AddBlockComment">
- </action>
+ id="org.eclipse.php.ui.actions.AddBlockComment" />
<action
definitionId="org.eclipse.php.ui.edit.text.toggle.comment"
id="org.eclipse.php.ui.actions.ToggleCommentAction"
label="%ToggleCommentAction.label"
retarget="true"
- menubarPath="org.eclipse.php.ui.source.menu/editGroup">
- </action>
+ menubarPath="org.eclipse.php.ui.source.menu/editGroup" />
<action
definitionId="org.eclipse.php.ui.edit.text.uncomment"
label="%UncommentAction.label"
retarget="true"
- id="org.eclipse.php.ui.actions.Uncomment">
- </action>
+ id="org.eclipse.php.ui.actions.Uncomment" />
<action
definitionId="org.eclipse.php.ui.edit.text.comment"
label="%CommentAction.label"
retarget="true"
- id="org.eclipse.php.ui.actions.Comment">
- </action>
+ id="org.eclipse.php.ui.actions.Comment" />
<action
definitionId="org.eclipse.php.ui.edit.OpenFunctionsManualAction"
label="Open PHP Manual"
retarget="true"
- id="org.eclipse.php.ui.actions.OpenFunctionsManualAction"/>
+ id="org.eclipse.php.ui.actions.OpenFunctionsManualAction" />
+ </actionSet>
+ <actionSet
+ id="org.eclipse.php.ui.SearchActionSet"
+ label="%PHPSearchActionSet.label"
+ visible="false">
+ <!--see https://bugs.eclipse.org/bugs/show_bug.cgi?id=149461-->
+ <!--Note: The menu (re-) definition has to be here due to bug:-->
+ <!--Search Menu:-->
+ <menu
+ label="%searchMenu.label"
+ path="navigate"
+ id="org.eclipse.search.menu">
+ <groupMarker name="internalDialogGroup" />
+ <groupMarker name="dialogGroup" />
+ <separator name="fileSearchContextMenuActionsGroup" />
+ <separator name="contextMenuActionsGroup" />
+ <separator name="occurencesActionsGroup" />
+ <separator name="extraSearchGroup" />
+ </menu>
+ <action
+ class="org.eclipse.php.internal.ui.search.OpenPHPSearchPageAction"
+ helpContextId="php_search_action_context"
+ icon="icons/full/obj16/php_search_obj.gif"
+ id="org.eclipse.php.ui.actions.OpenPHPSearchPage"
+ label="%openPHPSearchPageAction.label"
+ menubarPath="org.eclipse.search.menu/dialogGroup" />
</actionSet>
</extension>
<extension point="org.eclipse.ui.actionSetPartAssociations">
- <actionSetPartAssociation
- targetID="org.eclipse.php.ui.CodingActionSet">
- <part id="org.eclipse.php.ui.explorer"></part>
- <part id="org.eclipse.php.editor"></part>
+ <actionSetPartAssociation targetID="org.eclipse.php.ui.A_OpenActionSet">
+ <part id="org.eclipse.php.ui.explorer" />
+ </actionSetPartAssociation>
+ <actionSetPartAssociation targetID="org.eclipse.php.ui.CodingActionSet">
+ <part id="org.eclipse.php.ui.explorer" />
+ <part id="org.eclipse.php.editor" />
</actionSetPartAssociation>
</extension>
-
-
- <!-- =============================== -->
- <!-- COMMANDS -->
- <!-- =============================== -->
-
+ <!--Commands:-->
<extension point="org.eclipse.ui.contexts">
<context
name="%context.editingPhpSource.name"
description="%context.editingPhpSource.description"
parentId="org.eclipse.ui.textEditorScope"
- id="org.eclipse.php.ui.phpEditorScope">
- </context>
+ id="org.eclipse.php.ui.phpEditorScope" />
+ <context
+ name="Open PHP File"
+ description="Open PHP File"
+ parentId="org.eclipse.ui.contexts.window"
+ id="org.eclipse.php.ui.contexts.window" />
</extension>
-
-
<extension point="org.eclipse.ui.commands">
<!-- categories -->
<category
name="%category.source.name"
description="%category.source.description"
- id="org.eclipse.php.ui.category.source">
- </category>
+ id="org.eclipse.php.ui.category.source" />
<category
name="%category.refactoring.name"
description="%category.refactoring.description"
- id="org.eclipse.php.ui.category.refactoring">
- </category>
+ id="org.eclipse.php.ui.category.refactoring" />
+
<!-- edit -->
<command
name="%ActionDefinition.showInExplorerView.name"
description="%ActionDefinition.showInExplorerView.description"
categoryId="org.eclipse.ui.category.navigate"
- id="org.eclipse.php.ui.edit.text.show.in.explorer.view">
- </command>
+ id="org.eclipse.php.ui.edit.text.show.in.explorer.view" />
<!-- source -->
<command
name="%ActionDefinition.comment.name"
description="%ActionDefinition.comment.description"
categoryId="org.eclipse.php.ui.category.source"
- id="org.eclipse.php.ui.edit.text.comment">
- </command>
+ id="org.eclipse.php.ui.edit.text.comment" />
<command
name="%ActionDefinition.uncomment.name"
description="%ActionDefinition.uncomment.description"
categoryId="org.eclipse.php.ui.category.source"
- id="org.eclipse.php.ui.edit.text.uncomment">
- </command>
+ id="org.eclipse.php.ui.edit.text.uncomment" />
<command
name="%ActionDefinition.toggleComment.name"
description="%ActionDefinition.toggleComment.description"
categoryId="org.eclipse.php.ui.category.source"
- id="org.eclipse.php.ui.edit.text.toggle.comment">
- </command>
+ id="org.eclipse.php.ui.edit.text.toggle.comment" />
<command
name="%ActionDefinition.addBlockComment.name"
description="%ActionDefinition.addBlockComment.description"
categoryId="org.eclipse.php.ui.category.source"
- id="org.eclipse.php.ui.edit.text.add.block.comment">
- </command>
+ id="org.eclipse.php.ui.edit.text.add.block.comment" />
<command
name="%ActionDefinition.removeBlockComment.name"
description="%ActionDefinition.removeBlockComment.description"
categoryId="org.eclipse.php.ui.category.source"
- id="org.eclipse.php.ui.edit.text.remove.block.comment">
- </command>
+ id="org.eclipse.php.ui.edit.text.remove.block.comment" />
+
<!-- perspectives -->
<command
name="%PerspectiveCommand.java.name"
@@ -626,62 +585,75 @@
id="org.eclipse.php.perspective" />
<!-- views -->
-
<command
name="%ViewCommand.packageExplorer.name"
description="%ViewCommand.packageExplorer.description"
categoryId="org.eclipse.ui.category.views"
- id="org.eclipse.php.ui.explorer">
- </command>
+ id="org.eclipse.php.ui.explorer" />
+
<!-- refactoring -->
<command
name="%ActionDefinition.renameElement.name"
description="%ActionDefinition.renameElement.description"
categoryId="org.eclipse.php.ui.category.refactoring"
- id="org.eclipse.php.ui.edit.text.rename.element">
- </command>
+ id="org.eclipse.php.ui.edit.text.rename.element" />
<command
name="%ActionDefinition.moveElement.name"
description="%ActionDefinition.moveElement.description"
categoryId="org.eclipse.php.ui.category.refactoring"
- id="org.eclipse.php.ui.edit.text.move.element">
- </command>
+ id="org.eclipse.php.ui.edit.text.move.element" />
<command
name="%ActionDefinition.openEditor.name"
description="%ActionDefinition.openEditor.description"
categoryId="org.eclipse.ui.category.navigate"
- id="org.eclipse.php.ui.edit.text.open.editor">
- </command>
-
+ id="org.eclipse.php.ui.edit.text.open.editor" />
+ <command
+ name="open declaration"
+ description="open declaration"
+ categoryId="org.eclipse.ui.category.navigate"
+ id="org.eclipse.php.ui.edit.text.OpenDeclaration" />
<command
name="%command.openType.name"
description="%command.openType.description"
categoryId="org.eclipse.ui.category.navigate"
- id="org.eclipse.php.ui.navigate.open.type">
- </command>
+ id="org.eclipse.php.ui.navigate.open.type" />
<command
name="%command.openFunctionsManual.name"
description="%command.openFunctionsManual.description"
categoryId="org.eclipse.php.ui.category.source"
- id="org.eclipse.php.ui.edit.OpenFunctionsManualAction"/>
+ id="org.eclipse.php.ui.edit.OpenFunctionsManualAction" />
+ <command
+ categoryId="org.eclipse.ui.category.edit"
+ description="Show Tooltip Description"
+ id="org.eclipse.php.ui.edit.text.show.phpdoc"
+ name="Show Tooltip Description" />
+ <command
+ categoryId="org.eclipse.ui.category.navigate"
+ description="%ActionDefinition.gotoMatchingBracket.description"
+ id="org.eclipse.php.ui.editor.goto.matching.bracket"
+ name="%ActionDefinition.gotoMatchingBracket.name" />
<command
- categoryId="org.eclipse.ui.category.edit"
- description="Show Tooltip Description"
- id="org.eclipse.php.ui.edit.text.show.phpdoc"
- name="Show Tooltip Description"/>
+ id="org.eclipse.php.ui.NewUntitledPHPDocumentAction"
+ name="New Untitled PHP Document">
+ </command>
</extension>
<extension point="org.eclipse.ui.bindings">
- <!-- win32: M1=CTRL, M2=SHIFT, M3=ALT, M4=-
- carbon: M1=COMMAND, M2=SHIFT, M3=ALT, M4=CTRL -->
-
+ <!--
+ win32: M1=CTRL, M2=SHIFT, M3=ALT, M4=-
+ carbon: M1=COMMAND, M2=SHIFT, M3=ALT, M4=CTRL
+ -->
<key
sequence="M1+/"
contextId="org.eclipse.php.ui.phpEditorScope"
commandId="org.eclipse.php.ui.edit.text.toggle.comment"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" />
-
-
+ <key
+ platform="gtk"
+ sequence="ESC CTRL+C"
+ contextId="org.eclipse.php.ui.phpEditorScope"
+ commandId="org.eclipse.php.ui.edit.text.toggle.comment"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" />
<key
sequence="M1+M2+/"
contextId="org.eclipse.php.ui.phpEditorScope"
@@ -693,49 +665,77 @@
commandId="org.eclipse.php.ui.edit.text.remove.block.comment"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" />
-
<!-- refactoring -->
<key
- sequence="M2+M3+R"
- commandId="org.eclipse.php.ui.edit.text.rename.element"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" />
+ commandId="org.eclipse.php.ui.edit.text.rename.element"
+ contextId="org.eclipse.php.ui.contexts.window"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="M2+M3+R"/>
+ <key
+ commandId="org.eclipse.php.ui.edit.text.rename.element"
+ contextId="org.eclipse.php.ui.phpEditorScope"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="M2+M3+R">
+ </key>
<key
- platform="carbon"
- sequence="M2+M3+R"
- commandId=""
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" />
+ platform="carbon"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="M2+M3+R"/>
<key
- platform="carbon"
- sequence="COMMAND+ALT+R"
- commandId="org.eclipse.php.ui.edit.text.rename.element"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" />
-
+ commandId="org.eclipse.php.ui.edit.text.rename.element"
+ contextId="org.eclipse.php.ui.contexts.window"
+ platform="carbon"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="COMMAND+ALT+R"/>
+ <key
+ commandId="org.eclipse.php.ui.edit.text.rename.element"
+ contextId="org.eclipse.php.ui.phpEditorScope"
+ platform="carbon"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="COMMAND+ALT+R">
+ </key>
<key
- sequence="M2+M3+V"
- commandId="org.eclipse.php.ui.edit.text.move.element"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" />
+ commandId="org.eclipse.php.ui.edit.text.move.element"
+ contextId="org.eclipse.php.ui.contexts.window"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="M2+M3+V"/>
+ <key
+ commandId="org.eclipse.php.ui.edit.text.move.element"
+ contextId="org.eclipse.php.ui.phpEditorScope"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="M2+M3+V">
+ </key>
<key
platform="carbon"
sequence="M2+M3+V"
commandId=""
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" />
<key
- platform="carbon"
- sequence="COMMAND+ALT+V"
- commandId="org.eclipse.php.ui.edit.text.move.element"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" />
-
+ commandId="org.eclipse.php.ui.edit.text.move.element"
+ contextId="org.eclipse.php.ui.contexts.window"
+ platform="carbon"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="COMMAND+ALT+V"/>
+ <key
+ commandId="org.eclipse.php.ui.edit.text.move.element"
+ contextId="org.eclipse.php.ui.phpEditorScope"
+ platform="carbon"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="COMMAND+ALT+V">
+ </key>
<key
sequence="F3"
commandId="org.eclipse.php.ui.edit.text.open.editor"
+ contextId="org.eclipse.php.ui.contexts.window"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" />
+ <key
+ sequence="F3"
+ commandId="org.eclipse.php.ui.edit.text.OpenDeclaration"
contextId="org.eclipse.php.ui.phpEditorScope"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" />
<!-- project -->
-
-
<!-- perspectives -->
-
<!-- views -->
<key
sequence="M2+M3+Q P"
@@ -751,109 +751,128 @@
sequence="COMMAND+ALT+Q P"
commandId="org.eclipse.php.ui.explorer"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" />
-
<key
sequence="M3+M2+G"
commandId="org.eclipse.php.ui.navigate.open.type"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" />
-
- <key
- sequence="M2+F2"
- commandId="org.eclipse.php.ui.edit.OpenFunctionsManualAction"
+ <key
+ sequence="M2+F2"
+ commandId="org.eclipse.php.ui.edit.OpenFunctionsManualAction"
contextId="org.eclipse.php.ui.phpEditorScope"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
- <key
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" />
+ <key
sequence="M1+M2+F"
- contextId="org.eclipse.php.ui.phpEditorScope"
+ contextId="org.eclipse.php.ui.phpEditorScope"
+ commandId="org.eclipse.wst.sse.ui.format.document"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" />
+ <key
+ sequence="M1+I"
+ commandId="org.eclipse.wst.sse.ui.format.active.elements"
+ contextId="org.eclipse.php.ui.phpEditorScope"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" />
+ <key
+ platform="gtk"
+ sequence="ESC CTRL+F"
+ contextId="org.eclipse.php.ui.phpEditorScope"
commandId="org.eclipse.wst.sse.ui.format.document"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
- <key
- commandId="org.eclipse.php.ui.edit.text.show.phpdoc"
- contextId="org.eclipse.php.ui.phpEditorScope"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="F2"/>
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" />
+ <key
+ commandId="org.eclipse.php.ui.edit.text.show.phpdoc"
+ contextId="org.eclipse.php.ui.phpEditorScope"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="F2" />
+ <key
+ commandId="org.eclipse.php.ui.editor.goto.matching.bracket"
+ contextId="org.eclipse.php.ui.phpEditorScope"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="M1+M2+P" />
</extension>
<extension point="org.eclipse.ui.preferencePages">
<page
- class="org.eclipse.php.internal.ui.preferences.PHPBasePreferencePage"
- id="org.eclipse.php.ui.preferences.ui.PHPBasePreferencePage"
- name="%phpPageName">
+ class="org.eclipse.php.internal.ui.preferences.PHPBasePreferencePage"
+ id="org.eclipse.php.ui.preferences.PHPBasePreferencePage"
+ name="%phpPageName">
<keywordReference id="org.eclipse.php.ui.general" />
</page>
<page
- category="org.eclipse.php.ui.preferences.ui.PHPBasePreferencePage"
- class="org.eclipse.php.ui.preferences.ui.PHPEditorPreferencePage"
- id="org.eclipse.php.ui.preferences.ui.PHPEditorPreferencePage"
+ category="org.eclipse.php.ui.preferences.PHPBasePreferencePage"
+ class="org.eclipse.php.internal.ui.preferences.PHPEditorPreferencePage"
+ id="org.eclipse.php.ui.preferences.PHPEditorPreferencePage"
name="%phpEditorPageName">
<keywordReference id="org.eclipse.php.ui.editor" />
</page>
<page
- category="org.eclipse.php.ui.preferences.ui.PHPBasePreferencePage"
- class="org.eclipse.php.ui.preferences.ui.PHPTemplatesPreferencePage"
- id="org.eclipse.php.ui.preferences.ui.PHPTemplatesPreferencePage"
+ category="org.eclipse.php.ui.preferences.PHPBasePreferencePage"
+ class="org.eclipse.php.internal.ui.preferences.PHPTemplatesPreferencePage"
+ id="org.eclipse.php.ui.preferences.PHPTemplatesPreferencePage"
name="%templatesPreferencePageName">
<keywordReference id="org.eclipse.php.ui.templates" />
</page>
<page
- category="org.eclipse.php.ui.preferences.ui.PHPBasePreferencePage"
+ category="org.eclipse.php.ui.preferences.PHPBasePreferencePage"
class="org.eclipse.php.internal.ui.preferences.PHPInterpreterPreferencePage"
- id="org.eclipse.php.internal.ui.preferences.PHPInterpreterPreferencePage"
+ id="org.eclipse.php.ui.preferences.PHPInterpreterPreferencePage"
name="%phpInterpreterPreferenceName">
<keywordReference id="org.eclipse.php.ui.phpInterpreter" />
</page>
<page
- category="org.eclipse.php.ui.preferences.ui.PHPEditorPreferencePage"
- class="org.eclipse.php.ui.preferences.ui.PHPColorPage"
- id="org.eclipse.php.ui.preferences.ui.PHPColorPage"
+ category="org.eclipse.php.ui.preferences.PHPEditorPreferencePage"
+ class="org.eclipse.php.internal.ui.preferences.PHPSyntaxColoringPage"
+ id="org.eclipse.php.ui.preferences.PHPColorPage"
name="%syntaxColoringPreferencePageName" />
<page
- category="org.eclipse.php.ui.preferences.ui.PHPEditorPreferencePage"
- class="org.eclipse.php.ui.preferences.ui.PHPCodeAssistPreferencePage"
- id="org.eclipse.php.ui.preferences.ui.PHPCodeAssistPreferencePage"
+ category="org.eclipse.php.ui.preferences.PHPEditorPreferencePage"
+ class="org.eclipse.php.internal.ui.preferences.PHPContentAssistPreferencePage"
+ id="org.eclipse.php.ui.preferences.PHPContentAssistPreferencePage"
name="%codeAssistPreferencePageName" />
<page
- category="org.eclipse.php.ui.preferences.ui.PHPEditorPreferencePage"
- class="org.eclipse.php.ui.preferences.ui.PHPFoldingPreferencePage"
+ category="org.eclipse.php.ui.preferences.PHPEditorPreferencePage"
+ class="org.eclipse.php.internal.ui.preferences.PHPFoldingPreferencePage"
id="org.eclipse.php.ui.preferences.PHPFoldingPreferencePage"
name="%editorFoldingPageName">
<keywordReference id="org.eclipse.php.ui.folding" />
</page>
<page
- category="org.eclipse.php.ui.preferences.ui.PHPEditorPreferencePage"
- class="org.eclipse.php.ui.preferences.ui.PhpTypingPreferencePage"
+ category="org.eclipse.php.ui.preferences.PHPEditorPreferencePage"
+ class="org.eclipse.php.internal.ui.preferences.PhpTypingPreferencePage"
id="org.eclipse.php.ui.preferences.PhpTypingPreferencePage"
name="%editorTypingPageName">
<keywordReference id="org.eclipse.php.ui.typing" />
</page>
<page
- category="org.eclipse.php.ui.preferences.ui.PHPEditorPreferencePage"
+ category="org.eclipse.php.ui.preferences.PHPEditorPreferencePage"
class="org.eclipse.php.internal.ui.preferences.TodoTaskPreferencePage"
id="org.eclipse.php.ui.preferences.TodoTaskPreferencePage"
name="%todoTaskPrefName" />
<page
- category="org.eclipse.php.ui.preferences.ui.PHPEditorPreferencePage"
+ category="org.eclipse.php.ui.preferences.PHPEditorPreferencePage"
class="org.eclipse.php.internal.ui.preferences.PHPEditorHoverPreferencePage"
- id="org.eclipse.php.internal.ui.preferences.PHPEditorHoverPreferencePage"
+ id="org.eclipse.php.ui.preferences.PHPEditorHoverPreferencePage"
name="%editorTextHoverPageName">
<keywordReference id="org.eclipse.php.ui.hover" />
</page>
<page
- category="org.eclipse.php.ui.preferences.ui.PHPBasePreferencePage"
- class="org.eclipse.php.ui.preferences.includepath.IncludePathVarsPreferencePage"
+ category="org.eclipse.php.ui.preferences.PHPBasePreferencePage"
+ class="org.eclipse.php.internal.ui.preferences.includepath.IncludePathVarsPreferencePage"
id="org.eclipse.php.ui.preferences.IncludePathVariables"
name="%includePathVariables" />
- <page
- category="org.eclipse.php.ui.preferences.ui.PHPBasePreferencePage"
- class="org.eclipse.php.internal.ui.preferences.PHPManualPreferencePage"
- id="org.eclipse.php.internal.ui.preferences.PHPManualPreferencePage"
- name="%functionsManualPageName">
- <keywordReference id="org.eclipse.php.ui.functionsManual"/>
- </page>
- <page
- category="org.eclipse.php.ui.preferences.ui.PHPBasePreferencePage"
- class="org.eclipse.php.internal.ui.preferences.PHPFormatterPreferencePage"
- id="org.eclipse.php.internal.ui.preferences.PHPFormatterPreferencePage"
- name="%formatterPreferencePageName"/>
+ <page
+ category="org.eclipse.php.ui.preferences.PHPBasePreferencePage"
+ class="org.eclipse.php.internal.ui.preferences.PHPManualPreferencePage"
+ id="org.eclipse.php.ui.preferences.PHPManualPreferencePage"
+ name="%functionsManualPageName">
+ <keywordReference id="org.eclipse.php.ui.functionsManual" />
+ </page>
+ <page
+ category="org.eclipse.php.ui.preferences.PHPBasePreferencePage"
+ class="org.eclipse.php.internal.ui.preferences.PHPFormatterPreferencePage"
+ id="org.eclipse.php.ui.preferences.PHPFormatterPreferencePage"
+ name="%formatterPreferencePageName" />
+ <page
+ category="org.eclipse.php.ui.preferences.PHPBasePreferencePage"
+ class="org.eclipse.php.internal.ui.preferences.PHPAppearancePreferencePage"
+ id="org.eclipse.php.ui.preferences.PHPAppearancePreferencePage"
+ name="%phpAppearancePageName" />
</extension>
<extension point="org.eclipse.ui.keywords">
@@ -871,39 +890,27 @@
id="org.eclipse.php.ui.functionsManual" />
</extension>
- <!-- this makes "run as" show up in php explorer-->
- <extension point="org.eclipse.core.runtime.adapters">
- <factory
- class=""
- adaptableType="org.eclipse.php.core.phpModel.parser.PHPCodeDataFactory$PHPFileDataImp">
- <adapter type="org.eclipse.debug.ui.actions.ILaunchable" />
- </factory>
- </extension>
- <extension
- point="org.eclipse.core.filebuffers.annotationModelCreation">
- </extension>
-
- <!-- =========================================================================== -->
- <!-- History & Others Working Set -->
- <!-- =========================================================================== -->
+ <!--History & Others Working Set:-->
<extension point="org.eclipse.ui.workingSets">
<workingSet
name="%HistoryWorkingSetWizardPage.name"
icon="icons/full/obj16/history_working_set_obj.gif"
- updaterClass="org.eclipse.php.ui.workingset.HistoryWorkingSetUpdater"
- id="org.eclipse.php.ui.HistoryWorkingSet">
- </workingSet>
+ updaterClass="org.eclipse.php.internal.ui.workingset.HistoryWorkingSetUpdater"
+ id="org.eclipse.php.ui.HistoryWorkingSet" />
<workingSet
name="%OthersWorkingSetWizardPage.name"
icon="icons/full/obj16/jworkingSet_obj.gif"
- updaterClass="org.eclipse.php.ui.workingset.OthersWorkingSetUpdater"
- id="org.eclipse.php.ui.OthersWorkingSet">
- </workingSet>
+ updaterClass="org.eclipse.php.internal.ui.workingset.OthersWorkingSetUpdater"
+ id="org.eclipse.php.ui.OthersWorkingSet" />
+ <workingSet
+ name="%PHPWorkingSetPage.name"
+ pageClass="org.eclipse.php.internal.ui.workingset.PHPWorkingSetPage"
+ updaterClass="org.eclipse.php.internal.ui.workingset.PHPWorkingSetUpdater"
+ icon="icons/full/obj16/jworkingSet_obj.gif"
+ id="org.eclipse.php.ui.workingset.PHPWorkingSetPage" />
</extension>
- <!-- =========================================================================== -->
- <!-- Filter Support -->
- <!-- =========================================================================== -->
+ <!--Filter Support:-->
<extension point="org.eclipse.php.ui.phpElementFilters">
<!-- PHP Explorer -->
<filter
@@ -911,97 +918,86 @@
name="%HideSystemFiles.label"
enabled="true"
description="%HideSystemFiles.description"
- pattern=".*">
- </filter>
+ class="org.eclipse.php.internal.ui.filters.SystemFilesFilter"
+ id="org.eclipse.php.ui.explorer.SystemFilesFilter" />
<filter
targetId="org.eclipse.php.ui.explorer"
name="%HideNonPHPElements.label"
enabled="false"
description="%HideNonPHPElements.description"
- class="org.eclipse.php.ui.filters.NonPHPElementFilter"
- id="org.eclipse.php.ui.explorer.NonPHPElementFilter">
- </filter>
-
+ class="org.eclipse.php.internal.ui.filters.NonPHPElementFilter"
+ id="org.eclipse.php.ui.explorer.NonPHPElementFilter" />
<filter
targetId="org.eclipse.php.ui.explorer"
name="%HidePHPFiles.label"
enabled="false"
description="%HidePHPFiles.description"
- class="org.eclipse.php.ui.filters.PHPFileFilter"
- id="org.eclipse.php.ui.explorer.PHPFileFilter">
- </filter>
+ class="org.eclipse.php.internal.ui.filters.PHPFileFilter"
+ id="org.eclipse.php.ui.explorer.PHPFileFilter" />
<filter
targetId="org.eclipse.php.ui.explorer"
name="%HideNonPHPProjects.label"
enabled="false"
description="%HideNonPHPProjects.description"
- class="org.eclipse.php.ui.filters.NonPHPProjectsFilter"
- id="org.eclipse.php.ui.explorer.NonPHPProjectsFilter">
- </filter>
+ class="org.eclipse.php.internal.ui.filters.NonPHPProjectsFilter"
+ id="org.eclipse.php.ui.explorer.NonPHPProjectsFilter" />
<filter
targetId="org.eclipse.php.ui.explorer"
name="%HideNonSharedProjects.label"
enabled="false"
description="%HideNonSharedProjects.description"
- class="org.eclipse.php.ui.filters.NonSharedProjectFilter"
- id="org.eclipse.php.ui.explorer.NonSharedProjectsFilter">
- </filter>
+ class="org.eclipse.php.internal.ui.filters.NonSharedProjectFilter"
+ id="org.eclipse.php.ui.explorer.NonSharedProjectsFilter" />
<filter
targetId="org.eclipse.php.ui.explorer"
name="%HideClosedProjects.label"
enabled="false"
description="%HideClosedProjects.description"
- class="org.eclipse.php.ui.filters.ClosedProjectFilter"
- id="org.eclipse.php.ui.explorer.ClosedProjectsFilter">
- </filter>
+ class="org.eclipse.php.internal.ui.filters.ClosedProjectFilter"
+ id="org.eclipse.php.ui.explorer.ClosedProjectsFilter" />
<filter
targetId="org.eclipse.php.ui.explorer"
name="%HideVariables.label"
enabled="false"
description="%HideVariables.description"
- class="org.eclipse.php.ui.filters.VariablesFilter"
- id="org.eclipse.php.ui.explorer.VariablesFilter">
- </filter>
-
+ class="org.eclipse.php.internal.ui.filters.VariablesFilter"
+ id="org.eclipse.php.ui.explorer.VariablesFilter" />
<filter
targetId="org.eclipse.php.ui.explorer"
name="%HideNonPublic.label"
enabled="false"
description="%HideNonPublic.description"
- class="org.eclipse.php.ui.filters.NonPublicFilter"
- id="org.eclipse.php.ui.explorer.NonPublicFilter">
- </filter>
-
+ class="org.eclipse.php.internal.ui.filters.NonPublicFilter"
+ id="org.eclipse.php.ui.explorer.NonPublicFilter" />
<filter
targetId="org.eclipse.php.ui.explorer"
name="%HideHTMLFiles.label"
enabled="false"
description="%HideHTMLFiles.description"
- class="org.eclipse.php.ui.filters.PHPContentTypeFilter"
+ class="org.eclipse.php.internal.ui.filters.PHPContentTypeFilter"
id="org.eclipse.php.ui.explorer.PHPHTMLFilter"
- pattern="org.eclipse.wst.html.core.htmlsource">
- </filter>
-
+ pattern="org.eclipse.wst.html.core.htmlsource" />
<filter
targetId="org.eclipse.php.ui.explorer"
name="Server Projects"
enabled="true"
description="Server Projects"
- class="org.eclipse.php.ui.filters.ServerProjectFilter"
- id="org.eclipse.php.ui.explorer.ServerProjectFilter">
- </filter>
-
- </extension>
- <extension point="org.eclipse.search.searchResultViewPages">
- <viewPage
- class="org.eclipse.php.ui.search.PHPSearchResultPage"
- id="org.eclipse.php.ui.PHPSearchResultPage"
- searchResultClass="org.eclipse.php.ui.search.PHPSearchResult" />
+ class="org.eclipse.php.internal.ui.filters.ServerProjectFilter"
+ id="org.eclipse.php.ui.explorer.ServerProjectFilter" />
+ <filter
+ class="org.eclipse.php.internal.ui.filters.RSEProjectFilter"
+ description="Filter out an RSE temporary project"
+ enabled="true"
+ id="org.eclipse.php.ui.explorer.RSEProjectFilter"
+ name="RSE Temp Project"
+ targetId="org.eclipse.php.ui.explorer">
+ </filter>
</extension>
+
<extension point="org.eclipse.search.searchPages">
<page
canSearchEnclosingProjects="true"
- class="org.eclipse.php.ui.search.PHPSearchPage"
+ class="org.eclipse.php.internal.ui.search.PHPSearchPage"
extensions="php:90, inc:90"
icon="icons/full/obj16/php_search_obj.gif"
id="org.eclipse.php.ui.PHPSearchPage"
@@ -1009,44 +1005,14 @@
showScopeSection="true"
sizeHint="460,160" />
</extension>
- <extension point="org.eclipse.ui.actionSets">
- <actionSet
- id="org.eclipse.php.ui.SearchActionSet"
- label="%PHPSearchActionSet.label"
- visible="false">
- <action
- class="org.eclipse.php.ui.search.OpenPHPSearchPageAction"
- helpContextId="php_search_action_context"
- icon="icons/full/obj16/php_search_obj.gif"
- id="org.eclipse.php.ui.actions.OpenPHPSearchPage"
- label="%openPHPSearchPageAction.label"
- menubarPath="org.eclipse.search.menu/dialogGroup" />
- </actionSet>
- </extension>
- <extension point="org.eclipse.core.runtime.adapters">
- <factory
- adaptableType="org.eclipse.php.core.phpModel.phpElementData.CodeData"
- class="org.eclipse.php.ui.CodeDataAdapterFactory">
- <adapter type="org.eclipse.core.resources.IResource" />
- </factory>
- </extension>
-
-
-
+ <extension point="org.eclipse.search.searchResultViewPages">
+ <viewPage
+ class="org.eclipse.php.internal.ui.search.PHPSearchResultPage"
+ id="org.eclipse.php.ui.PHPSearchResultPage"
+ searchResultClass="org.eclipse.php.internal.ui.search.PHPSearchResult" />
+ </extension>
- <!-- extension point="org.eclipse.ui.editorActions">
- <editorContribution
- id="org.eclipse.ui.texteditor.ruler.actions"
- targetID="org.eclipse.php.editor">
- <action
- actionID="RulerDoubleClick"
- class="org.eclipse.ui.texteditor.BookmarkRulerAction"
- helpContextId="org.eclipse.ui.bookmark_action_context"
- id="org.eclipse.ui.texteditor.BookmarkRulerAction"
- label="%DummyLabel" />
- </editorContribution>
- </extension -->
<extension point="org.eclipse.ui.popupMenus">
<viewerContribution
id="org.eclipse.php.ui.PHPStructuredEditorPopupActions"
@@ -1067,34 +1033,40 @@
tooltip="%AddBookmark.tooltip" />
</viewerContribution>
<objectContribution
- objectClass="org.eclipse.php.core.phpModel.phpElementData.PHPCodeData"
+ objectClass="org.eclipse.php.internal.core.phpModel.phpElementData.PHPCodeData"
id="org.eclipse.php.ui.codeDataContribution">
- <filter name="addDescriptionEnabled" value="true"/>
+ <filter
+ name="actionFilterContributorId"
+ value="org.eclipse.php.ui.phpCodeData.CodeDataActionFilterContributor" />
<menu
label="%Source"
path="additions"
id="source">
- <groupMarker name="sourceGroup"></groupMarker>
+ <groupMarker name="sourceGroup" />
</menu>
<action
label="%action.addDescription.name"
- class="org.eclipse.php.ui.actions.AddDescriptionAction"
+ class="org.eclipse.php.internal.ui.actions.AddDescriptionAction"
menubarPath="source/sourceGroup"
- enablesFor="1"
id="org.eclipse.php.ui.actions.AddDescriptionAction">
<enablement>
- <objectState name="addDescriptionVisible" value="true"/>
+ <objectState
+ name="actionFilterContributorId"
+ value="org.eclipse.php.ui.phpCodeData.AddPHPDocActionFilterContributor" />
</enablement>
</action>
</objectContribution>
</extension>
- <extension point="org.eclipse.core.runtime.adapters">
- <factory adaptableType="org.eclipse.php.core.phpModel.phpElementData.PHPCodeData" class="org.eclipse.php.ui.phpCodeData.PhpCodeDataAdapterFactory">
- <adapter type="org.eclipse.ui.IActionFilter"/>
- </factory>
+
+ <extension point="org.eclipse.php.ui.actionFilterContributors">
+ <contributor
+ class="org.eclipse.php.internal.ui.phpCodeData.AddPHPDocActionFilterContributor"
+ id="org.eclipse.php.ui.phpCodeData.AddPHPDocActionFilterContributor" />
+ <contributor
+ class="org.eclipse.php.internal.ui.phpCodeData.CodeDataActionFilterContributor"
+ id="org.eclipse.php.ui.phpCodeData.CodeDataActionFilterContributor" />
</extension>
-
-
+
<extension point="org.eclipse.php.ui.foldingStructureProviders">
<provider
class="org.eclipse.php.internal.ui.folding.DefaultPHPFoldingStructureProvider"
@@ -1103,148 +1075,130 @@
preferencesClass="org.eclipse.php.internal.ui.folding.DefaultPHPFoldingPreferenceBlock" />
</extension>
- <extension point="org.eclipse.ui.views">
- <category
- name="PHP Tools"
- id="org.eclipse.php.ui.views">
- </category>
-<!--
- <view
- name="PHP Manual"
- category="org.eclipse.php.ui.views"
- class=" org.eclipse.php.ui.manualView.ManualPart"
- id="org.eclipse.php.ui.manualPart"
- icon="icons/full/obj16/phpfile.gif">
- </view>
--->
- </extension>
-
<extension point="org.eclipse.core.runtime.preferences">
- <initializer
- class="org.eclipse.php.ui.preferences.PHPUIPreferenceInitializer" />
+ <initializer class="org.eclipse.php.internal.ui.preferences.PHPUIPreferenceInitializer" />
</extension>
-
- <extension point="org.eclipse.php.ui.phpTreeContentProvider">
- <phpTreeContentProvider
- class="org.eclipse.php.ui.treecontent.IncludePathTreeContent"
+ <extension point="org.eclipse.php.ui.phpTreeContentProviders">
+ <provider
+ class="org.eclipse.php.internal.ui.treecontent.IncludePathTreeContent"
targetId="org.eclipse.php.ui.explorer" />
</extension>
- <!-- =========================== -->
- <!-- PHP Editor Text Hovers -->
- <!-- =========================== -->
+ <!--PHP Editor Text Hovers:-->
<extension point="org.eclipse.php.ui.phpEditorTextHovers">
- <hover
- label="%sequentialHover"
- description="%sequentialHoverDescription"
- class="org.eclipse.php.ui.editor.hover.BestMatchHover"
- id="org.eclipse.php.ui.editor.hover.BestMatchHover">
- </hover>
- <hover
- label="%problemHover"
- description="%problemHoverDescription"
- class="org.eclipse.php.ui.editor.hover.ProblemHover"
- id="org.eclipse.php.ui.editor.hover.ProblemHover">
- </hover>
- <hover
- label="%annotationHover"
- description="%annotationHoverDescription"
- class="org.eclipse.php.ui.editor.hover.PHPAnnotationTextHover"
- id="org.eclipse.php.ui.editor.hover.PHPAnnotationTextHover">
- </hover>
- <hover
- label="%sourceHover"
- description="%sourceHoverDescription"
- class="org.eclipse.php.ui.editor.hover.PHPSourceTextHover"
- id="org.eclipse.php.ui.editor.hover.PHPSourceTextHover">
- </hover>
- </extension>
-
-<!-- =========================================================================== -->
-<!-- PHP Working Set -->
-<!-- =========================================================================== -->
- <extension
- point="org.eclipse.ui.workingSets">
- <workingSet
- name="%PHPWorkingSetPage.name"
- pageClass="org.eclipse.php.ui.workingset.PHPWorkingSetPage"
- updaterClass="org.eclipse.php.ui.workingset.PHPWorkingSetUpdater"
- icon="icons/full/obj16/jworkingSet_obj.gif"
- id="org.eclipse.php.ui.workingset.PHPWorkingSetPage">
- </workingSet>
- </extension>
- <extension
- point="org.eclipse.ui.ide.projectNatureImages">
- <image
- icon="icons/full/ovr16/php_ovr.gif"
- id="org.eclipse.php.ui.PHPProjectNatureImage"
- natureId="org.eclipse.php.core.PHPNature"/>
- </extension>
-
- <!-- ========================================================= //-->
- <!-- PHP Manual Directors //-->
- <!-- ========================================================= //-->
- <extension point="org.eclipse.php.ui.phpManualDirectors">
- <director id="org.eclipse.php.ui.phpManualDirector" label="Default PHP Manual Director">
- <element name="else" path="control-structures.%NAME.%EXT"/>
- <element name="elseif" path="control-structures.%NAME.%EXT"/>
- <element name="while" path="control-structures.%NAME.%EXT"/>
- <element name="do-while" path="control-structures.%NAME.%EXT"/>
- <element name="for" path="control-structures.%NAME.%EXT"/>
- <element name="foreach" path="control-structures.%NAME.%EXT"/>
- <element name="break" path="control-structures.%NAME.%EXT"/>
- <element name="continue" path="control-structures.%NAME.%EXT"/>
- <element name="switch" path="control-structures.%NAME.%EXT"/>
- <element name="declare" path="control-structures.%NAME.%EXT"/>
- <element name="__line__" path="language.constants.predefined.%EXT"/>
- <element name="__file__" path="language.constants.predefined.%EXT"/>
- <element name="__function__" path="language.constants.predefined.%EXT"/>
- <element name="__class__" path="language.constants.predefined.%EXT"/>
- <element name="__method__" path="language.constants.predefined.%EXT"/>
- <element name="final" path="language.oop5.final.%EXT"/>
- <element name="abstract" path="language.oop5.abstract.%EXT"/>
- <element name="extends" path="keyword.extends.%EXT"/>
- <element name="clone" path="language.oop5.cloning.%EXT"/>
- <element name="global" path="language.variables.scope.%EXT"/>
- <element name="if" path="language.control-structures.%EXT#control-structures.if"/>
- <element name="class" path="language.oop.%EXT#keyword.class"/>
- <element name="parent" path="keyword.parent.%EXT"/>
- <element name="function" path="language.functions.%EXT"/>
- <element name="_" path="function.gettext.%EXT"/>
- <element name="interface" path="language.oop5.interfaces.%EXT"/>
- <element name="implements" path="language.oop5.interfaces.%EXT"/>
- <element name="public" path="language.oop5.visibility.%EXT"/>
- <element name="private" path="language.oop5.visibility.%EXT"/>
- <element name="protected" path="language.oop5.visibility.%EXT"/>
- <element name="try" path="language.exceptions.%EXT"/>
- <element name="catch" path="language.exceptions.%EXT"/>
- <element name="throw" path="language.exceptions.%EXT"/>
- <element name="old_function" path="migration.old-function.%EXT"/>
- <element name="cfunction" path="migration.old-function.%EXT"/>
- <element name="*" path="function.%NAME.%EXT"/>
- </director>
+ <hover
+ class="org.eclipse.php.internal.ui.editor.hover.BestMatchHover"
+ description="%sequentialHoverDescription"
+ id="org.eclipse.php.ui.editor.hover.BestMatchHover"
+ label="%sequentialHover"
+ priority="1000" />
+ <hover
+ class="org.eclipse.php.internal.ui.editor.hover.ProblemHover"
+ description="%problemHoverDescription"
+ id="org.eclipse.php.ui.editor.hover.ProblemHover"
+ label="%problemHover"
+ priority="500" />
+ <hover
+ class="org.eclipse.php.internal.ui.editor.hover.PHPAnnotationTextHover"
+ description="%annotationHoverDescription"
+ id="org.eclipse.php.ui.editor.hover.PHPAnnotationTextHover"
+ label="%annotationHover"
+ priority="400" />
+ <hover
+ class="org.eclipse.php.internal.ui.editor.hover.PHPSourceTextHover"
+ description="%sourceHoverDescription"
+ id="org.eclipse.php.ui.editor.hover.PHPSourceTextHover"
+ label="%sourceHover"
+ priority="300" />
+ </extension>
+
+ <!--PHP Working Set:-->
+ <extension point="org.eclipse.ui.ide.projectNatureImages">
+ <image
+ icon="icons/full/ovr16/php_ovr.gif"
+ id="org.eclipse.php.ui.PHPProjectNatureImage"
+ natureId="org.eclipse.php.core.PHPNature" />
+ </extension>
+
+ <!--PHP Manual Sites:-->
+ <extension point="org.eclipse.php.ui.phpManualSites">
+ <site
+ extension="php"
+ id="org.eclipse.php.ui.phpDotNet"
+ label="PHP.net"
+ url="http://www.php.net/manual/en/" />
+ </extension>
+
+ <extension point="org.eclipse.ui.exportWizards">
+ <category
+ id="org.eclipse.php.ui.PHP"
+ name="PHP" />
+ </extension>
+ <extension point="org.eclipse.ui.themes">
+ <themeElementCategory
+ id="org.eclipse.php.ui.themePHP"
+ label="PHP" />
</extension>
- <extension
- point="org.eclipse.php.ui.phpManualSites">
- <site
- director="org.eclipse.php.ui.phpManualDirector"
- extension="php"
- id="org.eclipse.php.ui.phpDotNet"
- label="PHP.net"
- url="http://www.php.net/manual/en/"/>
- </extension>
- <extension
- point="org.eclipse.ui.exportWizards">
- <category
- id="org.eclipse.php.ui.PHP"
- name="PHP"/>
- </extension>
- <extension
- point="org.eclipse.ui.themes">
- <themeElementCategory
- id="org.eclipse.php.ui.themePHP"
- label="PHP"/>
- </extension>
-
+ <extension point="org.eclipse.ui.decorators">
+ <decorator
+ adaptable="true"
+ class="org.eclipse.php.internal.ui.util.ProblemsLabelDecorator"
+ id="org.eclipse.php.ui.problemsDecorator"
+ label="PHP Problem Decorator"
+ lightweight="true"
+ location="BOTTOM_LEFT"
+ objectClass="org.eclipse.core.resources.IResource"
+ state="true"/>
+ </extension>
+ <extension point="org.eclipse.ui.ide.markerSupport">
+ <markerTypeCategory name="%PhpProblemFilterCategory.name">
+ <markerTypeReference id="org.eclipse.php.core.phpproblemmarker" />
+ </markerTypeCategory>
+ </extension>
+ <extension point="org.eclipse.php.ui.phpPreferencePageBlocks">
+ <block
+ class="org.eclipse.php.internal.ui.preferences.PHPContentAssistFiltersConfigurationBlock"
+ id="org.eclipse.php.ui.PHPContentAssistPreferencePage.contentAssistFilters"
+ name="org.eclipse.php.ui.PHPContentAssistPreferencePage.200_contentAssistFilters"
+ pageId="org.eclipse.php.ui.preferences.PHPContentAssistPreferencePage" />
+ <block
+ class="org.eclipse.php.internal.ui.preferences.PHPContentAssistOptionsConfigurationBlock"
+ id="org.eclipse.php.ui.PHPContentAssistPreferencePage.contentAssistOptions"
+ name="org.eclipse.php.ui.PHPContentAssistPreferencePage.100_contentAssistOptions"
+ pageId="org.eclipse.php.ui.preferences.PHPContentAssistPreferencePage" />
+ <block
+ class="org.eclipse.php.internal.ui.preferences.PHPContentAssistAutoActivationConfigurationBlock"
+ id="org.eclipse.php.ui.PHPContentAssistPreferencePage.contentAssistAutoActivation"
+ name="org.eclipse.php.ui.PHPContentAssistPreferencePage.300_contentAssistAutoActivation"
+ pageId="org.eclipse.php.ui.preferences.PHPContentAssistPreferencePage" />
+ </extension>
+
+ <extension point="org.eclipse.php.ui.phpActionDelegator">
+ <action
+ actionId="org.eclipse.php.ui.actions.Move"
+ class="org.eclipse.php.internal.ui.actions.ReorgMoveAction"
+ id="org.eclipse.php.ui.reorgMoveAction"
+ priority="10" />
+ </extension>
+ <extension point="org.eclipse.wst.sse.ui.dropTargetTransfers">
+ <dropTargetContribution
+ targetID="org.eclipse.php.editor"
+ id="org.eclipse.php.editor.dropTargetContribution">
+ <dropAction
+ class="org.eclipse.php.internal.ui.IncludeDropAction"
+ transferID="org.eclipse.swt.dnd.FileTransfer"
+ id="org.eclipse.php.internal.ui.IncludeDropAction">
+ </dropAction>
+ </dropTargetContribution>
+ </extension>
+ <extension point = "org.eclipse.compare.contentMergeViewers">
+ <viewer
+ id="org.eclipse.php.internal.ui.compare.PhpMergeViewerCreator"
+ class="org.eclipse.php.internal.ui.compare.PhpMergeViewerCreator"
+ extensions="php"
+ />
+ </extension>
+
+
</plugin>
diff --git a/plugins/org.eclipse.php.ui/src/org/eclipse/php/internal/ui/PHPUiConstants.java b/plugins/org.eclipse.php.ui/src/org/eclipse/php/internal/ui/PHPUiConstants.java
index 36d17b2d0..45600873f 100644
--- a/plugins/org.eclipse.php.ui/src/org/eclipse/php/internal/ui/PHPUiConstants.java
+++ b/plugins/org.eclipse.php.ui/src/org/eclipse/php/internal/ui/PHPUiConstants.java
@@ -16,4 +16,6 @@ public interface PHPUiConstants {
// disable cut/copy/paste/rename etc on php elements within file
public static final boolean DISABLE_ELEMENT_REFACTORING=true;
+ public static final String CONTENT_ASSIST_PROFERENCE_PAGE = "org.eclipse.php.ui.preferences.PHPContentAssistPreferencePage";
+ public static final String RSE_TEMP_PROJECT_NATURE_ID = "org.eclipse.rse.ui.remoteSystemsTempNature"; //$NON-NLS-1$
}
diff --git a/plugins/org.eclipse.php.ui/src/org/eclipse/php/internal/ui/editor/PHPStructuredEditor.java b/plugins/org.eclipse.php.ui/src/org/eclipse/php/internal/ui/editor/PHPStructuredEditor.java
index f66ae2484..1e15faf67 100644
--- a/plugins/org.eclipse.php.ui/src/org/eclipse/php/internal/ui/editor/PHPStructuredEditor.java
+++ b/plugins/org.eclipse.php.ui/src/org/eclipse/php/internal/ui/editor/PHPStructuredEditor.java
@@ -50,7 +50,9 @@ import org.eclipse.php.internal.core.preferences.PreferencesPropagatorEvent;
import org.eclipse.php.internal.core.project.properties.handlers.PhpVersionChangedHandler;
import org.eclipse.php.internal.core.resources.ExternalFileDecorator;
import org.eclipse.php.internal.core.resources.ExternalFilesRegistry;
+import org.eclipse.php.internal.ui.Logger;
import org.eclipse.php.internal.ui.PHPUIMessages;
+import org.eclipse.php.internal.ui.PHPUiConstants;
import org.eclipse.php.internal.ui.PHPUiPlugin;
import org.eclipse.php.internal.ui.actions.*;
import org.eclipse.php.internal.ui.editor.hover.SourceViewerInformationControl;
@@ -1095,7 +1097,7 @@ public class PHPStructuredEditor extends StructuredTextEditor {
resAction = new InformationDispatchAction(PHPUIMessages.getBundleForConstructedKeys(), "ShowPHPDoc.", (TextOperationAction) resAction); //$NON-NLS-1$
resAction.setActionDefinitionId(IPHPEditorActionDefinitionIds.SHOW_PHPDOC);
setAction("ShowPHPDoc", resAction); //$NON-NLS-1$
-
+
if (isExternal) {
// Override the way breakpoints are set on external files.
action = new ToggleExternalBreakpointAction(this, getVerticalRuler());
@@ -1106,11 +1108,11 @@ public class PHPStructuredEditor extends StructuredTextEditor {
// StructuredTextEditor Action - edit breakpoints
action = new EditExternalBreakpointAction(this, getVerticalRuler());
setAction(ActionDefinitionIds.EDIT_BREAKPOINTS, action);
-
+
// Set the ruler double-click behavior.
setAction(ITextEditorActionConstants.RULER_DOUBLE_CLICK, new ToggleExternalBreakpointAction(this, getVerticalRuler(), getAction(ITextEditorActionConstants.RULER_DOUBLE_CLICK)));
}
-
+
ActionGroup rg = new RefactorActionGroup(this, ITextEditorActionConstants.GROUP_EDIT);
// We have to keep the context menu group separate to have better control over positioning
fContextMenuGroup = new CompositeActionGroup(new ActionGroup[] { rg });
@@ -1247,6 +1249,18 @@ public class PHPStructuredEditor extends StructuredTextEditor {
ExternalFilesRegistry externalRegistry = ExternalFilesRegistry.getInstance();
if (file.exists()) {
PHPWorkspaceModelManager.getInstance().addFileToModel(getFile());
+ IProject proj = file.getProject();
+ try {
+ //remove the file from project model when it is an RSE project.
+ //this is to prevent display of the completion from this file
+ //when it is closed
+ if (proj.hasNature(PHPUiConstants.RSE_TEMP_PROJECT_NATURE_ID)) {
+ PHPWorkspaceModelManager.getInstance().getModelForProject(proj).removeFileFromModel(file);
+ }
+ } catch (CoreException ce) {
+ Logger.logException(ce);
+ return;
+ }
}
//external php file
else {
@@ -1336,6 +1350,12 @@ public class PHPStructuredEditor extends StructuredTextEditor {
// This is the existing workspace file
final IFileEditorInput fileInput = (IFileEditorInput) input;
resource = fileInput.getFile();
+
+ //we add this test to provide model for PHP files opened from RSE (temp) project
+ IProject proj = resource.getProject();
+ if (proj.isAccessible() && proj.hasNature(PHPUiConstants.RSE_TEMP_PROJECT_NATURE_ID)) {
+ PHPWorkspaceModelManager.getInstance().getModelForProject(proj, true);
+ }
} else if (input instanceof IStorageEditorInput) {
// This kind of editor input usually means non-workspace file, like
// PHP file which comes from include path, remote file which comes from
diff --git a/plugins/org.eclipse.php.ui/src/org/eclipse/php/internal/ui/filters/RSEProjectFilter.java b/plugins/org.eclipse.php.ui/src/org/eclipse/php/internal/ui/filters/RSEProjectFilter.java
new file mode 100644
index 000000000..2de98f317
--- /dev/null
+++ b/plugins/org.eclipse.php.ui/src/org/eclipse/php/internal/ui/filters/RSEProjectFilter.java
@@ -0,0 +1,33 @@
+package org.eclipse.php.internal.ui.filters;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerFilter;
+import org.eclipse.php.internal.ui.Logger;
+import org.eclipse.php.internal.ui.PHPUiConstants;
+
+public class RSEProjectFilter extends ViewerFilter {
+
+ public RSEProjectFilter() {
+ // TODO Auto-generated constructor stub
+ }
+
+ @Override
+ public boolean select(Viewer viewer, Object parentElement, Object element) {
+ //This was added in order to hide the RSE Temp project from the PHP explorer view
+ if (element instanceof IProject) {
+ IProject proj = (IProject) element;
+ try {
+ if (!proj.isAccessible() || proj.hasNature(PHPUiConstants.RSE_TEMP_PROJECT_NATURE_ID)) {
+ return false;
+ }
+ } catch (CoreException ce) {
+ Logger.logException(ce);
+ return false;
+ }
+ }
+ return true;
+ }
+
+}

Back to the top