Bug 440203: [search] Extra Find Declarations hitsI20140826-0800I20140819-2200I20140819-1800I20140819-1200I20140819-0800I20140812-0800

1 files changed, 23 insertions, 44 deletions

diff --git a/bundles/org.eclipse.jdt.doc.user/reference/ref-menu-search.htm b/bundles/org.eclipse.jdt.doc.user/reference/ref-menu-search.htm
index 034ad6c24..e150d4dab 100644
--- a/bundles/org.eclipse.jdt.doc.user/reference/ref-menu-search.htm
+++ b/bundles/org.eclipse.jdt.doc.user/reference/ref-menu-search.htm
@@ -28,9 +28,6 @@
             Function
           </p>
         </th>
-        <td>
-          <strong>Keyboard Shortcut</strong>
-        </td>
       </tr>
       <tr align="left" valign="top">
         <td align="left" valign="top">
@@ -40,12 +37,9 @@
         </td>
         <td align="left" valign="top">
           <p>
-            Opens the search dialog
+            Opens the search dialog (<b>Ctrl+H</b>)
           </p>
         </td>
-        <td>
-          Ctrl + H
-        </td>
       </tr>
       <tr>
         <td align="left" valign="top">
@@ -58,9 +52,6 @@
             Opens the search dialog on the File search page
           </p>
         </td>
-        <td>&nbsp;
-          
-        </td>
       </tr>
       <tr>
         <td align="left" valign="top">
@@ -73,9 +64,6 @@
             Opens the search dialog on the Java search page
           </p>
         </td>
-        <td>&nbsp;
-          
-        </td>
       </tr>
       
       <tr>
@@ -89,15 +77,12 @@
             Searches for the selected text in the chosen scope:
           </p>
           <ul>
-            <li>Workspace (<b>Ctrl + Alt + G</b>)</li>
+            <li>Workspace (<b>Ctrl+Alt+G</b>)</li>
             <li>Project</li>
             <li>Hierarchy</li>
             <li>Working Set</li>
           </ul>
         </td>
-        <td>&nbsp;
-          
-        </td>
       </tr>
       
       <tr>
@@ -111,41 +96,47 @@
             Finds all references to the selected Java element in the chosen scope:
           </p>
           <ul>
-            <li>Workspace (<b>Ctrl + Shift + G</b>)</li>
+            <li>Workspace (<b>Ctrl+Shift+G</b>):</li>
             <li>Project</li>
             <li>Hierarchy</li>
             <li>Working Set</li>
           </ul>
         </td>
-        <td>&nbsp;
-        </td>
       </tr>
       <tr>
-        <td>
-          Declarations
+        <td align="left" valign="top">
+          <p>
+            Declarations
+          </p>
         </td>
         <td>
           <p>
           Finds all declarations of the selected Java element in the chosen scope:
           </p>
           <ul>
-            <li>Workspace (<b>Ctrl + G</b>)</li>
+            <li>Workspace (<b>Ctrl+G</b>)</li>
             <li>Project</li>
             <li>Hierarchy</li>
             <li>Working Set</li>
           </ul>
-        </td>
-        <td>&nbsp;          
+          <p>Note: A strict declaration search would only ever return a single declaration. Since that's not interesting,
+          declaration searches are relaxed as follows:</p>
+          <ul>
+            <li>Method declarations: Hierarchy search finds overriding and overridden methods in the hierarchy.
+                Other searches find methods with the same name and signature, but ignoring declaring type and return type.</li>
+            <li>Field declarations: Ignore the declaring type and the field's type.</li>
+          </ul>
         </td>
       </tr>
       <tr align="left" valign="top">
-        <td>
-          Implementors
+        <td align="left" valign="top">
+          <p>
+            Implementors
+          </p>
         </td>
         <td>
           <p>
           Finds all implementors of the selected interface in the chosen scope:
-            (Workspace, Project or Working Set)
           </p>
           <ul>
             <li>Workspace</li>
@@ -153,8 +144,6 @@
             <li>Working Set</li>
           </ul>            
         </td>
-        <td>&nbsp;
-        </td>
       </tr>
       <tr align="left" valign="top">
         <td>
@@ -171,8 +160,6 @@
             <li>Working Set</li>
           </ul>  
         </td>
-        <td>&nbsp;   
-        </td>
       </tr>
       <tr align="left" valign="top">
         <td>
@@ -189,8 +176,6 @@
             <li>Working Set</li>
           </ul>  
         </td>
-        <td>&nbsp;
-        </td>
       </tr>
 
       <tr>
@@ -199,7 +184,7 @@
         </td>
 
         <td valign="top">
-          <p>Finds all occurrences of the selected Java element in its file
+          <p>Finds all occurrences of the selected Java element in its file (<b>Ctrl+Shift+U</b>)
           </p>
           <ul>
             <li>Identifier: Occurrences of all identifiers resolving to the selected element</li>
@@ -209,10 +194,6 @@
             <li>Break/Continue Target: The targets of the selected break and continue statement</li>
           </ul>  
         </td>
-        <td>
-        	Ctrl + Shift + U
-        </td>
-
       </tr>
       
       <tr>
@@ -222,8 +203,6 @@
         <td valign="top">
           <p>Finds all JUnit tests that refer to the currently selected type</p>
         </td>
-        <td>&nbsp;
-        </td>
       </tr>
      
     </table>
@@ -295,7 +274,7 @@
       <tr>
         <td align="left" valign="top">
           <p>
-            Workings Set
+            Working Set
           </p>
         </td>
         <td>
@@ -309,8 +288,8 @@
       </tr>
     </table>
     <p>
-      Scopes can be saved and names in the working set dialog. Existing instances of working sets 
-	  are also available in the Search Scope submenu
+      Custom scopes can be configured using the working set dialog. Existing working sets 
+      are shown in the Search scope submenus after they've been used in a search.
     </p>
     <p>
       A Java search can also be conducted via the context menu of all Java views.