X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 3f512ea..8533507 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -19,6 +19,7 @@
       <import plugin="org.eclipse.debug.ui"/>
       <import plugin="org.apache.xerces"/>
       <import plugin="org.junit"/>
+      <import plugin="org.eclipse.update.ui"/>
    </requires>
 
 
@@ -96,8 +97,8 @@ Temporarily replaced until errors can be ironed out...
          </description>
       </wizard>
 <this wizard replaces it as it works - maybe not as pretty but still>
--->    
-		<wizard
+-->
+      <wizard
             name="%newWizardPHPProject.name"
             icon="icons/obj16/php.gif"
             category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
@@ -107,8 +108,8 @@ Temporarily replaced until errors can be ironed out...
          <description>
             Create a new PHP project.
          </description>
-      </wizard>  
-		<wizard
+      </wizard>
+      <wizard
             name="%newWizardPHPFile.name"
             icon="icons/obj16/phpedit.gif"
             category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
@@ -118,8 +119,8 @@ Temporarily replaced until errors can be ironed out...
             Create a basic PHP file.
          </description>
       </wizard>
-<!-- choochter's stuff -->	  
-	  <wizard
+<!-- choochter's stuff -->
+      <wizard
             name="Xaraya Module"
             icon="icons/obj16/php.gif"
             category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
@@ -129,7 +130,7 @@ Temporarily replaced until errors can be ironed out...
          <description>
             Create a Xaraya module.
          </description>
-      </wizard>       
+      </wizard>
    </extension>
    <extension
          point="org.eclipse.ui.projectNatureImages">
@@ -151,7 +152,7 @@ Temporarily replaced until errors can be ironed out...
                value="net.sourceforge.phpeclipse.phpnature">
          </filter>
       </page>
-	  <page
+      <page
             objectClass="net.sourceforge.phpeclipse.PHPProject"
             name="%propertyPagePHPProject.name"
             class="net.sourceforge.phpeclipse.preferences.PHPProjectPropertyPage"
@@ -226,61 +227,72 @@ Temporarily replaced until errors can be ironed out...
                id="net.sourceforge.phpeclipse.actions.PHPStartMySQLAction">
          </action>
       </actionSet>
-
       <actionSet
-		id="net.sourceforge.phpeclipse.ui.CodingActionSet"
-        label="%CodingActionSet.label"
-		visible="false"
-		description="%CodingActionSet.description">
-
-        <!-- =========================================================================== -->
-		<!-- Source Menu                                                                 -->
-		<!-- =========================================================================== -->
-
-      	<menu
-            id="net.sourceforge.phpeclipse.ui.source.menu"
-            label="%SourceMenu.label"
-            path="edit">
-         	<separator name="editGroup"/>
-      	</menu>
-			
-		<action id="net.sourceforge.phpeclipse.phpeditor.Uncomment"
-      		menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
-      		label="%UncommentAction.label"
-			definitionId="net.sourceforge.phpeclipse.phpeditor.uncomment"
-			retarget="true" />
-			
-		<action id="net.sourceforge.phpeclipse.phpeditor.Comment"
-      		menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
-      		label="%CommentAction.label"
-			definitionId="net.sourceforge.phpeclipse.phpeditor.comment"
-			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"/>
+         </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.phpeclipse.phpeditor.ContentAssistProposal"
-		name= "%ActionDefinition.contentAssistProposals.name"
-		description="%ActionDefinition.contentAssistProposals.description">
+   <extension
+         point="org.eclipse.ui.actionDefinitions">
+<!-- edit -->
+      <actionDefinition
+            name="%ActionDefinition.contentAssistProposals.name"
+            description="%ActionDefinition.contentAssistProposals.description"
+            id="net.sourceforge.phpeclipse.phpeditor.ContentAssistProposal">
       </actionDefinition>
-      <!-- source -->
-	  <actionDefinition
-		id="net.sourceforge.phpeclipse.phpeditor.Comment"
-		name= "%ActionDefinition.comment.name"
-		description= "%ActionDefinition.comment.description">
-	  </actionDefinition>
-	  <actionDefinition
-		id="net.sourceforge.phpeclipse.phpeditor.Uncomment"
-		name= "%ActionDefinition.uncomment.name"
-		description= "%ActionDefinition.uncomment.description">
+<!-- source -->
+      <actionDefinition
+            name="%ActionDefinition.comment.name"
+            description="%ActionDefinition.comment.description"
+            id="net.sourceforge.phpeclipse.phpeditor.Comment">
+      </actionDefinition>
+      <actionDefinition
+            name="%ActionDefinition.uncomment.name"
+            description="%ActionDefinition.uncomment.description"
+            id="net.sourceforge.phpeclipse.phpeditor.Uncomment">
       </actionDefinition>
-   </extension> 
+      	<actionDefinition
+      	    name= "%ActionDefinition.format.name"
+      	    description= "%ActionDefinition.format.description"
+     		id="net.sourceforge.phpeclipse.phpeditor.Format">
+	  </actionDefinition>
+   </extension>
 <!--   <extension
          point="org.eclipse.ui.acceleratorSets">
       <acceleratorSet
@@ -304,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"
@@ -320,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"
@@ -328,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"
@@ -336,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"
@@ -344,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"
@@ -352,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"
@@ -360,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
@@ -475,41 +495,40 @@ Temporarily replaced until errors can be ironed out...
                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">
@@ -530,18 +549,24 @@ Temporarily replaced until errors can be ironed out...
             class="net.sourceforge.phpeclipse.PHPOutlinePreferencePage"
             id="net.sourceforge.phpeclipse.preference.PHPOutlinePreferencePage">
       </page>
-      <page 
+      <page
             name="Templates"
-            category= "net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
-			class="net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage"
-			id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage">
+            category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+            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"
             class="net.sourceforge.phpeclipse.PHPLanguagePreferencePage"
             id="net.sourceforge.phpeclipse.preference.PHPLanguagePreferencePage">
-      </page>  	  
+      </page>
    </extension>
    <extension
          point="org.eclipse.ui.documentProviders">
@@ -619,42 +644,78 @@ Temporarily replaced until errors can be ironed out...
 <!-- =========================================================================== -->
 <!-- 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" />
-		
-        <!-- source -->
-		<accelerator key="Ctrl+/" id="net.sourceforge.phpeclipse.phpeditor.comment" />
-		<accelerator key="Ctrl+\" id="net.sourceforge.phpeclipse.phpeditor.uncomment" />
-    </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" />
-		
-		<!-- source -->
-		<accelerator key="Ctrl+/" id="net.sourceforge.phpeclipse.phpeditor.comment" />
-		<accelerator key="Ctrl+\" id="net.sourceforge.phpeclipse.phpeditor.uncomment" />
-    </acceleratorSet>
-    
-    <acceleratorSet 
-        scopeId="org.eclipse.ui.textEditorScope" 
-        configurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
-		<!-- edit --> 
-		<accelerator key="Command+1" id="net.sourceforge.phpeclipse.ui.edit.text.php.content.assist.proposals" platform="carbon" />
+   <extension
+         point="org.eclipse.ui.acceleratorSets">
+      <acceleratorSet
+            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" />
 
-		<!-- source --> 
-		<accelerator key="Command+/" id="net.sourceforge.phpeclipse.phpeditor.comment" platform="carbon" /> 
-		<accelerator key="Command+\" id="net.sourceforge.phpeclipse.phpeditor.uncomment" platform="carbon" /> 
+         <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+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">
+         </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="Command+Shift+P" id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket" platform="carbon" /> 
 		
-	</acceleratorSet>
-
+         <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>