Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchPartReference;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PerspectiveAdapter;
import org.eclipse.ui.PlatformUI;
Expand Down Expand Up @@ -156,16 +157,24 @@ public void partInputChanged(IWorkbenchPartReference partRef) {
public ConsoleManager() {
perspectiveListener = new ConsoleManagerPerspectiveListener();
partListener = new ConsoleManagerPartListener();
}

if (PlatformUI.isWorkbenchRunning() && PlatformUI.getWorkbench() != null
&& PlatformUI.getWorkbench().getActiveWorkbenchWindow() != null) {
PlatformUI.getWorkbench().getActiveWorkbenchWindow().addPerspectiveListener(perspectiveListener);

IPartService service = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getPartService();
public void addWindowAndPerspectiveListeners(IWorkbenchWindow window) {
if (PlatformUI.isWorkbenchRunning() && window != null) {
window.addPerspectiveListener(perspectiveListener);
IPartService service = window.getPartService();
service.addPartListener(partListener);
}
}

public void removeWindowAndPerspectiveListeners(IWorkbenchWindow window) {
if (PlatformUI.isWorkbenchRunning() && window != null) {
window.removePerspectiveListener(perspectiveListener);
IPartService service = window.getPartService();
service.removePartListener(partListener);
}
}

/**
* Returns the active workbench window page if the workbench is still running.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
*******************************************************************************/
package org.eclipse.terminal.view.ui.internal.listeners;

import org.eclipse.terminal.view.ui.internal.ConsoleManager;
import org.eclipse.terminal.view.ui.launcher.ITerminalConsoleViewManager;
import org.eclipse.ui.IPartListener2;
import org.eclipse.ui.IPartService;
import org.eclipse.ui.IPerspectiveListener;
Expand Down Expand Up @@ -85,6 +87,8 @@ public void windowClosed(IWorkbenchWindow window) {
if (perspectiveListener != null) {
window.removePerspectiveListener(perspectiveListener);
}
ConsoleManager consoleViewManager = (ConsoleManager) window.getService(ITerminalConsoleViewManager.class);
consoleViewManager.removeWindowAndPerspectiveListeners(window);
}
}

Expand Down Expand Up @@ -119,6 +123,8 @@ public void windowOpened(IWorkbenchWindow window) {
}
}

ConsoleManager consoleViewManager = (ConsoleManager) window.getService(ITerminalConsoleViewManager.class);
consoleViewManager.addWindowAndPerspectiveListeners(window);
initialized = true;
}
}
Expand Down
Loading