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

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 42ac482..873b7db 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -20,29 +20,24 @@
       <import plugin="org.eclipse.ui.console"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.debug.core"/>
       <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.compare"/>
       <import plugin="org.eclipse.core.filebuffers"/>
       <import plugin="org.eclipse.jface.text"/>
       <import plugin="org.eclipse.ui.workbench.texteditor"/>
       <import plugin="org.eclipse.ui.ide"/>
       <import plugin="org.eclipse.ui.views"/>
       <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui.externaltools"/>
-      <import plugin="org.eclipse.help"/>
       <import plugin="org.eclipse.team.core"/>
       <import plugin="org.eclipse.swt"/>
       <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.update.ui"/>
   <!--    <import plugin="net.sourceforge.phpeclipse.quantum.sql"/>  -->
    <!--   <import plugin="com.quantum.Quantum"/>  -->
       <import plugin="net.sourceforge.phpeclipse.webbrowser"/>
       <import plugin="net.sourceforge.phpeclipse.externaltools"/>
-      <import plugin="net.sourceforge.phpeclipse.core"/>
       <import plugin="net.sourceforge.phpeclipse.ui"/>
-      <import plugin="net.sourceforge.phpeclipse.xml.core"/>
       <import plugin="net.sourceforge.phpeclipse.xml.ui"/>
+      <import plugin="org.eclipse.ltk.core.refactoring"/>
+      <import plugin="org.eclipse.ltk.ui.refactoring"/>
    </requires>
 
    <extension
@@ -152,6 +147,7 @@
       <fileTypes type="text" extension="module" />
       <fileTypes type="text" extension="inc" />
       <fileTypes type="text" extension="phtml" />
+      <fileTypes type="text" extension="phpt" />
    </extension>
 
 <!-- declares a content type for PHP Source files -->
@@ -160,7 +156,7 @@
 	<content-type id="phpSource" name="%phpSourceName"
 		base-type="org.eclipse.core.runtime.text"
 		priority="high"
-		file-extensions="php,php3,php4,php5,phtml,inc,module"/>
+		file-extensions="php,php3,php4,php5,phtml,inc,module,phpt"/>
    </extension>
 
    <extension
@@ -499,9 +495,6 @@
          	<separator
          	      name="editGroup">
          	</separator>
-            <separator
-                  name="convertGroup">
-            </separator>
          </menu>
          <action
                definitionId="net.sourceforge.phpeclipse.phpeditor.format"
@@ -557,36 +550,6 @@
                menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
                id="net.sourceforge.phpeclipse.phpeditor.Comment">
          </action>
-<!-- convert group -->
-         <menu
-               label="%ConvertLineDelimitersActions.label"
-               path="edit/net.sourceforge.phpeclipse.ui.source.menu/convertGroup"
-               id="convertSubMenu">
-            <separator
-                  name="group1">
-            </separator>
-         </menu>
-         <action
-               label="%ConvertLineDelimitersToMacAction.label"
-               retarget="true"
-               menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/convertSubMenu/group1"
-               allowLabelUpdate="true"
-               id="net.sourceforge.phpeclipse.ui.actions.ConvertLineDelimitersToMac">
-         </action>
-         <action
-               label="%ConvertLineDelimitersToUNIXAction.label"
-               retarget="true"
-               menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/convertSubMenu/group1"
-               allowLabelUpdate="true"
-               id="net.sourceforge.phpeclipse.ui.actions.ConvertLineDelimitersToUNIX">
-         </action>
-         <action
-               label="%ConvertLineDelimitersToWindowsAction.label"
-               retarget="true"
-               menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/convertSubMenu/group1"
-               allowLabelUpdate="true"
-               id="net.sourceforge.phpeclipse.ui.actions.ConvertLineDelimitersToWindows">
-         </action>
       </actionSet>
    </extension>
    <extension
@@ -799,6 +762,22 @@
                id="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction">
          </action>
       </viewerContribution>
+ <!--     <viewerContribution
+        targetID="#PHPEditorContext"
+        id="net.sourceforge.phpdt.ltk.renamePHPIdentifier">
+        <action label="Rename Local Variable in Functions/Methods"
+                class="net.sourceforge.phpdt.ltk.ui.actions.RenameLocalVariable"
+                menubarPath="additions"
+                id="net.sourceforge.phpdt.ltk.ui.actions.RenameLocalVariable"/>
+      </viewerContribution>
+      <viewerContribution
+        targetID="#PHPEditorContext"
+        id="net.sourceforge.phpdt.ltk.renamePHPIdentifier">
+        <action label="Rename PHP Identifier"
+                class="net.sourceforge.phpdt.ltk.ui.actions.RenamePHPIdentifier"
+                menubarPath="additions"
+                id="net.sourceforge.phpdt.ltk.ui.actions.RenamePHPIdentifier"/>
+      </viewerContribution>  -->
       <viewerContribution
             targetID="#PHPRulerContext"
             id="net.sourceforge.phpdt.ui.PHPEditorPopupActions">
@@ -945,299 +924,72 @@
       <command
             name="%ActionDefinition.comment.name"
             description="%ActionDefinition.comment.description"
-            category="net.sourceforge.phpeclipse.ui.category.source"
+            categoryId="net.sourceforge.phpeclipse.ui.category.source"
             id="net.sourceforge.phpeclipse.phpeditor.comment">
       </command>
       <command
             name="%ActionDefinition.uncomment.name"
             description="%ActionDefinition.uncomment.description"
-            category="net.sourceforge.phpeclipse.ui.category.source"
+            categoryId="net.sourceforge.phpeclipse.ui.category.source"
             id="net.sourceforge.phpeclipse.phpeditor.uncomment">
       </command>
       <command
             name="%ActionDefinition.toggleComment.name"
             description="%ActionDefinition.toggleComment.description"
-            category="net.sourceforge.phpeclipse.ui.category.source"
+            categoryId="net.sourceforge.phpeclipse.ui.category.source"
             id="net.sourceforge.phpeclipse.phpeditor.toggle.comment">
       </command>
 
-      <keyBinding
-            string="Ctrl+Shift+C"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            string="Ctrl+/"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            string="Ctrl+7"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Ctrl+Shift+C"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command=""
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Command+Shift+C"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Ctrl+/"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Command+/"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Ctrl+7"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command=""
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Command+7"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="gtk"
-            string="Ctrl+Shift+C"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command=""
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="gtk"
-            string="Esc Ctrl+C"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
       <command
             name="%ActionDefinition.addBlockComment.name"
             description="%ActionDefinition.addBlockComment.description"
-            category="net.sourceforge.phpeclipse.ui.category.source"
+            categoryId="net.sourceforge.phpeclipse.ui.category.source"
             id="net.sourceforge.phpeclipse.phpeditor.add.block.comment">
       </command>
-      <keyBinding
-            string="Ctrl+Shift+/"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.add.block.comment"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Ctrl+Shift+/"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command=""
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Command+Shift+/"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.add.block.comment"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
       <command
             name="%ActionDefinition.removeBlockComment.name"
             description="%ActionDefinition.removeBlockComment.description"
-            category="net.sourceforge.phpeclipse.ui.category.source"
+            categoryId="net.sourceforge.phpeclipse.ui.category.source"
             id="net.sourceforge.phpeclipse.phpeditor.remove.block.comment">
       </command>
-      <keyBinding
-            string="Ctrl+Shift+\"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.remove.block.comment"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Ctrl+Shift+\"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command=""
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Command+Shift+\"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.remove.block.comment"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
       <command
             name="%ActionDefinition.indent.name"
             description="%ActionDefinition.indent.description"
-            category="net.sourceforge.phpeclipse.ui.category.source"
+            categoryId="net.sourceforge.phpeclipse.ui.category.source"
             id="net.sourceforge.phpeclipse.phpeditor.indent">
       </command>
-      <keyBinding
-            string="Ctrl+I"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.indent"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-
       <command
             name="%ActionDefinition.format.name"
             description="%ActionDefinition.format.description"
-            category="net.sourceforge.phpeclipse.ui.category.source"
+            categoryId="net.sourceforge.phpeclipse.ui.category.source"
             id="net.sourceforge.phpeclipse.phpeditor.format">
       </command>
-      <keyBinding
-            string="Ctrl+Shift+F"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.format"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Ctrl+Shift+F"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command=""
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Command+Shift+F"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.format"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="gtk"
-            string="Ctrl+Shift+F"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command=""
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="gtk"
-            string="Esc Ctrl+F"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.format"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
 
       <!-- navigate -->
       <command
             name="%ActionDefinition.gotoNextMember.name"
             description="%ActionDefinition.gotoNextMember.description"
-            category="org.eclipse.ui.category.navigate"
+            categoryId="org.eclipse.ui.category.navigate"
             id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.next.member">
       </command>
-      <keyBinding
-            string="Ctrl+Shift+ARROW_DOWN"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.next.member"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Ctrl+Shift+ARROW_DOWN"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command=""
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Command+Shift+ARROW_DOWN"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.next.member"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
       <command
             name="%ActionDefinition.gotoPreviousMember.name"
             description="%ActionDefinition.gotoPreviousMember.description"
-            category="org.eclipse.ui.category.navigate"
+            categoryId="org.eclipse.ui.category.navigate"
             id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.previous.member">
       </command>
-      <keyBinding
-            string="Ctrl+Shift+ARROW_UP"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.previous.member"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Ctrl+Shift+ARROW_UP"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command=""
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Command+Shift+ARROW_UP"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.previous.member"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-   <!--   <keyBinding
-            string=""
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpdt.ui.edit.text.java.show.next.problem"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding> -->
       <command
             name="%ActionDefinition.gotoMatchingBracket.name"
             description="%ActionDefinition.gotoMatchingBracket.description"
-            category="org.eclipse.ui.category.navigate"
+            categoryId="org.eclipse.ui.category.navigate"
             id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket">
       </command>
-      <keyBinding
-            string="Ctrl+Shift+P"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Ctrl+Shift+P"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command=""
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Command+Shift+P"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
       <command
             name="%OpenDeclaration"
             description="%OpenDeclaration"
-            category="net.sourceforge.phpeclipse.ui.category.source"
+            categoryId="net.sourceforge.phpeclipse.ui.category.source"
             id="net.sourceforge.phpeclipse.actions.opendeclaration">
       </command>
-      <keyBinding
-            string="F3"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.actions.opendeclaration"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
    </extension>
    <extension
          id="net.sourceforge.phpeclipse.JavaDocumentSetupParticipant"
@@ -1571,4 +1323,233 @@
       		translations="templates/default-templates.properties">
       </include>
    </extension>
+   <extension
+         point="org.eclipse.ui.bindings">
+      <key
+            sequence="Ctrl+Shift+C"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            sequence="Ctrl+/"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+           	sequence="Ctrl+7"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            platform="carbon"
+            sequence="Ctrl+Shift+C"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            platform="carbon"
+            sequence="Command+Shift+C"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            platform="carbon"
+            sequence="Ctrl+/"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            platform="carbon"
+            sequence="Command+/"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            platform="carbon"
+            sequence="Ctrl+7"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            platform="carbon"
+            sequence="Command+7"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            platform="gtk"
+            sequence="Ctrl+Shift+C"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            platform="gtk"
+            sequence="Esc Ctrl+C"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            sequence="Ctrl+Shift+/"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId="net.sourceforge.phpeclipse.phpeditor.add.block.comment"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            platform="carbon"
+            sequence="Ctrl+Shift+/"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            platform="carbon"
+            sequence="Command+Shift+/"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId="net.sourceforge.phpeclipse.phpeditor.add.block.comment"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            sequence="Ctrl+Shift+\"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId="net.sourceforge.phpeclipse.phpeditor.remove.block.comment"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            platform="carbon"
+            sequence="Ctrl+Shift+\"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            platform="carbon"
+            sequence="Command+Shift+\"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId="net.sourceforge.phpeclipse.phpeditor.remove.block.comment"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            sequence="Ctrl+I"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId="net.sourceforge.phpeclipse.phpeditor.indent"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            sequence="Ctrl+Shift+F"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId="net.sourceforge.phpeclipse.phpeditor.format"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            platform="carbon"
+            sequence="Ctrl+Shift+F"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            platform="carbon"
+            sequence="Command+Shift+F"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId="net.sourceforge.phpeclipse.phpeditor.format"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            platform="gtk"
+            sequence="Ctrl+Shift+F"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            platform="gtk"
+            sequence="Esc Ctrl+F"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId="net.sourceforge.phpeclipse.phpeditor.format"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            sequence="Ctrl+Shift+ARROW_DOWN"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId="net.sourceforge.phpeclipse.ui.edit.text.php.goto.next.member"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            platform="carbon"
+            sequence="Ctrl+Shift+ARROW_DOWN"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            platform="carbon"
+            sequence="Command+Shift+ARROW_DOWN"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId="net.sourceforge.phpeclipse.ui.edit.text.php.goto.next.member"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            sequence="Ctrl+Shift+ARROW_UP"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId="net.sourceforge.phpeclipse.ui.edit.text.php.goto.previous.member"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            platform="carbon"
+            sequence="Ctrl+Shift+ARROW_UP"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            platform="carbon"
+            sequence="Command+Shift+ARROW_UP"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId="net.sourceforge.phpeclipse.ui.edit.text.php.goto.previous.member"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+   <!--   <key
+            sequence=""
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId="net.sourceforge.phpdt.ui.edit.text.java.show.next.problem"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key> -->
+      <key
+            sequence="Ctrl+Shift+P"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            platform="carbon"
+            sequence="Ctrl+Shift+P"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId=""
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            platform="carbon"
+            sequence="Command+Shift+P"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            sequence="F3"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId="net.sourceforge.phpeclipse.actions.opendeclaration"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+   </extension>
 </plugin>