Codeformatter preferences should work now
[phpeclipse.git] / net.sourceforge.phpeclipse / plugin.xml
index 5d25fbb..8533507 100644 (file)
@@ -232,17 +232,23 @@ 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"
+                       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"
@@ -281,6 +287,11 @@ Temporarily replaced until errors can be ironed out...
             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">
@@ -305,15 +316,17 @@ Temporarily replaced until errors can be ironed out...
             extensions="php"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
-            id="net.sourceforge.phpeclipse.PHPEditor">
-      </editor>
+            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">
+            id="net.sourceforge.phpeclipse.PHPEditor"
+            default="true">
       </editor>
       <editor
             name="%phpEditorName"
@@ -321,7 +334,8 @@ Temporarily replaced until errors can be ironed out...
             extensions="php4"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
-            id="net.sourceforge.phpeclipse.PHPEditor">
+            id="net.sourceforge.phpeclipse.PHPEditor"
+            default="true">
       </editor>
       <editor
             name="%phpEditorName"
@@ -329,7 +343,8 @@ Temporarily replaced until errors can be ironed out...
             extensions="inc"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
-            id="net.sourceforge.phpeclipse.PHPEditor">
+            id="net.sourceforge.phpeclipse.PHPEditor"
+            default="true">
       </editor>
       <editor
             name="%phpEditorName"
@@ -337,7 +352,8 @@ Temporarily replaced until errors can be ironed out...
             extensions="phtml"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
-            id="net.sourceforge.phpeclipse.PHPEditor">
+            id="net.sourceforge.phpeclipse.PHPEditor"
+            default="true">
       </editor>
       <editor
             name="%phpEditorName"
@@ -345,7 +361,8 @@ Temporarily replaced until errors can be ironed out...
             extensions="htm"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
-            id="net.sourceforge.phpeclipse.PHPEditor">
+            id="net.sourceforge.phpeclipse.PHPEditor"
+            default="true">
       </editor>
       <editor
             name="%phpEditorName"
@@ -353,7 +370,8 @@ Temporarily replaced until errors can be ironed out...
             extensions="html"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
-            id="net.sourceforge.phpeclipse.PHPEditor">
+            id="net.sourceforge.phpeclipse.PHPEditor"
+            default="true">
       </editor>
       <editor
             name="%phpEditorName"
@@ -361,7 +379,8 @@ Temporarily replaced until errors can be ironed out...
             extensions="xml"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
-            id="net.sourceforge.phpeclipse.PHPEditor">
+            id="net.sourceforge.phpeclipse.PHPEditor"
+            default="true">
       </editor>
    </extension>
    <extension
@@ -536,6 +555,12 @@ Temporarily replaced until errors can be ironed out...
             class="net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage"
             id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage">
       </page>
+      <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"
@@ -625,6 +650,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">
@@ -638,11 +665,16 @@ Temporarily replaced until errors can be ironed out...
                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+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">
@@ -656,11 +688,17 @@ Temporarily replaced until errors can be ironed out...
                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="Command+Shift+P" id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket" platform="carbon" /> 
+               
          <accelerator
                platform="carbon"
                key="Command+1"