*** empty log message ***

[phpeclipse.git] / net.sourceforge.phpeclipse / plugin.xml

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 0dd2df1..89e8568 100644 (file)
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -232,17 +232,16 @@ Temporarily replaced until errors can be ironed out...
             description="%CodingActionSet.description"
             visible="false"
             id="net.sourceforge.phpeclipse.ui.CodingActionSet">
-<!-- =========================================================================== -->
-<!-- Source Menu                                                                 -->
-<!-- =========================================================================== -->
+         <!-- =========================================================================== -->
+         <!-- Source Menu                                                                 -->
+         <!-- =========================================================================== -->
          <menu
                label="%SourceMenu.label"
                path="edit"
                id="net.sourceforge.phpeclipse.ui.source.menu">
-            <separator
-                  name="editGroup">
-            </separator>
-         </menu>
+            <separator name="editGroup"/>
+         </menu>       
+       
          <action 
                        definitionId="net.sourceforge.phpeclipse.phpeditor.format"
                        label="%FormatAction.label"
@@ -316,64 +315,72 @@ Temporarily replaced until errors can be ironed out...
             icon="icons/obj16/phpedit.gif"
             extensions="php"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
-            id="net.sourceforge.phpeclipse.PHPEditor">
-      </editor>
+            class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
+            id="net.sourceforge.phpeclipse.PHPEditor"
+            default="true">
+      </editor>  
       <editor
             name="%phpEditorName"
             icon="icons/obj16/phpedit.gif"
             extensions="php3"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
-            id="net.sourceforge.phpeclipse.PHPEditor">
+            class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
+            id="net.sourceforge.phpeclipse.PHPEditor"
+            default="true">
       </editor>
       <editor
             name="%phpEditorName"
             icon="icons/obj16/phpedit.gif"
             extensions="php4"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
-            id="net.sourceforge.phpeclipse.PHPEditor">
+            class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
+            id="net.sourceforge.phpeclipse.PHPEditor"
+            default="true">
       </editor>
       <editor
             name="%phpEditorName"
             icon="icons/obj16/phpedit.gif"
             extensions="inc"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
-            id="net.sourceforge.phpeclipse.PHPEditor">
+            class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
+            id="net.sourceforge.phpeclipse.PHPEditor"
+            default="true">
       </editor>
       <editor
             name="%phpEditorName"
             icon="icons/obj16/phpedit.gif"
             extensions="phtml"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
-            id="net.sourceforge.phpeclipse.PHPEditor">
+            class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
+            id="net.sourceforge.phpeclipse.PHPEditor"
+            default="true">
       </editor>
       <editor
             name="%phpEditorName"
             icon="icons/obj16/htmledit.gif"
             extensions="htm"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
-            id="net.sourceforge.phpeclipse.PHPEditor">
+            class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
+            id="net.sourceforge.phpeclipse.PHPEditor"
+            default="true">
       </editor>
       <editor
             name="%phpEditorName"
             icon="icons/obj16/htmledit.gif"
             extensions="html"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
-            id="net.sourceforge.phpeclipse.PHPEditor">
+            class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
+            id="net.sourceforge.phpeclipse.PHPEditor"
+            default="true">
       </editor>
       <editor
             name="%phpEditorName"
             icon="icons/obj16/xmledit.gif"
             extensions="xml"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
-            id="net.sourceforge.phpeclipse.PHPEditor">
+            class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
+            id="net.sourceforge.phpeclipse.PHPEditor"
+            default="true">
       </editor>
    </extension>
    <extension
@@ -530,12 +537,12 @@ Temporarily replaced until errors can be ironed out...
             class="net.sourceforge.phpeclipse.PHPEclipseBasePreferencePage"
             id="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
       </page>
-      <page
-            name="Editor"
+  <!--    <page
+            name="Editor2"
             category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
             class="net.sourceforge.phpeclipse.PHPSyntaxEditorPreferencePage"
             id="net.sourceforge.phpeclipse.preference.PHPSyntaxEditorPreferencePage">
-      </page>
+      </page>  -->
       <page
             name="Outline"
             category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
@@ -554,6 +561,12 @@ Temporarily replaced until errors can be ironed out...
                class="net.sourceforge.phpdt.internal.ui.preferences.CodeFormatterPreferencePage"
                category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
          </page>
+         <page 
+        name="Editor"
+               id="net.sourceforge.phpeclipse.preference.PHPEditorPreferencePage"
+               class="net.sourceforge.phpdt.internal.ui.preferences.PHPEditorPreferencePage"
+               category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
+         </page>
       <page
             name="Language Settings"
             category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
@@ -643,6 +656,8 @@ Temporarily replaced until errors can be ironed out...
             scopeId="org.eclipse.ui.textEditorScope"
             configurationId="org.eclipse.ui.emacsAcceleratorConfiguration">
 <!-- edit -->
+                <accelerator key="Ctrl+Shift+P" id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket" />
+
          <accelerator
                key="Ctrl+1"
                id="net.sourceforge.phpeclipse.ui.edit.text.php.content.assist.proposals">
@@ -665,6 +680,7 @@ Temporarily replaced until errors can be ironed out...
             scopeId="org.eclipse.ui.textEditorScope"
             configurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
 <!-- edit -->
+         <accelerator key="Ctrl+Shift+P" id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket" />
          <accelerator
                key="Ctrl+Space"
                id="net.sourceforge.phpeclipse.ui.edit.text.php.content.assist.proposals">
@@ -687,6 +703,8 @@ Temporarily replaced until errors can be ironed out...
             scopeId="org.eclipse.ui.textEditorScope"
             configurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
 <!-- edit -->
+         <accelerator key="Command+Shift+P" id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket" platform="carbon" /> 
+               
          <accelerator
                platform="carbon"
                key="Command+1"