diff options
| author | Lucas Bullen | 2018-02-16 15:27:25 +0000 |
|---|---|---|
| committer | Lucas Bullen | 2018-02-16 19:25:02 +0000 |
| commit | cc429ecc8cc1ebcb2fefd453e2945b33f6784b18 (patch) | |
| tree | 869089c7e0b09b81d1b17b72477ec7e770eae646 | |
| parent | be947700dd0a9d8428650b01e8ddad1b471095ff (diff) | |
| download | eclipse.platform.common-cc429ecc8cc1ebcb2fefd453e2945b33f6784b18.tar.gz eclipse.platform.common-cc429ecc8cc1ebcb2fefd453e2945b33f6784b18.tar.xz eclipse.platform.common-cc429ecc8cc1ebcb2fefd453e2945b33f6784b18.zip | |
Bug 531162 - Rename of Display view not done in HelpI20180220-2000I20180219-2000I20180218-2000I20180217-1500I20180216-2000
Change-Id: I4d90e1a81963f8cfc06f698116b52b67988abeaf
Signed-off-by: Lucas Bullen <lbullen@redhat.com>
32 files changed, 52 insertions, 52 deletions
diff --git a/bundles/org.eclipse.jdt.doc.user/concepts/concept-java-perspective.htm b/bundles/org.eclipse.jdt.doc.user/concepts/concept-java-perspective.htm index bf175c62c..1d3918b52 100644 --- a/bundles/org.eclipse.jdt.doc.user/concepts/concept-java-perspective.htm +++ b/bundles/org.eclipse.jdt.doc.user/concepts/concept-java-perspective.htm @@ -122,7 +122,7 @@ <a href="../reference/views/console/ref-console_view.htm">Console view</a><br /> <a href="../reference/views/debug/ref-debug_view.htm">Debug view</a><br /> - <a href="../reference/views/display/ref-display_view.htm">Display view</a><br /> + <a href="../reference/views/display/ref-debug_shell_view.htm">Debug Shell view</a><br /> <a href="../reference/views/expressions/ref-expressions_view.htm">Expressions view</a><br /> <a href="../reference/views/ref-view-outline.htm">Java outline</a><br /> <a href="../reference/views/ref-view-package-explorer.htm">Package Explorer view</a><br /> diff --git a/bundles/org.eclipse.jdt.doc.user/concepts/concept-java-views.htm b/bundles/org.eclipse.jdt.doc.user/concepts/concept-java-views.htm index d8967b0a5..88223df88 100644 --- a/bundles/org.eclipse.jdt.doc.user/concepts/concept-java-views.htm +++ b/bundles/org.eclipse.jdt.doc.user/concepts/concept-java-views.htm @@ -234,12 +234,12 @@ </li> <li> <h3> - Display View + Debug Shell View </h3> <p> - The <a href="../reference/views/display/ref-display_view.htm">Display view</a> displays the result of + The <a href="../reference/views/display/ref-debug_shell_view.htm">Debug Shell view</a> displays the result of evaluating an expression in the context of the current stack frame. You can evaluate and display a selection - either from the editor or directly from the Display View. + either from the editor or directly from the Debug Shell View. </p> </li> diff --git a/bundles/org.eclipse.jdt.doc.user/contexts_Debugger.xml b/bundles/org.eclipse.jdt.doc.user/contexts_Debugger.xml index ba0e4db27..738d2c100 100644 --- a/bundles/org.eclipse.jdt.doc.user/contexts_Debugger.xml +++ b/bundles/org.eclipse.jdt.doc.user/contexts_Debugger.xml @@ -1272,8 +1272,8 @@ For all of these entries, you can input them as HEX by selecting the <b>Input as </context> <context id="inspect_action_context" > <description>This command allows you to inspect the result of evaluating the selected expression.</description> - <topic label="Inspecting in the Display View" href="reference/views/shared/ref-inspect.htm" /> - <topic label="Display View" href="reference/views/display/ref-display_view.htm" /> + <topic label="Inspecting in the Debug Shell View" href="reference/views/shared/ref-inspect.htm" /> + <topic label="Debug Shell View" href="reference/views/display/ref-debug_shell_view.htm" /> <topic label="Inspecting in the Expressions View" href="reference/views/expressions/ref-inspect.htm" /> <topic label="Expressions View" href="reference/views/expressions/ref-expressions_view.htm"/> <topic label="Inspecting in the Variables View" href="reference/views/shared/ref-inspect.htm" /> @@ -1388,7 +1388,7 @@ For all of these entries, you can input them as HEX by selecting the <b>Input as <topic label="Console View" href="reference/views/console/ref-console_view.htm"/> <topic label="Debug View" href="reference/views/debug/ref-debug_view.htm"/> <topic label="Detail Pane" href="reference/views/shared/ref-detailpane.htm"/> - <topic label="Display View" href="reference/views/display/ref-display_view.htm"/> + <topic label="Debug Shell View" href="reference/views/display/ref-debug_shell_view.htm"/> <topic label="Expressions View" href="reference/views/expressions/ref-expressions_view.htm"/> <topic label="Variables View" href="reference/views/variables/ref-variables_view.htm"/> </context> diff --git a/bundles/org.eclipse.jdt.doc.user/contexts_JDT.xml b/bundles/org.eclipse.jdt.doc.user/contexts_JDT.xml index 860132fe3..3c2a4c0a8 100644 --- a/bundles/org.eclipse.jdt.doc.user/contexts_JDT.xml +++ b/bundles/org.eclipse.jdt.doc.user/contexts_JDT.xml @@ -90,10 +90,10 @@ </context> <context id="display_action_context"> - <description>This command evaluates the selected expression and shows the result in the Display view.</description> + <description>This command evaluates the selected expression and shows the result in the Debug Shell view.</description> <topic label="Displaying the result of evaluating an expression" href="tasks/task-display_evaluation_result.htm"/> <topic label="Evaluating expressions" href="tasks/task-evaluating_expressions.htm"/> - <topic label="Display view" href="reference/views/display/ref-display_view.htm"/> + <topic label="Debug Shell view" href="reference/views/display/ref-debug_shell_view.htm"/> </context> <context id="focus_on_selection_action"> diff --git a/bundles/org.eclipse.jdt.doc.user/contexts_JDT_Debugger.xml b/bundles/org.eclipse.jdt.doc.user/contexts_JDT_Debugger.xml index 0149a798b..df50053ef 100644 --- a/bundles/org.eclipse.jdt.doc.user/contexts_JDT_Debugger.xml +++ b/bundles/org.eclipse.jdt.doc.user/contexts_JDT_Debugger.xml @@ -290,11 +290,11 @@ </context> <!-- - Display View + Debug Shell View --> <context id="display_view_context" > <description>This view displays the result of expression evaluations. It allows you to select an expression and evaluate it.</description> - <topic label="Display View" href="reference/views/display/ref-display_view.htm"/> + <topic label="Debug Shell View" href="reference/views/display/ref-debug_shell_view.htm"/> <topic label="Clear" href="reference/views/display/ref-clear.htm"/> <topic label="Display Result" href="reference/views/shared/ref-display.htm"/> <topic label="Evaluating Expressions" href="tasks/task-evaluating_expressions.htm"/> @@ -302,9 +302,9 @@ <topic label="Inspect" href="reference/views/shared/ref-inspect.htm"/> </context> <context id="clear_display_view_action_context" > - <description>This command clears the contents of the Display view.</description> + <description>This command clears the contents of the Debug Shell view.</description> <topic label="Clear" href="reference/views/display/ref-clear.htm"/> - <topic label="Display View" href="reference/views/display/ref-display_view.htm"/> + <topic label="Debug Shell View" href="reference/views/display/ref-debug_shell_view.htm"/> </context> <!-- diff --git a/bundles/org.eclipse.jdt.doc.user/gettingStarted/images/view_debugshell_display.png b/bundles/org.eclipse.jdt.doc.user/gettingStarted/images/view_debugshell_display.png Binary files differnew file mode 100644 index 000000000..d7d70f95a --- /dev/null +++ b/bundles/org.eclipse.jdt.doc.user/gettingStarted/images/view_debugshell_display.png diff --git a/bundles/org.eclipse.jdt.doc.user/gettingStarted/images/view_debugshell_display_done.png b/bundles/org.eclipse.jdt.doc.user/gettingStarted/images/view_debugshell_display_done.png Binary files differnew file mode 100644 index 000000000..8821faa5d --- /dev/null +++ b/bundles/org.eclipse.jdt.doc.user/gettingStarted/images/view_debugshell_display_done.png diff --git a/bundles/org.eclipse.jdt.doc.user/gettingStarted/images/view_debugshell_inspect.png b/bundles/org.eclipse.jdt.doc.user/gettingStarted/images/view_debugshell_inspect.png Binary files differnew file mode 100644 index 000000000..47b5d786b --- /dev/null +++ b/bundles/org.eclipse.jdt.doc.user/gettingStarted/images/view_debugshell_inspect.png diff --git a/bundles/org.eclipse.jdt.doc.user/gettingStarted/images/view_display_display.png b/bundles/org.eclipse.jdt.doc.user/gettingStarted/images/view_display_display.png Binary files differdeleted file mode 100644 index 06380e4d1..000000000 --- a/bundles/org.eclipse.jdt.doc.user/gettingStarted/images/view_display_display.png +++ /dev/null diff --git a/bundles/org.eclipse.jdt.doc.user/gettingStarted/images/view_display_display_done.png b/bundles/org.eclipse.jdt.doc.user/gettingStarted/images/view_display_display_done.png Binary files differdeleted file mode 100644 index abfac8404..000000000 --- a/bundles/org.eclipse.jdt.doc.user/gettingStarted/images/view_display_display_done.png +++ /dev/null diff --git a/bundles/org.eclipse.jdt.doc.user/gettingStarted/images/view_display_inspect.png b/bundles/org.eclipse.jdt.doc.user/gettingStarted/images/view_display_inspect.png Binary files differdeleted file mode 100644 index a1f1babf4..000000000 --- a/bundles/org.eclipse.jdt.doc.user/gettingStarted/images/view_display_inspect.png +++ /dev/null diff --git a/bundles/org.eclipse.jdt.doc.user/gettingStarted/qs-13.htm b/bundles/org.eclipse.jdt.doc.user/gettingStarted/qs-13.htm index 06506dfae..3d76feb8f 100644 --- a/bundles/org.eclipse.jdt.doc.user/gettingStarted/qs-13.htm +++ b/bundles/org.eclipse.jdt.doc.user/gettingStarted/qs-13.htm @@ -118,7 +118,7 @@ <a href="../reference/ref-toolbar-run.htm">Run and debug toolbar actions</a><br> <a href="../reference/views/breakpoints/ref-breakpoints_view.htm">Breakpoints view</a><br> <a href="../reference/views/console/ref-console_view.htm">Console view</a><br> - <a href="../reference/views/display/ref-display_view.htm">Display view</a><br> + <a href="../reference/views/display/ref-debug_shell_view.htm">Debug shell view</a><br> <a href="../reference/views/expressions/ref-expressions_view.htm">Expressions view</a><br> <a href="../reference/views/variables/ref-variables_view.htm">Variables view</a></p> diff --git a/bundles/org.eclipse.jdt.doc.user/gettingStarted/qs-14.htm b/bundles/org.eclipse.jdt.doc.user/gettingStarted/qs-14.htm index f76e00ecc..3ddd387c0 100644 --- a/bundles/org.eclipse.jdt.doc.user/gettingStarted/qs-14.htm +++ b/bundles/org.eclipse.jdt.doc.user/gettingStarted/qs-14.htm @@ -16,29 +16,29 @@ running Java program. </p> <code>setUp()</code> method and select <b>Step Over</b> twice to populate <code>fFull</code>. (See the <a href="qs-13.htm">Debugging your Programs</a> section for full details.)<br> </li> - <li>Open the Display view by selecting <b>Window > Show View > Display</b> + <li>Open the Debug Shell view by selecting <b>Window > Show View > Display</b> and type the following line in the view: <p> <code>fFull.size()</code></p> </li> <li> Select the text you just typed, and from its context menu, select <strong>Display</strong>. (You can also choose <strong>Display Result of Evaluating Selected Text </strong> (<img src="../images/org.eclipse.jdt.debug.ui/etool16/disp_sbook.png" alt="Display" >) from - the Display view toolbar.) - <p> <img src="images/view_display_display.png" alt="Display view with fFull.size selected and showing context menu"> + the Debug Shell view toolbar.) + <p> <img src="images/view_debugshell_display.png" alt="Debug Shell view with fFull.size selected and showing context menu"> </p> </li> <li> The expression is evaluated and the result is displayed in the Display view. - <p> <img src="images/view_display_display_done.png" alt="Display view showing evaluation result: (int) 2"> + <p> <img src="images/view_debugshell_display_done.png" alt="Debug Shell view showing evaluation result: (int) 2"> </p> </li> - <li> On a new line in the Display view, type the following line: + <li> On a new line in the Debug Shell view, type the following line: <p> <code>fFull.toArray()</code> </p> </li> <li> Select this line, and select <strong>Inspect</strong> from the context menu. (You can also choose <strong>Inspect Result of Evaluating - Selected Text </strong> (<img src="../images/org.eclipse.jdt.debug.ui/etool16/insp_sbook.png" alt="Inspect" >) from the Display view toolbar.) </li> + Selected Text </strong> (<img src="../images/org.eclipse.jdt.debug.ui/etool16/insp_sbook.png" alt="Inspect" >) from the Debug Shell view toolbar.) </li> <li>A lightweight window opens with the value of the evaluated expression. - <p> <img src="images/view_display_inspect.png" alt="Pop-up containing fFull.toArray() expression"> + <p> <img src="images/view_debugshell_inspect.png" alt="Pop-up containing fFull.toArray() expression"> </p> </li> </ol> diff --git a/bundles/org.eclipse.jdt.doc.user/reference/menus/run/ref-menu-run.htm b/bundles/org.eclipse.jdt.doc.user/reference/menus/run/ref-menu-run.htm index 647864ff9..f4f7de452 100644 --- a/bundles/org.eclipse.jdt.doc.user/reference/menus/run/ref-menu-run.htm +++ b/bundles/org.eclipse.jdt.doc.user/reference/menus/run/ref-menu-run.htm @@ -68,7 +68,7 @@ <tr> <td colspan="1" valign="top" align="left"><img src="../../../images/org.eclipse.jdt.debug.ui/etool16/disp_sbook.png" alt="Display"></td> <td rowspan="1" colspan="1" valign="top" align="left"><p><strong><a href="../../../reference/views/shared/ref-display.htm">Display</a></strong></p></td> - <td rowspan="1" colspan="1" valign="top" align="left"><p>Uses the Display view to show the result of evaluating the selected expression in the context of a stack frame or variable in that thread. If the current active part is a Java Snippet Editor, the result is displayed there.</p></td> + <td rowspan="1" colspan="1" valign="top" align="left"><p>Uses the Debug Shell view to show the result of evaluating the selected expression in the context of a stack frame or variable in that thread. If the current active part is a Java Snippet Editor, the result is displayed there.</p></td> <td rowspan="1" colspan="1" valign="top" align="left"><p>Ctrl + Shift + D</p></td> </tr> <tr> diff --git a/bundles/org.eclipse.jdt.doc.user/reference/views/display/images/ref-debug_shell_view.PNG b/bundles/org.eclipse.jdt.doc.user/reference/views/display/images/ref-debug_shell_view.PNG Binary files differnew file mode 100644 index 000000000..9324f2e0d --- /dev/null +++ b/bundles/org.eclipse.jdt.doc.user/reference/views/display/images/ref-debug_shell_view.PNG diff --git a/bundles/org.eclipse.jdt.doc.user/reference/views/display/images/ref-display_view.PNG b/bundles/org.eclipse.jdt.doc.user/reference/views/display/images/ref-display_view.PNG Binary files differdeleted file mode 100644 index ec186221b..000000000 --- a/bundles/org.eclipse.jdt.doc.user/reference/views/display/images/ref-display_view.PNG +++ /dev/null diff --git a/bundles/org.eclipse.jdt.doc.user/reference/views/display/ref-clear.htm b/bundles/org.eclipse.jdt.doc.user/reference/views/display/ref-clear.htm index 3903e345d..781854274 100644 --- a/bundles/org.eclipse.jdt.doc.user/reference/views/display/ref-clear.htm +++ b/bundles/org.eclipse.jdt.doc.user/reference/views/display/ref-clear.htm @@ -11,7 +11,7 @@ <h1> Clear </h1> <p> Select the <strong>Clear</strong> command [ <img src="../../../images/org.eclipse.ui.console/elcl16/clear_co.png" alt="Clear the view"> ] to remove all of the contents from the view. </p> <p><img src="../../../images/ngrelr.png" alt="Related Reference"></p> -<p><a href="ref-display_view.htm">Display View</a></p> +<p><a href="ref-debug_shell_view.htm">Debug Shell View</a></p> <p> </p> </body> </html> diff --git a/bundles/org.eclipse.jdt.doc.user/reference/views/display/ref-display_view.htm b/bundles/org.eclipse.jdt.doc.user/reference/views/display/ref-debug_shell_view.htm index 32560eb6f..8ed32e1d0 100644 --- a/bundles/org.eclipse.jdt.doc.user/reference/views/display/ref-display_view.htm +++ b/bundles/org.eclipse.jdt.doc.user/reference/views/display/ref-debug_shell_view.htm @@ -5,17 +5,17 @@ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> <meta http-equiv="Content-Style-Type" content="text/css"> <link rel="stylesheet" href="../../../book.css" charset="ISO-8859-1" type="text/css"> -<title>Display View</title> +<title>Debug Shell View</title> </head> <body> -<h1> Display View </h1> -<p> The <strong>Display View</strong> displays the result of evaluating an expression in the context of the current stack frame. You can evaluate and display a selection either from the editor or - directly from the <strong>Display View</strong>.</p> -<p><img src="../../../reference/views/display/images/ref-display_view.PNG" alt="Display View"></p> -<p>The commands available in the display view are listed below.</p> +<h1> Debug Shell View </h1> +<p> The <strong>Debug Shell View</strong> displays the result of evaluating an expression in the context of the current stack frame. You can evaluate and display a selection either from the editor or + directly from the <strong>Debug Shell View</strong>.</p> +<p><img src="../../../reference/views/display/images/ref-debug_shell_view.PNG" alt="Debug Shell View"></p> +<p>The commands available in the debug shell view are listed below.</p> <table border="1" cellspacing="0" cellpadding="5"> <caption> - Display View Commands + Debug Shell View Commands </caption> <thead> <tr> diff --git a/bundles/org.eclipse.jdt.doc.user/reference/views/ref-viewsandeditors.htm b/bundles/org.eclipse.jdt.doc.user/reference/views/ref-viewsandeditors.htm index fec7383b1..88e8b7868 100644 --- a/bundles/org.eclipse.jdt.doc.user/reference/views/ref-viewsandeditors.htm +++ b/bundles/org.eclipse.jdt.doc.user/reference/views/ref-viewsandeditors.htm @@ -36,7 +36,7 @@ <a href="breakpoints/ref-breakpoints_view.htm">Breakpoints view</a><br> <a href="console/ref-console_view.htm">Console view</a><br> <a href="debug/ref-debug_view.htm">Debug view</a><br> - <a href="display/ref-display_view.htm">Display view</a><br> + <a href="display/ref-debug_shell_view.htm">Debug Shell view</a><br> <a href="expressions/ref-expressions_view.htm">Expressions view</a><br> <a href="../views/ref-java-editor.htm">Java editor</a><br> <a href="ref-view-package-explorer.htm">Package Explorer view</a><br> diff --git a/bundles/org.eclipse.jdt.doc.user/reference/views/shared/images/ref-displayresult.PNG b/bundles/org.eclipse.jdt.doc.user/reference/views/shared/images/ref-displayresult.PNG Binary files differindex 047d17759..bea3631fc 100644 --- a/bundles/org.eclipse.jdt.doc.user/reference/views/shared/images/ref-displayresult.PNG +++ b/bundles/org.eclipse.jdt.doc.user/reference/views/shared/images/ref-displayresult.PNG diff --git a/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-contentassist.htm b/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-contentassist.htm index b8f49fc62..71acd937c 100644 --- a/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-contentassist.htm +++ b/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-contentassist.htm @@ -15,7 +15,7 @@ <p>This command applies to:</p> <ul> <li><a href="../../../concepts/concept-java-editor.htm"><strong>Java Editor</strong></a></li> - <li><a href="../../../reference/views/display/ref-display_view.htm"><strong>Display View</strong></a></li> + <li><a href="../../../reference/views/display/ref-debug_shell_view.htm"><strong>Debug Shell View</strong></a></li> <li><a href="../../../reference/views/shared/ref-detailpane.htm"><strong>Detail Pane</strong></a> (in the <a href="../../../reference/views/expressions/ref-expressions_view.htm"><strong>Expressions View</strong></a> and <a href="../../../reference/views/variables/ref-variables_view.htm"><strong>Variables View</strong></a>)</li> </ul> <p><img src="../../../images/ngrelt.png" alt="Related Tasks"></p> diff --git a/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-copy.htm b/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-copy.htm index b02adf64d..b3bb3b28d 100644 --- a/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-copy.htm +++ b/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-copy.htm @@ -15,7 +15,7 @@ <li><a href="../../../reference/views/breakpoints/ref-breakpoints_view.htm"><strong>Breakpoints View </strong></a></li> <li> <a href="../../../reference/views/console/ref-console_view.htm"><strong>Console View</strong></a></li> <li><a href="../../../reference/views/debug/ref-debug_view.htm"><strong>Debug View</strong></a></li> - <li> <a href="../../../reference/views/display/ref-display_view.htm"><strong>Display View </strong></a></li> + <li> <a href="../../../reference/views/display/ref-debug_shell_view.htm"><strong>Debug Shell View </strong></a></li> <li> <a href="../../../reference/views/expressions/ref-expressions_view.htm"><strong>Expressions View</strong></a></li> <li> Registers View</li> <li><a href="../../../reference/views/variables/ref-variables_view.htm"><strong>Variables View</strong></a> </li> diff --git a/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-cut.htm b/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-cut.htm index a99c2c901..013fb6b2f 100644 --- a/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-cut.htm +++ b/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-cut.htm @@ -13,7 +13,7 @@ <p>This command applies to:</p> <ul> <li><a href="../../../reference/views/console/ref-console_view.htm"><strong>Console View</strong></a></li> - <li><a href="../../../reference/views/display/ref-display_view.htm"><strong>Display View</strong></a></li> + <li><a href="../../../reference/views/display/ref-debug_shell_view.htm"><strong>Debug Shell View</strong></a></li> <li><a href="../../../reference/views/shared/ref-detailpane.htm"><strong>Detail Pane</strong></a> (in the <a href="../../../reference/views/expressions/ref-expressions_view.htm"><strong>Expressions View</strong></a> and <a href="../../../reference/views/variables/ref-variables_view.htm"><strong>Variables View</strong></a>)</li> </ul> <p> </p> diff --git a/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-display.htm b/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-display.htm index e6d229a8a..66935f894 100644 --- a/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-display.htm +++ b/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-display.htm @@ -9,15 +9,15 @@ </head> <body> <h1> Display </h1> -<p> Select the <strong>Display</strong> command [ <img src="../../../images/org.eclipse.jdt.debug.ui/etool16/disp_sbook.png" alt="Display Result"> ] to have the selected statement evaluated and the results displayed inline in the <a href="../../../reference/views/display/ref-display_view.htm"><strong>Display View</strong></a> or in a popup dialog (that can be moved to the Display View).</p> -<p>For example, consider we have the following statement selected in the Display View:</p> +<p> Select the <strong>Display</strong> command [ <img src="../../../images/org.eclipse.jdt.debug.ui/etool16/disp_sbook.png" alt="Display Result"> ] to have the selected statement evaluated and the results displayed inline in the <a href="../../../reference/views/display/ref-debug_shell_view.htm"><strong>Debug Shell View</strong></a> or in a popup dialog (that can be moved to the Display View).</p> +<p>For example, consider we have the following statement selected in the Debug Shell View:</p> <p><img src="../../../reference/views/shared/images/ref-selectedstatement.PNG" alt="Selected Statement"> </p> <p>After we select the <strong>Display </strong> command we notice that the result is inserted inline in the view. In the following case though, a <em><strong>println()</strong></em> statement does not have an explicit return value, so that is what is written in the view. </p> <p><img src="../../../reference/views/shared/images/ref-displayresult.PNG" alt="Display command result"></p> <p>This command applies to:</p> <ul> <li><a href="../../../concepts/concept-java-editor.htm"><strong>Java Editor</strong></a></li> - <li><a href="../../../reference/views/display/ref-display_view.htm"><strong>Display View</strong></a></li> + <li><a href="../../../reference/views/display/ref-debug_shell_view.htm"><strong>Debug Shell View</strong></a></li> <li><a href="../../../reference/views/shared/ref-detailpane.htm"><strong>Detail Pane</strong></a> (in the <a href="../../../reference/views/expressions/ref-expressions_view.htm"><strong>Expressions View</strong></a> and <a href="../../../reference/views/variables/ref-variables_view.htm"><strong>Variables View</strong></a>)</li> <li><a href="../../../reference/menus/run/ref-menu-run.htm"><strong>Run Menu</strong></a></li> </ul> diff --git a/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-execute.htm b/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-execute.htm index 4be7f8c39..e5ed081a7 100644 --- a/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-execute.htm +++ b/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-execute.htm @@ -13,7 +13,7 @@ <p>This command applies to:</p> <ul> <li><a href="../../../concepts/concept-java-editor.htm"><strong>Java Editor</strong></a></li> - <li><a href="../../../reference/views/display/ref-display_view.htm"><strong>Display View</strong></a></li> + <li><a href="../../../reference/views/display/ref-debug_shell_view.htm"><strong>Debug Shell View</strong></a></li> <li><a href="../../../reference/views/shared/ref-detailpane.htm"><strong>Detail Pane</strong></a> (in the <a href="../../../reference/views/expressions/ref-expressions_view.htm"><strong>Expressions View</strong></a> and <a href="../../../reference/views/variables/ref-variables_view.htm"><strong>Variables View</strong></a>)</li> <li><a href="../../../reference/menus/run/ref-menu-run.htm"><strong>Run Menu</strong></a></li> </ul> diff --git a/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-findreplace.htm b/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-findreplace.htm index 577f34abf..6767a87a8 100644 --- a/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-findreplace.htm +++ b/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-findreplace.htm @@ -15,7 +15,7 @@ <p>This command applies to:</p> <ul> <li><a href="../../../reference/views/console/ref-console_view.htm"><strong>Console View</strong></a></li> - <li><a href="../../../reference/views/display/ref-display_view.htm"><strong>Display View</strong></a></li> + <li><a href="../../../reference/views/display/ref-debug_shell_view.htm"><strong>Debug Shell View</strong></a></li> <li><a href="../../../reference/views/shared/ref-detailpane.htm"><strong>Detail Pane</strong></a> (in the <a href="../../../reference/views/expressions/ref-expressions_view.htm"><strong>Expressions View</strong></a> and <a href="../../../reference/views/variables/ref-variables_view.htm"><strong>Variables View</strong></a>)</li> </ul> <p> </p> diff --git a/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-forcereturn.htm b/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-forcereturn.htm index ef92991ad..c5198ebc4 100644 --- a/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-forcereturn.htm +++ b/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-forcereturn.htm @@ -16,7 +16,7 @@ in the method and releases any locks obtained by synchronized blocks. A return value is created by selecting an expression and <strong>Force Return</strong> (<strong>Alt+Shift+F</strong>). This action is available - from the Java editor's context menu, top level <a href="../../../reference/menus/run/ref-menu-run.htm"><strong>Run</strong></a> menu, in the <a href="../../../reference/views/display/ref-display_view.htm"><strong>Display + from the Java editor's context menu, top level <a href="../../../reference/menus/run/ref-menu-run.htm"><strong>Run</strong></a> menu, in the <a href="../../../reference/views/display/ref-debug_shell_view.htm"><strong>Display View</strong></a>, and in the <strong><a href="../../../reference/views/shared/ref-detailpane.htm">detail pane</a></strong> of the <a href="../../../reference/views/variables/ref-variables_view.htm"><strong>Variables View</strong></a>.</p> <p>Forcing an early return from a non-void method requires an expression to be evaluated. For example, if a method was going to return false @@ -24,12 +24,12 @@ View</strong> and invoking <strong>Force Return</strong>. In the following example, <code>elementCount</code> is not equal to zero, and would return false (see debug hover showing the value of <code>elementCount</code>).</p> <p><img src="images/force-return-code.png" alt="Force Return Example"></p> -<p>From the<strong> Display View</strong>, we could enter the value we want returned, select it and use the <strong>Force Return</strong> command to force the method <code>isEmpty()</code> to return with that value (in the following example we will force <code>isEmpty()</code> to return with the value <code>true</code>). </p> -<p><img src="images/force-return-action.png" alt="Force Return Action in the Display View"></p> +<p>From the<strong> Debug Shell View</strong>, we could enter the value we want returned, select it and use the <strong>Force Return</strong> command to force the method <code>isEmpty()</code> to return with that value (in the following example we will force <code>isEmpty()</code> to return with the value <code>true</code>). </p> +<p><img src="images/force-return-action.png" alt="Force Return Action in the Debug Shell View"></p> <p>This command applies to:</p> <ul> <li><a href="../../../concepts/concept-java-editor.htm"><strong>Java Editor</strong></a></li> - <li><a href="../../../reference/views/display/ref-display_view.htm"><strong>Display View</strong></a></li> + <li><a href="../../../reference/views/display/ref-debug_shell_view.htm"><strong>Debug Shell View</strong></a></li> <li><a href="../../../reference/views/shared/ref-detailpane.htm"><strong>Detail Pane</strong></a> (in the <a href="../../../reference/views/expressions/ref-expressions_view.htm"><strong>Expressions View</strong></a> and <a href="../../../reference/views/variables/ref-variables_view.htm"><strong>Variables View</strong></a>)</li> <li><a href="../../../reference/menus/run/ref-menu-run.htm"><strong>Run Menu</strong></a></li> </ul> diff --git a/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-inspect.htm b/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-inspect.htm index d7025798d..749026a3a 100644 --- a/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-inspect.htm +++ b/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-inspect.htm @@ -15,7 +15,7 @@ <p>This command applies to:</p> <ul> <li><a href="../../../concepts/concept-java-editor.htm"><strong>Java Editor</strong></a></li> - <li><a href="../../../reference/views/display/ref-display_view.htm"><strong>Display View</strong></a></li> + <li><a href="../../../reference/views/display/ref-debug_shell_view.htm"><strong>Debug Shell View</strong></a></li> <li><a href="../../../reference/views/shared/ref-detailpane.htm"><strong>Detail Pane</strong></a> (in the <a href="../../../reference/views/expressions/ref-expressions_view.htm"><strong>Expressions View</strong></a> and <a href="../../../reference/views/variables/ref-variables_view.htm"><strong>Variables View</strong></a>)</li> <li><a href="../../../reference/menus/run/ref-menu-run.htm"><strong>Run Menu</strong></a></li> </ul> diff --git a/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-paste.htm b/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-paste.htm index 341e707b6..c2cbb9dc3 100644 --- a/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-paste.htm +++ b/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-paste.htm @@ -14,7 +14,7 @@ <ul> <li><a href="../../../reference/views/breakpoints/ref-breakpoints_view.htm"><strong>Breakpoints View </strong></a></li> <li> <a href="../../../reference/views/console/ref-console_view.htm"><strong>Console View</strong></a></li> - <li> <a href="../../../reference/views/display/ref-display_view.htm"><strong>Display View </strong></a></li> + <li> <a href="../../../reference/views/display/ref-debug_shell_view.htm"><strong>Debug Shell View </strong></a></li> <li><a href="../../../reference/views/shared/ref-detailpane.htm"><strong>Detail Pane</strong></a> (in the <a href="../../../reference/views/expressions/ref-expressions_view.htm"><strong>Expressions View</strong></a> and <a href="../../../reference/views/variables/ref-variables_view.htm"><strong>Variables View</strong></a>)</li> </ul> <p> </p> diff --git a/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-selectall.htm b/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-selectall.htm index 46b213d12..959603f76 100644 --- a/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-selectall.htm +++ b/bundles/org.eclipse.jdt.doc.user/reference/views/shared/ref-selectall.htm @@ -14,7 +14,7 @@ <ul> <li> <a href="../../../reference/views/breakpoints/ref-breakpoints_view.htm"><strong>Breakpoints View</strong></a></li> <li><a href="../../../reference/views/console/ref-console_view.htm"><strong>Console View</strong></a></li> - <li> <a href="../../../reference/views/display/ref-display_view.htm"><strong>Display View</strong></a></li> + <li> <a href="../../../reference/views/display/ref-debug_shell_view.htm"><strong>Debug Shell View</strong></a></li> <li> <a href="../../../reference/views/expressions/ref-expressions_view.htm"><strong>Expressions View</strong></a></li> <li> Registers View </li> <li><a href="../../../reference/views/variables/ref-variables_view.htm"><strong>Variables View</strong></a></li> diff --git a/bundles/org.eclipse.jdt.doc.user/tasks/task-evaluating_expressions.htm b/bundles/org.eclipse.jdt.doc.user/tasks/task-evaluating_expressions.htm index 49fd19ba8..9ba37e1ba 100644 --- a/bundles/org.eclipse.jdt.doc.user/tasks/task-evaluating_expressions.htm +++ b/bundles/org.eclipse.jdt.doc.user/tasks/task-evaluating_expressions.htm @@ -16,7 +16,7 @@ is selected, the selected stack frame will be the context. </li> <li> Expressions can be entered and evaluated in the following areas: <ul> - <li> <strong><a href="../reference/views/display/ref-display_view.htm">Display View</a></strong> </li> + <li> <strong><a href="../reference/views/display/ref-debug_shell_view.htm">Debug Shell View</a></strong> </li> <li> <a href="../reference/views/shared/ref-detailpane.htm"><strong>Detail Pane</strong></a> (in the <a href="../reference/views/expressions/ref-expressions_view.htm"><strong>Expressions View</strong></a> and <a href="../reference/views/variables/ref-variables_view.htm"><strong>Variables View</strong></a>)</li> <li><a href="../concepts/concept-java-editor.htm"><strong>Java Editor</strong></a> when it is displaying source and it is not read-only </li> </ul> @@ -27,11 +27,11 @@ a result - the expression is just executed.</li> <li>The result popup window can be dismissed by clicking outside of the popup window or by pressing <em><strong>Esc</strong></em>. The result can be persisted to - the Display view (if <strong>Display</strong> was chosen) or Expressions view + the Debug Shell view (if <strong>Display</strong> was chosen) or Expressions view (if <strong>Inspect</strong> was chosen) by pressing the key sequence shown at the bottom of the popup window. For example, to move the result of an <strong>Inspect </strong>evaluation to the Expressions view press <em><strong>Ctrl-Shift-I</strong></em>. Note that when the <strong>Display</strong> action is used from the Display - view the result is written to the Display view rather than a popup</li> + view the result is written to the Debug Shell view rather than a popup</li> </ol> <p><strong>Note:</strong> Evaluations cannot be performed in threads that have been manually suspended.</p> <p> <img border="0" src="../images/ngrelc.png" alt="Related concepts" ><br> @@ -42,7 +42,7 @@ <a href="../tasks/task-resuming_threads.htm">Resuming the execution of suspended threads</a> </p> <p><img border="0" src="../images/ngrelr.png" alt="Related reference" ><br> <a href="../reference/views/shared/ref-detailpane.htm">Detail Pane</a><br> - <a href="../reference/views/display/ref-display_view.htm">Display view</a><br> + <a href="../reference/views/display/ref-debug_shell_view.htm">Debug Shell view</a><br> <a href="../reference/views/expressions/ref-expressions_view.htm">Expressions view</a><br> <a href="../reference/views/variables/ref-variables_view.htm">Variables view</a></p> </body> diff --git a/bundles/org.eclipse.jdt.doc.user/topics_Reference.xml b/bundles/org.eclipse.jdt.doc.user/topics_Reference.xml index be0f92f73..e865c5b96 100644 --- a/bundles/org.eclipse.jdt.doc.user/topics_Reference.xml +++ b/bundles/org.eclipse.jdt.doc.user/topics_Reference.xml @@ -264,9 +264,9 @@ </topic> <!-- - Display View + Debug Shell View --> - <topic label="Display View" href="reference/views/display/ref-display_view.htm"> + <topic label="Debug Shell View" href="reference/views/display/ref-debug_shell_view.htm"> <topic label="Clear" href="reference/views/display/ref-clear.htm"/> <topic label="Content Assist" href="reference/views/shared/ref-contentassist.htm"/> <topic label="Copy Selected Statements" href="reference/views/shared/ref-copy.htm"/> |
