From e93de453f8d18577d04a886ed03cf209ea6837b1 Mon Sep 17 00:00:00 2001
From: Jonah Graham <jonah@kichwacoders.com>
Date: Fri, 6 Jan 2017 11:30:04 +0000
Subject: [PATCH] Bug 509897: Use View Management for Debugger Console

Change-Id: I509d3b5679e2ab236f8cd09b122ffae603a5fc51
Signed-off-by: Jonah Graham <jonah@kichwacoders.com>
---
 debug/org.eclipse.cdt.debug.ui/plugin.xml                  | 4 ++++
 .../dsf/gdb/internal/ui/console/GdbCliConsoleManager.java  | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index f01dee13ba8..5cdde0e680b 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -1031,6 +1031,10 @@
       <contextViewBinding
             contextId="org.eclipse.cdt.debug.ui.debugging"
             viewId="org.eclipse.debug.ui.ModuleView"/>
+     <contextViewBinding
+           contextId="org.eclipse.cdt.debug.ui.debugging"
+           viewId="org.eclipse.cdt.debug.ui.debuggerConsoleView"
+           autoClose="false"/>
    </extension>
    <extension
          point="org.eclipse.ui.editors.annotationTypes">
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/GdbCliConsoleManager.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/GdbCliConsoleManager.java
index ae0604cdbb0..3fb62987399 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/GdbCliConsoleManager.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/GdbCliConsoleManager.java
@@ -207,8 +207,13 @@ public class GdbCliConsoleManager implements ILaunchesListener2 {
 			}
 			
 			addConsole(console);
+			
+// No need to open the view manually as it is associated with the Debug view
+// and is handled through the automatic view management system.
+// It will be opened by the platform.
+// See http://eclip.se/509897 
 			// Make sure the Debugger Console view is visible but do not force it to the top
-			getDebuggerConsoleManager().openConsoleView();
+			// getDebuggerConsoleManager().openConsoleView();
 		}
 	}