Bug 345435 - [console] EOF Ctrl+Z keybinding doesn't work with two

consoles up

Change-Id: I1e45eb5450887c9107e1cb46b3f3894e5443d85c
Signed-off-by: Paul Pazderski <paul-eclipse@ppazderski.de>

1 files changed, 17 insertions, 10 deletions

diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleView.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleView.java
index b6730b2dd..88d374eff 100644
--- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleView.java
+++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleView.java
@@ -167,18 +167,20 @@ public class ConsoleView extends PageBookView implements IConsoleView, IConsoleL
 		}
 
 		super.showPageRec(pageRec);
-		fActiveConsole = recConsole;
-		IConsole tos = null;
-		if (!fStack.isEmpty()) {
-			tos = fStack.get(0);
-		}
-		if (tos != null && !tos.equals(fActiveConsole) && fActive) {
-			deactivateParticipants(tos);
+
+		if (fActiveConsole != recConsole) {
+			if (fActive && fActiveConsole != null) {
+				deactivateParticipants(fActiveConsole);
+			}
+			if (recConsole != null) {
+				activateParticipants(recConsole);
+			}
 		}
-		if (fActiveConsole != null && !fActiveConsole.equals(tos)) {
+		fActiveConsole = recConsole;
+		// bring active console on top of stack
+		if (fActiveConsole != null && !fStack.isEmpty() && !fActiveConsole.equals(fStack.get(0))) {
 			fStack.remove(fActiveConsole);
-			fStack.add(0,fActiveConsole);
-			activateParticipants(fActiveConsole);
+			fStack.add(0, fActiveConsole);
 		}
 		updateTitle();
 		updateHelp();
@@ -509,6 +511,11 @@ public class ConsoleView extends PageBookView implements IConsoleView, IConsoleL
 		ConsoleWorkbenchPart part = fConsoleToPart.get(console);
 		if (part != null) {
 			partActivated(part);
+			// Workaround for bug 345435: call activated for this to force PageBookView to
+			// activate the new pages context
+			if (fActive) {
+				partActivated(this);
+			}
 		}
 	}