Bug 494622 - Relabel Display view
Call it "Debug Shell" and put some comments.
Change-Id: I9476d9d23a9ab8e77e3a97bcd06b55d6205259c1
Signed-off-by: Mickael Istria <mistria@redhat.com>
Also-By: Sarika Sinha <sarika.sinha@in.ibm.com>
diff --git a/org.eclipse.jdt.debug.ui/plugin.properties b/org.eclipse.jdt.debug.ui/plugin.properties
index c454609..4696186 100644
--- a/org.eclipse.jdt.debug.ui/plugin.properties
+++ b/org.eclipse.jdt.debug.ui/plugin.properties
@@ -44,7 +44,7 @@
ForceReturn.label=&Force Return
-displayViewName=Display
+displayViewName=Debug Shell
filteringPage.label=Filtering
commonPage.label=Common
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ActionMessages.properties b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ActionMessages.properties
index 12a54f7..d67533c 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ActionMessages.properties
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ActionMessages.properties
@@ -31,7 +31,7 @@
Evaluate_error_message_wrapped_exception=An exception occurred: {0}
Evaluate_error_problem_append_pattern={0}\n{1}
Evaluate_error_title_eval_problems=Error Evaluating
-EvaluateAction_Cannot_open_Display_view=Unable to open Display View
+EvaluateAction_Cannot_open_Display_view=Unable to open Debug Shell view
EvaluateAction__evaluation_failed__1=(evaluation failed)
EvaluateAction__evaluation_failed__Reason=Evaluation failed. Reason(s):\n{0}
EvaluateAction_Thread_not_suspended___unable_to_perform_evaluation__1=Thread not suspended - unable to perform evaluation.
@@ -96,7 +96,7 @@
BreakpointLocationVerifierJob_breakpointRemoved=Breakpoint removed.
BreakpointLocationVerifierJob_breakpointMovedToValidPosition=The breakpoint has been moved to a valid position.
BreakpointLocationVerifierJob_breakpointSetToRightType=The breakpoint has been set to the right type.
-PopupDisplayAction_2=Move to Display View
+PopupDisplayAction_2=Move to Debug Shell view
ToggleBreakpointAdapter_9=Selection does not contain a method
ToggleBreakpointAdapter_10=Selection does not contain a field
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayMessages.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayMessages.java
index f11b6f7..4b8d3bc 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayMessages.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayMessages.java
@@ -29,6 +29,7 @@
public static String DisplayView_SelectAll_description;
public static String DisplayView_SelectAll_label;
public static String DisplayView_SelectAll_tooltip;
+ public static String DisplayView_Initial_Comment;
public static String JavaInspectExpression_0;
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayMessages.properties b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayMessages.properties
index d33ee06..065f5b8 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayMessages.properties
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayMessages.properties
@@ -23,5 +23,6 @@
DisplayView_SelectAll_description=Select All
DisplayView_SelectAll_label=Select &All
DisplayView_SelectAll_tooltip=Select
+DisplayView_Initial_Comment=// Use this area to write, run and inspect Java expressions in the context of a debug session
JavaInspectExpression_0=An exception occurred: {0}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayView.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayView.java
index e4db3d8..5f2f265 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayView.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayView.java
@@ -172,6 +172,9 @@
fSourceViewer.configure(new DisplayViewerConfiguration());
fSourceViewer.getSelectionProvider().addSelectionChangedListener(getSelectionChangedListener());
IDocument doc= getRestoredDocument();
+ if (doc.getLength() == 0) {
+ doc.set(DisplayMessages.DisplayView_Initial_Comment);
+ }
fSourceViewer.setDocument(doc);
fSourceViewer.addTextInputListener(this);
fRestoredContents= null;
