Bug 530664 - Debug Shell hint moved to content description

Change-Id: Ib82fb8a1fa98d62ff4a84a0ec6fe86ec07c52e18
Signed-off-by: Lucas Bullen <lbullen@redhat.com>
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 4b8d3bc..8745021 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,7 +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 DisplayView_Content_Description;
 
 	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 065f5b8..399da44 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
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2006 IBM Corporation and others.
+# Copyright (c) 2000, 2018 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -23,6 +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
+DisplayView_Content_Description=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 5f2f265..85c6aa7 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Lucas Bullen (Red Hat Inc.) - Bug 530664 - Debug Shell hint moved to content description
  *******************************************************************************/
 package org.eclipse.jdt.internal.debug.ui.display;
 
@@ -82,7 +83,6 @@
 import org.eclipse.ui.operations.RedoActionHandler;
 import org.eclipse.ui.operations.UndoActionHandler;
 import org.eclipse.ui.part.ViewPart;
-
 import org.eclipse.ui.texteditor.FindReplaceAction;
 import org.eclipse.ui.texteditor.IAbstractTextEditorHelpContextIds;
 import org.eclipse.ui.texteditor.ITextEditorActionConstants;
@@ -171,16 +171,13 @@
 		fSourceViewer= new JDISourceViewer(parent, null, SWT.V_SCROLL | SWT.H_SCROLL | SWT.MULTI | SWT.FULL_SELECTION | SWT.LEFT_TO_RIGHT);
 		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.setDocument(getRestoredDocument());
 		fSourceViewer.addTextInputListener(this);
 		fRestoredContents= null;
 		createActions();
 		createUndoRedoActions();
 		initializeToolBar();
+		this.setContentDescription(DisplayMessages.DisplayView_Content_Description);
 
 		// create context menu
 		MenuManager menuMgr = new MenuManager("#PopUp"); //$NON-NLS-1$