diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/debuggerconsole/DebuggerConsoleManager.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/debuggerconsole/DebuggerConsoleManager.java index 5d178dbc185..ad90f994f86 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/debuggerconsole/DebuggerConsoleManager.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/debuggerconsole/DebuggerConsoleManager.java @@ -81,29 +81,21 @@ public class DebuggerConsoleManager implements IDebuggerConsoleManager { } @Override - public void showConsoleView(IDebuggerConsole console) { - fShowDebuggerConsoleViewJob.setConsole(console); + public void showConsoleView() { fShowDebuggerConsoleViewJob.schedule(100); } private class ShowDebuggerConsoleViewJob extends WorkbenchJob { - private IConsole fConsole; - ShowDebuggerConsoleViewJob() { super("Show GDB Console View"); //$NON-NLS-1$ setSystem(true); setPriority(Job.SHORT); } - void setConsole(IConsole console) { - fConsole = console; - } - @Override public IStatus runInUIThread(IProgressMonitor monitor) { IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - IConsole c = fConsole; - if (window != null && c != null) { + if (window != null) { IWorkbenchPage page = window.getActivePage(); if (page != null) { boolean consoleFound = false; @@ -114,7 +106,6 @@ public class DebuggerConsoleManager implements IDebuggerConsoleManager { if (consoleVisible) { consoleFound = true; page.bringToTop(consoleView); - consoleView.display(c); } } @@ -125,14 +116,12 @@ public class DebuggerConsoleManager implements IDebuggerConsoleManager { null, IWorkbenchPage.VIEW_CREATE); page.bringToTop(consoleView); - consoleView.display(c); } catch (PartInitException e) { CDebugUIPlugin.log(e); } } } } - fConsole = null; return Status.OK_STATUS; } } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/debuggerconsole/DebuggerConsoleView.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/debuggerconsole/DebuggerConsoleView.java index fd513db0950..0af01357613 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/debuggerconsole/DebuggerConsoleView.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/debuggerconsole/DebuggerConsoleView.java @@ -289,7 +289,7 @@ implements IConsoleView, IDebuggerConsoleView, IConsoleListener, IPropertyChange new PageSwitcher(this) { @Override public void activatePage(Object page) { - getConsoleManager().showConsoleView((IDebuggerConsole)page); + display((IDebuggerConsole)page); } @Override diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/debuggerconsole/IDebuggerConsoleManager.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/debuggerconsole/IDebuggerConsoleManager.java index a66c3cf6be6..870a25a8d6e 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/debuggerconsole/IDebuggerConsoleManager.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/debuggerconsole/IDebuggerConsoleManager.java @@ -52,11 +52,8 @@ public interface IDebuggerConsoleManager { public IDebuggerConsole[] getConsoles(); /** - * Opens the console view and displays given the console. + * Opens the console view. * If the view is already open, it is brought to the front. - * Has no effect if the given console is not currently registered. - * - * @param console console to display */ - public void showConsoleView(IDebuggerConsole console); + public void showConsoleView(); } 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 49e9a048a1f..15870f79389 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 @@ -199,7 +199,7 @@ public class GdbCliConsoleManager implements ILaunchesListener2 { addConsole(console); // Make sure the Debugger Console view is visible - getDebuggerConsoleManager().showConsoleView(console); + getDebuggerConsoleManager().showConsoleView(); } }