X-Git-Url: http://git.phpeclipse.com
diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 7783dea..0dd2df1 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -18,6 +18,8 @@
<import plugin="org.eclipse.swt"/>
<import plugin="org.eclipse.debug.ui"/>
<import plugin="org.apache.xerces"/>
+ <import plugin="org.junit"/>
+ <import plugin="org.eclipse.update.ui"/>
</requires>
@@ -27,7 +29,7 @@
point="org.eclipse.core.resources.natures">
<runtime>
<run
- class="net.sourceforge.phpeclipse.PHPProject">
+ class="net.sourceforge.phpeclipse.resourcesview.PHPProject">
</run>
</runtime>
</extension>
@@ -81,7 +83,9 @@
name="%newWizardCategory.name"
id="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP">
</category>
- <wizard
+<!--
+Temporarily replaced until errors can be ironed out...
+ <wizard
name="%newWizardPHPProject.name"
icon="icons/obj16/php.gif"
category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
@@ -92,6 +96,19 @@
Create a new PHP project.
</description>
</wizard>
+<this wizard replaces it as it works - maybe not as pretty but still>
+-->
+ <wizard
+ name="%newWizardPHPProject.name"
+ icon="icons/obj16/php.gif"
+ category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
+ class="net.sourceforge.phpeclipse.wizards.TempnewPHPProject"
+ project="true"
+ id="net.sourceforge.phpeclipse.wizards.NewWizardProjectCreation">
+ <description>
+ Create a new PHP project.
+ </description>
+ </wizard>
<wizard
name="%newWizardPHPFile.name"
icon="icons/obj16/phpedit.gif"
@@ -102,6 +119,18 @@
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.projectNatureImages">
@@ -123,7 +152,7 @@
value="net.sourceforge.phpeclipse.phpnature">
</filter>
</page>
- <page
+ <page
objectClass="net.sourceforge.phpeclipse.PHPProject"
name="%propertyPagePHPProject.name"
class="net.sourceforge.phpeclipse.preferences.PHPProjectPropertyPage"
@@ -199,37 +228,73 @@
</action>
</actionSet>
<actionSet
- id="net.sourceforge.phpeclipse.ui.CodingActionSet"
- label="%phpActionSet.label"
- visible="false"
- description="%CodingActionSet.description">
- <menu
- id="net.sourceforge.phpeclipse.ui.source.menu"
- label="%php.menu.label"
- path="edit">
- <separator name="editGroup"/>
- </menu>
- <action id="net.sourceforge.phpdt.ui.actions.Uncomment"
- menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
- label="%phpUncommentAction.label"
- retarget="true" />
-
- <action id="net.sourceforge.phpdt.ui.actions.Comment"
- menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
- label="%phpCommentAction.label"
- retarget="true" />
- </actionSet>
+ label="%CodingActionSet.label"
+ description="%CodingActionSet.description"
+ visible="false"
+ id="net.sourceforge.phpeclipse.ui.CodingActionSet">
+<!-- =========================================================================== -->
+<!-- Source Menu -->
+<!-- =========================================================================== -->
+ <menu
+ label="%SourceMenu.label"
+ path="edit"
+ id="net.sourceforge.phpeclipse.ui.source.menu">
+ <separator
+ name="editGroup">
+ </separator>
+ </menu>
+ <action
+ definitionId="net.sourceforge.phpeclipse.phpeditor.format"
+ label="%FormatAction.label"
+ retarget="true"
+ menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+ id="net.sourceforge.phpeclipse.phpeditor.Format" >
+ </action>
+ <action
+ definitionId="net.sourceforge.phpeclipse.phpeditor.uncomment"
+ label="%UncommentAction.label"
+ retarget="true"
+ menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+ id="net.sourceforge.phpeclipse.phpeditor.Uncomment">
+ </action>
+ <action
+ definitionId="net.sourceforge.phpeclipse.phpeditor.comment"
+ label="%CommentAction.label"
+ retarget="true"
+ menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+ id="net.sourceforge.phpeclipse.phpeditor.Comment">
+ </action>
+ </actionSet>
</extension>
+<!-- =========================================================================== -->
+<!-- PHP Editor Action Definition IDs -->
+<!-- =========================================================================== -->
<extension
point="org.eclipse.ui.actionDefinitions">
+<!-- edit -->
<actionDefinition
- id="net.sourceforge.phpdt.ui.actions.comment">
+ name="%ActionDefinition.contentAssistProposals.name"
+ description="%ActionDefinition.contentAssistProposals.description"
+ id="net.sourceforge.phpeclipse.phpeditor.ContentAssistProposal">
</actionDefinition>
+<!-- source -->
<actionDefinition
- id="net.sourceforge.phpdt.ui.actions.uncomment">
+ name="%ActionDefinition.comment.name"
+ description="%ActionDefinition.comment.description"
+ id="net.sourceforge.phpeclipse.phpeditor.Comment">
</actionDefinition>
- </extension>
- <extension
+ <actionDefinition
+ name="%ActionDefinition.uncomment.name"
+ description="%ActionDefinition.uncomment.description"
+ id="net.sourceforge.phpeclipse.phpeditor.Uncomment">
+ </actionDefinition>
+ <actionDefinition
+ name= "%ActionDefinition.format.name"
+ description= "%ActionDefinition.format.description"
+ id="net.sourceforge.phpeclipse.phpeditor.Format">
+ </actionDefinition>
+ </extension>
+<!-- <extension
point="org.eclipse.ui.acceleratorSets">
<acceleratorSet
scopeId="org.eclipse.ui.textEditorScope"
@@ -243,7 +308,7 @@
id="net.sourceforge.phpdt.ui.actions.uncomment">
</accelerator>
</acceleratorSet>
- </extension>
+ </extension> -->
<extension
point="org.eclipse.ui.editors">
<editor
@@ -315,39 +380,6 @@
point="org.eclipse.ui.popupMenus">
<objectContribution
objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.html"
- id="net.sourceforge.phpeclipse.actions.htmlParserAction">
- <action
- label="Run JTidy Parser"
- class="net.sourceforge.phpeclipse.actions.HTMLParserAction"
- menubarPath="additions"
- id="net.sourceforge.phpeclipse.actions.htmlParserAction">
- </action>
- </objectContribution>
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.htm"
- id="net.sourceforge.phpeclipse.actions.htmlParserAction">
- <action
- label="Run JTidy Parser"
- class="net.sourceforge.phpeclipse.actions.HTMLParserAction"
- menubarPath="additions"
- id="net.sourceforge.phpeclipse.actions.htmlParserAction">
- </action>
- </objectContribution>
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.xml"
- id="net.sourceforge.phpeclipse.actions.htmlParserAction">
- <action
- label="Run JTidy Parser"
- class="net.sourceforge.phpeclipse.actions.HTMLParserAction"
- menubarPath="additions"
- id="net.sourceforge.phpeclipse.actions.htmlParserAction">
- </action>
- </objectContribution>
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
nameFilter="*.php"
id="net.sourceforge.phpeclipse.actions.externalParserAction">
<action
@@ -456,60 +488,78 @@
id="net.sourceforge.phpeclipse.actions.showAction">
</action>
</objectContribution>
-
- <viewerContribution
- id="net.sourceforge.phpdt.ui.PHPEditorPopupActions"
- targetID="#PHPRulerContext">
- <action
- id="org.eclipse.ui.texteditor.TaskRulerAction"
- menubarPath="add"
- label="%AddTask.label"
- tooltip="%AddTask.tooltip"
- helpContextId="org.eclipse.ui.AddTask_action_context"
- class="org.eclipse.ui.texteditor.TaskRulerAction">
- </action>
- <action
- id="org.eclipse.ui.texteditor.BookmarkRulerAction"
- menubarPath="add"
- label="%AddBookmark.label"
- tooltip="%AddBookmark.tooltip"
- helpContextId="org.eclipse.ui.bookmark_action_context"
- class="org.eclipse.ui.texteditor.BookmarkRulerAction">
- </action>
- </viewerContribution>
+ <viewerContribution
+ targetID="#PHPRulerContext"
+ id="net.sourceforge.phpdt.ui.PHPEditorPopupActions">
+ <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>
+ </viewerContribution>
</extension>
- <extension point="org.eclipse.ui.editorActions">
- <editorContribution
- id="org.eclipse.ui.texteditor.ruler.actions"
- targetID="net.sourceforge.phpeclipse.PHPEditor">
-
- <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
+ 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"
+ actionID="RulerDoubleClick"
+ id="org.eclipse.ui.texteditor.BookmarkRulerAction">
+ </action>
+ </editorContribution>
</extension>
<extension
point="org.eclipse.ui.preferencePages">
<page
name="PHP"
- class="net.sourceforge.phpeclipse.PHPEclipsePreferencePage"
+ class="net.sourceforge.phpeclipse.PHPEclipseBasePreferencePage"
id="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
</page>
<page
name="Editor"
category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
- class="net.sourceforge.phpeclipse.PHPSyntaxPreferencePage"
- id="net.sourceforge.phpeclipse.preference.PHPSyntaxPreferencePage">
+ class="net.sourceforge.phpeclipse.PHPSyntaxEditorPreferencePage"
+ 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">
+ </page>
+ <page
+ name="Templates"
+ category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+ class="net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage"
+ id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage">
</page>
- <page name="Templates"
- id = "net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage"
- class="net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage"
- category= "net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
+ <page
+ name="Formatter"
+ id="net.sourceforge.phpeclipse.preference.CodeFormatterPreferencePage"
+ class="net.sourceforge.phpdt.internal.ui.preferences.CodeFormatterPreferencePage"
+ category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
</page>
+ <page
+ name="Language Settings"
+ category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+ class="net.sourceforge.phpeclipse.PHPLanguagePreferencePage"
+ id="net.sourceforge.phpeclipse.preference.PHPLanguagePreferencePage">
+ </page>
</extension>
<extension
point="org.eclipse.ui.documentProviders">
@@ -584,5 +634,76 @@
id="net.sourceforge.phpeclipse.views.phpconsoleview">
</view>
</extension>
+<!-- =========================================================================== -->
+<!-- Java Editor Key Bindings -->
+<!-- =========================================================================== -->
+ <extension
+ point="org.eclipse.ui.acceleratorSets">
+ <acceleratorSet
+ scopeId="org.eclipse.ui.textEditorScope"
+ configurationId="org.eclipse.ui.emacsAcceleratorConfiguration">
+<!-- edit -->
+ <accelerator
+ key="Ctrl+1"
+ id="net.sourceforge.phpeclipse.ui.edit.text.php.content.assist.proposals">
+ </accelerator>
+<!-- source -->
+ <accelerator
+ key="Ctrl+/"
+ id="net.sourceforge.phpeclipse.phpeditor.comment">
+ </accelerator>
+ <accelerator
+ key="Ctrl+\"
+ id="net.sourceforge.phpeclipse.phpeditor.uncomment">
+ </accelerator>
+ <accelerator
+ key="Ctrl+Shift+F"
+ id="net.sourceforge.phpeclipse.phpeditor.format">
+ </accelerator>
+ </acceleratorSet>
+ <acceleratorSet
+ scopeId="org.eclipse.ui.textEditorScope"
+ configurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
+<!-- edit -->
+ <accelerator
+ key="Ctrl+Space"
+ id="net.sourceforge.phpeclipse.ui.edit.text.php.content.assist.proposals">
+ </accelerator>
+<!-- source -->
+ <accelerator
+ key="Ctrl+/"
+ id="net.sourceforge.phpeclipse.phpeditor.comment">
+ </accelerator>
+ <accelerator
+ key="Ctrl+\"
+ id="net.sourceforge.phpeclipse.phpeditor.uncomment">
+ </accelerator>
+ <accelerator
+ key="Ctrl+Shift+F"
+ id="net.sourceforge.phpeclipse.phpeditor.format">
+ </accelerator>
+ </acceleratorSet>
+ <acceleratorSet
+ scopeId="org.eclipse.ui.textEditorScope"
+ configurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
+<!-- edit -->
+ <accelerator
+ platform="carbon"
+ key="Command+1"
+ id="net.sourceforge.phpeclipse.ui.edit.text.php.content.assist.proposals">
+ </accelerator>
+<!-- source -->
+ <accelerator
+ platform="carbon"
+ key="Command+/"
+ id="net.sourceforge.phpeclipse.phpeditor.comment">
+ </accelerator>
+ <accelerator
+ platform="carbon"
+ key="Command+\"
+ id="net.sourceforge.phpeclipse.phpeditor.uncomment">
+ </accelerator>
+ </acceleratorSet>
+ </extension>
</plugin>