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

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index cf3c6f1..57699a0 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -11,6 +11,7 @@
       <library name="phpeclipse.jar">
         <export name="*"/>
       </library>
+ <!--     <library name="lib/xstream-1.0.2.jar" /> -->
    </runtime>
    <requires>
       <import plugin="org.eclipse.core.runtime.compatibility"/>
@@ -989,55 +990,46 @@
   
       <viewerContribution
             targetID="#PHPEditorContext"
-            id="net.sourceforge.phpeclipse.actions.popupOpenDeclaration">
-         <action
-               label="Open PHP Declaration"
-               class="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction"
-               menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.opendeclaration">
-         </action>
-      </viewerContribution>
-      <viewerContribution
-            targetID="#PHPEditorContext"
-            id="net.sourceforge.phpeclipse.actions.popupOpenAllIncludes">
+            id="net.sourceforge.phpeclipse.actions.popupOpenSQLTable">
          <action
-               label="Open Included Files List"
-               class="net.sourceforge.phpeclipse.actions.PHPOpenAllIncludesEditorAction"
+               label="Open Quantum SQL Table View"
+               class="net.sourceforge.phpeclipse.actions.PHPOpenSQLTableEditorAction"
                menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.openallincludes">
+               id="net.sourceforge.phpeclipse.actions.opensqltable">
          </action>
       </viewerContribution>
       <viewerContribution
             targetID="#PHPEditorContext"
-            id="net.sourceforge.phpeclipse.actions.popupOpenInclude">
+            id="net.sourceforge.phpeclipse.actions.popupHTMLWizard">
          <action
-               label="Open Include File"
-               class="net.sourceforge.phpeclipse.actions.PHPOpenIncludeEditorAction"
+               label="Insert HTML (dl,ul,ol,table)"
+               class="net.sourceforge.phpeclipse.wizards.html.InsertHTMLElementAction"
                menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.openinclude">
+               id="net.sourceforge.phpeclipse.actions.wizards.html">
          </action>
       </viewerContribution>
       <viewerContribution
             targetID="#PHPEditorContext"
-            id="net.sourceforge.phpeclipse.actions.popupOpenSQLTable">
+            id="net.sourceforge.phpeclipse.actions.popupOpenAllIncludes">
          <action
-               label="Open Quantum SQL Table View"
-               class="net.sourceforge.phpeclipse.actions.PHPOpenSQLTableEditorAction"
+               label="Open Included Files List"
+               class="net.sourceforge.phpeclipse.actions.PHPOpenAllIncludesEditorAction"
                menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.opensqltable">
+               id="net.sourceforge.phpeclipse.actions.openallincludes">
          </action>
       </viewerContribution>
       <viewerContribution
             targetID="#PHPEditorContext"
-            id="net.sourceforge.phpeclipse.actions.popupHTMLWizard">
+            id="net.sourceforge.phpeclipse.actions.popupOpenDeclaration">
          <action
-               label="Insert HTML (dl,ul,ol,table)"
-               class="net.sourceforge.phpeclipse.wizards.html.InsertHTMLElementAction"
+               label="%OpenDeclaration"
+               class="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction"
                menubarPath="additions"
-               id="net.sourceforge.phpdt.phphelp.actions.contexthelp">
+               definitionId="net.sourceforge.phpeclipse.actions.opendeclaration"
+               id="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction">
          </action>
       </viewerContribution>
-   
+      
       <viewerContribution
             targetID="#PHPRulerContext"
             id="net.sourceforge.phpdt.ui.PHPEditorPopupActions">
@@ -1063,7 +1055,6 @@
       <editorContribution
             id="org.eclipse.ui.texteditor.ruler.actions"
             targetID="net.sourceforge.phpeclipse.PHPUnitEditor">
-
 		<action
 			id="org.eclipse.ui.texteditor.BookmarkRulerAction"
 			actionID="RulerDoubleClick"
@@ -1078,6 +1069,16 @@
             id="net.sourceforge.phpeclipse.phpeditor.JavaSelectRulerAction">
         </action>
       </editorContribution>
+      <editorContribution
+            id="net.sourceforge.phpdt.editor.actions" 
+            targetID="net.sourceforge.phpeclipse.PHPUnitEditor">
+         <action 
+               definitionId="net.sourceforge.phpeclipse.actions.opendeclaration"
+               label="%OpenDeclaration"
+               class="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction"
+               id="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction">
+         </action>
+      </editorContribution>
    </extension>
    <extension
          point="org.eclipse.ui.popupMenus">
@@ -1381,6 +1382,19 @@
             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"
+            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"